Typo that typo and other minor cleanups.

Testing-Combo.md

@@ -12,7 +12,7 @@
     - [ ] bolus must have been fully delivered by pump
     - [ ] bolus must have been added to DB
     - [ ] 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 a notification on a smartwatch
   - [ ] Test bolusing a bolus bigger than what's left in the reservoir. A message to check what

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

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

ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java

@@ -94,6 +94,9 @@ public class SetTbrCommand extends BaseCommand {
                 // 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
                 // 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();
                 if (Objects.equals(warningOrErrorCode.warningCode, 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
      * 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) {
         scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);