aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/ms5611/ms5611.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-10-10 13:29:25 +0200
committerLorenz Meier <lm@inf.ethz.ch>2015-01-02 12:28:22 +0100
commit4c3ebee15b2d3626b328d313b1356634e70ab6d8 (patch)
tree8e89af4720db98544a3cbb9254ab4ed7bce20d97 /src/drivers/ms5611/ms5611.cpp
parenta77c9225df3aa494d5db64824926174c95381b97 (diff)
downloadpx4-firmware-4c3ebee15b2d3626b328d313b1356634e70ab6d8.tar.gz
px4-firmware-4c3ebee15b2d3626b328d313b1356634e70ab6d8.tar.bz2
px4-firmware-4c3ebee15b2d3626b328d313b1356634e70ab6d8.zip
Hackery on option parsing to make MS5611 comply
Diffstat (limited to 'src/drivers/ms5611/ms5611.cpp')
-rw-r--r--src/drivers/ms5611/ms5611.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/drivers/ms5611/ms5611.cpp b/src/drivers/ms5611/ms5611.cpp
index beca29d6d..aed72de01 100644
--- a/src/drivers/ms5611/ms5611.cpp
+++ b/src/drivers/ms5611/ms5611.cpp
@@ -855,13 +855,13 @@ start(bool external_bus)
int fd;
prom_u prom_buf;
- if (external_bus && (g_dev_ext != nullptr))
+ if (external_bus && (g_dev_ext != nullptr)) {
/* if already started, the still command succeeded */
errx(0, "ext already started");
-
- if (g_dev_int != nullptr)
+ } else if (!external_bus && (g_dev_int != nullptr)) {
/* if already started, the still command succeeded */
errx(0, "int already started");
+ }
device::Device *interface = nullptr;
@@ -1157,6 +1157,12 @@ ms5611_main(int argc, char *argv[])
const char *verb = argv[optind];
+ if (argc > optind+1) {
+ if (!strcmp(argv[optind+1], "-X")) {
+ external_bus = true;
+ }
+ }
+
/*
* Start/load the driver.
*/