Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Bsongis/access registration id reinit when zero (#6700)

Browse source 
ACCESS registration ID reinitialized when zero (coming from Companion)
Fix incorrect module settings on model load
This commit is contained in:
Bertrand Songis 2019-09-02 17:04:25 +02:00 • committed by GitHub
parent 0fe2b8918b
commit 02d07c4d2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -2498,9 +2498,6 @@ void OpenTxModelData::beforeExport()
{ {
// qDebug() << QString("before export model") << modelData.name; // qDebug() << QString("before export model") << modelData.name;
for (int module=0; module<2; module++) {
}
if (IS_HORUS(board)) { if (IS_HORUS(board)) {
uint32_t newSwitchWarningStates = 0; uint32_t newSwitchWarningStates = 0;
for (int i = 0; i < MAX_SWITCHES(board, version); i++) { for (int i = 0; i < MAX_SWITCHES(board, version); i++) {
@ -2517,11 +2514,6 @@ void OpenTxModelData::afterImport()
{ {
qCDebug(eepromImport) << QString("OpenTxModelData::afterImport()") << modelData.name; qCDebug(eepromImport) << QString("OpenTxModelData::afterImport()") << modelData.name;
// ??? what's this ???
if (IS_HORUS(board)) {
modelData.moduleData[0].protocol = PULSES_PXX_XJT_X16;
}
if (IS_HORUS(board)) { if (IS_HORUS(board)) {
uint32_t newSwitchWarningStates = 0; uint32_t newSwitchWarningStates = 0;
for (int i = 0; i < MAX_SWITCHES(board, version); i++) { for (int i = 0; i < MAX_SWITCHES(board, version); i++) {
@ -2534,8 +2526,9 @@ void OpenTxModelData::afterImport()
modelData.switchWarningStates = newSwitchWarningStates; modelData.switchWarningStates = newSwitchWarningStates;
} }
if (version <= 218 && IS_HORUS_X10(board) && modelData.thrTraceSrc > 3) if (version <= 218 && IS_HORUS_X10(board) && modelData.thrTraceSrc > 3) {
modelData.thrTraceSrc += 2; modelData.thrTraceSrc += 2;
}
} }
OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type board, unsigned int version, unsigned int variant): OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type board, unsigned int version, unsigned int variant):

3
radio/src/storage/eeprom_common.cpp
View file

@ -27,7 +27,6 @@
void eeLoadModel(uint8_t index) void eeLoadModel(uint8_t index)
{ {
if (index < MAX_MODELS) { if (index < MAX_MODELS) {
preModelLoad(); preModelLoad();
uint16_t size = eeLoadModelData(index); uint16_t size = eeLoadModelData(index);
@ -111,6 +110,8 @@ bool storageReadRadioSettings(bool allowFixes)
} }
} }
postRadioSettingsLoad();
return true; return true;
} }

2
radio/src/storage/sdcard_raw.cpp
View file

@ -169,6 +169,8 @@ const char * loadRadioSettings(const char * path)
convertRadioData(version); convertRadioData(version);
} }
postRadioSettingsLoad();
return nullptr; return nullptr;
} }

2
radio/src/storage/storage.h
View file

@ -49,7 +49,7 @@ void storageReadAll();
void storageDirty(uint8_t msk); void storageDirty(uint8_t msk);
void storageCheck(bool immediately); void storageCheck(bool immediately);
void storageFlushCurrentModel(); void storageFlushCurrentModel();
void postRadioSettingsLoad();
void preModelLoad(); void preModelLoad();
void postModelLoad(bool alarms); void postModelLoad(bool alarms);

30
radio/src/storage/storage_common.cpp
View file

@ -53,20 +53,34 @@ void preModelLoad()
pauseMixerCalculations(); pauseMixerCalculations();
} }
#if defined(PCBTARANIS) || defined(PCBHORUS)
static void fixUpModel() void postRadioSettingsLoad()
{ {
// Ensure that when rfProtocol is MODULE_SUBTYPE_PXX1_OFF the type of the module is MODULE_TYPE_NONE #if defined(PXX2)
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT_PXX1 && g_model.moduleData[INTERNAL_MODULE].rfProtocol == MODULE_SUBTYPE_PXX1_OFF) if (is_memclear(g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID)) {
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_NONE; setDefaultOwnerId();
} }
#endif #endif
}
void postModelLoad(bool alarms) void postModelLoad(bool alarms)
{ {
#if defined(PCBTARANIS) || defined(PCBHORUS) #if defined(PXX2)
fixUpModel(); if (is_memclear(g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID)) {
memcpy(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID);
}
#endif #endif
#if defined(HARDWARE_INTERNAL_MODULE)
if (!isInternalModuleAvailable(g_model.moduleData[INTERNAL_MODULE].type)) {
memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData));
}
#endif
if (!isExternalModuleAvailable(g_model.moduleData[EXTERNAL_MODULE].type)) {
memclear(&g_model.moduleData[EXTERNAL_MODULE], sizeof(ModuleData));
}
AUDIO_FLUSH(); AUDIO_FLUSH();
flightReset(false); flightReset(false);