diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-03 13:44:22 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-09 22:56:21 +0100 |
| commit | 6e4b95e844e0e24c65ee5166d3d214957e3be9e6 (patch) | |
| tree | a44e89c98d80de9df3f3d743677a1cb9210e802d /src | |
| parent | 3036ad034de863cc4161f8c3569024b89ad32e17 (diff) | |
| download | px4-firmware-6e4b95e844e0e24c65ee5166d3d214957e3be9e6.tar.gz px4-firmware-6e4b95e844e0e24c65ee5166d3d214957e3be9e6.tar.bz2 px4-firmware-6e4b95e844e0e24c65ee5166d3d214957e3be9e6.zip | |
Airspeed: Move to 0-based index
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/airspeed/airspeed.cpp | 4 | ||||
| -rw-r--r-- | src/drivers/ets_airspeed/ets_airspeed.cpp | 8 | ||||
| -rw-r--r-- | src/drivers/meas_airspeed/meas_airspeed.cpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/drivers/airspeed/airspeed.cpp b/src/drivers/airspeed/airspeed.cpp index 6db6713c4..d5935dfd4 100644 --- a/src/drivers/airspeed/airspeed.cpp +++ b/src/drivers/airspeed/airspeed.cpp @@ -106,7 +106,7 @@ Airspeed::~Airspeed() stop(); if (_class_instance != -1) - unregister_class_devname(AIRSPEED_DEVICE_PATH, _class_instance); + unregister_class_devname(AIRSPEED_BASE_DEVICE_PATH, _class_instance); /* free any existing reports */ if (_reports != nullptr) @@ -133,7 +133,7 @@ Airspeed::init() goto out; /* register alternate interfaces if we have to */ - _class_instance = register_class_devname(AIRSPEED_DEVICE_PATH); + _class_instance = register_class_devname(AIRSPEED_BASE_DEVICE_PATH); /* publication init */ if (_class_instance == CLASS_DEVICE_PRIMARY) { diff --git a/src/drivers/ets_airspeed/ets_airspeed.cpp b/src/drivers/ets_airspeed/ets_airspeed.cpp index 0f77bb805..4c75143ac 100644 --- a/src/drivers/ets_airspeed/ets_airspeed.cpp +++ b/src/drivers/ets_airspeed/ets_airspeed.cpp @@ -300,7 +300,7 @@ start(int i2c_bus) goto fail; /* set the poll rate to default, starts automatic data collection */ - fd = open(AIRSPEED_DEVICE_PATH, O_RDONLY); + fd = open(AIRSPEED0_DEVICE_PATH, O_RDONLY); if (fd < 0) goto fail; @@ -349,10 +349,10 @@ test() ssize_t sz; int ret; - int fd = open(AIRSPEED_DEVICE_PATH, O_RDONLY); + int fd = open(ETS_PATH, O_RDONLY); if (fd < 0) - err(1, "%s open failed (try 'ets_airspeed start' if the driver is not running", AIRSPEED_DEVICE_PATH); + err(1, "%s open failed (try 'ets_airspeed start' if the driver is not running", ETS_PATH); /* do a simple demand read */ sz = read(fd, &report, sizeof(report)); @@ -402,7 +402,7 @@ test() void reset() { - int fd = open(AIRSPEED_DEVICE_PATH, O_RDONLY); + int fd = open(ETS_PATH, O_RDONLY); if (fd < 0) err(1, "failed "); diff --git a/src/drivers/meas_airspeed/meas_airspeed.cpp b/src/drivers/meas_airspeed/meas_airspeed.cpp index ba46de379..45684b590 100644 --- a/src/drivers/meas_airspeed/meas_airspeed.cpp +++ b/src/drivers/meas_airspeed/meas_airspeed.cpp @@ -437,7 +437,7 @@ start(int i2c_bus) } /* set the poll rate to default, starts automatic data collection */ - fd = open(AIRSPEED_DEVICE_PATH, O_RDONLY); + fd = open(PATH_MS4525, O_RDONLY); if (fd < 0) { goto fail; @@ -488,10 +488,10 @@ test() ssize_t sz; int ret; - int fd = open(AIRSPEED_DEVICE_PATH, O_RDONLY); + int fd = open(PATH_MS4525, O_RDONLY); if (fd < 0) { - err(1, "%s open failed (try 'meas_airspeed start' if the driver is not running", AIRSPEED_DEVICE_PATH); + err(1, "%s open failed (try 'meas_airspeed start' if the driver is not running", PATH_MS4525); } /* do a simple demand read */ @@ -548,7 +548,7 @@ test() void reset() { - int fd = open(AIRSPEED_DEVICE_PATH, O_RDONLY); + int fd = open(PATH_MS4525, O_RDONLY); if (fd < 0) { err(1, "failed "); |