From 40ae1879e84365abec324485c9ffe3a865c4b877 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 31 Jan 2016 11:34:07 +0100
Subject: [PATCH] VC++ compilation fix

---
 radio/src/opentx.cpp                      |  6 ++--
 radio/src/opentx.h                        |  2 +-
 radio/src/switches.cpp                    |  3 +-
 radio/src/targets/horus/adc_driver.cpp    |  2 +-
 radio/src/targets/horus/board_horus.h     |  2 +-
 radio/src/targets/sky9x/adc_driver.cpp    | 42 +++++++++++------------
 radio/src/targets/sky9x/board_sky9x.h     |  2 +-
 radio/src/targets/taranis/adc_driver.cpp  | 42 +++++++++++------------
 radio/src/targets/taranis/board_taranis.h |  2 +-
 9 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 28edb4b7a..45a57ed64 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1544,9 +1544,9 @@ void getADC()
   }
 #endif
 
-  for (uint32_t i=0; i<4; i++) {
+  for (uint8_t i=0; i<4; i++) {
     adcRead();
-    for (uint32_t x=0; x<NUMBER_ANALOG; x++) {
+    for (uint8_t x=0; x<NUMBER_ANALOG; x++) {
       uint16_t val = getAnalogValue(x);
 #if defined(JITTER_MEASURE)
       if (JITTER_MEASURE_ACTIVE()) {
@@ -1557,7 +1557,7 @@ void getADC()
     }
   }
 
-  for (uint32_t x=0; x<NUMBER_ANALOG; x++) {
+  for (uint8_t x=0; x<NUMBER_ANALOG; x++) {
     uint16_t v = temp[x] >> 3;
 
 #if defined(JITTER_FILTER)
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index ee7cc3454..41ef601f4 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -973,7 +973,7 @@ void checkAlarm();
 void checkAll();
 
 #if !defined(SIMU)
-  void getADC();
+void getADC();
 #endif
 
 #if defined(SBUS)
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
index 8813a6a19..b2854b9b3 100644
--- a/radio/src/switches.cpp
+++ b/radio/src/switches.cpp
@@ -762,8 +762,9 @@ void checkSwitches()
 #define GETADC_COUNT 1
 #endif
 #ifdef GETADC_COUNT
-    for (int i=0; i<GETADC_COUNT; i++)
+    for (uinr8_t i=0; i<GETADC_COUNT; i++) {
       getADC();
+    }
 #undef GETADC_COUNT
 #endif
 #endif  // !defined(MODULE_ALWAYS_SEND_PULSES)
diff --git a/radio/src/targets/horus/adc_driver.cpp b/radio/src/targets/horus/adc_driver.cpp
index 512e8a0d8..589d4796f 100644
--- a/radio/src/targets/horus/adc_driver.cpp
+++ b/radio/src/targets/horus/adc_driver.cpp
@@ -201,7 +201,7 @@ void adcRead()
 
 const int8_t ana_direction[NUMBER_ANALOG] = {1,-1,1,-1,  -1,1,-1,  -1,-1,  -1,1, 0,0,0};
 
-uint16_t getAnalogValue(uint32_t index)
+uint16_t getAnalogValue(uint8_t index)
 {
   if (ana_direction[index] < 0)
     return 4096 - adcValues[index];
diff --git a/radio/src/targets/horus/board_horus.h b/radio/src/targets/horus/board_horus.h
index 3a34a796f..bb374f50e 100644
--- a/radio/src/targets/horus/board_horus.h
+++ b/radio/src/targets/horus/board_horus.h
@@ -233,7 +233,7 @@ enum Analogs {
 extern uint16_t adcValues[NUMBER_ANALOG];
 void adcInit(void);
 void adcRead(void);
-uint16_t getAnalogValue(uint32_t value);
+uint16_t getAnalogValue(uint8_t index);
 
 #if defined(REV3)
   #define BATT_SCALE    120
diff --git a/radio/src/targets/sky9x/adc_driver.cpp b/radio/src/targets/sky9x/adc_driver.cpp
index e420385a6..df38418ca 100644
--- a/radio/src/targets/sky9x/adc_driver.cpp
+++ b/radio/src/targets/sky9x/adc_driver.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "../opentx.h"
 
 uint16_t adcValues[NUMBER_ANALOG];
@@ -112,7 +112,7 @@ void adcRead()
 #endif
 }
 
-uint16_t getAnalogValue(uint32_t value)
+uint16_t getAnalogValue(uint8_t value)
 {
   return adcValues[value];
 }
diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h
index 453b696e4..72a7033aa 100644
--- a/radio/src/targets/sky9x/board_sky9x.h
+++ b/radio/src/targets/sky9x/board_sky9x.h
@@ -227,7 +227,7 @@ enum Analogs {
 };
 void adcInit();
 void adcRead(void);
-uint16_t getAnalogValue(uint32_t value);
+uint16_t getAnalogValue(uint8_t index);
 void setSticksGain(uint8_t gains);
 
 // Buzzer driver
diff --git a/radio/src/targets/taranis/adc_driver.cpp b/radio/src/targets/taranis/adc_driver.cpp
index 41ad53fa3..f88deb4bb 100644
--- a/radio/src/targets/taranis/adc_driver.cpp
+++ b/radio/src/targets/taranis/adc_driver.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "../../opentx.h"
 
 #define PIN_ANALOG  0x0003
@@ -148,7 +148,7 @@ void adcStop()
 {
 }
 
-uint16_t getAnalogValue(uint32_t index)
+uint16_t getAnalogValue(uint8_t index)
 {
   if (IS_POT(index) && !IS_POT_AVAILABLE(index)) {
     // Use fixed analog value for non-existing and/or non-connected pots.
diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index 935297eff..0146e2ac4 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -265,7 +265,7 @@ enum Analogs {
 void adcInit(void);
 void adcRead(void);
 extern uint16_t adcValues[NUMBER_ANALOG];
-uint16_t getAnalogValue(uint32_t value);
+uint16_t getAnalogValue(uint8_t index);
 
 #define BATT_SCALE    150