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

WiP

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-10 11:06:59 +01:00
parent 5a367a5221
commit 985a8760bb
11 changed files with 550 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+34 -7
View File
@@ -763,7 +763,8 @@ PACK(struct TrainerData {
NOBACKUP(uint8_t spare5:1 SKIP); \
NOBACKUP(uint8_t blOffBright:7); \
NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]);
#elif defined(PCBTARANIS) //|| defined(PCBNV14)
#define CURR_MODEL_FILENAME
#elif defined(PCBTARANIS)
#if defined(STORAGE_BLUETOOTH)
#define BLUETOOTH_FIELDS \
uint8_t spare5 SKIP; \
@@ -780,10 +781,13 @@ PACK(struct TrainerData {
swconfig_t switchConfig ARRAY(2,struct_switchConfig,nullptr); \
char switchNames[STORAGE_NUM_SWITCHES][LEN_SWITCH_NAME]; \
char anaNames[NUM_STICKS+STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS][LEN_ANA_NAME]; \
char currModelFilename[LEN_MODEL_FILENAME+1]; \
BLUETOOTH_FIELDS
#if defined(SDCARD_YAML)
#define CURR_MODEL_FILENAME char currModelFilename[LEN_MODEL_FILENAME+1]
#endif
#else
#define EXTRA_GENERAL_FIELDS
#define CURR_MODEL_FILENAME
#endif
#if defined(COLORLCD) && !defined(BACKUP)
@@ -879,6 +883,9 @@ PACK(struct RadioData {
GYRO_FIELDS
NOBACKUP(int8_t uartSampleMode:2); // See UartSampleModes
#if defined(PCBTARANIS)
CURR_MODEL_FILENAME;
#endif
});
#undef SWITCHES_WARNING_DATA
@@ -985,19 +992,39 @@ static inline void check_struct()
CHKSIZE(TrainerData, 16);
#if defined(PCBXLITES)
CHKSIZE(RadioData, 861);
#if !defined(SDCARD_YAML)
CHKSIZE(RadioData, 861);
#else
CHKSIZE(RadioData, 878);
#endif
CHKSIZE(ModelData, 6157);
#elif defined(PCBXLITE)
CHKSIZE(RadioData, 859);
#if !defined(SDCARD_YAML)
CHKSIZE(RadioData, 859);
#else
CHKSIZE(RadioData, 876);
#endif
CHKSIZE(ModelData, 6157);
#elif defined(PCBX7)
CHKSIZE(RadioData, 865);
#if !defined(SDCARD_YAML)
CHKSIZE(RadioData, 865);
#else
CHKSIZE(RadioData, 882);
#endif
CHKSIZE(ModelData, 6157);
#elif defined(PCBX9E)
CHKSIZE(RadioData, 961);
#if !defined(SDCARD_YAML)
CHKSIZE(RadioData, 961);
#else
CHKSIZE(RadioData, 978);
#endif
CHKSIZE(ModelData, 6614);
#elif defined(PCBX9D) || defined(PCBX9DP)
CHKSIZE(RadioData, 899);
#if !defined(SDCARD_YAML)
CHKSIZE(RadioData, 899);
#else
CHKSIZE(RadioData, 916);
#endif
CHKSIZE(ModelData, 6604);
#elif defined(PCBHORUS)
CHKSIZE(RadioData, 902);