diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-12-10 11:37:25 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-12-10 11:37:25 +0100 |
| commit | eed5b99a4a94ce80534d6b999377c3feb7bcecd4 (patch) | |
| tree | 6e619e395f7bfea7bc102067ac28df267f4a1ca2 /src/drivers/hmc5883 | |
| parent | b2b9665e4460ce25718509b7abb75c4b702c4c5f (diff) | |
| parent | c72162cc5ae12e2e64f9a4fb86e205bab51a5b6d (diff) | |
| download | px4-firmware-eed5b99a4a94ce80534d6b999377c3feb7bcecd4.tar.gz px4-firmware-eed5b99a4a94ce80534d6b999377c3feb7bcecd4.tar.bz2 px4-firmware-eed5b99a4a94ce80534d6b999377c3feb7bcecd4.zip | |
Merge branch 'redundant_sensors' of github.com:PX4/Firmware
Diffstat (limited to 'src/drivers/hmc5883')
| -rw-r--r-- | src/drivers/hmc5883/hmc5883.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/hmc5883/hmc5883.cpp b/src/drivers/hmc5883/hmc5883.cpp index 5f0ce4ff8..22ad301ff 100644 --- a/src/drivers/hmc5883/hmc5883.cpp +++ b/src/drivers/hmc5883/hmc5883.cpp @@ -77,6 +77,7 @@ */ #define HMC5883L_ADDRESS PX4_I2C_OBDEV_HMC5883 +#define HMC5883L_DEVICE_PATH "/dev/hmc5883" /* Max measurement rate is 160Hz, however with 160 it will be set to 166 Hz, therefore workaround using 150 */ #define HMC5883_CONVERSION_INTERVAL (1000000 / 150) /* microseconds */ @@ -315,7 +316,7 @@ extern "C" __EXPORT int hmc5883_main(int argc, char *argv[]); HMC5883::HMC5883(int bus) : - I2C("HMC5883", MAG_DEVICE_PATH, bus, HMC5883L_ADDRESS, 400000), + I2C("HMC5883", HMC5883L_DEVICE_PATH, bus, HMC5883L_ADDRESS, 400000), _measure_ticks(0), _reports(nullptr), _range_scale(0), /* default range scale from counts to gauss */ @@ -1256,7 +1257,7 @@ start() goto fail; /* set the poll rate to default, starts automatic data collection */ - fd = open(MAG_DEVICE_PATH, O_RDONLY); + fd = open(HMC5883L_DEVICE_PATH, O_RDONLY); if (fd < 0) goto fail; @@ -1288,7 +1289,7 @@ test() ssize_t sz; int ret; - int fd = open(MAG_DEVICE_PATH, O_RDONLY); + int fd = open(HMC5883L_DEVICE_PATH, O_RDONLY); if (fd < 0) err(1, "%s open failed (try 'hmc5883 start' if the driver is not running", MAG_DEVICE_PATH); |