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

Update mixer to use servo count from results of pwm mapping.

Browse source 
Also ensure that only aux channels for which there are available servos
are used when forwarding channels.

Removed magic number usage.
This commit is contained in:
Dominic Clifton 2014-06-11 19:05:03 +01:00
parent 51366ed629
commit fd59a4cd52
5 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/main.c
View file

@ -78,7 +78,8 @@ void timerInit(void);
void initTelemetry(void);
void serialInit(serialConfig_t *initialSerialConfig);
failsafe_t* failsafeInit(rxConfig_t *intialRxConfig);
void pwmInit(drv_pwm_config_t *init);
pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init);
void mixerInit(MultiType mixerConfiguration, motorMixer_t *customMixers, pwmOutputConfiguration_t *pwmOutputConfiguration);
void rxInit(rxConfig_t *rxConfig, failsafe_t *failsafe);
void buzzerInit(failsafe_t *initialFailsafe);
void gpsInit(serialConfig_t *serialConfig, gpsConfig_t *initialGpsConfig, gpsProfile_t *initialGpsProfile, pidProfile_t *pidProfile);
@ -163,8 +164,6 @@ void init(void)
compassInit();
#endif
mixerInit(masterConfig.mixerConfiguration, masterConfig.customMixer);
timerInit();
serialInit(&masterConfig.serialConfig);
@ -195,7 +194,9 @@ void init(void)
pwm_params.idlePulse = 0; // brushed motors
pwm_params.servoCenterPulse = masterConfig.rxConfig.midrc;
pwmInit(&pwm_params);
pwmOutputConfiguration_t *pwmOutputConfiguration = pwmInit(&pwm_params);
mixerInit(masterConfig.mixerConfiguration, masterConfig.customMixer, pwmOutputConfiguration);
failsafe = failsafeInit(&masterConfig.rxConfig);
buzzerInit(failsafe);