From 8119da792d58fe06c2d64e1112758c6715fd7036 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Thu, 23 Jun 2016 15:35:32 +0200
Subject: [PATCH] VC++ compilation

---
 radio/src/storage/eeprom_conversions.cpp | 31 ++++++++++--------------
 radio/src/translations.h                 |  1 +
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/radio/src/storage/eeprom_conversions.cpp b/radio/src/storage/eeprom_conversions.cpp
index ec97da951..081f5cf29 100644
--- a/radio/src/storage/eeprom_conversions.cpp
+++ b/radio/src/storage/eeprom_conversions.cpp
@@ -761,25 +761,20 @@ PACK(typedef struct {
   int8_t   varioRange;
   int8_t   varioRepeat;
   int8_t   backgroundVolume;
+ 
+  TARANIS_FIELD(uint8_t  serial2Mode : 6)
+  TARANIS_FIELD(uint8_t  slidersConfig : 2)
+  TARANIS_FIELD(uint8_t  potsConfig)
+  TARANIS_FIELD(uint8_t  backlightColor)
+  TARANIS_FIELD(swarnstate_t switchUnlockStates)
+  TARANIS_FIELD(CustomFunctionData_v216 customFn[NUM_CFN])
+  TARANIS_FIELD(swconfig_t switchConfig)
+  TARANIS_FIELD(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME])
+  TARANIS_FIELD(char anaNames[NUM_STICKS + NUM_POTS][LEN_ANA_NAME])
+  N_TARANIS_FIELD(CustomFunctionData_v216 customFn[NUM_CFN])
 
-#if defined(PCBTARANIS)
-  uint8_t  serial2Mode:6;
-  uint8_t  slidersConfig:2;
-  uint8_t  potsConfig;
-  uint8_t  backlightColor;
-  swarnstate_t switchUnlockStates;
-  CustomFunctionData_v216 customFn[NUM_CFN];
-  swconfig_t switchConfig;
-  char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME];
-  char anaNames[NUM_STICKS+NUM_POTS][LEN_ANA_NAME];
-#else
-  CustomFunctionData_v216 customFn[NUM_CFN];
-#endif
-
-#if defined(PCBTARANIS) && defined(REV9E)
-  uint8_t bluetoothEnable;
-  char bluetoothName[LEN_BLUETOOTH_NAME];
-#endif
+  TARANIS_REV9E_FIELD(uint8_t bluetoothEnable)
+  TARANIS_REV9E_FIELD(char bluetoothName[LEN_BLUETOOTH_NAME])
 }) RadioData_v216;
 
 void ConvertRadioData_216_to_217(RadioData & settings)
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 970ac4fdd..5d5370cde 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -755,6 +755,7 @@ extern const pm_char STR_OWN[];
 extern const pm_char STR_ROTARY_ENCODER[];
 extern const pm_char STR_DATE[];
 extern const pm_char STR_CHANNELS_MONITOR[];
+extern const pm_char STR_MIXERS_MONITOR[];
 extern const pm_char STR_PATH_TOO_LONG[];
 extern const pm_char STR_VIEW_TEXT[];
 extern const pm_char STR_FLASH_BOOTLOADER[];