Update docs.

README-Combo.md

@@ -1,38 +1,46 @@
 **This software is part of a DIY solution and is not a product, but
 requires YOU to read, learn and understand the system and how to use it.
+It is not something that does all your diabetes management for you, but
+allows you to improve your diabetes and quality of life significantly
+if you're willing to put in the time required.
 You alone are responsible for what you do with it.**
 
 Hardware requirements:
 - A Roche Accu-Chek Combo (any firmware, they all work)
 - A Smartpix or Realtyme device together with the 360 Configuration
   Software to configure the pump.
-  Roche sends these out free of charge to their customers upon request.
+  Roche sends these out Smartpix devices and the configuration software
-- A compatible phone: An Android phone with a phone running LineageOS 14.1
+  free of charge to their customers upon request.
-  (formerly CyanogenMod), or possibly stock Android >= 8.1 in the future.
+- A compatible phone: An Android phone with a phone running LineageOS 14.1 (formerly CyanogenMod)
 - To build AndroidAPS with Combo support you need the lastet Android Studio 3 version
 
 Limitations:
 - Extended bolus and multiwave bolus are not supported.
 - Only one basal profile is supported.
 - Setting a basal profile other than 1 on the pump, or delivering extended boluses or multiwave
-  boluses from the pump will disable the loop functionality for 6h as the the loop can't run
+  boluses from the pump interferes with TBRs and forces the loop into low-suspend only mode for 6 hours
-  safely under those conditions.
+  as the the loop can't run safely under those conditions.
-- If multiple boluses are given within a single minute, only one will
+- It's currently not possible to set the time and date on the pump, however, this has no effect
-  be recognized. This is due to the Combo saving history records with
+  on AAPS and will not cause a problem if the pump's clock is not updated at the exact time
-  minute-precision only. However, this case is only possible for very
+  daylight savings time starts or ends.
-  small boluses and is unlikely to occur in non-testing scenarios
+- There's a bug in the pump's firmware that's triggered when "too much" communication happens
-  (e.g. bolusing from the pump and then immediately bolusing from AAPS
+  with the pump. Specifically, this issue occurs when going from just issuing commands to the pump
-   or giving smaller boluses in the pump in quick succession).
+  to reading the pumps data and history. For that reason, a minimal amount of data is read from
-- If a TBR is set on the pump, AAPS will cancel it. This is because it's not possible to determine
+  the pump (no history).
-  the start point of a TBR until it is finished or was cancelled at which point a record in the
+  The bug might still rarely occur and causes the pump to not accept any connection
-  pump's history is created. Before that, there is none and it's simply not possible to determine
+  unless a button is physically pressed on the pump.
-  the TBRs influence on IOB. Set TBR using AAPS instead.
+  Therefore, the pump's reservoir level is not read and the pump status information uploaded to Nightscout
-- It's currently not possible to set the time and date on the pump (only reading the time - but
+  shows fake numbers of 250 (above low threshold - which can be configured via the configuration
-  not the date - is supported raises a warning in AAPS to update the pump clock manually).
+  tool), 50 (below low threshold) and 0 if the reservoir is empty.
-  Thus, the pump's clock must be updated manually when the clocks are turned forward/backward
+  Furthermore, no history (from the My Data menu) is read unless absolutely required.
-  for daylight saving time.
+  Reading all pump data can be forced through the Combo tab (long press "TDDS"), to "import"
+  events that happend solely on the pump, but that code has been tested less and may
+  trigger the bug, so it's strongly recommended to stick to the usage scenario of controlling the
+  pump solely through AAPS.
+  Checking history, reservoir level etc on the pump causes no issues but should be avoided
+  when the Bluetooth icon is displayed on the display, indicating that AAPS is communicating with the pump.
 
