Update Testing-Combo.md to be in line with code.

Testing-Combo.md

@@ -5,8 +5,8 @@
         no bolus or a partial bolus was delivered
   - [ ] Enter a bolus of 2 U and press cancel when delivery is at 1.7 (cancelling requires AAAPS
         to press the up button for 3 seconds, so the cancellation attempt will not succeed because delivery
-        ends before those 3 seconds are elapsed. The code should handle this without giving an
+        ends before those 3 seconds are elapsed). The code should handle this without giving an
-        error and adding the full bolus to treatments.
+        error and add the full bolus to treatments.
   - [ ] Low cartridge alarm during bolus
     - [ ] alarm must be confirmed by AAPS
     - [ ] bolus must have been fully delivered by pump
@@ -16,12 +16,12 @@
   - [ ] 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
-        was actually delivered must appear (this is a corner-case where when practically can't
+        was actually delivered must appear (this is a corner-case where we practically can't
         check what was actually delivered).
   - [ ] Pressing a button on the pump before bolus delivery started must be handled gracefully
     - [ ] Same as above, but moving pump out of range
-  - [ ] Pressing a button on the pump after bolus delivery has started must be handled
+  - [ ] Pressing a button on the pump after bolus delivery has started must raise a warning
-        gracefully (bolus finished and AAPS must correctly add it the the DB)
+        to check what was actually delivered and manually update treatments in AAPS.
     - [ ] Same as above, but moving pump out of range
   - [ ] Test the highest bolus you'd ever give yourself (AAPS has a configurable limit and the pump
         has a limit which can be configured with the Config SW), no timeout or other issues must show
@@ -40,10 +40,6 @@
         (not hanging indefinitely with "initializing" activity)
   - [ ] Starting AAPS without a reachable pump must trigger "pump unrechable" alert after the configured threshold
   - [ ] If the pump's profile doesn't match AAPS', the pump must be updated when AAPS starts
-  - [ ] Doing a profile change (to shift time or increase/decrease insulin), the pump's basal profile must be updated
-  - [ ] If a profile change has a duration, the pump's basal profile must be set to the original value again at the end
-        (this can vary a few minutes between what the overview screen shows and when the pump is updated, as the check
-        whether the pump is up-to-date or not is performed periodically and not at the exact minute a profile change ends)
 - [ ] Read history using Smartpix and compare with AAPS' DB (treatment tab)
       Esp. those times we communication was interrupted, boluses were cancelled, ...
   - [ ] Boluses
@@ -66,24 +62,25 @@
   - [ ] With the pump powered off or out of reach, the 'pump unreachable alert' must still
         trigger
 - [ ] Combo tab
-  - [ ] Check displayed data (state, battery, reservoir, bolus, temp basal) is the same
+  - [ ] Check displayed data (state, battery, reservoir, temp basal) is the same
         as on the pump
 - [ ] Unsafe usage
   - [ ] An extended or multiwave bolus given within the last six hour must raise an alert and
         restrict the loop functionality to low-suspend only (setting maxIOB to zero)
   - [ ] Closed loop functionality must resume 6 h after the last ext/multiwave bolus
-  - [ ] An active ext/multiwave bolus (a history record is created only after the bolus completed)
+  - [ ] An active ext/multiwave bolus must also raise an alert and restrict the loop
-        must also raise an alert and restrict the loop
   - [ ] If a basal rate other than profile 1 is activated, this must also raise an alert and disable
         the restrict the loop
 - [ ] Reading/setting basal profile
   - [ ] AAPS reads basal rate properly
-  - [ ] AAPS doesn't touch pump basal if "Sync to profile" pref not set
-  - [ ] AAPS updates basal rate if "Sync to profile" is enabled
   - [ ] Test profile with 115% (or something like that) change to ask the
         pump for basal rates like 0.812, which should then be set propely
   - [ ] Updating the profile extensively (200%, shifting time) takes up to 6 minutes, but
         should complete without timeout.
+  - [ ] Doing a profile change (to shift time or increase/decrease insulin), the pump's basal profile must be updated
+  - [ ] If a profile change has a duration, the pump's basal profile must be set to the original value again at the end
+        (this can vary a few minutes between what the overview screen shows and when the pump is updated, as the check
+        whether the pump is up-to-date or not is performed periodically and not at the exact minute a profile change ends)
 - [ ] Taking over alerts
   - [ ] If an error alert is active on the pump, pressing refresh shall display the error
         in the Combo tab but NOT confirm it. Easiest error to trigger: rewind piston
@@ -91,6 +88,9 @@
   - [ ] Pressing refresh while a low cartridge or low battery alarm is active
         must confirm the alarm, indicate the new status in the Combo tab and
         show a notification on the overview screen
+  - [ ] A TBR CANCELLED is now also taken over when refreshing (since it's a benign error the loop will correct
+        during the next iteration).
 - [ ] Misc
-  - [ ] Pump state is correctly uploaded to Nightscout
+  - [ ] Pump state is correctly uploaded to Nightscout (note that reservoir level are fake numbers representing
+        norma/low/empty).