From 60abae8a8b8653fc2f73d58d9ade4798d62d320f Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Sun, 22 Feb 2015 13:25:07 +0100
Subject: [PATCH] OP-1685 - Rename PIN6 to PIN8 (that's Input6)

---
 flight/targets/boards/coptercontrol/board_hw_defs.c  |  2 +-
 .../boards/coptercontrol/firmware/pios_board.c       | 12 ++++++------
 shared/uavobjectdefinition/hwsettings.xml            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flight/targets/boards/coptercontrol/board_hw_defs.c b/flight/targets/boards/coptercontrol/board_hw_defs.c
index 2a22cf78a..17981095f 100644
--- a/flight/targets/boards/coptercontrol/board_hw_defs.c
+++ b/flight/targets/boards/coptercontrol/board_hw_defs.c
@@ -1247,7 +1247,7 @@ const struct pios_ppm_cfg pios_ppm_cfg = {
     .num_channels = 1,
 };
 
-const struct pios_ppm_cfg pios_ppm_pin6_cfg = {
+const struct pios_ppm_cfg pios_ppm_pin8_cfg = {
     .tim_ic_init         = {
         .TIM_ICPolarity  = TIM_ICPolarity_Rising,
         .TIM_ICSelection = TIM_ICSelection_DirectTI,
diff --git a/flight/targets/boards/coptercontrol/firmware/pios_board.c b/flight/targets/boards/coptercontrol/firmware/pios_board.c
index 444c9f772..5a9935772 100644
--- a/flight/targets/boards/coptercontrol/firmware/pios_board.c
+++ b/flight/targets/boards/coptercontrol/firmware/pios_board.c
@@ -742,12 +742,12 @@ void PIOS_Board_Init(void)
         break;
     case HWSETTINGS_CC_RCVRPORT_PPMNOONESHOT:
     case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTSNOONESHOT:
-    case HWSETTINGS_CC_RCVRPORT_PPM_PIN6ONESHOT:
+    case HWSETTINGS_CC_RCVRPORT_PPM_PIN8ONESHOT:
 #if defined(PIOS_INCLUDE_PPM)
         {
             uint32_t pios_ppm_id;
-            if (hwsettings_rcvrport == HWSETTINGS_CC_RCVRPORT_PPM_PIN6ONESHOT) {
-                PIOS_PPM_Init(&pios_ppm_id, &pios_ppm_pin6_cfg);
+            if (hwsettings_rcvrport == HWSETTINGS_CC_RCVRPORT_PPM_PIN8ONESHOT) {
+                PIOS_PPM_Init(&pios_ppm_id, &pios_ppm_pin8_cfg);
             } else {
                 PIOS_PPM_Init(&pios_ppm_id, &pios_ppm_cfg);
             }
@@ -811,7 +811,7 @@ void PIOS_Board_Init(void)
     case HWSETTINGS_CC_RCVRPORT_PWMNOONESHOT:
     case HWSETTINGS_CC_RCVRPORT_PPMNOONESHOT:
     case HWSETTINGS_CC_RCVRPORT_PPMPWMNOONESHOT:
-    case HWSETTINGS_CC_RCVRPORT_PPM_PIN6ONESHOT:
+    case HWSETTINGS_CC_RCVRPORT_PPM_PIN8ONESHOT:
         PIOS_Servo_Init(&pios_servo_cfg);
         break;
     case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTSNOONESHOT:
@@ -877,8 +877,8 @@ SystemAlarmsExtendedAlarmStatusOptions CopterControlConfigHook()
     // Those modes allows oneshot usage
     case HWSETTINGS_CC_RCVRPORT_DISABLEDONESHOT:
     case HWSETTINGS_CC_RCVRPORT_OUTPUTSONESHOT:
-    case HWSETTINGS_CC_RCVRPORT_PPM_PIN6ONESHOT:
-        if ((recmode == HWSETTINGS_CC_RCVRPORT_PPM_PIN6ONESHOT ||
+    case HWSETTINGS_CC_RCVRPORT_PPM_PIN8ONESHOT:
+        if ((recmode == HWSETTINGS_CC_RCVRPORT_PPM_PIN8ONESHOT ||
              flexiMode == HWSETTINGS_CC_FLEXIPORT_PPM) &&
             (modes[3] == ACTUATORSETTINGS_BANKMODE_PWMSYNC ||
              modes[3] == ACTUATORSETTINGS_BANKMODE_ONESHOT125)) {
diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index 3daac0180..9467964c1 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -1,7 +1,7 @@
 <xml>
 	<object name="HwSettings" singleinstance="true" settings="true" category="System">
 		<description>Selection of optional hardware configurations.</description>
-		<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled+OneShot,PWM+NoOneShot,PPM+NoOneShot,PPM+PWM+NoOneShot,PPM+Outputs+NoOneShot,PPM_PIN6+OneShot, Outputs+OneShot" defaultvalue="PWM+NoOneShot"/>
+		<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled+OneShot,PWM+NoOneShot,PPM+NoOneShot,PPM+PWM+NoOneShot,PPM+Outputs+NoOneShot,PPM_PIN8+OneShot, Outputs+OneShot" defaultvalue="PWM+NoOneShot"/>
 		<field name="CC_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM,DebugConsole,ComBridge,OsdHk" defaultvalue="Telemetry"/>
 		<field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,PPM,DSM,DebugConsole,ComBridge,OsdHk" defaultvalue="Disabled"/>