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

Merge from 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2019-12-05 09:29:11 +01:00
parent 19022414c9 b334e1845d
commit 4c484017a4
161 changed files with 3682 additions and 10305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/storage_common.cpp
+11 -2
View File
@@ -19,11 +19,12 @@
*/
#include "opentx.h"
#include "pulses/multi.h"
uint8_t storageDirtyMsk;
tmr10ms_t storageDirtyTime10ms;
#if defined(RAMBACKUP)
#if defined(RTC_BACKUP_RAM)
uint8_t rambackupDirtyMsk;
tmr10ms_t rambackupDirtyTime10ms;
#endif
@@ -33,7 +34,7 @@ void storageDirty(uint8_t msk)
storageDirtyMsk |= msk;
storageDirtyTime10ms = get_tmr10ms();
#if defined(RAMBACKUP)
#if defined(RTC_BACKUP_RAM)
rambackupDirtyMsk = storageDirtyMsk;
rambackupDirtyTime10ms = storageDirtyTime10ms;
#endif
@@ -133,11 +134,19 @@ void postModelLoad(bool alarms)
if (!isInternalModuleAvailable(g_model.moduleData[INTERNAL_MODULE].type)) {
memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData));
}
#if defined(MULTIMODULE)
else if (isModuleMultimodule(INTERNAL_MODULE))
multiPatchCustom(INTERNAL_MODULE);
#endif
#endif
if (!isExternalModuleAvailable(g_model.moduleData[EXTERNAL_MODULE].type)) {
memclear(&g_model.moduleData[EXTERNAL_MODULE], sizeof(ModuleData));
}
#if defined(MULTIMODULE)
else if (isModuleMultimodule(EXTERNAL_MODULE))
multiPatchCustom(EXTERNAL_MODULE);
#endif
AUDIO_FLUSH();
flightReset(false);