rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #421 from mikeller/fix_initialisation_beep 

Fixed failure to disable beeping on FC init. Also, fixed spelling.
This commit is contained in:
borisbstyle 2016-05-25 22:36:50 +02:00
parent c8945c179a 94d9df4cc1
commit 4a80a64f43
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/config/config.c
View File

@ -1115,12 +1115,12 @@ void setBeeperOffMask(uint32_t mask)
masterConfig.beeper_off_flags = mask; masterConfig.beeper_off_flags = mask;
} }
uint32_t getPreferedBeeperOffMask(void) uint32_t getPreferredBeeperOffMask(void)
{ {
return masterConfig.prefered_beeper_off_flags; return masterConfig.preferred_beeper_off_flags;
} }
void setPreferedBeeperOffMask(uint32_t mask) void setPreferredBeeperOffMask(uint32_t mask)
{ {
masterConfig.prefered_beeper_off_flags = mask; masterConfig.preferred_beeper_off_flags = mask;
} }

4
src/main/config/config.h
View File

@ -60,8 +60,8 @@ void beeperOffClear(uint32_t mask);
void beeperOffClearAll(void); void beeperOffClearAll(void);
uint32_t getBeeperOffMask(void); uint32_t getBeeperOffMask(void);
void setBeeperOffMask(uint32_t mask); void setBeeperOffMask(uint32_t mask);
uint32_t getPreferedBeeperOffMask(void); uint32_t getPreferredBeeperOffMask(void);
void setPreferedBeeperOffMask(uint32_t mask); void setPreferredBeeperOffMask(uint32_t mask);
void copyCurrentProfileToProfileSlot(uint8_t profileSlotIndex); void copyCurrentProfileToProfileSlot(uint8_t profileSlotIndex);

2
src/main/config/config_master.h
View File

@ -139,7 +139,7 @@ typedef struct master_t {
#endif #endif
uint32_t beeper_off_flags; uint32_t beeper_off_flags;
uint32_t prefered_beeper_off_flags; uint32_t preferred_beeper_off_flags;
uint8_t magic_ef; // magic number, should be 0xEF uint8_t magic_ef; // magic number, should be 0xEF
uint8_t chk; // XOR checksum uint8_t chk; // XOR checksum

2
src/main/io/beeper.c
View File

@ -172,7 +172,7 @@ typedef struct beeperTableEntry_s {
{ BEEPER_ENTRY(BEEPER_USB, 17, NULL, "ON_USB") }, { BEEPER_ENTRY(BEEPER_USB, 17, NULL, "ON_USB") },
{ BEEPER_ENTRY(BEEPER_ALL, 18, NULL, "ALL") }, { BEEPER_ENTRY(BEEPER_ALL, 18, NULL, "ALL") },
{ BEEPER_ENTRY(BEEPER_PREFERENCE, 19, NULL, "PREFERED") }, { BEEPER_ENTRY(BEEPER_PREFERENCE, 19, NULL, "PREFERRED") },
}; };
static const beeperTableEntry_t *currentBeeperEntry = NULL; static const beeperTableEntry_t *currentBeeperEntry = NULL;

4
src/main/io/serial_cli.c
View File

@ -2177,7 +2177,7 @@ static void cliBeeper(char *cmdline)
beeperOffSetAll(beeperCount-2); beeperOffSetAll(beeperCount-2);
else else
if (i == BEEPER_PREFERENCE-1) if (i == BEEPER_PREFERENCE-1)
setBeeperOffMask(getPreferedBeeperOffMask()); setBeeperOffMask(getPreferredBeeperOffMask());
else { else {
mask = 1 << i; mask = 1 << i;
beeperOffSet(mask); beeperOffSet(mask);
@ -2189,7 +2189,7 @@ static void cliBeeper(char *cmdline)
beeperOffClearAll(); beeperOffClearAll();
else else
if (i == BEEPER_PREFERENCE-1) if (i == BEEPER_PREFERENCE-1)
setPreferedBeeperOffMask(getBeeperOffMask()); setPreferredBeeperOffMask(getBeeperOffMask());
else { else {
mask = 1 << i; mask = 1 << i;
beeperOffClear(mask); beeperOffClear(mask);

2
src/main/main.c
View File

@ -480,7 +480,7 @@ void init(void)
LED1_TOGGLE; LED1_TOGGLE;
LED0_TOGGLE; LED0_TOGGLE;
delay(25); delay(25);
if (!(getPreferedBeeperOffMask() & (1 << (BEEPER_SYSTEM_INIT - 1)))) BEEP_ON; if (!(getBeeperOffMask() & (1 << (BEEPER_SYSTEM_INIT - 1)))) BEEP_ON;
delay(25); delay(25);
BEEP_OFF; BEEP_OFF;
} }