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

Merge remote-tracking branch 'upstream/development' into development

This commit is contained in:
Evgeny Sychov 2016-06-16 01:36:53 -07:00
commit e717472f60
21 changed files with 296 additions and 260 deletions

View file

@ -267,12 +267,11 @@ void init(void)
if (feature(FEATURE_SONAR)) {
sonarHardware = sonarGetHardwareConfiguration(&masterConfig.batteryConfig);
sonarGPIOConfig_t sonarGPIOConfig = {
.gpio = SONAR_GPIO,
.triggerPin = sonarHardware->echo_pin,
.echoPin = sonarHardware->trigger_pin,
sonarIOConfig_t sonarConfig = {
.triggerPin = sonarHardware->triggerIO,
.echoPin = sonarHardware->echoIO
};
pwm_params.sonarGPIOConfig = &sonarGPIOConfig;
pwm_params.sonarConfig = &sonarConfig;
}
#endif