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

Updates sonar so that it can be used together with ADC current meter

Browse source 
Check if ADC current meter is enabled in sonarInit() and change
sonar pins to pwm 5 and 6 if it is. Same as when RX_PARALLEL is enabled.
This commit is contained in:
Per Magnus Auby 2015-03-31 13:35:45 +02:00
parent 6e8d081c45
commit b83b9040f9
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/main.c
View file

@ -367,7 +367,7 @@ void init(void)
#ifdef SONAR
if (feature(FEATURE_SONAR)) {
sonarInit();
sonarInit(&masterConfig.batteryConfig);
}
#endif

6
src/main/sensors/sonar.c
View file

@ -37,7 +37,7 @@
static int32_t calculatedAltitude;
void sonarInit(void)
void sonarInit(batteryConfig_t *batteryConfig)
{
#if defined(NAZE) || defined(EUSTM32F103RC) || defined(PORT103R)
static const sonarHardware_t const sonarPWM56 = {
@ -54,8 +54,8 @@ void sonarInit(void)
.exti_pin_source = GPIO_PinSource1,
.exti_irqn = EXTI1_IRQn
};
// If we are using parallel PWM for our receiver, then use motor pins 5 and 6 for sonar, otherwise use rc pins 7 and 8
if (feature(FEATURE_RX_PARALLEL_PWM)) {
// If we are using parallel PWM for our receiver or ADC current sensor, then use motor pins 5 and 6 for sonar, otherwise use rc pins 7 and 8
if (feature(FEATURE_RX_PARALLEL_PWM ) || (feature(FEATURE_CURRENT_METER) && batteryConfig->currentMeterType == CURRENT_SENSOR_ADC) ) {
hcsr04_init(&sonarPWM56);
} else {
hcsr04_init(&sonarRC78);

3
src/main/sensors/sonar.h
View file

@ -16,8 +16,9 @@
*/
#pragma once
#include "sensors/battery.h"
void sonarInit(void);
void sonarInit(batteryConfig_t *batteryConfig);
void sonarUpdate(void);
int32_t sonarRead(void);