From 42727e6e195bf4e36c26fc99762fc0305754cbb1 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 29 Mar 2014 11:47:58 +0100
Subject: [PATCH] Visual C++ Compilation

---
 companion/src/CMakeLists.txt     |  3 +++
 radio/src/eeprom_conversions.cpp | 15 +++++++++++++--
 radio/src/simpgmspace.cpp        | 18 +++++++++---------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 5d1d71535..9f7d1ba94 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -90,12 +90,15 @@ add_custom_command(
   WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )
 
+if(WIN32)
+else()
 add_custom_command(
   OUTPUT ${RADIO_SRC_DIRECTORY}/stamp-opentx.h
   COMMAND make stamp_header
   DEPENDS ${RADIO_SRC_DIRECTORY}/Makefile
   WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )
+endif()
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index fb0aa2324..68fdd0506 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -36,6 +36,7 @@
 
 #include "opentx.h"
 
+#if defined(PCBTARANIS)
 PACK(typedef struct {
   uint8_t  mode;         // 0=end, 1=pos, 2=neg, 3=both
   uint8_t  chn;
@@ -44,11 +45,21 @@ PACK(typedef struct {
   int8_t   weight;
   uint8_t  curveMode;
   char     name[LEN_EXPOMIX_NAME];
-#if defined(PCBTARANIS)
   uint8_t  spare[2];
-#endif
   int8_t   curveParam;
 }) ExpoData_v215;
+#else
+PACK(typedef struct {
+  uint8_t  mode;         // 0=end, 1=pos, 2=neg, 3=both
+  uint8_t  chn;
+  int8_t   swtch;
+  uint16_t phases;
+  int8_t   weight;
+  uint8_t  curveMode;
+  char     name[LEN_EXPOMIX_NAME];
+  int8_t   curveParam;
+}) ExpoData_v215;
+#endif
 
 #if defined(PCBTARANIS)
   #define LIMITDATA_V215_EXTRA  char name[LEN_CHANNEL_NAME];
diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp
index 33d16b028..305d00b61 100644
--- a/radio/src/simpgmspace.cpp
+++ b/radio/src/simpgmspace.cpp
@@ -101,37 +101,37 @@ sem_t *eeprom_write_sem;
 #if defined(PCBTARANIS)
 #define SWITCH_CASE(swtch, pin, mask) \
     case swtch: \
-      if (state > 0) pin &= ~(mask); else pin |= (mask); \
+      if ((int)state > 0) pin &= ~(mask); else pin |= (mask); \
       break;
 #else
 #define SWITCH_CASE(swtch, pin, mask) \
     case swtch: \
-      if (state > 0) pin |= (mask); else pin &= ~(mask); \
+      if ((int)state > 0) pin |= (mask); else pin &= ~(mask); \
       break;
 #endif
 #define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
     case swtch: \
-      if (state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
-      if (state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+      if ((int)state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+      if ((int)state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
       break;
 #define KEY_CASE(key, pin, mask) \
     case key: \
-      if (state > 0) pin &= ~mask; else pin |= mask;\
+      if ((int)state > 0) pin &= ~mask; else pin |= mask;\
       break;
 #define TRIM_CASE KEY_CASE
 #else
 #define SWITCH_CASE(swtch, pin, mask) \
     case swtch: \
-      if (state > 0) pin &= ~(mask); else pin |= (mask); \
+      if ((int)state > 0) pin &= ~(mask); else pin |= (mask); \
       break;
 #define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
     case swtch: \
-      if (state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
-      if (state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+      if ((int)state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+      if ((int)state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
       break;
 #define KEY_CASE(key, pin, mask) \
     case key: \
-      if (state > 0) pin |= (mask); else pin &= ~(mask);\
+      if ((int)state > 0) pin |= (mask); else pin &= ~(mask);\
       break;
 #define TRIM_CASE KEY_CASE
 #endif