Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 23:05:19 +03:00
Code Issues Wiki Activity

Fix logic error for RACEFLIGHT and KISS rates range checks

Browse source 
Fixes logic errors in #9574

For RACEFLIGHT rates the applicable `case` was missing so the logic defaulted to the BETAFLIGHT rates logic which incorrectly limited the maximum rate value to 100. RACEFLIGHT values range to 255.

For KISS rates the limit was set to 100 but the Configurator constrains to 99.
This commit is contained in:
Bruce Luckcuck 2020-12-27 18:14:16 -05:00
parent 9fe4141342
commit 76d50f1d37
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/config/config.c
View file

@ -104,7 +104,7 @@ pidProfile_t *currentPidProfile;
#define DYNAMIC_FILTER_MAX_SUPPORTED_LOOP_TIME HZ_TO_INTERVAL_US(2000) #define DYNAMIC_FILTER_MAX_SUPPORTED_LOOP_TIME HZ_TO_INTERVAL_US(2000)
#define BETAFLIGHT_MAX_SRATE 100 #define BETAFLIGHT_MAX_SRATE 100
#define KISS_MAX_SRATE 100 #define KISS_MAX_SRATE 99
#define QUICK_MAX_RATE 200 #define QUICK_MAX_RATE 200
#define ACTUAL_MAX_RATE 200 #define ACTUAL_MAX_RATE 200
@ -580,6 +580,8 @@ static void validateAndFixConfig(void)
} }
break; break;
case RATES_TYPE_RACEFLIGHT:
break; // no range constraint is necessary - allows 0 - 255
case RATES_TYPE_KISS: case RATES_TYPE_KISS:
for (int axis = FD_ROLL; axis <= FD_YAW; axis++) { for (int axis = FD_ROLL; axis <= FD_YAW; axis++) {
controlRateProfilesMutable(i)->rates[axis] = constrain(controlRateProfilesMutable(i)->rates[axis], 0, KISS_MAX_SRATE); controlRateProfilesMutable(i)->rates[axis] = constrain(controlRateProfilesMutable(i)->rates[axis], 0, KISS_MAX_SRATE);
@ -596,6 +598,8 @@ static void validateAndFixConfig(void)
for (int axis = FD_ROLL; axis <= FD_YAW; axis++) { for (int axis = FD_ROLL; axis <= FD_YAW; axis++) {
controlRateProfilesMutable(i)->rates[axis] = constrain(controlRateProfilesMutable(i)->rates[axis], 0, QUICK_MAX_RATE); controlRateProfilesMutable(i)->rates[axis] = constrain(controlRateProfilesMutable(i)->rates[axis], 0, QUICK_MAX_RATE);
} }
break;
} }
} }