From c49f31748cf13ae9d5740f21ab55932d36a619bf Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 10 Apr 2012 22:07:21 +0000 Subject: [PATCH] companion9x VC++ compilation --- src/myeeprom.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/myeeprom.h b/src/myeeprom.h index f33bac863..98768ab36 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -89,6 +89,15 @@ enum BeeperMode { e_mode_all }; +#if defined(PCBARM) +#define EXTRA_ARM_FIELDS \ + uint8_t speakerVolume; \ + uint8_t backlightBright; \ + int8_t currentCalib; +#else +#define EXTRA_ARM_FIELDS +#endif + #define ALTERNATE_VIEW 0x10 PACK(typedef struct t_EEGeneral { uint8_t myVers; @@ -130,11 +139,9 @@ PACK(typedef struct t_EEGeneral { uint8_t gpsFormat:1; uint8_t spare4:1; uint8_t speakerPitch; -#if defined(PCBARM) - uint8_t speakerVolume; - uint8_t backlightBright; // backlight - int8_t currentCalib; -#endif + + EXTRA_ARM_FIELDS + }) EEGeneral; // eeprom modelspec