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

Linux: ms5611 open, close changed to px4_open, px4_close

Browse Source 
Calls to open and close were used instead of px4_open and px4_close.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2015-04-01 18:13:59 -07:00
parent f62ea8aeae
commit 92d90f7780
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/drivers/ms5611/ms5611_linux.cpp
View File

@ -894,7 +894,7 @@ start_bus(struct ms5611_bus_option &bus)
return false;
}
int fd = open(bus.devpath, O_RDONLY);
int fd = px4_open(bus.devpath, O_RDONLY);
/* set the poll rate to default, starts automatic data collection */
if (fd == -1) {
@ -902,12 +902,12 @@ start_bus(struct ms5611_bus_option &bus)
return false;
}
if (px4_ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
close(fd);
px4_close(fd);
warnx("failed setting default poll rate");
return false;
}
close(fd);
px4_close(fd);
return true;
}
@ -959,7 +959,6 @@ struct ms5611_bus_option &find_bus(enum MS5611_BUS busid)
}
// FIXME - This is fatal to all threads
errx(1, "bus %u not started", (unsigned)busid);
}
/**
@ -977,7 +976,7 @@ test(enum MS5611_BUS busid)
int fd;
fd = open(bus.devpath, O_RDONLY);
fd = px4_open(bus.devpath, O_RDONLY);
if (fd < 0) {
warn("open failed (try 'ms5611 start' if the driver is not running)");
return 1;
@ -1098,7 +1097,7 @@ calibrate(unsigned altitude, enum MS5611_BUS busid)
int fd;
fd = open(bus.devpath, O_RDONLY);
fd = px4_open(bus.devpath, O_RDONLY);
if (fd < 0) {
warn("open failed (try 'ms5611 start' if the driver is not running)");