From 9828e4a5bf1b4cde9916ddf1dfccbf1b9b607a81 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Wed, 21 Jan 2015 14:03:18 +0100
Subject: [PATCH 1/4] OP-1652 Rename Flex-IO pins for ws281x leds

---
 shared/uavobjectdefinition/hwsettings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index b6bacdd03..6bf66d066 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -25,7 +25,7 @@
 		<field name="OptionalModules" units="" type="enum" elementnames="CameraStab,GPS,Fault,Altitude,Airspeed,TxPID,Battery,Overo,MagBaro,OsdHk" options="Disabled,Enabled" defaultvalue="Disabled"/>
 		<field name="ADCRouting" units="" type="enum" elementnames="adc0,adc1,adc2,adc3" options="Disabled,BatteryVoltage,BatteryCurrent,AnalogAirspeed,Generic" defaultvalue="Disabled"/>
 		<field name="DSMxBind" units=""  type="uint8"  elements="1" defaultvalue="0"/>
-        <field name="WS2811LED_Out" units="" type="enum" elements="1" options="ServoOut1,ServoOut2,ServoOut3,ServoOut4,ServoOut5,ServoOut6,FlexiPin3,FlexiPin4,Disabled" defaultvalue="Disabled" />
+        <field name="WS2811LED_Out" units="" type="enum" elements="1" options="ServoOut1,ServoOut2,ServoOut3,ServoOut4,ServoOut5,ServoOut6,FlexIOPin3,FlexIOPin4,Disabled" defaultvalue="Disabled" />
 
 		<access gcs="readwrite" flight="readwrite"/>
 		<telemetrygcs acked="true" updatemode="onchange" period="0"/>

From bc178b8a95797ea3abc0f1e0faba09298c261989 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Wed, 21 Jan 2015 14:12:36 +0100
Subject: [PATCH 2/4] OP-1652 WS281x pins : Update flight side for revo

---
 flight/targets/boards/revolution/board_hw_defs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flight/targets/boards/revolution/board_hw_defs.c b/flight/targets/boards/revolution/board_hw_defs.c
index 63b784f09..77bb01156 100644
--- a/flight/targets/boards/revolution/board_hw_defs.c
+++ b/flight/targets/boards/revolution/board_hw_defs.c
@@ -2074,7 +2074,7 @@ const struct pios_ws2811_pin_cfg pios_ws2811_pin_cfg[] = {
             .GPIO_OType = GPIO_OType_PP,
         },
     },
-    [HWSETTINGS_WS2811LED_OUT_FLEXIPIN3] = {
+    [HWSETTINGS_WS2811LED_OUT_FLEXIOPIN3] = {
         .gpio     = GPIOB,
         .gpioInit =                        {
             .GPIO_Pin   = GPIO_Pin_12,
@@ -2083,7 +2083,7 @@ const struct pios_ws2811_pin_cfg pios_ws2811_pin_cfg[] = {
             .GPIO_OType = GPIO_OType_PP,
         },
     },
-    [HWSETTINGS_WS2811LED_OUT_FLEXIPIN4] = {
+    [HWSETTINGS_WS2811LED_OUT_FLEXIOPIN4] = {
         .gpio     = GPIOB,
         .gpioInit =                        {
             .GPIO_Pin   = GPIO_Pin_13,

From 68f9763e732d1d5f1e8581f29b2f725a4afce3ec Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Wed, 21 Jan 2015 14:32:21 +0100
Subject: [PATCH 3/4] OP-1652 Typo FlexiIOPin

---
 flight/targets/boards/revolution/board_hw_defs.c | 4 ++--
 shared/uavobjectdefinition/hwsettings.xml        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flight/targets/boards/revolution/board_hw_defs.c b/flight/targets/boards/revolution/board_hw_defs.c
index 77bb01156..9c7e6980b 100644
--- a/flight/targets/boards/revolution/board_hw_defs.c
+++ b/flight/targets/boards/revolution/board_hw_defs.c
@@ -2074,7 +2074,7 @@ const struct pios_ws2811_pin_cfg pios_ws2811_pin_cfg[] = {
             .GPIO_OType = GPIO_OType_PP,
         },
     },
-    [HWSETTINGS_WS2811LED_OUT_FLEXIOPIN3] = {
+    [HWSETTINGS_WS2811LED_OUT_FLEXIIOPIN3] = {
         .gpio     = GPIOB,
         .gpioInit =                        {
             .GPIO_Pin   = GPIO_Pin_12,
@@ -2083,7 +2083,7 @@ const struct pios_ws2811_pin_cfg pios_ws2811_pin_cfg[] = {
             .GPIO_OType = GPIO_OType_PP,
         },
     },
-    [HWSETTINGS_WS2811LED_OUT_FLEXIOPIN4] = {
+    [HWSETTINGS_WS2811LED_OUT_FLEXIIOPIN4] = {
         .gpio     = GPIOB,
         .gpioInit =                        {
             .GPIO_Pin   = GPIO_Pin_13,
diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index 6bf66d066..2fb566340 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -25,7 +25,7 @@
 		<field name="OptionalModules" units="" type="enum" elementnames="CameraStab,GPS,Fault,Altitude,Airspeed,TxPID,Battery,Overo,MagBaro,OsdHk" options="Disabled,Enabled" defaultvalue="Disabled"/>
 		<field name="ADCRouting" units="" type="enum" elementnames="adc0,adc1,adc2,adc3" options="Disabled,BatteryVoltage,BatteryCurrent,AnalogAirspeed,Generic" defaultvalue="Disabled"/>
 		<field name="DSMxBind" units=""  type="uint8"  elements="1" defaultvalue="0"/>
-        <field name="WS2811LED_Out" units="" type="enum" elements="1" options="ServoOut1,ServoOut2,ServoOut3,ServoOut4,ServoOut5,ServoOut6,FlexIOPin3,FlexIOPin4,Disabled" defaultvalue="Disabled" />
+        <field name="WS2811LED_Out" units="" type="enum" elements="1" options="ServoOut1,ServoOut2,ServoOut3,ServoOut4,ServoOut5,ServoOut6,FlexiIOPin3,FlexiIOPin4,Disabled" defaultvalue="Disabled" />
 
 		<access gcs="readwrite" flight="readwrite"/>
 		<telemetrygcs acked="true" updatemode="onchange" period="0"/>

From 5d4b1df85c55913c7dc9893b765be1cc0546580f Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Sat, 24 Jan 2015 00:56:31 +0100
Subject: [PATCH 4/4] OP-1652 Fix comment

---
 flight/pios/stm32f4xx/pios_ws2811.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flight/pios/stm32f4xx/pios_ws2811.c b/flight/pios/stm32f4xx/pios_ws2811.c
index 4b8e9d987..f0a9ddf29 100644
--- a/flight/pios/stm32f4xx/pios_ws2811.c
+++ b/flight/pios/stm32f4xx/pios_ws2811.c
@@ -74,7 +74,7 @@ static void genericTIM_OCxPreloadConfig(TIM_TypeDef *TIMx, uint16_t TIM_OCPreloa
         },
     },
     ....
-    [HWSETTINGS_WS2811LED_OUT_FLEXIPIN4] = {
+    [HWSETTINGS_WS2811LED_OUT_FLEXIIOPIN4] = {
         .gpio     = GPIOB,
         .gpioInit =                        {
             .GPIO_Pin   = GPIO_Pin_13,