From d6dc5a7302a8b3a6099b0f2213fd1e221be01702 Mon Sep 17 00:00:00 2001
From: mcsauder <mcsauder@gmail.com>
Date: Mon, 18 Feb 2019 10:34:05 -0700
Subject: [PATCH] Rename MB12XX_MAX_RANGEFINDERS to RANGE_FINDER_MAX_SENSORS.
---
src/drivers/distance_sensor/mb12xx/mb12xx.cpp | 4 ++--
src/drivers/distance_sensor/srf02/srf02.cpp | 4 ++--
src/drivers/drv_range_finder.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
index 7001ab7d3a..d79fbb08cf 100644
--- a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
+++ b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
@@ -131,7 +131,7 @@ private:
uint8_t _cycle_counter; /* counter in cycle to change i2c adresses */
int _cycling_rate; /* */
uint8_t _index_counter; /* temporary sonar i2c address */
- px4::Array<uint8_t, MB12XX_MAX_RANGEFINDERS> addr_ind; /* temp sonar i2c address vector */
+ px4::Array<uint8_t, RANGE_FINDER_MAX_SENSORS> addr_ind; /* temp sonar i2c address vector */
/**
* Test whether the device supported by the driver is present at a
@@ -266,7 +266,7 @@ MB12XX::init()
/* check for connected rangefinders on each i2c port:
We start from i2c base address (0x70 = 112) and count downwards
So second iteration it uses i2c address 111, third iteration 110 and so on*/
- for (unsigned counter = 0; counter <= MB12XX_MAX_RANGEFINDERS; counter++) {
+ for (unsigned counter = 0; counter <= RANGE_FINDER_MAX_SENSORS; counter++) {
_index_counter = MB12XX_BASEADDR - counter; /* set temp sonar i2c address to base adress - counter */
set_device_address(_index_counter); /* set I2c port to temp sonar i2c adress */
int ret2 = measure();
diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp
index 71231d9e00..d749d18929 100644
--- a/src/drivers/distance_sensor/srf02/srf02.cpp
+++ b/src/drivers/distance_sensor/srf02/srf02.cpp
@@ -131,7 +131,7 @@ private:
uint8_t _cycle_counter; /* counter in cycle to change i2c adresses */
int _cycling_rate; /* */
uint8_t _index_counter; /* temporary sonar i2c address */
- px4::Array<uint8_t, MB12XX_MAX_RANGEFINDERS> addr_ind; /* temp sonar i2c address vector */
+ px4::Array<uint8_t, RANGE_FINDER_MAX_SENSORS> addr_ind; /* temp sonar i2c address vector */
/**
* Test whether the device supported by the driver is present at a
@@ -266,7 +266,7 @@ SRF02::init()
/* check for connected rangefinders on each i2c port:
We start from i2c base address (0x70 = 112) and count downwards
So second iteration it uses i2c address 111, third iteration 110 and so on*/
- for (unsigned counter = 0; counter <= MB12XX_MAX_RANGEFINDERS; counter++) {
+ for (unsigned counter = 0; counter <= RANGE_FINDER_MAX_SENSORS; counter++) {
_index_counter = SRF02_BASEADDR - counter; /* set temp sonar i2c address to base adress - counter */
set_device_address(_index_counter); /* set I2c port to temp sonar i2c adress */
int ret2 = measure();
diff --git a/src/drivers/drv_range_finder.h b/src/drivers/drv_range_finder.h
index 38f49af6bc..c02634c8d3 100644
--- a/src/drivers/drv_range_finder.h
+++ b/src/drivers/drv_range_finder.h
@@ -46,6 +46,6 @@
#define RANGE_FINDER_BASE_DEVICE_PATH "/dev/range_finder"
#define RANGE_FINDER0_DEVICE_PATH "/dev/range_finder0"
-#define MB12XX_MAX_RANGEFINDERS 12 // Maximum number of Maxbotix sensors on bus
+#define RANGE_FINDER_MAX_SENSORS 12 // Maximum number of sensors on bus
#endif /* _DRV_RANGEFINDER_H */
--
GitLab