fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 12:48:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

distance sensors: remove bus_option array and add it to i2c.h header

Browse Source
This commit is contained in:
DanielePettenuzzo
2018-07-03 17:33:18 +02:00
committed by Beat Küng
parent e15d390f65
commit 6cb17839ee
6 changed files with 28 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/distance_sensor/srf02/srf02.cpp
+2 -20
View File
@@ -686,23 +686,6 @@ namespace srf02
SRF02 *g_dev;
int bus_options[] = {
#ifdef PX4_I2C_BUS_EXPANSION
PX4_I2C_BUS_EXPANSION,
#endif
#ifdef PX4_I2C_BUS_EXPANSION1
PX4_I2C_BUS_EXPANSION1,
#endif
#ifdef PX4_I2C_BUS_EXPANSION2
PX4_I2C_BUS_EXPANSION2,
#endif
#ifdef PX4_I2C_BUS_ONBOARD
PX4_I2C_BUS_ONBOARD,
#endif
};
#define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0]))
int start(uint8_t rotation);
int start_bus(uint8_t rotation, int i2c_bus);
int stop();
@@ -727,8 +710,8 @@ start(uint8_t rotation)
return PX4_ERROR;
}
for (unsigned i = 0; i < NUM_BUS_OPTIONS; i++) {
if (start_bus(rotation, bus_options[i]) == PX4_OK) {
for (unsigned i = 0; i < NUM_I2C_BUS_OPTIONS; i++) {
if (start_bus(rotation, i2c_bus_options[i]) == PX4_OK) {
return PX4_OK;
}
}
@@ -788,7 +771,6 @@ fail:
g_dev = nullptr;
}
PX4_ERR("not started on bus %d", i2c_bus);
return PX4_ERROR;
}