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

More members marked as spare in EEPROM

Browse source
This commit is contained in:
Bertrand Songis 2019-08-16 09:34:52 +02:00
parent 01e312a8d4
commit 76bb9ef41e
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
radio/src/datastructs.h
View file

@ -673,13 +673,13 @@ PACK(struct TrainerData {
NOBACKUP(char switchNames[STORAGE_NUM_SWITCHES][LEN_SWITCH_NAME]); \ NOBACKUP(char switchNames[STORAGE_NUM_SWITCHES][LEN_SWITCH_NAME]); \
NOBACKUP(char anaNames[NUM_STICKS + STORAGE_NUM_POTS + STORAGE_NUM_SLIDERS][LEN_ANA_NAME]); \ NOBACKUP(char anaNames[NUM_STICKS + STORAGE_NUM_POTS + STORAGE_NUM_SLIDERS][LEN_ANA_NAME]); \
NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \ NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \
NOBACKUP(uint8_t spare:1); \ NOBACKUP(uint8_t spare4:1); \
NOBACKUP(uint8_t blOffBright:7); \ NOBACKUP(uint8_t blOffBright:7); \
NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]); NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]);
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#if defined(STORAGE_BLUETOOTH) #if defined(STORAGE_BLUETOOTH)
#define BLUETOOTH_FIELDS \ #define BLUETOOTH_FIELDS \
uint8_t spare; \ uint8_t spare4; \
char bluetoothName[LEN_BLUETOOTH_NAME]; char bluetoothName[LEN_BLUETOOTH_NAME];
#else #else
#define BLUETOOTH_FIELDS #define BLUETOOTH_FIELDS
@ -697,7 +697,7 @@ PACK(struct TrainerData {
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
#define EXTRA_GENERAL_FIELDS \ #define EXTRA_GENERAL_FIELDS \
int8_t txCurrentCalibration; \ int8_t txCurrentCalibration; \
int8_t spare; \ int8_t spare4; \
uint8_t mAhWarn; \ uint8_t mAhWarn; \
uint16_t mAhUsed; \ uint16_t mAhUsed; \
int8_t temperatureCalib; \ int8_t temperatureCalib; \
@ -723,7 +723,7 @@ PACK(struct TrainerData {
#if defined(BUZZER) #if defined(BUZZER)
#define BUZZER_FIELD int8_t buzzerMode:2 // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware) #define BUZZER_FIELD int8_t buzzerMode:2 // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
#else #else
#define BUZZER_FIELD int8_t spareRadio:2 #define BUZZER_FIELD int8_t spare3:2
#endif #endif
PACK(struct RadioData { PACK(struct RadioData {
@ -756,7 +756,7 @@ PACK(struct RadioData {
NOBACKUP(uint8_t templateSetup); // RETA order for receiver channels NOBACKUP(uint8_t templateSetup); // RETA order for receiver channels
NOBACKUP(int8_t PPM_Multiplier); NOBACKUP(int8_t PPM_Multiplier);
NOBACKUP(int8_t hapticLength); NOBACKUP(int8_t hapticLength);
N_HORUS_FIELD(N_TARANIS_FIELD(uint8_t reNavigation)); N_HORUS_FIELD(N_TARANIS_FIELD(uint8_t spare1));
N_HORUS_FIELD(N_TARANIS_FIELD(uint8_t stickReverse)); N_HORUS_FIELD(N_TARANIS_FIELD(uint8_t stickReverse));
NOBACKUP(int8_t beepLength:3); NOBACKUP(int8_t beepLength:3);
NOBACKUP(int8_t hapticStrength:3); NOBACKUP(int8_t hapticStrength:3);
@ -777,7 +777,7 @@ PACK(struct RadioData {
NOBACKUP(uint8_t disableRssiPoweroffAlarm:1); NOBACKUP(uint8_t disableRssiPoweroffAlarm:1);
NOBACKUP(uint8_t USBMode:2); NOBACKUP(uint8_t USBMode:2);
NOBACKUP(uint8_t jackMode:2); NOBACKUP(uint8_t jackMode:2);
NOBACKUP(uint8_t spareExtraArm:1); NOBACKUP(uint8_t spare2:1);
NOBACKUP(char ttsLanguage[2]); NOBACKUP(char ttsLanguage[2]);
NOBACKUP(int8_t beepVolume:4); NOBACKUP(int8_t beepVolume:4);
NOBACKUP(int8_t wavVolume:4); NOBACKUP(int8_t wavVolume:4);