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

Merge pull request #3121 from iNavFlight/dzikuvx-RANGEFINDER_HCSR04_PWM_TRIGGER_PIN-cleanup

Browse source 
RANGEFINDER_HCSR04_PWM_TRIGGER_PIN removed
This commit is contained in:
Konstantin Sharlaimov 2018-04-26 00:41:05 +10:00 • committed by GitHub
commit bd044deca4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/sensors/rangefinder.c
View file

@ -72,18 +72,7 @@ const rangefinderHardwarePins_t * rangefinderGetHardwarePins(void)
{
static rangefinderHardwarePins_t rangefinderHardwarePins;
#if defined(RANGEFINDER_HCSR04_PWM_TRIGGER_PIN)
// If we are using softserial, parallel PWM or ADC current sensor, then use motor pins for sonar, otherwise use RC pins
if (feature(FEATURE_SOFTSERIAL)
|| (rxConfig()->receiverType == RX_TYPE_PWM)
|| (feature(FEATURE_CURRENT_METER) && batteryConfig()->currentMeterType == CURRENT_SENSOR_ADC)) {
rangefinderHardwarePins.triggerTag = IO_TAG(RANGEFINDER_HCSR04_TRIGGER_PIN_PWM);
rangefinderHardwarePins.echoTag = IO_TAG(RANGEFINDER_HCSR04_ECHO_PIN_PWM);
} else {
rangefinderHardwarePins.triggerTag = IO_TAG(RANGEFINDER_HCSR04_TRIGGER_PIN);
rangefinderHardwarePins.echoTag = IO_TAG(RANGEFINDER_HCSR04_ECHO_PIN);
}
#elif defined(RANGEFINDER_HCSR04_TRIGGER_PIN)
#if defined(RANGEFINDER_HCSR04_TRIGGER_PIN)
rangefinderHardwarePins.triggerTag = IO_TAG(RANGEFINDER_HCSR04_TRIGGER_PIN);
rangefinderHardwarePins.echoTag = IO_TAG(RANGEFINDER_HCSR04_ECHO_PIN);
#else