Devo 8s Modifications - Adding AUX4 and AUX5

diff --git a/src/target/common_emu/fltk.cpp b/src/target/common_emu/fltk.cpp
--- a/src/target/common_emu/fltk.cpp
+++ b/src/target/common_emu/fltk.cpp
@@ -248,6 +248,8 @@
     gui.elevator = 5;
     gui.aileron  = 5;
     gui.rudder   = 5;
+    gui.aux4     = 5;
+    gui.aux5     = 5;
     switch(Transmitter.mode) {
     case MODE_1:
     case MODE_3:
diff --git a/src/target/devo8/capabilities.h b/src/target/devo8/capabilities.h
--- a/src/target/devo8/capabilities.h
+++ b/src/target/devo8/capabilities.h
@@ -3,6 +3,8 @@
   CHANDEF(ELEVATOR)
   CHANDEF(THROTTLE)
   CHANDEF(RUDDER)
+  CHANDEF(AUX4)
+  CHANDEF(AUX5)
   CHANDEF(RUD_DR0)
   CHANDEF(RUD_DR1)
   CHANDEF(ELE_DR0)
diff --git a/src/target/devo8/channels.c b/src/target/devo8/channels.c
--- a/src/target/devo8/channels.c
+++ b/src/target/devo8/channels.c
@@ -19,7 +19,7 @@
 #include "config/tx.h"
 #include "../common_devo/devo.h"
 
-const u8 adc_chan_sel[NUM_ADC_CHANNELS] = {13, 11, 10, 12, 16, 14};
+const u8 adc_chan_sel[NUM_ADC_CHANNELS] = {13, 11, 10, 12, 4, 15, 16, 14};
 
 void CHAN_Init()
 {
@@ -31,6 +31,8 @@
     gpio_set_mode(GPIOC, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO1);
     gpio_set_mode(GPIOC, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO2);
     gpio_set_mode(GPIOC, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO3);
+    gpio_set_mode(GPIOC, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO5); // AUX4 = C5
+    gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO4); // AUX5 = A4
     /* Enable Voltage measurement */
     gpio_set_mode(GPIOC, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO4);
 
@@ -53,6 +55,9 @@
     case INP_ELEVATOR: value = adc_array_raw[2]; break;
     case INP_AILERON:  value = adc_array_raw[3]; break;
 
+    case INP_AUX4:     value = adc_array_raw[4]; break;
+    case INP_AUX5:     value = adc_array_raw[5]; break;
+
     case INP_RUD_DR0:  value = gpio_get(GPIOC, GPIO8); break;
     case INP_RUD_DR1:  value = ! gpio_get(GPIOC, GPIO8); break;
 
diff --git a/src/target/devo8/target_defs.h b/src/target/devo8/target_defs.h
--- a/src/target/devo8/target_defs.h
+++ b/src/target/devo8/target_defs.h
@@ -22,7 +22,7 @@
 #define MAX_POINTS 13
 #define NUM_MIXERS ((NUM_OUT_CHANNELS + NUM_VIRT_CHANNELS) * 4)
 
-#define INP_HAS_CALIBRATION 4
+#define INP_HAS_CALIBRATION 6
 
 /* Compute voltage from y = 0.0021x + 0.3026 */
 #define VOLTAGE_NUMERATOR 210
diff --git a/src/target/emu_devo8/channels.c b/src/target/emu_devo8/channels.c
--- a/src/target/emu_devo8/channels.c
+++ b/src/target/emu_devo8/channels.c
@@ -25,6 +25,9 @@
         case INP_ELEVATOR: return CHAN_MIN_VALUE + step * gui.elevator;
         case INP_AILERON:  return CHAN_MIN_VALUE + step * gui.aileron;
 
+        case INP_AUX4:     return CHAN_MIN_VALUE + step * gui.aux4;
+        case INP_AUX5:     return CHAN_MIN_VALUE + step * gui.aux5;
+
         case INP_RUD_DR0:  return gui.rud_dr ? CHAN_MIN_VALUE : CHAN_MAX_VALUE;
         case INP_RUD_DR1:  return gui.rud_dr ? CHAN_MAX_VALUE : CHAN_MIN_VALUE;