From ff70c87f0bbac135d6db12266029b6d9d4de4a53 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 25 Mar 2014 14:42:15 +1100
Subject: [PATCH] Plane: support 14 RC channels on PX4

---
 ArduPlane/Attitude.pde   | 2 ++
 ArduPlane/Parameters.h   | 6 ++++++
 ArduPlane/Parameters.pde | 8 ++++++++
 ArduPlane/radio.pde      | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/ArduPlane/Attitude.pde b/ArduPlane/Attitude.pde
index cb4ca9f30a..85c56b75ed 100644
--- a/ArduPlane/Attitude.pde
+++ b/ArduPlane/Attitude.pde
@@ -975,6 +975,8 @@ static void set_servos(void)
  #endif
  #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
     g.rc_12.output_ch(CH_12);
+    g.rc_13.output_ch(CH_13);
+    g.rc_14.output_ch(CH_14);
  #endif
 }
 
diff --git a/ArduPlane/Parameters.h b/ArduPlane/Parameters.h
index 2487ba1049..58ba52af80 100644
--- a/ArduPlane/Parameters.h
+++ b/ArduPlane/Parameters.h
@@ -218,6 +218,8 @@ public:
         k_param_fs_batt_mah,
         k_param_short_fs_timeout,
         k_param_long_fs_timeout,
+        k_param_rc_13,
+        k_param_rc_14,
 
         //
         // 200: Feed-forward gains
@@ -442,6 +444,8 @@ public:
 #endif
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
     RC_Channel_aux rc_12;
+    RC_Channel_aux rc_13;
+    RC_Channel_aux rc_14;
 #endif
     uint8_t _dummy;
 
@@ -465,6 +469,8 @@ public:
 #endif
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
         rc_12                                   (CH_12),
+        rc_13                                   (CH_13),
+        rc_14                                   (CH_14),
 #endif
         _dummy(0)
         {}
diff --git a/ArduPlane/Parameters.pde b/ArduPlane/Parameters.pde
index e4ce7bd355..e6074db28d 100644
--- a/ArduPlane/Parameters.pde
+++ b/ArduPlane/Parameters.pde
@@ -863,6 +863,14 @@ const AP_Param::Info var_info[] PROGMEM = {
     // @Group: RC12_
     // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
     GGROUP(rc_12,                    "RC12_", RC_Channel_aux),
+
+    // @Group: RC13_
+    // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
+    GGROUP(rc_13,                    "RC13_", RC_Channel_aux),
+
+    // @Group: RC14_
+    // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
+    GGROUP(rc_14,                    "RC14_", RC_Channel_aux),
 #endif
 
     // @Group: RLL2SRV_
diff --git a/ArduPlane/radio.pde b/ArduPlane/radio.pde
index a2c4dc528b..87d5a8707b 100644
--- a/ArduPlane/radio.pde
+++ b/ArduPlane/radio.pde
@@ -65,6 +65,8 @@ static void init_rc_out()
 #endif
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
     servo_write(CH_12,  g.rc_12.radio_trim);
+    servo_write(CH_13,  g.rc_13.radio_trim);
+    servo_write(CH_14,  g.rc_14.radio_trim);
 #endif
 
     // setup PX4 to output the min throttle when safety off if arming