Merge pull request #94 from blckmn/sbus_fix_config

Removed dependency on config from sbus.c now passed in as configuration param.
rs2k · Feb 17, 2016 · c86eb1f · c86eb1f
2 parents c576abe + f59c086
commit c86eb1f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -25,17 +25,13 @@
 
 #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"
 
 #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;