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

Merge pull request #9936 from mikeller/cleanup_rangefinder_support

Browse source 
Cleaned up rangefinder code, removed unsupported driver stubs.
This commit is contained in:
Michael Keller 2020-06-29 23:16:20 +12:00 • committed by GitHub
commit c1dc66b452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,42 +104,6 @@ static bool rangefinderDetect(rangefinderDev_t * dev, uint8_t rangefinderHardwar
#endif
break;
case RANGEFINDER_SRF10:
#ifdef USE_RANGEFINDER_SRF10
if (srf10Detect(dev)) {
rangefinderHardware = RANGEFINDER_SRF10;
rescheduleTask(TASK_RANGEFINDER, TASK_PERIOD_MS(RANGEFINDER_SRF10_TASK_PERIOD_MS));
}
#endif
break;
case RANGEFINDER_HCSR04I2C:
#ifdef USE_RANGEFINDER_HCSR04_I2C
if (hcsr04i2c0Detect(dev)) {
rangefinderHardware = RANGEFINDER_HCSR04I2C;
rescheduleTask(TASK_RANGEFINDER, TASK_PERIOD_MS(RANGEFINDER_HCSR04_i2C_TASK_PERIOD_MS));
}
#endif
break;
case RANGEFINDER_VL53L0X:
#if defined(USE_RANGEFINDER_VL53L0X)
if (vl53l0xDetect(dev)) {
rangefinderHardware = RANGEFINDER_VL53L0X;
rescheduleTask(TASK_RANGEFINDER, TASK_PERIOD_MS(RANGEFINDER_VL53L0X_TASK_PERIOD_MS));
}
#endif
break;
case RANGEFINDER_UIB:
#if defined(USE_RANGEFINDER_UIB)
if (uibRangefinderDetect(dev)) {
rangefinderHardware = RANGEFINDER_UIB;
rescheduleTask(TASK_RANGEFINDER, TASK_PERIOD_MS(RANGEFINDER_UIB_TASK_PERIOD_MS));
}
#endif
break;
case RANGEFINDER_TFMINI:
#if defined(USE_RANGEFINDER_TF)
if (lidarTFminiDetect(dev)) {

5
src/main/sensors/rangefinder.h
View file

@ -31,11 +31,6 @@ typedef enum {
RANGEFINDER_HCSR04 = 1,
RANGEFINDER_TFMINI = 2,
RANGEFINDER_TF02 = 3,
// Following sensors are to be ported from iNav
RANGEFINDER_SRF10 = 4,
RANGEFINDER_HCSR04I2C = 5,
RANGEFINDER_VL53L0X = 6,
RANGEFINDER_UIB = 7,
} rangefinderType_e;
typedef struct rangefinderConfig_s {