Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 06:45:16 +03:00
Code Issues Wiki Activity

Removed 'PREFERRED' beeper settings.

Browse source
This commit is contained in:
mikeller 2018-05-19 17:52:30 +12:00
parent a0dd12db42
commit 2c3bf6ad2d
7 changed files with 11 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/interface/cli.c
View file

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

3
src/main/interface/settings.c
View file

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