piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add ability to disable trainer warning on shutdown (#4831)

Browse Source 
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
3djc
2024-05-08 11:19:18 +10:00
committed by GitHub
co-authored by philmoz Peter Feerick
parent acd34e7fc9
commit 09d4066a23
41 changed files with 944 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+3 -3
View File
@@ -1671,7 +1671,7 @@ uint32_t pwrCheck()
while (
(usbPlugged() && getSelectedUsbMode() != USB_UNSELECTED_MODE) ||
(TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm) ||
isTrainerConnected())
(isTrainerConnected() && !g_eeGeneral.disableTrainerPoweroffAlarm))
#endif
{
@@ -1688,7 +1688,7 @@ uint32_t pwrCheck()
msg = STR_USB_STILL_CONNECTED;
msg_len = sizeof(TR_USB_STILL_CONNECTED);
}
else if (isTrainerConnected()) {
else if (isTrainerConnected() && !g_eeGeneral.disableTrainerPoweroffAlarm) {
msg = STR_TRAINER_STILL_CONNECTED;
msg_len = sizeof(TR_TRAINER_STILL_CONNECTED);
}
@@ -1732,7 +1732,7 @@ uint32_t pwrCheck()
return !TELEMETRY_STREAMING() || g_eeGeneral.disableRssiPoweroffAlarm;
};
}
else if (!trainerConfirmed) {
else if (!trainerConfirmed && !g_eeGeneral.disableTrainerPoweroffAlarm) {
message = STR_TRAINER_STILL_CONNECTED;
closeCondition = [](){
return !isTrainerConnected();