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

Better fix

Browse Source
This commit is contained in:
Bertrand Songis
2019-11-22 18:42:33 +01:00
parent a5ed6afa1d
commit 2708fdf378
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/radio_version.cpp
-8
View File
@@ -124,14 +124,6 @@ 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 = 1;
POPUP_WARNING(STR_MODULE_UPGRADE);
}
}
}
y += FH;
radio/src/gui/480x272/view_main.cpp
+4 -13
View File
@@ -224,19 +224,10 @@ bool menuMainView(event_t event)
}
#if defined(HARDWARE_INTERNAL_MODULE) && defined(INTERNAL_MODULE_PXX2) && defined(ACCESS_LIB)
if (globalData.authenticationCount > 0 && !globalData.upgradeModulePopup) {
if (!globalData.internalModuleVersionChecked) {
globalData.internalModuleVersionChecked = 1;
memclear(&reusableBuffer.viewMain.internalModule, sizeof(reusableBuffer.viewMain.internalModule));
moduleState[INTERNAL_MODULE].readModuleInformation(&reusableBuffer.viewMain.internalModule, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
}
else if (reusableBuffer.viewMain.internalModule.information.modelID == PXX2_MODULE_ISRM_S_X10S &&
reusableBuffer.viewMain.internalModule.information.swVersion.major == 0 &&
reusableBuffer.viewMain.internalModule.information.swVersion.minor == 1 &&
reusableBuffer.viewMain.internalModule.information.swVersion.revision < 5) {
globalData.upgradeModulePopup = 1;
POPUP_WARNING(STR_MODULE_UPGRADE);
}
if (globalData.authenticationCount > 0 && !globalData.upgradeModulePopup && !globalData.internalModuleVersionChecked) {
globalData.internalModuleVersionChecked = 1;
memclear(&reusableBuffer.viewMain.internalModule, sizeof(reusableBuffer.viewMain.internalModule));
moduleState[INTERNAL_MODULE].readModuleInformation(&reusableBuffer.viewMain.internalModule, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
}
#endif
radio/src/telemetry/frsky_pxx2.cpp
+5
View File
@@ -35,6 +35,11 @@ void processGetHardwareInfoFrame(uint8_t module, const uint8_t * frame)
memcpy(&destination->information, &frame[4], length);
if (destination->information.capabilities & ~((1 << MODULE_CAPABILITY_COUNT) - 1))
destination->information.capabilityNotSupported = true;
if (!globalData.upgradeModulePopup && destination->information.modelID == PXX2_MODULE_ISRM_S_X10S &&
destination->information.swVersion.major == 0 && destination->information.swVersion.minor == 1 && destination->information.swVersion.revision < 5) {
globalData.upgradeModulePopup = 1;
POPUP_WARNING(STR_MODULE_UPGRADE);
}
}
else if (index < PXX2_MAX_RECEIVERS_PER_MODULE && modelId < DIM(PXX2ReceiversNames)) {
memcpy(&destination->receivers[index].information, &frame[4], length);