From e64464ff9bec8b086d941e6b8fb5686b48af88e2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 21 Jun 2016 20:24:58 +0200 Subject: [PATCH] [VC++] Compilation fixes --- radio/src/datastructs.h | 2 +- radio/src/gui/horus/topbar.h | 2 +- radio/src/pulses/pulses_arm.h | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 294154582..07779da3f 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -1104,7 +1104,7 @@ static inline void check_struct() CHKSIZE(ModelHeader, 27); CHKSIZE(CurveData, 4); CHKSIZE(RadioData, 835); - CHKSIZE(ModelData, 9372); + CHKSIZE(ModelData, 9380); #elif defined(PCBSKY9X) CHKSIZE(MixData, 20); diff --git a/radio/src/gui/horus/topbar.h b/radio/src/gui/horus/topbar.h index 8dde196ac..7c4e5f3b2 100644 --- a/radio/src/gui/horus/topbar.h +++ b/radio/src/gui/horus/topbar.h @@ -24,7 +24,7 @@ #include "widgets_container.h" #define MAX_TOPBAR_ZONES 4 -#define MAX_TOPBAR_OPTIONS 0 +#define MAX_TOPBAR_OPTIONS 1 // just because of VC++ which doesn't like 0-size arrays :( #define TOPBAR_ZONE_WIDTH 70 #define TOPBAR_ZONE_MARGIN 3 diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h index b6925a1a9..a99104237 100644 --- a/radio/src/pulses/pulses_arm.h +++ b/radio/src/pulses/pulses_arm.h @@ -86,12 +86,14 @@ PACK(struct PxxTimerPulsesData { uint32_t pcmOnesCount; }); -PACK(struct Dsm2TimerPulsesData { #if defined(MULTIMODULE) - pulse_duration_t pulses[300]; +#define MAX_PULSES_TRANSITIONS 300 #else - pulse_duration_t pulses[200]; +#define MAX_PULSES_TRANSITIONS 200 #endif + +PACK(struct Dsm2TimerPulsesData { + pulse_duration_t pulses[MAX_PULSES_TRANSITIONS]; pulse_duration_t * ptr; uint16_t rest; uint8_t index;