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

fix(pxx2): prevent unnecessary model yaml rewrite on load (#5047)

Browse Source
This commit is contained in:
philmoz
2024-05-24 17:12:43 +10:00
committed by GitHub
parent a13fc6254b
commit d21ac7be2c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/storage_common.cpp
+12 -4
View File
@@ -201,30 +201,38 @@ if(g_model.rssiSource) {
}
#if defined(PXX2)
bool changed = false;
if (is_memclear(g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID)) {
memcpy(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID);
if (!is_memclear(g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID)) {
memcpy(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID);
changed = true;
}
}
// fix colorLCD radios not writing yaml tag receivers
if(isModulePXX2(INTERNAL_MODULE)) {
ModuleData *intModule = &g_model.moduleData[INTERNAL_MODULE];
unsigned int oldVal = intModule->pxx2.receivers;
for(uint8_t receiverIdx = 0; receiverIdx < 3; receiverIdx++) {
if(intModule->pxx2.receiverName[receiverIdx][0])
intModule->pxx2.receivers |= (1 << receiverIdx);
}
if (oldVal != intModule->pxx2.receivers) changed = true;
}
if(isModulePXX2(EXTERNAL_MODULE)) {
ModuleData *extModule = &g_model.moduleData[EXTERNAL_MODULE];
unsigned int oldVal = extModule->pxx2.receivers;
for(uint8_t receiverIdx = 0; receiverIdx < 3; receiverIdx++) {
if(extModule->pxx2.receiverName[receiverIdx][0])
extModule->pxx2.receivers |= (1 << receiverIdx);
}
if (oldVal != extModule->pxx2.receivers) changed = true;
}
storageDirty(EE_MODEL);
if (changed)
storageDirty(EE_MODEL);
#endif
#if defined(MULTIMODULE) && defined(MULTI_PROTOLIST)