caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Typo that typo and other minor cleanups.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-12-13 16:01:35 +01:00
parent d0c494fb56
commit 71355f0421
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Testing-Combo.md
View file

@ -12,7 +12,7 @@
- [ ] bolus must have been fully delivered by pump - [ ] bolus must have been fully delivered by pump
- [ ] bolus must have been added to DB - [ ] bolus must have been added to DB
- [ ] the confirmed pump warning must be raised as a notification in AAPS - [ ] the confirmed pump warning must be raised as a notification in AAPS
- [ ] notification must also appear on smartwatch (or as android notification on watch/smartphone if setting "use system notifications ..." is enabled
- [ ] An error during bolus must yield an error in AAPS - [ ] An error during bolus must yield an error in AAPS
- [ ] An error during bolus must yield a notification on a smartwatch - [ ] An error during bolus must yield a notification on a smartwatch
- [ ] Test bolusing a bolus bigger than what's left in the reservoir. A message to check what - [ ] Test bolusing a bolus bigger than what's left in the reservoir. A message to check what

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

@ -231,6 +231,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
@Override @Override
public void disconnect(String reason) { public void disconnect(String reason) {
log.debug("Disconnect called with reason: " + reason);
ruffyScripter.disconnect(); ruffyScripter.disconnect();
} }

5
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
View file

@ -94,6 +94,9 @@ public class SetTbrCommand extends BaseCommand {
// rounds seconds up to full minutes). In that case confirm the alert since we know // rounds seconds up to full minutes). In that case confirm the alert since we know
// we caused it (in a way), but still fail the command so the usual cleanups of returning // we caused it (in a way), but still fail the command so the usual cleanups of returning
// to main menu etc are performed, after which this command can simply be retried. // to main menu etc are performed, after which this command can simply be retried.
// Note that this situation should have been dealt with in
// #checkAndWaitIfExistingTbrIsAboutToEnd, but still occur if that method runs
// into a timeout or some other freaky thing happens, so we'll leave it here.
WarningOrErrorCode warningOrErrorCode = scripter.readWarningOrErrorCode(); WarningOrErrorCode warningOrErrorCode = scripter.readWarningOrErrorCode();
if (Objects.equals(warningOrErrorCode.warningCode, PumpWarningCodes.TBR_CANCELLED)) { if (Objects.equals(warningOrErrorCode.warningCode, PumpWarningCodes.TBR_CANCELLED)) {
scripter.confirmAlert(PumpWarningCodes.TBR_CANCELLED); scripter.confirmAlert(PumpWarningCodes.TBR_CANCELLED);
@ -111,7 +114,7 @@ public class SetTbrCommand extends BaseCommand {
* and all). To avoid this, wait until the active TBR runs out if the active TBR * and all). To avoid this, wait until the active TBR runs out if the active TBR
* is about to end. * is about to end.
* *
* @return true wf we waited till the TBR ended and cancellation was request so all work is done. * @return true if we waited till the TBR ended and cancellation was request so all work is done.
*/ */
private boolean checkAndWaitIfExistingTbrIsAboutToEnd(boolean cancellingTbr) { private boolean checkAndWaitIfExistingTbrIsAboutToEnd(boolean cancellingTbr) {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU); scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);