Merge pull request #2961 from shellixyz/fix_flaperon_mode

Fix flaperon mode mix direction and widen flaperon_throw_offset min/max
iNavFlight · Mar 24, 2018 · 64d675d · 64d675d
2 parents 4a10153 + af1f156
commit 64d675d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c
@@ -109,8 +109,8 @@ static rateLimitFilter_t servoSpeedLimitFilter[MAX_SERVO_RULES];
 static const servoMixer_t servoMixerAirplane[] = {
     { SERVO_FLAPPERON_1, INPUT_STABILIZED_ROLL,  100, 0 },
     { SERVO_FLAPPERON_2, INPUT_STABILIZED_ROLL,  100, 0 },
-    { SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,    100, 0 },
-    { SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,   -100, 0 },
+    { SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,   -100, 0 },
+    { SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,    100, 0 },
     { SERVO_RUDDER,      INPUT_STABILIZED_YAW,   100, 0 },
     { SERVO_ELEVATOR,    INPUT_STABILIZED_PITCH, 100, 0 },
 };

diff --git a/src/main/flight/servos.h b/src/main/flight/servos.h
@@ -81,8 +81,8 @@ typedef enum {
 #define SERVO_FLAPPERONS_MAX SERVO_FLAPPERON_2
 
 #define FLAPERON_THROW_DEFAULT 200
-#define FLAPERON_THROW_MIN 100
-#define FLAPERON_THROW_MAX 400
+#define FLAPERON_THROW_MIN 50
+#define FLAPERON_THROW_MAX 450
 
 typedef struct servoMixer_s {
     uint8_t targetChannel;                  // servo that receives the output of the rule