diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-15 22:19:27 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-15 22:19:27 +0100 |
| commit | 7a351c317bec8eca72b00d531aeb2c7538a904d6 (patch) | |
| tree | 9cb3af1605f6e328f65134aa866d8f2938b546ed /src/drivers/meas_airspeed | |
| parent | 387bfad1cacc2f9929e7590130ca93f27c688655 (diff) | |
| parent | 0f7483c804226d5557bd4cfd2d46df1533e91c44 (diff) | |
| download | px4-firmware-7a351c317bec8eca72b00d531aeb2c7538a904d6.tar.gz px4-firmware-7a351c317bec8eca72b00d531aeb2c7538a904d6.tar.bz2 px4-firmware-7a351c317bec8eca72b00d531aeb2c7538a904d6.zip | |
Merge branch 'beta' of github.com:PX4/Firmware into beta
Diffstat (limited to 'src/drivers/meas_airspeed')
| -rw-r--r-- | src/drivers/meas_airspeed/meas_airspeed.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/drivers/meas_airspeed/meas_airspeed.cpp b/src/drivers/meas_airspeed/meas_airspeed.cpp index 6fe6c2221..06d89abf7 100644 --- a/src/drivers/meas_airspeed/meas_airspeed.cpp +++ b/src/drivers/meas_airspeed/meas_airspeed.cpp @@ -90,8 +90,10 @@ /* I2C bus address is 1010001x */ #define I2C_ADDRESS_MS4525DO 0x28 //0x51 /* 7-bit address. */ +#define PATH_MS4525 "/dev/ms4525" /* The MS5525DSO address is 111011Cx, where C is the complementary value of the pin CSB */ #define I2C_ADDRESS_MS5525DSO 0x77 //0x77/* 7-bit address, addr. pin pulled low */ +#define PATH_MS5525 "/dev/ms5525" /* Register address */ #define ADDR_READ_MR 0x00 /* write to this address to start conversion */ @@ -102,7 +104,7 @@ class MEASAirspeed : public Airspeed { public: - MEASAirspeed(int bus, int address = I2C_ADDRESS_MS4525DO); + MEASAirspeed(int bus, int address = I2C_ADDRESS_MS4525DO, const char* path = PATH_MS4525); protected: @@ -121,8 +123,8 @@ protected: */ extern "C" __EXPORT int meas_airspeed_main(int argc, char *argv[]); -MEASAirspeed::MEASAirspeed(int bus, int address) : Airspeed(bus, address, - CONVERSION_INTERVAL) +MEASAirspeed::MEASAirspeed(int bus, int address, const char* path) : Airspeed(bus, address, + CONVERSION_INTERVAL, path) { } @@ -305,7 +307,7 @@ start(int i2c_bus) errx(1, "already started"); /* 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, PATH_MS4525); /* check if the MS4525DO was instantiated */ if (g_dev == nullptr) @@ -314,7 +316,7 @@ start(int i2c_bus) /* try the MS5525DSO next if init fails */ if (OK != g_dev->Airspeed::init()) { delete g_dev; - g_dev = new MEASAirspeed(i2c_bus, I2C_ADDRESS_MS5525DSO); + g_dev = new MEASAirspeed(i2c_bus, I2C_ADDRESS_MS5525DSO, PATH_MS5525); /* check if the MS5525DSO was instantiated */ if (g_dev == nullptr) |