From 0b77d9921de8256cd4a8e4a5afacdb0d4a113a18 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 1 Feb 2014 10:47:21 +0100
Subject: [PATCH] VC doesn't like binary constants

---
 companion/src/firmwares/opentx/opentxeeprom.cpp | 4 ++--
 companion/src/helpers.h                         | 2 ++
 radio/src/myeeprom.h                            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index b94134043..5658598a4 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -467,7 +467,7 @@ class PhaseField: public TransformedField {
       for (int i=0; i<NUM_STICKS; i++) {
         if (board == BOARD_TARANIS && version >= 216) {
           if (phase.trimMode[i] < 0)
-            trimMode[i] = 0b11111;
+            trimMode[i] = TRIM_MODE_NONE;
           else
             trimMode[i] = 2*phase.trimRef[i] + phase.trimMode[i];
         }
@@ -494,7 +494,7 @@ class PhaseField: public TransformedField {
     {
       for (int i=0; i<NUM_STICKS; i++) {
         if (board == BOARD_TARANIS && version >= 216) {
-          if (trimMode[i] == 0b11111) {
+          if (trimMode[i] == TRIM_MODE_NONE) {
             phase.trimMode[i] = -1;
           }
           else {
diff --git a/companion/src/helpers.h b/companion/src/helpers.h
index aa424e482..2d7f08ad6 100644
--- a/companion/src/helpers.h
+++ b/companion/src/helpers.h
@@ -23,6 +23,8 @@
 #define TRIM_OFF 1
 #define TRIM_OFFSET 2
 
+#define TRIM_MODE_NONE  0x1F  // 0b11111
+
 void populateGvSourceCB(QComboBox *b, int value);
 void populateVoiceLangCB(QComboBox *b, QString language);
 void populateTTraceCB(QComboBox *b, int value);
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index ba18118fc..cf9cc61ec 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1077,7 +1077,7 @@ PACK(typedef struct t_SwashRingData { // Swash Ring data
       int16_t  value:11;
       uint16_t mode:5;
     }) trim_t;
-    #define TRIM_MODE_NONE 0b11111
+    #define TRIM_MODE_NONE  0x1F  // 0b11111
   #else
     #define trim_t          int16_t
   #endif