RssiPowerOff alarm enabled by default (#5129)

* RssiPowerOff alarm enabled by default
+ Companion support

* Fix continuously toggling RSSI on shutdown setting on X9
This commit is contained in:
Bertrand Songis
2017-08-04 11:01:52 +02:00
committed by Andre Bernet
parent 6304f0daf6
commit 76e72c8a86
12 changed files with 147 additions and 88 deletions
+3 -3
View File
@@ -2763,7 +2763,7 @@ uint32_t pwrCheck()
}
else if (pwr_press_time == 0) {
pwr_press_time = get_tmr10ms();
if (message && g_eeGeneral.rssiPoweroffAlarm) {
if (message && !g_eeGeneral.disableRssiPoweroffAlarm) {
audioEvent(AU_MODEL_STILL_POWERED);
}
}
@@ -2792,7 +2792,7 @@ uint32_t pwrCheck()
}
}
#else
while ((TELEMETRY_STREAMING() && g_eeGeneral.rssiPoweroffAlarm)) {
while ((TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm)) {
lcdRefreshWait();
lcdClear();
POPUP_CONFIRMATION("Confirm Shutdown");
@@ -2846,7 +2846,7 @@ uint32_t pwrCheck()
}
#endif
if (g_eeGeneral.rssiPoweroffAlarm) {
if (!g_eeGeneral.disableRssiPoweroffAlarm) {
if (TELEMETRY_STREAMING()) {
RAISE_ALERT(STR_MODEL, STR_MODEL_STILL_POWERED, STR_PRESS_ENTER_TO_CONFIRM, AU_MODEL_STILL_POWERED);
while (TELEMETRY_STREAMING()) {