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

Fixed up ets driver (not tested, WIP on meas driver)

Browse Source
This commit is contained in:
Lorenz Meier
2013-07-22 09:19:59 +02:00
parent 08ddbbc23e
commit 97f732ccf1
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/ets_airspeed/ets_airspeed.cpp
+1 -1
View File
@@ -282,7 +282,7 @@ start(int i2c_bus)
if (g_dev == nullptr) if (g_dev == nullptr)
goto fail; goto fail;
if (OK != g_dev->init()) if (OK != g_dev->Airspeed::init())
goto fail; goto fail;
/* set the poll rate to default, starts automatic data collection */ /* set the poll rate to default, starts automatic data collection */
src/drivers/meas_airspeed/meas_airspeed.cpp
+23 -23
View File
@@ -278,7 +278,7 @@ namespace meas_airspeed
#endif #endif
const int ERROR = -1; const int ERROR = -1;
MEASAirspeed *g_dev; MEASAirspeed *g_dev = nullptr;
void start(int i2c_bus); void start(int i2c_bus);
void stop(); void stop();
@@ -300,16 +300,33 @@ start(int i2c_bus)
/* create the driver, try the MS4525DO first */ /* create the driver, try the MS4525DO first */
//g_dev = new MEASAirspeed(i2c_bus, I2C_ADDRESS_MS4525DO); //g_dev = new MEASAirspeed(i2c_bus, I2C_ADDRESS_MS4525DO);
{
int bus = PX4_I2C_BUS_EXPANSION; int bus = PX4_I2C_BUS_EXPANSION;
//delete g_dev; //delete g_dev;
// XXX hack scan all addresses // XXX hack scan all addresses
for (int i = 0x20 / 2; i < 0xFE / 2; i++) {
warnx("scanning addr (7 bit): 0x%02x", i);
g_dev = new MEASAirspeed(bus, i);
warnx("probing");
if (OK == g_dev->Airspeed::init()) {
warnx("SUCCESS!");
usleep(200000);
exit(0);
} else {
warnx("FAIL!");
usleep(200000);
delete g_dev;
}
}
bus = PX4_I2C_BUS_ESC;
for (int i = 1; i < 0xFF / 2; i++) { for (int i = 1; i < 0xFF / 2; i++) {
warnx("scanning addr (7 bit): %0x", i); warnx("scanning addr (7 bit): %0x", i);
g_dev = new MEASAirspeed(bus, i); g_dev = new MEASAirspeed(bus, i);
warnx("probing"); if (OK == g_dev->Airspeed::init()) {
if (OK == g_dev->init()) {
warnx("SUCCESS!"); warnx("SUCCESS!");
exit(0); exit(0);
} else { } else {
@@ -318,29 +335,12 @@ start(int i2c_bus)
} }
// bus = PX4_I2C_BUS_ESC;
// for (int i = 1; i < 0xFF / 2; i++) {
// warnx("scanning addr (7 bit): %0x", i);
// g_dev = new MEASAirspeed(bus, i);
// if (OK == g_dev->init()) {
// warnx("SUCCESS!");
// exit(0);
// } else {
// delete g_dev;
// }
// }
exit(1);
}
/* check if the MS4525DO was instantiated */ /* check if the MS4525DO was instantiated */
if (g_dev == nullptr) if (g_dev == nullptr)
goto fail; goto fail;
/* try the MS5525DSO next if init fails */ /* try the MS5525DSO next if init fails */
if (OK != g_dev->init()) if (OK != g_dev->Airspeed::init())
delete g_dev; delete g_dev;
g_dev = new MEASAirspeed(i2c_bus, I2C_ADDRESS_MS5525DSO); g_dev = new MEASAirspeed(i2c_bus, I2C_ADDRESS_MS5525DSO);
@@ -349,7 +349,7 @@ start(int i2c_bus)
goto fail; goto fail;
/* both versions failed if the init for the MS5525DSO fails, give up */ /* both versions failed if the init for the MS5525DSO fails, give up */
if (OK != g_dev->init()) if (OK != g_dev->Airspeed::init())
goto fail; goto fail;
/* set the poll rate to default, starts automatic data collection */ /* set the poll rate to default, starts automatic data collection */