caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Abort reading all pump data if history read fails.

Browse source 
(cherry picked from commit 9f679bc)
This commit is contained in:
Johannes Mockenhaupt 2017-11-26 12:38:41 +01:00
parent 9ce57e7076
commit b46165e52a
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -1025,11 +1025,14 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
} }
void readAllPumpData() { void readAllPumpData() {
readHistory(new PumpHistoryRequest() boolean readHistorySuccess = readHistory(new PumpHistoryRequest()
.bolusHistory(pump.lastHistoryBolusTime) .bolusHistory(pump.lastHistoryBolusTime)
.tbrHistory(pump.lastHistoryTbrTime) .tbrHistory(pump.lastHistoryTbrTime)
.pumpErrorHistory(PumpHistoryRequest.FULL) .pumpErrorHistory(PumpHistoryRequest.FULL)
.tddHistory(PumpHistoryRequest.FULL)); .tddHistory(PumpHistoryRequest.FULL));
if (!readHistorySuccess) {
return;
}
CommandResult reservoirResult = runCommand("Checking reservoir level", 2, CommandResult reservoirResult = runCommand("Checking reservoir level", 2,
ruffyScripter::readReservoirLevelAndLastBolus); ruffyScripter::readReservoirLevelAndLastBolus);