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

Rename serial2 to aux_serial

Browse Source
This commit is contained in:
Bertrand Songis
2019-06-04 16:57:35 +02:00
parent 0dbbfa1670
commit c9581630ff
30 changed files with 98 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/conversions/conversions_216_218.cpp
+2 -2
View File
@@ -796,7 +796,7 @@ PACK(typedef struct {
int8_t varioRepeat;
int8_t backgroundVolume;
TARANIS_FIELD(uint8_t serial2Mode:6)
TARANIS_FIELD(uint8_t auxSerialMode:6)
TARANIS_FIELD(uint8_t slidersConfig:2)
TARANIS_FIELD(uint8_t potsConfig)
TARANIS_FIELD(uint8_t backlightColor)
@@ -867,7 +867,7 @@ void convertRadioData_217_to_218(RadioData &settings)
ConvertSpecialFunctions_217_to_218((CustomFunctionData_v218 *)settings.customFn, settings_v217.customFn);
#if defined(PCBTARANIS)
settings.serial2Mode = settings_v217.serial2Mode;
settings.auxSerialMode = settings_v217.auxSerialMode;
settings.slidersConfig = settings_v217.slidersConfig;
settings.potsConfig = settings_v217.potsConfig;
settings.backlightColor = settings_v217.backlightColor;
radio/src/storage/conversions/conversions_218_219.cpp
+2 -2
View File
@@ -273,11 +273,11 @@ void convertRadioData_218_to_219(RadioData & settings)
#if defined(PCBHORUS)
RadioData_v218 settings_v218 = (RadioData_v218 &)settings;
memcpy(&settings.chkSum, &settings_v218.chkSum, offsetof(RadioData, serial2Mode) - offsetof(RadioData, chkSum));
memcpy(&settings.chkSum, &settings_v218.chkSum, offsetof(RadioData, auxSerialMode) - offsetof(RadioData, chkSum));
memcpy(&settings.calib[NUM_STICKS + 5], &settings_v218.calib[NUM_STICKS + 3], sizeof(CalibData) * (STORAGE_NUM_SLIDERS + STORAGE_NUM_MOUSE_ANALOGS));
memclear(&settings.calib[NUM_STICKS + 3], sizeof(CalibData) * 2);
settings.serial2Mode = settings_v218.serial2Mode;
settings.auxSerialMode = settings_v218.auxSerialMode;
settings.switchConfig = settings_v218.switchConfig;
settings.potsConfig = settings_v218.potsConfig;
settings.slidersConfig = settings_v218.slidersConfig;
radio/src/storage/conversions/datastructs_218.h
+2 -2
View File
@@ -506,7 +506,7 @@ static inline void check_struct_218()
#if defined(PCBHORUS)
#define EXTRA_GENERAL_FIELDS_218 \
EXTRA_GENERAL_FIELDS_GENERAL_218 \
uint8_t serial2Mode:4; \
uint8_t auxSerialMode:4; \
uint8_t slidersConfig:4; \
uint32_t switchConfig; \
uint8_t potsConfig; /* two bits per pot */ \
@@ -526,7 +526,7 @@ static inline void check_struct_218()
#endif
#define EXTRA_GENERAL_FIELDS_218 \
EXTRA_GENERAL_FIELDS_GENERAL_218 \
uint8_t serial2Mode:4; \
uint8_t auxSerialMode:4; \
uint8_t slidersConfig:4; \
uint8_t potsConfig; /* two bits per pot */\
uint8_t backlightColor; \