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

merge in savaga

Browse source
This commit is contained in:
nathan 2016-06-16 02:29:52 -07:00
commit b95e540217
41 changed files with 408 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/drivers/pwm_mapping.c
View file

@ -111,7 +111,7 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
int channelIndex = 0;
memset(&pwmOutputConfiguration, 0, sizeof(pwmOutputConfiguration));
// this is pretty hacky shit, but it will do for now. array of 4 config maps, [ multiPWM multiPPM airPWM airPPM ]
if (init->airplane)
i = 2; // switch to air hardware config
@ -189,12 +189,11 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
#endif
#ifdef SONAR
if (init->sonarGPIOConfig &&
if (init->sonarConfig &&
(
CheckGPIOPin(timerHardwarePtr->pin, init->sonarGPIOConfig->gpio, init->sonarGPIOConfig->triggerPin) ||
CheckGPIOPin(timerHardwarePtr->pin, init->sonarGPIOConfig->gpio, init->sonarGPIOConfig->echoPin)
)
) {
timerHardwarePtr->pin == init->sonarConfig->triggerPin ||
timerHardwarePtr->pin == init->sonarConfig->echoPin
)) {
continue;
}
#endif