Some VS compilation fixes

This commit is contained in:
Kilrah
2019-05-04 11:13:27 +02:00
parent dc1987e0ab
commit 9c46abf1e5
3 changed files with 26 additions and 9 deletions
+19 -7
View File
@@ -539,6 +539,21 @@ PACK(struct CustomScreenData {
uint8_t view;
#endif
#if defined(PCBX9)
#define TOPBAR_DATA \
NOBACKUP(uint8_t voltsSource);
NOBACKUP(uint8_t altitudeSource);
#else
#define TOPBAR_DATA
#endif
#if defined(PCBHORUS) || defined(PCBTARANIS)
#define SCRIPT_DATA \
NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]);
#else
#define SCRIPT_DATA
#endif
PACK(struct ModelData {
ModelHeader header;
TimerData timers[MAX_TIMERS];
@@ -574,10 +589,9 @@ PACK(struct ModelData {
NOBACKUP(VarioData varioData);
NOBACKUP(uint8_t rssiSource);
#if defined(PCBX9)
NOBACKUP(uint8_t voltsSource);
NOBACKUP(uint8_t altitudeSource);
#endif
TOPBAR_DATA;
NOBACKUP(RssiAlarmData rssiAlarms);
NOBACKUP(uint8_t spare1:6);
@@ -586,9 +600,7 @@ PACK(struct ModelData {
int16_t failsafeChannels[MAX_OUTPUT_CHANNELS];
TrainerModuleData trainerData;
#if defined(PCBHORUS) || defined(PCBTARANIS)
NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]);
#endif
SCRIPT_DATA;
NOBACKUP(char inputNames[MAX_INPUTS][LEN_INPUT_NAME]);
NOBACKUP(uint8_t potsWarnEnabled);