Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 19:40:20 +03:00
Code Issues Wiki Activity

Some VS compilation fixes

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,3 +8,4 @@
build*/ build*/
cmake-build-*/ cmake-build-*/
/debian/ /debian/
/*.vscode

26
radio/src/datastructs.h
View file

@ -539,6 +539,21 @@ PACK(struct CustomScreenData {
uint8_t view; uint8_t view;
#endif #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 { PACK(struct ModelData {
ModelHeader header; ModelHeader header;
TimerData timers[MAX_TIMERS]; TimerData timers[MAX_TIMERS];
@ -574,10 +589,9 @@ PACK(struct ModelData {
NOBACKUP(VarioData varioData); NOBACKUP(VarioData varioData);
NOBACKUP(uint8_t rssiSource); NOBACKUP(uint8_t rssiSource);
#if defined(PCBX9)
NOBACKUP(uint8_t voltsSource); TOPBAR_DATA;
NOBACKUP(uint8_t altitudeSource);
#endif
NOBACKUP(RssiAlarmData rssiAlarms); NOBACKUP(RssiAlarmData rssiAlarms);
NOBACKUP(uint8_t spare1:6); NOBACKUP(uint8_t spare1:6);
@ -586,9 +600,7 @@ PACK(struct ModelData {
int16_t failsafeChannels[MAX_OUTPUT_CHANNELS]; int16_t failsafeChannels[MAX_OUTPUT_CHANNELS];
TrainerModuleData trainerData; TrainerModuleData trainerData;
#if defined(PCBHORUS) || defined(PCBTARANIS) SCRIPT_DATA;
NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]);
#endif
NOBACKUP(char inputNames[MAX_INPUTS][LEN_INPUT_NAME]); NOBACKUP(char inputNames[MAX_INPUTS][LEN_INPUT_NAME]);
NOBACKUP(uint8_t potsWarnEnabled); NOBACKUP(uint8_t potsWarnEnabled);

8
radio/src/targets/taranis/board.h
View file

@ -496,12 +496,16 @@ enum Analogs {
#define STICKS_PWM_ENABLED() false #define STICKS_PWM_ENABLED() false
#endif #endif
PACK(typedef struct {
#if NUM_PWMSTICKS > 0 #if NUM_PWMSTICKS > 0
PACK(typedef struct {
uint8_t sticksPwmDisabled:1; uint8_t sticksPwmDisabled:1;
#endif
uint8_t pxx2Enabled:1; uint8_t pxx2Enabled:1;
}) HardwareOptions; }) HardwareOptions;
#else
PACK(typedef struct {
uint8_t pxx2Enabled:1;
}) HardwareOptions;
#endif
extern HardwareOptions hardwareOptions; extern HardwareOptions hardwareOptions;