From f59c08683fa39c5b972b09470f8778998b17b169 Mon Sep 17 00:00:00 2001
From: blckmn <blackman@xtra.com.au>
Date: Wed, 17 Feb 2016 19:36:36 +1100
Subject: [PATCH] Removed dependency on config from sbus.c passed in as
 configuration param.

---
 src/main/main.c    | 1 +
 src/main/rx/rx.h   | 1 +
 src/main/rx/sbus.c | 7 ++-----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/main.c b/src/main/main.c
index 51864fd83..3f313cf33 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -463,6 +463,7 @@ void init(void)
 
     failsafeInit(&masterConfig.rxConfig, masterConfig.flight3DConfig.deadband3d_throttle);
 
+    masterConfig.rxConfig.rxSerialInverted = feature(FEATURE_SBUS_INVERTER);
     rxInit(&masterConfig.rxConfig, currentProfile->modeActivationConditions);
 
 #ifdef GPS
diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h
index 8a7e4d1f2..b8240071a 100644
--- a/src/main/rx/rx.h
+++ b/src/main/rx/rx.h
@@ -127,6 +127,7 @@ typedef struct rxConfig_s {
     rxFailsafeChannelConfiguration_t failsafe_channel_configurations[MAX_SUPPORTED_RC_CHANNEL_COUNT];
 
     rxChannelRangeConfiguration_t channelRanges[NON_AUX_CHANNEL_COUNT];
+    bool rxSerialInverted;
 } rxConfig_t;
 
 #define REMAPPABLE_CHANNEL_COUNT (sizeof(((rxConfig_t *)0)->rcmap) / sizeof(((rxConfig_t *)0)->rcmap[0]))
diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c
index 1c6fa6aee..64d26222e 100644
--- a/src/main/rx/sbus.c
+++ b/src/main/rx/sbus.c
@@ -25,9 +25,6 @@
 
 #include "drivers/system.h"
 
-#include "drivers/gpio.h"
-#include "drivers/inverter.h"
-
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
 #include "io/serial.h"
@@ -35,7 +32,6 @@
 #include "rx/rx.h"
 #include "rx/sbus.h"
 
-#include "config/config.h"
 /*
  * Observations
  *
@@ -99,7 +95,8 @@ bool sbusInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadRa
     }
 
     portOptions_t options = SBUS_PORT_OPTIONS;
-    if (!feature(FEATURE_SBUS_INVERTER)) options = options & ~SERIAL_INVERTED;
+	if (!rxConfig->rxSerialInverted) 
+    	options = options & ~SERIAL_INVERTED;
     serialPort_t *sBusPort = openSerialPort(portConfig->identifier, FUNCTION_RX_SERIAL, sbusDataReceive, SBUS_BAUDRATE, MODE_RX, options);
 
     return sBusPort != NULL;