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

Fixed use_unsyncedpwm inversion issue

Browse source
This commit is contained in:
blckmn 2016-07-17 07:32:53 +10:00
parent fc54e696a1
commit 3126551832
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ static flight3DConfig_t *flight3DConfig;
static escAndServoConfig_t *escAndServoConfig; static escAndServoConfig_t *escAndServoConfig;
static airplaneConfig_t *airplaneConfig; static airplaneConfig_t *airplaneConfig;
static rxConfig_t *rxConfig; static rxConfig_t *rxConfig;
static bool syncPwm = false; static bool syncPwmWithPidLoop = false;
static mixerMode_e currentMixerMode; static mixerMode_e currentMixerMode;
static motorMixer_t currentMixer[MAX_SUPPORTED_MOTORS]; static motorMixer_t currentMixer[MAX_SUPPORTED_MOTORS];
@ -427,7 +427,7 @@ void mixerUsePWMOutputConfiguration(pwmOutputConfiguration_t *pwmOutputConfigura
motorCount = 0; motorCount = 0;
servoCount = pwmOutputConfiguration->servoCount; servoCount = pwmOutputConfiguration->servoCount;
syncPwm = use_unsyncedPwm; syncPwmWithPidLoop = !use_unsyncedPwm;
if (currentMixerMode == MIXER_CUSTOM || currentMixerMode == MIXER_CUSTOM_TRI || currentMixerMode == MIXER_CUSTOM_AIRPLANE) { if (currentMixerMode == MIXER_CUSTOM || currentMixerMode == MIXER_CUSTOM_TRI || currentMixerMode == MIXER_CUSTOM_AIRPLANE) {
// load custom mixer into currentMixer // load custom mixer into currentMixer
@ -528,9 +528,12 @@ void mixerInit(mixerMode_e mixerMode, motorMixer_t *initialCustomMixers)
customMixers = initialCustomMixers; customMixers = initialCustomMixers;
} }
void mixerUsePWMOutputConfiguration(pwmOutputConfiguration_t *pwmOutputConfiguration) void mixerUsePWMOutputConfiguration(pwmOutputConfiguration_t *pwmOutputConfiguration, bool use_unsyncedPwm)
{ {
UNUSED(pwmOutputConfiguration); UNUSED(pwmOutputConfiguration);
syncPwmWithPidLoop = !use_unsyncedPwm;
motorCount = 4; motorCount = 4;
#ifdef USE_SERVOS #ifdef USE_SERVOS
servoCount = 0; servoCount = 0;
@ -644,7 +647,7 @@ void writeMotors(void)
for (i = 0; i < motorCount; i++) for (i = 0; i < motorCount; i++)
pwmWriteMotor(i, motor[i]); pwmWriteMotor(i, motor[i]);
if (syncPwm) { if (syncPwmWithPidLoop) {
pwmCompleteOneshotMotorUpdate(motorCount); pwmCompleteOneshotMotorUpdate(motorCount);
} }
} }