Merge remote-tracking branch 'upstream/master'

Author: breadoven

src/main/blackbox/blackbox.c

@@ -1727,9 +1727,10 @@ static void loadMainState(timeUs_t currentTimeUs)
 
     blackboxCurrent->rssi = getRSSI();
 
+    const uint8_t minServoIndex = getMinServoIndex();
     const int servoCount = getServoCount();
     for (int i = 0; i < servoCount; i++) {
-        blackboxCurrent->servo[i] = servo[i];
+        blackboxCurrent->servo[i] = servo[i + minServoIndex];
     }
 
     blackboxCurrent->navState = navCurrentState;

src/main/flight/servos.c

@@ -683,3 +683,8 @@ bool isMixerUsingServos(void)
 {
     return mixerUsesServos;
 }
+
+uint8_t getMinServoIndex(void)
+{
+    return minServoIndex;
+}

src/main/flight/servos.h

@@ -182,3 +182,4 @@ void servoMixer(float dT);
 void servoComputeScalingFactors(uint8_t servoIndex);
 void servosInit(void);
 int getServoCount(void);
+uint8_t getMinServoIndex(void);