|
|
@ -565,7 +565,8 @@ MS5611::cycle() |
|
|
|
|
|
|
|
|
|
|
|
/* perform collection */ |
|
|
|
/* perform collection */ |
|
|
|
if (OK != collect()) { |
|
|
|
if (OK != collect()) { |
|
|
|
log("FATAL collection error - restarting\n"); |
|
|
|
log("collection error"); |
|
|
|
|
|
|
|
/* reset the collection state machine and try again */ |
|
|
|
start(); |
|
|
|
start(); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
@ -592,10 +593,8 @@ MS5611::cycle() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* measurement phase */ |
|
|
|
/* measurement phase */ |
|
|
|
if (OK != measure()) { |
|
|
|
if (OK != measure()) |
|
|
|
log("FATAL measure error - restarting\n"); |
|
|
|
log("measure error"); |
|
|
|
start(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* next phase is collection */ |
|
|
|
/* next phase is collection */ |
|
|
|
_collect_phase = true; |
|
|
|
_collect_phase = true; |
|
|
|