diff --git a/src/main/fc/config.c b/src/main/fc/config.c index ced8ff79ef..a8491c3a18 100644 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -574,21 +574,3 @@ void setBeeperOffMask(uint32_t mask) UNUSED(mask); #endif } - -uint32_t getPreferredBeeperOffMask(void) -{ -#ifdef USE_BEEPER - return beeperConfig()->preferred_beeper_off_flags; -#else - return 0; -#endif -} - -void setPreferredBeeperOffMask(uint32_t mask) -{ -#ifdef USE_BEEPER - beeperConfigMutable()->preferred_beeper_off_flags = mask; -#else - UNUSED(mask); -#endif -} diff --git a/src/main/fc/config.h b/src/main/fc/config.h index c36c70be48..0907ec7609 100644 --- a/src/main/fc/config.h +++ b/src/main/fc/config.h @@ -55,8 +55,6 @@ void beeperOffClear(uint32_t mask); void beeperOffClearAll(void); uint32_t getBeeperOffMask(void); void setBeeperOffMask(uint32_t mask); -uint32_t getPreferredBeeperOffMask(void); -void setPreferredBeeperOffMask(uint32_t mask); void initEEPROM(void); void resetEEPROM(void); diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c index d3b87fbd0b..a881e4af7f 100644 --- a/src/main/interface/cli.c +++ b/src/main/interface/cli.c @@ -2376,25 +2376,19 @@ static void cliBeeper(char *cmdline) } if (strncasecmp(cmdline, beeperNameForTableIndex(i), len) == 0) { if (remove) { // beeper off - if (i == BEEPER_ALL-1) + if (i == BEEPER_ALL-1) { beeperOffSetAll(beeperCount-2); - else - if (i == BEEPER_PREFERENCE-1) - setBeeperOffMask(getPreferredBeeperOffMask()); - else { - beeperOffSet(beeperModeMaskForTableIndex(i)); - } + } else { + beeperOffSet(beeperModeMaskForTableIndex(i)); + } cliPrint("Disabled"); } else { // beeper on - if (i == BEEPER_ALL-1) + if (i == BEEPER_ALL-1) { beeperOffClearAll(); - else - if (i == BEEPER_PREFERENCE-1) - setPreferredBeeperOffMask(getBeeperOffMask()); - else { - beeperOffClear(beeperModeMaskForTableIndex(i)); - } + } else { + beeperOffClear(beeperModeMaskForTableIndex(i)); + } cliPrint("Enabled"); } cliPrintLinef(" %s", beeperNameForTableIndex(i)); diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c index 07419e291d..731ce95401 100644 --- a/src/main/interface/settings.c +++ b/src/main/interface/settings.c @@ -630,9 +630,8 @@ const clivalue_t valueTable[] = { // PG_BEEPER_CONFIG #ifdef USE_DSHOT { "beeper_dshot_beacon_tone", VAR_UINT8 | MASTER_VALUE, .config.minmax = {0, DSHOT_CMD_BEACON5 }, PG_BEEPER_CONFIG, offsetof(beeperConfig_t, dshotBeaconTone) }, - { "disable_rx_loss_dshot_beacon", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BEEPER_CONFIG, offsetof(beeperConfig_t, disableRxLossDshotBeacon) }, -#endif #endif +#endif // USE_BEEPER // PG_MIXER_CONFIG { "yaw_motors_reversed", VAR_INT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_MIXER_CONFIG, offsetof(mixerConfig_t, yaw_motors_reversed) }, diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c index bf121c83c5..f29cccc889 100644 --- a/src/main/io/beeper.c +++ b/src/main/io/beeper.c @@ -218,7 +218,6 @@ typedef struct beeperTableEntry_s { { BEEPER_ENTRY(BEEPER_CAM_CONNECTION_OPEN, 20, beep_camOpenBeep, "CAM_CONNECTION_OPEN") }, { BEEPER_ENTRY(BEEPER_CAM_CONNECTION_CLOSE, 21, beep_camCloseBeep, "CAM_CONNECTION_CLOSED") }, { BEEPER_ENTRY(BEEPER_ALL, 22, NULL, "ALL") }, - { BEEPER_ENTRY(BEEPER_PREFERENCE, 23, NULL, "PREFERRED") }, }; static const beeperTableEntry_t *currentBeeperEntry = NULL; @@ -392,7 +391,7 @@ void beeperUpdate(timeUs_t currentTimeUs) beeperIsOn = 1; #ifdef USE_DSHOT - if (!areMotorsRunning() && beeperConfig()->dshotBeaconTone && (beeperConfig()->dshotBeaconTone <= DSHOT_CMD_BEACON5) && (currentBeeperEntry->mode == BEEPER_RX_SET || (beeperConfig()->disableRxLossDshotBeacon && currentBeeperEntry->mode == BEEPER_RX_LOST))) { + if (!areMotorsRunning() && beeperConfig()->dshotBeaconTone && (beeperConfig()->dshotBeaconTone <= DSHOT_CMD_BEACON5) && (currentBeeperEntry->mode == BEEPER_RX_SET || currentBeeperEntry->mode == BEEPER_RX_LOST)) { pwmDisableMotors(); delay(1); diff --git a/src/main/pg/beeper.c b/src/main/pg/beeper.c index 56e561b310..f1e39944ba 100644 --- a/src/main/pg/beeper.c +++ b/src/main/pg/beeper.c @@ -27,10 +27,9 @@ #include "beeper.h" -PG_REGISTER_WITH_RESET_TEMPLATE(beeperConfig_t, beeperConfig, PG_BEEPER_CONFIG, 1); +PG_REGISTER_WITH_RESET_TEMPLATE(beeperConfig_t, beeperConfig, PG_BEEPER_CONFIG, 2); PG_RESET_TEMPLATE(beeperConfig_t, beeperConfig, .dshotBeaconTone = 0, - .disableRxLossDshotBeacon = false, ); #endif diff --git a/src/main/pg/beeper.h b/src/main/pg/beeper.h index ada84b429a..5496e13cf3 100644 --- a/src/main/pg/beeper.h +++ b/src/main/pg/beeper.h @@ -25,9 +25,7 @@ typedef struct beeperConfig_s { uint32_t beeper_off_flags; - uint32_t preferred_beeper_off_flags; uint8_t dshotBeaconTone; - uint8_t disableRxLossDshotBeacon; } beeperConfig_t; PG_DECLARE(beeperConfig_t, beeperConfig);