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

Popup in module information screen

Browse Source
This commit is contained in:
Bertrand Songis
2019-11-22 17:08:55 +01:00
parent 64c3164ed4
commit 33e320a581
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/radio_version.cpp
+8
View File
@@ -124,6 +124,14 @@ bool menuRadioModulesVersion(event_t event)
if (variant < DIM(variants)) {
lcdDrawText(lcdNextPos + 1, y, variants[variant]);
}
if (!globalData.upgradeModulePopup &&
reusableBuffer.hardwareAndSettings.modules[module].information.modelID == PXX2_MODULE_ISRM_S_X10S &&
reusableBuffer.hardwareAndSettings.modules[module].information.swVersion.major == 0 &&
reusableBuffer.hardwareAndSettings.modules[module].information.swVersion.minor == 1 &&
reusableBuffer.hardwareAndSettings.modules[module].information.swVersion.revision < 5) {
globalData.upgradeModulePopup = 0;
POPUP_WARNING(STR_MODULE_UPGRADE);
}
}
}
y += FH;
radio/src/opentx.h
+1 -1
View File
@@ -571,7 +571,7 @@ PACK(struct GlobalData {
uint8_t unexpectedShutdown:1;
uint8_t externalAntennaEnabled:1;
uint8_t authenticationCount:2;
uint8_t authenticationPopup:1;
uint8_t upgradeModulePopup:1;
uint8_t spare:3;
});
radio/src/telemetry/frsky_pxx2.cpp
+4 -4
View File
@@ -204,8 +204,8 @@ void processAuthenticationFrame(uint8_t module, const uint8_t * frame)
uint8_t messageDigest[16] = {0};
if (frame[0] == 4 && PXX2_AUTH_REFUSED_FLAG == frame[4]) {
if (!globalData.authenticationPopup) {
globalData.authenticationPopup = 1;
if (!globalData.upgradeModulePopup) {
globalData.upgradeModulePopup = 1;
POPUP_INFORMATION(STR_AUTH_FAILURE);
}
return;
@@ -219,9 +219,9 @@ void processAuthenticationFrame(uint8_t module, const uint8_t * frame)
// we remain in AUTHENTICATION mode to avoid a CHANNELS frame is sent at the end of the mixing process
}
if (!globalData.authenticationPopup) {
if (!globalData.upgradeModulePopup) {
if (globalData.authenticationCount >= 2) {
globalData.authenticationPopup = 1;
globalData.upgradeModulePopup = 1;
POPUP_WARNING(STR_MODULE_UPGRADE);
}
else {