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

Merge pull request #9728 from etracer65/dynamic_idle_rpmfilter_check

Browse source
This commit is contained in:
Michael Keller 2020-04-25 12:56:23 +12:00 • committed by GitHub
commit 393a432927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -522,6 +522,14 @@ static void validateAndFixConfig(void)
&& motorConfig()->dev.useDshotTelemetry) { && motorConfig()->dev.useDshotTelemetry) {
motorConfigMutable()->dev.useDshotTelemetry = false; motorConfigMutable()->dev.useDshotTelemetry = false;
} }
#if defined(USE_DYN_IDLE)
if (!isRpmFilterEnabled()) {
for (unsigned i = 0; i < PID_PROFILE_COUNT; i++) {
pidProfilesMutable(i)->idle_min_rpm = 0;
}
}
#endif // USE_DYN_IDLE
#endif // USE_DSHOT_TELEMETRY #endif // USE_DSHOT_TELEMETRY
#endif // USE_DSHOT #endif // USE_DSHOT

6
src/main/flight/mixer.c
View file

@ -355,11 +355,7 @@ void initEscEndpoints(void)
void mixerInitProfile(void) void mixerInitProfile(void)
{ {
#ifdef USE_DYN_IDLE #ifdef USE_DYN_IDLE
if (motorConfig()->dev.useDshotTelemetry) { idleMinMotorRps = currentPidProfile->idle_min_rpm * 100.0f / 60.0f;
idleMinMotorRps = currentPidProfile->idle_min_rpm * 100.0f / 60.0f;
} else {
idleMinMotorRps = 0;
}
idleMaxIncrease = currentPidProfile->idle_max_increase * 0.001f; idleMaxIncrease = currentPidProfile->idle_max_increase * 0.001f;
idleP = currentPidProfile->idle_p * 0.0001f; idleP = currentPidProfile->idle_p * 0.0001f;
#endif #endif