diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-18 13:28:26 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-18 13:28:26 +0200 |
| commit | ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4 (patch) | |
| tree | e49120ba6d087dcf39e899451e680f443a5de8f7 /src/drivers/ms5611 | |
| parent | 3bea32af8d41585976b78c6dad2701df4180659f (diff) | |
| parent | 8d1abf4aa441e1c6c886e8af6ecaab2c3ca6e255 (diff) | |
| download | px4-firmware-ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4.tar.gz px4-firmware-ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4.tar.bz2 px4-firmware-ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'src/drivers/ms5611')
| -rw-r--r-- | src/drivers/ms5611/ms5611.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/drivers/ms5611/ms5611.cpp b/src/drivers/ms5611/ms5611.cpp index 9d9888a90..d9268c0b3 100644 --- a/src/drivers/ms5611/ms5611.cpp +++ b/src/drivers/ms5611/ms5611.cpp @@ -791,7 +791,8 @@ start() prom_u prom_buf; if (g_dev != nullptr) - errx(1, "already started"); + /* if already started, the still command succeeded */ + errx(0, "already started"); device::Device *interface = nullptr; @@ -1050,4 +1051,4 @@ ms5611_main(int argc, char *argv[]) } errx(1, "unrecognised command, try 'start', 'test', 'reset' or 'info'"); -}
\ No newline at end of file +} |