yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename MB12XX_MAX_RANGEFINDERS to RANGE_FINDER_MAX_SENSORS.

Browse Source
This commit is contained in:
mcsauder
2019-02-18 10:34:05 -07:00
committed by Daniel Agar
parent 4dea79b2d6
commit d6dc5a7302
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/distance_sensor/mb12xx/mb12xx.cpp
View File

@@ -131,7 +131,7 @@ private:
uint8_t _cycle_counter; /* counter in cycle to change i2c adresses */ uint8_t _cycle_counter; /* counter in cycle to change i2c adresses */
int _cycling_rate; /* */ int _cycling_rate; /* */
uint8_t _index_counter; /* temporary sonar i2c address */ 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 * 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: /* check for connected rangefinders on each i2c port:
We start from i2c base address (0x70 = 112) and count downwards 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*/ 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 */ _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 */ set_device_address(_index_counter); /* set I2c port to temp sonar i2c adress */
int ret2 = measure(); int ret2 = measure();

4
src/drivers/distance_sensor/srf02/srf02.cpp
View File

@@ -131,7 +131,7 @@ private:
uint8_t _cycle_counter; /* counter in cycle to change i2c adresses */ uint8_t _cycle_counter; /* counter in cycle to change i2c adresses */
int _cycling_rate; /* */ int _cycling_rate; /* */
uint8_t _index_counter; /* temporary sonar i2c address */ 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 * 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: /* check for connected rangefinders on each i2c port:
We start from i2c base address (0x70 = 112) and count downwards 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*/ 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 */ _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 */ set_device_address(_index_counter); /* set I2c port to temp sonar i2c adress */
int ret2 = measure(); int ret2 = measure();

2
src/drivers/drv_range_finder.h
View File

@@ -46,6 +46,6 @@
#define RANGE_FINDER_BASE_DEVICE_PATH "/dev/range_finder" #define RANGE_FINDER_BASE_DEVICE_PATH "/dev/range_finder"
#define RANGE_FINDER0_DEVICE_PATH "/dev/range_finder0" #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 */ #endif /* _DRV_RANGEFINDER_H */