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

Reset ISRM upgrade moduel counter reset when mode is changed (#7425)

Browse Source 
Reset authentication counter on ISRM mode change
This commit is contained in:
3djc
2020-03-07 10:47:10 +01:00
committed by GitHub
parent ec56892de6
commit 6b5f6bc817
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/model_setup.cpp
+4
View File
@@ -1018,6 +1018,10 @@ bool menuModelSetup(event_t event)
uint8_t moduleType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isInternalModuleAvailable);
if (checkIncDec_Ret) {
setModuleType(INTERNAL_MODULE, moduleType);
#if defined(ACCESS_LIB)
// the module will reset on mode switch, we need to reset the authentication counter
globalData.authenticationCount = 0;
#endif
}
}
else if (isModuleXJT(INTERNAL_MODULE)) {
radio/src/gui/480x272/radio_power_meter.cpp
+4
View File
@@ -50,6 +50,10 @@ bool menuRadioPowerMeter(event_t event)
lcdDrawCenteredText(LCD_H/2, STR_STOPPING);
lcdRefresh();
moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
#if defined(ACCESS_LIB)
// the module will reset on mode switch, we need to reset the authentication counter
globalData.authenticationCount = 0;
#endif
/* wait 1s to resume normal operation before leaving */
watchdogSuspend(500 /*5s*/);
RTOS_WAIT_MS(1000);
radio/src/gui/480x272/radio_spectrum_analyser.cpp
+6 -1
View File
@@ -56,8 +56,13 @@ bool menuRadioSpectrumAnalyser(event_t event)
if (menuEvent) {
lcdDrawCenteredText(LCD_H / 2, STR_STOPPING);
lcdRefresh();
if (isModulePXX2(g_moduleIdx))
if (isModulePXX2(g_moduleIdx)) {
moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
#if defined(ACCESS_LIB)
// the module will reset on mode switch, we need to reset the authentication counter
globalData.authenticationCount = 0;
#endif
}
else if (isModuleMultimodule(g_moduleIdx)) {
if (reusableBuffer.spectrumAnalyser.moduleOFF)
setModuleType(INTERNAL_MODULE, MODULE_TYPE_NONE);