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

Fixed defaults for NAZE rev5 and above 

Also included small rename of isOD to isOpenDrain for readability
This commit is contained in:
blckmn 2016-11-19 11:57:48 +11:00
parent abc2127a90
commit e0d9e225d2
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/drivers/sound_beeper.c
View File

@ -59,7 +59,7 @@ void beeperInit(const beeperConfig_t *config)
if (beeperIO) { if (beeperIO) {
IOInit(beeperIO, OWNER_BEEPER, 0); IOInit(beeperIO, OWNER_BEEPER, 0);
IOConfigGPIO(beeperIO, config->isOD ? IOCFG_OUT_OD : IOCFG_OUT_PP); IOConfigGPIO(beeperIO, config->isOpenDrain ? IOCFG_OUT_OD : IOCFG_OUT_PP);
} }
systemBeep(false); systemBeep(false);
#endif #endif

2
src/main/drivers/sound_beeper.h
View File

@ -32,7 +32,7 @@
typedef struct beeperConfig_s { typedef struct beeperConfig_s {
ioTag_t ioTag; ioTag_t ioTag;
uint8_t isInverted; uint8_t isInverted;
uint8_t isOD; uint8_t isOpenDrain;
} beeperConfig_t; } beeperConfig_t;
void systemBeep(bool on); void systemBeep(bool on);

4
src/main/fc/config.c
View File

@ -352,10 +352,10 @@ void resetAdcConfig(adcConfig_t *adcConfig)
void resetBeeperConfig(beeperConfig_t *beeperConfig) void resetBeeperConfig(beeperConfig_t *beeperConfig)
{ {
#ifdef BEEPER_INVERTED #ifdef BEEPER_INVERTED
beeperConfig->isOD = false; beeperConfig->isOpenDrain = false;
beeperConfig->isInverted = true; beeperConfig->isInverted = true;
#else #else
beeperConfig->isOD = true; beeperConfig->isOpenDrain = true;
beeperConfig->isInverted = false; beeperConfig->isInverted = false;
#endif #endif
beeperConfig->ioTag = IO_TAG(BEEPER); beeperConfig->ioTag = IO_TAG(BEEPER);

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

@ -754,8 +754,8 @@ const clivalue_t valueTable[] = {
#endif #endif
#ifdef BEEPER #ifdef BEEPER
{ "beeper_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.beeperConfig.isInverted, .config.lookup = { TABLE_OFF_ON } }, { "beeper_inversion", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.beeperConfig.isInverted, .config.lookup = { TABLE_OFF_ON } },
{ "beeper_od", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.beeperConfig.isOD, .config.lookup = { TABLE_OFF_ON } }, { "beeper_od", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.beeperConfig.isOpenDrain, .config.lookup = { TABLE_OFF_ON } },
#endif #endif
#ifdef SERIAL_RX #ifdef SERIAL_RX

5
src/main/target/NAZE/config.c
View File

@ -82,8 +82,11 @@ void targetConfiguration(master_t *config)
if (hardwareRevision >= NAZE32_REV5) { if (hardwareRevision >= NAZE32_REV5) {
// naze rev4 and below used opendrain to PNP for buzzer. Rev5 and above use PP to NPN. // naze rev4 and below used opendrain to PNP for buzzer. Rev5 and above use PP to NPN.
config->beeperConfig.isOD = false; config->beeperConfig.isOpenDrain = false;
config->beeperConfig.isInverted = true; config->beeperConfig.isInverted = true;
} else {
config->beeperConfig.isOpenDrain = true;
config->beeperConfig.isInverted = false;
} }
} }