CF/BF/INAV - Delete unused 'angleAtMin' and 'angleAtMax'.

src/main/fc/cli.c

@@ -2179,7 +2179,7 @@ static void cliModeColor(char *cmdline)
 static void printServo(uint8_t dumpMask, const servoParam_t *servoParam, const servoParam_t *defaultServoParam)
 {
     // print out servo settings
-    const char *format = "servo %u %d %d %d %d %d %d %d\r\n";
+    const char *format = "servo %u %d %d %d %d %dr\n";
     for (uint32_t i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
         const servoParam_t *servoConf = &servoParam[i];
         bool equalsDefault = false;
@@ -2188,7 +2188,6 @@ static void printServo(uint8_t dumpMask, const servoParam_t *servoParam, const s
             equalsDefault = servoConf->min == servoConfDefault->min
                 && servoConf->max == servoConfDefault->max
                 && servoConf->middle == servoConfDefault->middle
-                && servoConf->angleAtMin == servoConfDefault->angleAtMax
                 && servoConf->rate == servoConfDefault->rate
                 && servoConf->forwardFromChannel == servoConfDefault->forwardFromChannel;
             cliDefaultPrintf(dumpMask, equalsDefault, format,
@@ -2196,8 +2195,6 @@ static void printServo(uint8_t dumpMask, const servoParam_t *servoParam, const s
                 servoConfDefault->min,
                 servoConfDefault->max,
                 servoConfDefault->middle,
-                servoConfDefault->angleAtMin,
-                servoConfDefault->angleAtMax,
                 servoConfDefault->rate,
                 servoConfDefault->forwardFromChannel
             );
@@ -2207,8 +2204,6 @@ static void printServo(uint8_t dumpMask, const servoParam_t *servoParam, const s
             servoConf->min,
             servoConf->max,
             servoConf->middle,
-            servoConf->angleAtMin,
-            servoConf->angleAtMax,
             servoConf->rate,
             servoConf->forwardFromChannel
         );
@@ -2236,7 +2231,7 @@ static void printServo(uint8_t dumpMask, const servoParam_t *servoParam, const s
 
 static void cliServo(char *cmdline)
 {
-    enum { SERVO_ARGUMENT_COUNT = 8 };
+    enum { SERVO_ARGUMENT_COUNT = 6 };
     int16_t arguments[SERVO_ARGUMENT_COUNT];
 
     servoParam_t *servo;
@@ -2274,7 +2269,7 @@ static void cliServo(char *cmdline)
             }
         }
 
-        enum {INDEX = 0, MIN, MAX, MIDDLE, ANGLE_AT_MIN, ANGLE_AT_MAX, RATE, FORWARD};
+        enum {INDEX = 0, MIN, MAX, MIDDLE, RATE, FORWARD};
 
         i = arguments[INDEX];
 
@@ -2292,9 +2287,7 @@ static void cliServo(char *cmdline)
             arguments[MIDDLE] < arguments[MIN] || arguments[MIDDLE] > arguments[MAX] ||
             arguments[MIN] > arguments[MAX] || arguments[MAX] < arguments[MIN] ||
             arguments[RATE] < -100 || arguments[RATE] > 100 ||
-            arguments[FORWARD] >= MAX_SUPPORTED_RC_CHANNEL_COUNT ||
+            arguments[FORWARD] >= MAX_SUPPORTED_RC_CHANNEL_COUNT
-            arguments[ANGLE_AT_MIN] < 0 || arguments[ANGLE_AT_MIN] > 180 ||
-            arguments[ANGLE_AT_MAX] < 0 || arguments[ANGLE_AT_MAX] > 180
         ) {
             cliShowParseError();
             return;
@@ -2303,9 +2296,7 @@ static void cliServo(char *cmdline)
         servo->min = arguments[1];
         servo->max = arguments[2];
         servo->middle = arguments[3];
-        servo->angleAtMin = arguments[4];
+        servo->rate = arguments[5];
-        servo->angleAtMax = arguments[5];
-        servo->rate = arguments[6];
         servo->forwardFromChannel = arguments[7];
     }
 }

src/main/fc/fc_msp.c

@@ -598,8 +598,6 @@ static bool mspFcProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProcessFn
             sbufWriteU16(dst, servoParams(i)->max);
             sbufWriteU16(dst, servoParams(i)->middle);
             sbufWriteU8(dst, servoParams(i)->rate);
-            sbufWriteU8(dst, servoParams(i)->angleAtMin);
-            sbufWriteU8(dst, servoParams(i)->angleAtMax);
             sbufWriteU8(dst, servoParams(i)->forwardFromChannel);
             sbufWriteU32(dst, servoParams(i)->reversedSources);
         }
@@ -1473,8 +1471,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
             servoParamsMutable(i)->max = sbufReadU16(src);
             servoParamsMutable(i)->middle = sbufReadU16(src);
             servoParamsMutable(i)->rate = sbufReadU8(src);
-            servoParamsMutable(i)->angleAtMin = sbufReadU8(src);
-            servoParamsMutable(i)->angleAtMax = sbufReadU8(src);
             servoParamsMutable(i)->forwardFromChannel = sbufReadU8(src);
             servoParamsMutable(i)->reversedSources = sbufReadU32(src);
         }

src/main/flight/servos.c

@@ -86,8 +86,6 @@ void pgResetFn_servoParams(servoParam_t *instance)
             .max = DEFAULT_SERVO_MAX,
             .middle = DEFAULT_SERVO_MIDDLE,
             .rate = 100,
-            .angleAtMin = DEFAULT_SERVO_MIN_ANGLE,
-            .angleAtMax = DEFAULT_SERVO_MAX_ANGLE,
             .forwardFromChannel = CHANNEL_FORWARDING_DISABLED
         );
     }

src/main/flight/servos.h

@@ -104,8 +104,6 @@ typedef struct servoParam_s {
     int16_t max;                            // servo max
     int16_t middle;                         // servo middle
     int8_t rate;                            // range [-125;+125] ; can be used to adjust a rate 0-125% and a direction
-    uint8_t angleAtMin;                     // range [0;180] the measured angle in degrees from the middle when the servo is at the 'min' value.
-    uint8_t angleAtMax;                     // range [0;180] the measured angle in degrees from the middle when the servo is at the 'max' value.
     int8_t forwardFromChannel;              // RX channel index, 0 based.  See CHANNEL_FORWARDING_DISABLED
 } servoParam_t;
 

src/main/rx/rx.h

@@ -40,8 +40,6 @@
 #define DEFAULT_SERVO_MIN 1000
 #define DEFAULT_SERVO_MIDDLE 1500
 #define DEFAULT_SERVO_MAX 2000
-#define DEFAULT_SERVO_MIN_ANGLE 90
-#define DEFAULT_SERVO_MAX_ANGLE 90
 
 typedef enum {
     RX_FRAME_PENDING = 0,