aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2012-08-25 19:09:23 -0700
committerpx4dev <px4@purgatory.org>2012-08-25 19:09:23 -0700
commit35009cd332c8617fe7b13ed0c149c08fd250f601 (patch)
tree37ea25ea8d6efbaf3f559b80d14a85822f6a68f7 /apps
parent93f26e3c964bf613d4ee9a82d14dcec298606064 (diff)
downloadpx4-firmware-35009cd332c8617fe7b13ed0c149c08fd250f601.tar.gz
px4-firmware-35009cd332c8617fe7b13ed0c149c08fd250f601.tar.bz2
px4-firmware-35009cd332c8617fe7b13ed0c149c08fd250f601.zip
clean up an error message
Diffstat (limited to 'apps')
-rw-r--r--apps/drivers/ms5611/ms5611.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/drivers/ms5611/ms5611.cpp b/apps/drivers/ms5611/ms5611.cpp
index 4921efb28..37308e8d9 100644
--- a/apps/drivers/ms5611/ms5611.cpp
+++ b/apps/drivers/ms5611/ms5611.cpp
@@ -565,7 +565,8 @@ MS5611::cycle()
/* perform collection */
if (OK != collect()) {
- log("FATAL collection error - restarting\n");
+ log("collection error");
+ /* reset the collection state machine and try again */
start();
return;
}
@@ -592,10 +593,8 @@ MS5611::cycle()
}
/* measurement phase */
- if (OK != measure()) {
- log("FATAL measure error - restarting\n");
- start();
- }
+ if (OK != measure())
+ log("measure error");
/* next phase is collection */
_collect_phase = true;