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

Fixed a problem when the motor count for motorInit came from a custom

Browse source 
mixer table lookup which was 0.

1. took the motor count from the loading of the custom mixer table.
2. Moved the mixerconfig to before motorInit as motorInit needs the
motorCount.
3. removed pwmIsSynced checks as this was a order of init problem, and
not required as pwmCompleteMotorUpdate protects itself.
This commit is contained in:
atomiclama 2016-11-17 08:30:05 +00:00
parent 135231f289
commit d4a81879d8
5 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/main.c
View file

@ -263,10 +263,15 @@ void init(void)
idlePulse = 0; // brushed motors
}
mixerConfigureOutput();
#ifdef USE_SERVOS
servoConfigureOutput();
#endif
#ifdef USE_QUAD_MIXER_ONLY
motorInit(&masterConfig.motorConfig, idlePulse, QUAD_MOTOR_COUNT);
#else
motorInit(&masterConfig.motorConfig, idlePulse, mixers[masterConfig.mixerMode].motorCount);
motorInit(&masterConfig.motorConfig, idlePulse, motorCount);
#endif
#ifdef USE_SERVOS
@ -285,10 +290,7 @@ void init(void)
pwmRxSetInputFilteringMode(masterConfig.inputFilteringMode);
#endif
mixerConfigureOutput();
#ifdef USE_SERVOS
servoConfigureOutput();
#endif
systemState |= SYSTEM_STATE_MOTORS_READY;
#ifdef BEEPER