Merge branch 'multiwii-master'

Conflicts:
	src/board.h
	src/buzzer.c
	src/config.c
	src/drivers/serial_common.h
	src/drivers/system_common.c
	src/drv_gpio.h
	src/drv_pwm.c
	src/drv_timer.c
	src/drv_uart.c
	src/flight_imu.c
	src/mw.c
	src/rx_sbus.c
	src/sensors.c
	src/serial_cli.c

src/rx_sbus.c

@@ -94,8 +94,14 @@ static void sbusDataReceive(uint16_t c)
 
 bool sbusFrameComplete(void)
 {
-    if (sbusFrameDone) {
-        if (!((sbus.in[22] >> 3) & 0x0001)) { // failsave flag
+    if (!sbusFrameDone) {
+        return false;
+    }
+    sbusFrameDone = false;
+    if ((sbus.in[22] >> 3) & 0x0001) {
+        // internal failsafe enabled and rx failsafe flag set
+        return false;
+    }
     sbusChannelData[0] = sbus.msg.chan0;
     sbusChannelData[1] = sbus.msg.chan1;
     sbusChannelData[2] = sbus.msg.chan2;
@@ -105,12 +111,7 @@ bool sbusFrameComplete(void)
     sbusChannelData[6] = sbus.msg.chan6;
     sbusChannelData[7] = sbus.msg.chan7;
     // need more channels? No problem. Add them.
-            sbusFrameDone = false;
     return true;
-        }
-        sbusFrameDone = false;
-    }
-    return false;
 }
 
 static uint16_t sbusReadRawRC(rxRuntimeConfig_t *rxRuntimeConfig, uint8_t chan)

src/serial_cli.c

@@ -303,7 +303,6 @@ static void cliSetVar(const clivalue_t *var, const int_float_value_t value);
 static void cliPrintVar(const clivalue_t *var, uint32_t full);
 static void cliPrint(const char *str);
 static void cliWrite(uint8_t ch);
-
 static void cliPrompt(void)
 {
     cliPrint("\r\n# ");