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

VC++ compilation

Browse Source
This commit is contained in:
Andre Bernet
2016-06-23 15:35:32 +02:00
parent e282c02be2
commit 8119da792d
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/eeprom_conversions.cpp
+13 -18
View File
@@ -761,25 +761,20 @@ PACK(typedef struct {
int8_t varioRange;
int8_t varioRepeat;
int8_t backgroundVolume;
TARANIS_FIELD(uint8_t serial2Mode : 6)
TARANIS_FIELD(uint8_t slidersConfig : 2)
TARANIS_FIELD(uint8_t potsConfig)
TARANIS_FIELD(uint8_t backlightColor)
TARANIS_FIELD(swarnstate_t switchUnlockStates)
TARANIS_FIELD(CustomFunctionData_v216 customFn[NUM_CFN])
TARANIS_FIELD(swconfig_t switchConfig)
TARANIS_FIELD(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME])
TARANIS_FIELD(char anaNames[NUM_STICKS + NUM_POTS][LEN_ANA_NAME])
N_TARANIS_FIELD(CustomFunctionData_v216 customFn[NUM_CFN])
#if defined(PCBTARANIS)
uint8_t serial2Mode:6;
uint8_t slidersConfig:2;
uint8_t potsConfig;
uint8_t backlightColor;
swarnstate_t switchUnlockStates;
CustomFunctionData_v216 customFn[NUM_CFN];
swconfig_t switchConfig;
char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME];
char anaNames[NUM_STICKS+NUM_POTS][LEN_ANA_NAME];
#else
CustomFunctionData_v216 customFn[NUM_CFN];
#endif
#if defined(PCBTARANIS) && defined(REV9E)
uint8_t bluetoothEnable;
char bluetoothName[LEN_BLUETOOTH_NAME];
#endif
TARANIS_REV9E_FIELD(uint8_t bluetoothEnable)
TARANIS_REV9E_FIELD(char bluetoothName[LEN_BLUETOOTH_NAME])
}) RadioData_v216;
void ConvertRadioData_216_to_217(RadioData & settings)
radio/src/translations.h
+1
View File
@@ -755,6 +755,7 @@ extern const pm_char STR_OWN[];
extern const pm_char STR_ROTARY_ENCODER[];
extern const pm_char STR_DATE[];
extern const pm_char STR_CHANNELS_MONITOR[];
extern const pm_char STR_MIXERS_MONITOR[];
extern const pm_char STR_PATH_TOO_LONG[];
extern const pm_char STR_VIEW_TEXT[];
extern const pm_char STR_FLASH_BOOTLOADER[];