caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

A little less broken CancellableBolusCommand.

Browse source 
(cherry picked from commit 9d56f23)
This commit is contained in:
Johannes Mockenhaupt 2017-09-03 21:54:02 +02:00
parent add3011e4b
commit 0fda86dffa
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancellableBolusCommand.java
View file

@ -91,9 +91,11 @@ public class CancellableBolusCommand extends BolusCommand {
// TODO extract into method // TODO extract into method
// TODO 'low cartrdige' alarm must be handled inside, since the bolus continues regardless; // TODO 'low cartrdige' alarm must be handled inside, since the bolus continues regardless;
// it must be claread so we can see the remaining bolus again; // it must be cleared so we can see the remaining bolus again;
while (bolusRemaining != null) { while (bolusRemaining != null) {
if (cancelRequested) { if (cancelRequested) {
// cancel running bolus by pressing up for 3s, while raise a BOLUS CANCELLED
// alert, unless the bolus finished within those 3s.
progressReportCallback.report(STOPPING, 0, 0); progressReportCallback.report(STOPPING, 0, 0);
scripter.pressKeyMs(RuffyScripter.Key.UP, 3000); scripter.pressKeyMs(RuffyScripter.Key.UP, 3000);
progressReportCallback.report(STOPPED, 0, 0); progressReportCallback.report(STOPPED, 0, 0);
@ -116,6 +118,8 @@ public class CancellableBolusCommand extends BolusCommand {
lastBolusReported = bolusRemaining; lastBolusReported = bolusRemaining;
} }
// TODO think through situatiotns where an alarm can be raised, not just when pressing a button,
// but a 'low battery' alarm can trigger at any time ...
if (scripter.getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR) { if (scripter.getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR) {
String message = (String) scripter.getCurrentMenu().getAttribute(MenuAttribute.MESSAGE); String message = (String) scripter.getCurrentMenu().getAttribute(MenuAttribute.MESSAGE);
if (message.equals("LOW CARTRIDGE")) { if (message.equals("LOW CARTRIDGE")) {
@ -129,17 +133,23 @@ public class CancellableBolusCommand extends BolusCommand {
SystemClock.sleep(50); SystemClock.sleep(50);
bolusRemaining = (Double) scripter.getCurrentMenu().getAttribute(MenuAttribute.BOLUS_REMAINING); bolusRemaining = (Double) scripter.getCurrentMenu().getAttribute(MenuAttribute.BOLUS_REMAINING);
} }
progressReportCallback.report(DELIVERED, 100, bolus);
// wait up to 2s for any possible warning to be raised, if not raised already // wait up to 2s for any possible warning to be raised, if not raised already
long minWait = System.currentTimeMillis() + 2 * 1000; // TODO what could be raised here, other than those alarms than can ring at any time anyways?
while (scripter.getCurrentMenu().getType() != MenuType.WARNING_OR_ERROR || System.currentTimeMillis() < minWait) { long timeout = System.currentTimeMillis() + 2 * 1000;
while (scripter.getCurrentMenu().getType() != MenuType.WARNING_OR_ERROR && System.currentTimeMillis() < timeout) {
SystemClock.sleep(50); SystemClock.sleep(50);
} }
// process warnings (confirm them, report back to AAPS about them) // process warnings (confirm them, report back to AAPS about them)
while (scripter.getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR || System.currentTimeMillis() < minWait) { // while (scripter.getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR || System.currentTimeMillis() < timeout) {
// TODO // TODO brute-force hack
if (scripter.getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR) {
scripter.confirmAlert(((String) scripter.getCurrentMenu().getAttribute(MenuAttribute.MESSAGE)), 1000);
} }
// SystemClock.sleep(50);
// }
// TODO what if we hit 'cartridge low' alert here? is it immediately displayed or after the bolus? // TODO what if we hit 'cartridge low' alert here? is it immediately displayed or after the bolus?
// TODO how are error states reported back to the caller that occur outside of calls in genal? Low battery, low cartridge? // TODO how are error states reported back to the caller that occur outside of calls in genal? Low battery, low cartridge?
@ -149,7 +159,6 @@ public class CancellableBolusCommand extends BolusCommand {
"Bolus delivery did not complete as expected. " "Bolus delivery did not complete as expected. "
+ "Check pump manually, the bolus might not have been delivered."); + "Check pump manually, the bolus might not have been delivered.");
// TODO report back what was read from history // TODO report back what was read from history
// read last bolus record; those menus display static data and therefore // read last bolus record; those menus display static data and therefore
@ -184,7 +193,6 @@ public class CancellableBolusCommand extends BolusCommand {
+ "did not return the main menu successfully."); + "did not return the main menu successfully.");
} }
progressReportCallback.report(DELIVERED, 100, bolus);
return new CommandResult().success(true).enacted(true) return new CommandResult().success(true).enacted(true)
.message(String.format(Locale.US, "Delivered %02.1f U", bolus)); .message(String.format(Locale.US, "Delivered %02.1f U", bolus));