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

Fixes #2343

Browse Source
This commit is contained in:
bsongis
2015-05-26 21:25:41 +02:00
parent 0f99e07d9a
commit ca515a9edb
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_conversions.cpp
+20 -2
View File
@@ -556,8 +556,21 @@ PACK(typedef struct {
uint8_t rxBattAlarms[2];
#endif
#if defined(PCBTARANIS)
PACK(typedef struct {
ModelHeader header;
char name[LEN_MODEL_NAME];
uint8_t modelId;
char bitmap[LEN_BITMAP_NAME];
}) ModelHeader_v216;
#else
PACK(typedef struct {
char name[LEN_MODEL_NAME];
uint8_t modelId;
}) ModelHeader_v216;
#endif
PACK(typedef struct {
ModelHeader_v216 header;
TimerData_v216 timers[2];
AVR_FIELD(uint8_t protocol:3)
ARM_FIELD(uint8_t telemetryProtocol:3)
@@ -885,7 +898,12 @@ void ConvertModel_216_to_217(ModelData &model)
zchar2str(name, oldModel.header.name, LEN_MODEL_NAME);
TRACE("Model %s conversion from v216 to v217", name);
memcpy(&newModel.header, &oldModel.header, sizeof(newModel.header));
newModel.header.modelId[0] = oldModel.header.modelId;
memcpy(newModel.header.name, oldModel.header.name, LEN_MODEL_NAME);
#if defined(PCBTARANIS)
memcpy(newModel.header.bitmap, oldModel.header.bitmap, LEN_BITMAP_NAME);
#endif
for (uint8_t i=0; i<2; i++) {
TimerData & timer = newModel.timers[i];
if (oldModel.timers[i].mode >= TMRMODE_COUNT)