-Setup v2:
+Setup:
 - Configure pump using 360 config software.
   - Set/leave the menu configuration as "Standard", this will show only the supported
     menus/actions on the pump and hide those which are unsupported (extended/multiwave bolus,
@@ -49,23 +57,18 @@ Setup v2:
   can be controlled via ruffy, installing the above version is sufficient.
   If AAPS is already installed, switch to the MDI plugin to avoid the Combo
   plugin from interfering with ruffy during the pairing process.
-- Get AndroidAPS from https://gitlab.com/jotomo/KEF (Branch `combo-scripter-v2`)
+- Get AndroidAPS from https://github.com/jotomo/AndroidAPS (Branch `combo-scripter-v2`)
 - Before enabling the Combo plugin in AAPS make sure you're profile is set up
   correctly and your basal profile is up to date as AAPS will sync the basal profile
   to the pump.
-- There might be minor glitches around enabling/disabling the Combo plugi, requiring
-  to restart AAPS by force-closing it.
 
 Usage:
 - This is not a product, esp. in the beginning the user needs to monitor and understand the system,
   its limitations and how it can fail. It is strongly advised NOT to use this system when the person
   using is not able to fully understand the system.
 - The integration of the Combo with AndroidAPS is designed with the assumption that all inputs are
-  made via AndroidAPS. While there are checks that will detected boluses entered directly on the
+  made via AndroidAPS. Boluses entered on the pump will NOT be detected by AAPS and may therefore
-  pump, which will be added to the history and be included in IOB calulations, there are delays
+  result in too much insulin being delivered.
-  until AAPS becomes aware of those bolusus (up to 15m). It is therefore strongly adviced
-  to only bolus via AndroidAPS (it's also only possible to enter carbs via AndroidAPS, required for
-  advanced loop functionality).
 - It's recommended to enable key lock on the pump to prevent bolusing from the pump, esp. when the
   pump was used before and quick bolusing was a habit.
   Also, with keylock enabled, accidentally pressing a key will NOT interrupt a running command

TODO-Combo.md

@@ -1,5 +1,5 @@
 - [ ] Bugs
-  - [ ] Pump stops to response to connect attemps every 2-20h or so, only reacting
+  - [-] Pump stops to response to connect attemps every 2-20h or so, only reacting
         again when physically pressing a button on the pump ...
         Occassionally the pump starts to accept connections again, sometimes
         after 40m, sometimes no luck even after 80m
@@ -19,7 +19,7 @@
         Did this already happen before the whole 'basal profile' thing?
         Takes ages, could that trigger some weird bug that has never
         surfaced in any other scenario before?
-  - [ ] Temp basal history shows TBRs twice, once with a 1 min
+  - [-] Temp basal history shows TBRs twice, once with a 1 min
         duration and then with the reminder; caused by clock not
         being within ~30s of the phone.
         Cancelling TBR or overriding a running one with a new one
@@ -31,6 +31,9 @@
         the Combo.
         Explicit end records when adding pump history records;
         and/or: logic to detect time differences and align data
+        Current solution works, albeit a bit ugly, but is used in rare
+        circumstances where clock might be off anyway, so this would
+        still occur.
   - [x] Deleting a bolus from the history re-adds it from the pump's
         history. Deleting it again, flags it as invalid at which point
         it will not be added to IOB and not be re-added.

Testing-Combo.md

@@ -20,36 +20,30 @@
   - [ ] Pressing a button on the pump after bolus delivery has started must be handled
         gracefully (bolus finished and AAPS must correctly add it the the DB)
     - [ ] Same as above, but moving pump out of range
-  - [ ] Giving a bolus on the pump and immediately afterwards entering a bolus on AAPS
-        must reject the bolus with a warning that IOB is not up to date
-  - [ ] A bolus given on the pump must appear in AAPS after the next communication or when
-        manually refreshing via the Combo tab
   - [ ] 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)
+  - [ ] Test a bolus exceeding the pumps max bolus; should show a generic error message
 - [ ] BT disconnect issues
   - [ ] Moving pump out of reach when setting TBR causes "TBR cancelled" alarm on pump.
         When putting pump close to phone, AAPS must confirm the alert and successfully
-        retry setting TBR
+        retry setting TBR (reconnects are a best-effort kind of a thing, so this might not always work)
   - [ ] Same as above while bolusing must report an error and NOT retry the command
 - [ ] AAPS start
   - [ ] Starting AAPS without a reachable pump must show something sensible in the Combo tab
         (that is not hang indefinitely with "initializing" activity)
   - [ ] Starting AAPS without a reachable pump must trigger "pump unrechable" alert after
         5 to 10 min.
-  - [ ] If 'sync profile to pump' is set the basal rate profile must be synced to pump on start
+  - [ ] If the pump's profile doesn't match AAPS', the pump must be updated when AAPS starts
-  - [ ] If 'sync profile to pump' is set NOT set, the pump's profile must not be touched
+  - [ ] 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
   - [ ] TBR
   - [ ] Alerts
   - [ ] TDDs
-- [ ] Date/Time
-  - [ ] If time is off by more than 2m, a warning must be shown on the main screen whenever
-        a connection to the pump is established
-  - [ ] Since history records store the year, it must be inferred. Set phone and pump to something
-        like 31.21.17, 23:00, cause an alert, deliver a bolus, set a TBR, let the new year arrive
-        trigger the above events again and verify AAPS has correctly read them.
 - [ ] Disconnected pump (pump unreachable)
       - [ ] ...
 - [ ] Refilling cartridge
@@ -66,8 +60,6 @@
 - [ ] Combo tab
   - [ ] Check displayed data (state, battery, reservoir, last bolus, temp basal) is the same
         as on the pump
-  - [ ] Last connection must indicate issues (yellow if recent connections/commands failed),
-        red if communications failed for 30 or more minutes
 - [ ] Unsafe usage
   - [ ] An extended or multiwave bolus given within the last six hour must raise an alert and
         closed loop functionality (Loop plugin shows "disabled by constrains" when "execute" is pressed)