Removed 'PREFERRED' beeper settings.

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
-}

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);

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
+                    } else {
-                        if (i == BEEPER_PREFERENCE-1)
+                        beeperOffSet(beeperModeMaskForTableIndex(i));
-                            setBeeperOffMask(getPreferredBeeperOffMask());
+                    }
-                        else {
-                            beeperOffSet(beeperModeMaskForTableIndex(i));
-                        }
                     cliPrint("Disabled");
                 }
                 else { // beeper on
-                    if (i == BEEPER_ALL-1)
+                    if (i == BEEPER_ALL-1) {
                         beeperOffClearAll();
-                    else
+                    } else {
-                        if (i == BEEPER_PREFERENCE-1)
+                        beeperOffClear(beeperModeMaskForTableIndex(i));
-                            setPreferredBeeperOffMask(getBeeperOffMask());
+                    }
-                        else {
-                            beeperOffClear(beeperModeMaskForTableIndex(i));
-                        }
                     cliPrint("Enabled");
                 }
             cliPrintLinef(" %s", beeperNameForTableIndex(i));

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) },

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);
 

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

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);