Merge pull request #10225 from dkustec/buzzer-mute-box-mode
This commit is contained in:
commit
7d0c1ebad9
|
@ -76,6 +76,7 @@ typedef enum {
|
|||
BOXLAUNCHCONTROL,
|
||||
BOXMSPOVERRIDE,
|
||||
BOXSTICKCOMMANDDISABLE,
|
||||
BOXBEEPERMUTE,
|
||||
CHECKBOX_ITEM_COUNT
|
||||
} boxId_e;
|
||||
|
||||
|
|
|
@ -241,7 +241,7 @@ void beeper(beeperMode_e mode)
|
|||
mode == BEEPER_SILENCE || (
|
||||
(beeperConfig()->beeper_off_flags & BEEPER_GET_FLAG(BEEPER_USB))
|
||||
&& getBatteryState() == BATTERY_NOT_PRESENT
|
||||
)
|
||||
) || IS_RC_MODE_ACTIVE(BOXBEEPERMUTE)
|
||||
) {
|
||||
beeperSilence();
|
||||
return;
|
||||
|
|
|
@ -98,7 +98,8 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT] = {
|
|||
{ BOXVTXCONTROLDISABLE, "VTX CONTROL DISABLE", 48},
|
||||
{ BOXLAUNCHCONTROL, "LAUNCH CONTROL", 49 },
|
||||
{ BOXMSPOVERRIDE, "MSP OVERRIDE", 50},
|
||||
{ BOXSTICKCOMMANDDISABLE, "STICK COMMANDS DISABLE", 51}
|
||||
{ BOXSTICKCOMMANDDISABLE, "STICK COMMANDS DISABLE", 51},
|
||||
{ BOXBEEPERMUTE, "BEEPER MUTE", 52},
|
||||
};
|
||||
|
||||
// mask of enabled IDs, calculated on startup based on enabled features. boxId_e is used as bit index
|
||||
|
@ -230,6 +231,7 @@ void initActiveBoxIds(void)
|
|||
}
|
||||
|
||||
BME(BOXBEEPERON);
|
||||
BME(BOXBEEPERMUTE);
|
||||
|
||||
#ifdef USE_LED_STRIP
|
||||
if (featureIsEnabled(FEATURE_LED_STRIP)) {
|
||||
|
|
Loading…
Reference in New Issue