Browse Source

Drivers: Add TeraRanger Evo 600Hz support (#9169)

sbg
Mateusz Sadowski 7 years ago committed by Daniel Agar
parent
commit
f0a8569c93
  1. 3
      src/drivers/distance_sensor/teraranger/parameters.c
  2. 28
      src/drivers/distance_sensor/teraranger/teraranger.cpp

3
src/drivers/distance_sensor/teraranger/parameters.c

@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
* @value 0 Disabled
* @value 1 Autodetect
* @value 2 TROne
* @value 3 TREvo
* @value 3 TREvo60m
* @value 4 TREvo600Hz
*/
PARAM_DEFINE_INT32(SENS_EN_TRANGER, 0);

28
src/drivers/distance_sensor/teraranger/teraranger.cpp

@ -87,8 +87,10 @@ @@ -87,8 +87,10 @@
/* Device limits */
#define TRONE_MIN_DISTANCE (0.20f)
#define TRONE_MAX_DISTANCE (14.00f)
#define TREVO_MIN_DISTANCE (0.50f)
#define TREVO_MAX_DISTANCE (60.0f)
#define TREVO_60M_MIN_DISTANCE (0.50f)
#define TREVO_60M_MAX_DISTANCE (60.0f)
#define TREVO_600HZ_MIN_DISTANCE (0.75f)
#define TREVO_600HZ_MAX_DISTANCE (8.0f)
#define TERARANGER_CONVERSION_INTERVAL 50000 /* 50ms */
@ -295,8 +297,8 @@ TERARANGER::init() @@ -295,8 +297,8 @@ TERARANGER::init()
goto out;
} else {
_min_distance = TREVO_MIN_DISTANCE;
_max_distance = TREVO_MAX_DISTANCE;
_min_distance = TREVO_60M_MIN_DISTANCE;
_max_distance = TREVO_60M_MAX_DISTANCE;
}
} else {
@ -317,7 +319,7 @@ TERARANGER::init() @@ -317,7 +319,7 @@ TERARANGER::init()
_max_distance = TRONE_MAX_DISTANCE;
break;
case 3: /* TREvo */
case 3: /* TREvo60m */
set_device_address(TREVO_BASEADDR);
/* do I2C init (and probe) first */
@ -325,8 +327,20 @@ TERARANGER::init() @@ -325,8 +327,20 @@ TERARANGER::init()
goto out;
}
_min_distance = TREVO_MIN_DISTANCE;
_max_distance = TREVO_MAX_DISTANCE;
_min_distance = TREVO_60M_MIN_DISTANCE;
_max_distance = TREVO_60M_MAX_DISTANCE;
break;
case 4: /* TREvo600Hz */
set_device_address(TREVO_BASEADDR);
/* do I2C init (and probe) first */
if (I2C::init() != OK) {
goto out;
}
_min_distance = TREVO_600HZ_MIN_DISTANCE;
_max_distance = TREVO_600HZ_MAX_DISTANCE;
break;
default:

Loading…
Cancel
Save