From 90ebf2a92df6a6246d379d1c8143fe851ce88ccc Mon Sep 17 00:00:00 2001
From: Nicholas Sherlock <n.sherlock@gmail.com>
Date: Thu, 24 Sep 2015 23:32:27 +1200
Subject: [PATCH 1/2] Fix RX_MSP never set rxSignalReceived to true, increase
 allowed delay

---
 src/main/rx/rx.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 67c184f9f..6f457fb75 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -83,6 +83,7 @@ int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT];     // interval [1000;2000]
 
 #define DELAY_50_HZ (1000000 / 50)
 #define DELAY_10_HZ (1000000 / 10)
+#define DELAY_5_HZ (1000000 / 5)
 #define SKIP_RC_ON_SUSPEND_PERIOD 1500000           // 1.5 second period in usec (call frequency independent)
 #define SKIP_RC_SAMPLES_ON_RESUME  2                // flush 2 samples to drop wrong measurements (timing independent)
 
@@ -297,16 +298,18 @@ void updateRx(uint32_t currentTime)
         if (frameStatus & SERIAL_RX_FRAME_COMPLETE) {
             rxDataReceived = true;
             rxSignalReceived = (frameStatus & SERIAL_RX_FRAME_FAILSAFE) == 0;
+            needRxSignalBefore = currentTime + DELAY_10_HZ;
         }
     }
 #endif
 
     if (feature(FEATURE_RX_MSP)) {
         rxDataReceived = rxMspFrameComplete();
-    }
 
-    if (feature(FEATURE_RX_SERIAL | FEATURE_RX_MSP) && rxDataReceived) {
-        needRxSignalBefore = currentTime + DELAY_10_HZ;
+        if (rxDataReceived) {
+            rxSignalReceived = true;
+            needRxSignalBefore = currentTime + DELAY_5_HZ;
+        }
     }
 
     if (feature(FEATURE_RX_PPM)) {

From 8e9669dc0c047fdb0b7c45539a522ee748765754 Mon Sep 17 00:00:00 2001
From: Nicholas Sherlock <n.sherlock@gmail.com>
Date: Fri, 25 Sep 2015 00:16:54 +1200
Subject: [PATCH 2/2] Fix RX_MSP writing to rcData was causing feedback loop
 with channel map

Fixes support for RX_MSP > 8 channels
---
 src/main/io/serial_msp.c | 10 +++++++---
 src/main/rx/msp.c        | 16 +++++++++++++---
 src/main/rx/msp.h        |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index b6e1c1578..f383acbf8 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -1310,9 +1310,13 @@ static bool processInCommand(void)
             if (channelCount > MAX_SUPPORTED_RC_CHANNEL_COUNT) {
                 headSerialError(0);
             } else {
-                for (i = 0; i < channelCount; i++)
-                    rcData[i] = read16();
-                rxMspFrameRecieve();
+                uint16_t frame[MAX_SUPPORTED_RC_CHANNEL_COUNT];
+
+                for (i = 0; i < channelCount; i++) {
+                    frame[i] = read16();
+                }
+
+                rxMspFrameReceive(frame, channelCount);
             }
         }
         break;
diff --git a/src/main/rx/msp.c b/src/main/rx/msp.c
index 105a30ec9..86399a909 100644
--- a/src/main/rx/msp.c
+++ b/src/main/rx/msp.c
@@ -31,16 +31,26 @@
 #include "rx/rx.h"
 #include "rx/msp.h"
 
+static uint16_t mspFrame[MAX_SUPPORTED_RC_CHANNEL_COUNT];
 static bool rxMspFrameDone = false;
 
 static uint16_t rxMspReadRawRC(rxRuntimeConfig_t *rxRuntimeConfigPtr, uint8_t chan)
 {
     UNUSED(rxRuntimeConfigPtr);
-    return rcData[chan];
+    return mspFrame[chan];
 }
 
-void rxMspFrameRecieve(void)
+void rxMspFrameReceive(uint16_t *frame, int channelCount)
 {
+    for (int i = 0; i < channelCount; i++) {
+        mspFrame[i] = frame[i];
+    }
+
+    // Any channels not provided will be reset to zero
+    for (int i = channelCount; i < MAX_SUPPORTED_RC_CHANNEL_COUNT; i++) {
+        mspFrame[i] = 0;
+    }
+
     rxMspFrameDone = true;
 }
 
@@ -57,7 +67,7 @@ bool rxMspFrameComplete(void)
 void rxMspInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadRawDataPtr *callback)
 {
     UNUSED(rxConfig);
-    rxRuntimeConfig->channelCount = 8; // Limited to 8 channels due to MSP_SET_RAW_RC command.
+    rxRuntimeConfig->channelCount = MAX_SUPPORTED_RC_CHANNEL_COUNT;
     if (callback)
         *callback = rxMspReadRawRC;
 }
diff --git a/src/main/rx/msp.h b/src/main/rx/msp.h
index e58c4ee95..8b2ee6f7c 100644
--- a/src/main/rx/msp.h
+++ b/src/main/rx/msp.h
@@ -18,4 +18,4 @@
 #pragma once
 
 bool rxMspFrameComplete(void);
-void rxMspFrameRecieve(void);
+void rxMspFrameReceive(uint16_t *frame, int channelCount);