Visual C++ compilation

radio/src/eeprom_conversions.cpp

@@ -48,6 +48,12 @@ PACK(typedef struct {
   int8_t   curveParam;
 }) ExpoData_v215;
 
+#if defined(PCBTARANIS)
+  #define LIMITDATA_V215_EXTRA  char name[LEN_CHANNEL_NAME];
+#else
+  #define LIMITDATA_V215_EXTRA
+#endif
+
 PACK(typedef struct {
   int8_t  min;
   int8_t  max;
@@ -55,9 +61,7 @@ PACK(typedef struct {
   int16_t offset:14;
   uint16_t symetrical:1;
   uint16_t revert:1;
-#if defined(PCBTARANIS)
-  char name[LEN_CHANNEL_NAME];
-#endif
+  LIMITDATA_V215_EXTRA
 }) LimitData_v215;
 
 #if defined(PCBTARANIS)
@@ -462,7 +466,7 @@ bool eeConvert()
   theFile.openRlc(0);
   theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
 #else
-  #warning "TODO openRlc for sky9x"
+  #pragma message("TODO openRlc for sky9x")
 #endif
   if (g_eeGeneral.version == 215) ConvertGeneralSettings_215_to_216(g_eeGeneral);
   s_eeDirtyMsk = EE_GENERAL;
@@ -482,7 +486,7 @@ bool eeConvert()
       theFile.openRlc(FILE_MODEL(id));
       theFile.readRlc((uint8_t*)&g_model, sizeof(g_model));
 #else
-      #warning "TODO openRlc for sky9x"
+      #pragma message("TODO openRlc for sky9x")
 #endif
       int version = conversionVersionStart;
       if (version == 215) {

radio/src/gui/menu_model.cpp

@@ -3934,7 +3934,7 @@ void menuModelLimits(uint8_t event)
 #if defined(PPM_CENTER_ADJUSTABLE)
         case ITEM_LIMITS_PPM_CENTER:
           lcd_outdezAtt(LIMITS_PPM_CENTER_POS, y, PPM_CENTER+ld->ppmCenter, attr);
-#warning "could be less restrictive!"
+#pragma message("could be less restrictive!")
           if (active && ld->max <= 0 && ld->min >= 0) {
             CHECK_INCDEC_MODELVAR(event, ld->ppmCenter, -125, +125);
           }

radio/src/myeeprom.h

@@ -770,7 +770,7 @@ PACK(typedef struct t_CustomFnData { // Function Switches data
 #define CFN_CH_NUMBER(p)        (CFN_FUNC(p))
 #define CFN_PLAY_REPEAT(p)      ((p)->active)
 #define CFN_PLAY_REPEAT_MUL     1
-#define CFN_PLAY_REPEAT_NOSTART 0b111111
+#define CFN_PLAY_REPEAT_NOSTART 0x3F
 #define CFN_GVAR_MODE(p)        ((p)->mode)
 #define CFN_PARAM(p)            ((p)->param.composite.val)
 #define CFN_RESET(p)            (p->active = 0, memset(&(p)->param, 0, sizeof((p)->param)))
@@ -1411,6 +1411,12 @@ PACK(typedef struct t_ModelHeader {
   MODELDATA_BITMAP
 }) ModelHeader;
 
+#if defined (CPUARM)
+  #define ARM_OR_AVR(x, y) x
+#else
+  #define ARM_OR_AVR(x, y) y
+#endif
+
 PACK(typedef struct t_ModelData {
   ModelHeader header;
   TimerData timers[MAX_TIMERS];
@@ -1419,11 +1425,7 @@ PACK(typedef struct t_ModelData {
   int8_t    ppmNCH:4; /* spare on ARM */
   uint8_t   trimInc:3;            // Trim Increments
   uint8_t   disableThrottleWarning:1;
-#if defined (CPUARM)
-  uint8_t   displayText:1; 
-#else
-  uint8_t   pulsePol:1; /* unused on ARM */
-#endif
+  uint8_t   ARM_OR_AVR(displayText, pulsePol):1;
   uint8_t   extendedLimits:1;
   uint8_t   extendedTrims:1;
   uint8_t   throttleReversed:1;

radio/src/templates.cpp

@@ -204,7 +204,7 @@ void applyTemplate(uint8_t idx)
       case TMPL_ELEVON_DELTA:
         defaultInputs();
 #if defined(PCBTARANIS)
-#warning "Templates below are not implemented (only V-TAIL has been done). Feel free to help!"
+ #pragma message("Templates below are not implemented (only V-TAIL has been done). Feel free to help!")
 #endif
         setDest(ICC(STK_ELE), MIXSRC_Ele, true);
         setDest(ICC(STK_ELE), MIXSRC_Ail);