Merge pull request #1041 from openaps/Diaconn_from_master_2021-06-06

3.0.0
openaps · Oct 6, 2021 · 0e4443c · 0e4443c
2 parents e8f2941 + df3fe38
commit 0e4443c
Show file tree

Hide file tree

Showing 19 changed files with 151 additions and 0 deletions.
diff --git a/docs/EN/Configuration/DiaconnG8.rst b/docs/EN/Configuration/DiaconnG8.rst
@@ -0,0 +1,112 @@
+Diaconn G8 Insulin Pump
+************************
+
+Insulin Pump Bluetooth Pairing
+===============================
+
+- Click on the hamburger menu in the top left corner.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_01.jpg
+    :alt: Hamburger menu
+
+- Click on Config Builder.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_02.jpg
+    :alt: Config builder
+
+- After selecting the Diaconn G8 Pump click on the Settings icon (cog wheel).
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_03.jpg
+    :alt: Settings
+
+- Choose Selected pump.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_04.jpg
+    :alt: Select pump
+
+- Select your insulin pump’s model number once it appears in the list.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_05.jpg
+    :alt: Pump pairing
+
+- There are two options to check your model number:
+
+   i. The last 5 digits of the SN number on the back of the pump.
+   ii. Click on O button > Information > BLE > Last 5 digits.
+
+      .. image:: ../images/DiaconnG8/DiaconnG8_06.jpg
+       :alt: check model no.
+
+- Once you select your pump, a window appears asking for a pin code. Enter the pin number displayed on your pump to complete the connection.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_07.jpg
+    :alt: PIN code
+
+Pump status check and log synchronization
+==========================================
+
+- Once your pump is connected, click on the Bluetooth symbol to check the status and to synchronize logs.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_08.jpg
+    :alt: Bluetooth status
+
+Bluetooth Troubleshooting
+==========================
+
+**What to do in the case of an unstable Bluetooth connection with the pump.**
+
+Method 1 ) Check the pump again after AAPS application is completed.
+--------------------------------------------------------------------- 
+- Click on the 3 dots button on the top right.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_09.jpg
+    :alt: Preferences menu
+
+- Click on Exit. 
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_10.jpg
+    :alt: Exit
+
+Method 2) If the first method doesn’t work, disconnect Bluetooth and then reconnect.
+-------------------------------------------------------------------------------------
+- Press and hold the Bluetooth button at the top for about 3 seconds. 
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_11.jpg
+    :alt: Bluetooth button
+
+- Click on the Setting button on the paired Diaconn G8 Insulin pump.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_12.jpg
+    :alt: Settings button
+
+- Unpair.
+
+   .. image:: ../images/DiaconnG8/DiaconnG8_13.jpg
+    :alt: Unpair
+
+- Repeat the Bluetooth pairing process for the pump (see above).
+
+Further Information
+====================
+Diaconn G8 Insulin pump option setting
+--------------------------------------
+-	Config manager > pump > Diaconn G8 > Settings
+-	DIACONN G8 at the top> 3 dots button on the top right > Diaconn G8 Preferences
+
+.. image:: ../images/DiaconnG8/DiaconnG8_14.jpg
+ :alt: Diaconn G8 pump options
+
+- If the **Log reservoir change** option is activated, the relevant details are automatically uploaded to the careportal when an “Insulin Change” event occurs.
+- If the **Log needle change** option is activated, the relevant details are automatically uploaded to the careportal when a “Site Change” event occurs. 
+- If the **Log tube change** option is activated, the relevant details are automatically uploaded to the careportal when a “Tube Change” event occurs.
+- If the **Log battery change** option is activated, the relevant details are automatically uploaded to the careportal when a “Battery Change” event occurs, and the PUMP BATTERY CHANGE button in the ACTION tab is deactivated. (Note: To change the battery, please stop all in-progress injection functions before proceeding.)
+
+.. image:: ../images/DiaconnG8/DiaconnG8_15.jpg
+ :alt: Diaconn G8 actions menu
+
+Extended Bolus function
+------------------------
+- If you use extended bolus it will disable closed loop.
+
+- See `this page <../Usage/Extended-Carbs.html#why-extended-boluses-won-t-work-in-a-closed-loop-environment>`_ for details why extended bolus does not work in a closed loop environment.
+
diff --git a/docs/EN/Hardware/pumps.rst b/docs/EN/Hardware/pumps.rst
@@ -9,6 +9,7 @@ Pump Configuration
    Dana-RS pump <../Configuration/DanaRS-Insulin-Pump.md>
    Accu-Chek Combo pump <../Configuration/Accu-Chek-Combo-Pump.md>
    Accu-Chek Insight pump <../Configuration/Accu-Chek-Insight-Pump.md>
+   Diaconn G8 insulin pump <../Configuration/DiaconnG8.rst>
    Omnipod Eros <../Configuration/OmnipodEros.rst>
    Medtronic pump <../Configuration/MedtronicPump.md>
    Future possible pump drivers <../Getting-Started/Future-possible-Pump-Drivers.md>
diff --git a/docs/EN/Installing-AndroidAPS/Releasenotes.rst b/docs/EN/Installing-AndroidAPS/Releasenotes.rst
@@ -13,6 +13,44 @@ If you do not update for another 30 days (90 days from new release date) AAPS wi
 
 Please understand that this change is not intended to bug you but is due to safety reasons. New versions of AndroidAPS do not only provide new features but also important safety fixes. Therefore it is necessary that every user updates a.s.a.p.. Unfortunately there are still bug reports from very old versions so this is a try to improve safety for every single user and the whole DIY community. Thanks for your understanding.
 
+Version 3.0.0
+================
+Release date: XX-XX-2021
+
+Important hints
+----------------------
+* **Minimum Android version is 9.0 now.**
+* **Data is not migrated to new database.** Do not complain, it's so huge change so it's simply not possible. Thus after update IOB, COB, treatments etc. will be cleared. You have to create new profile switch and start with zero IOB and COB. Plan the update carefully!!! Best in situation without active insulin and carbs
+* Use the same version of AAPS and NSClient
+
+Changes
+----------------------
+* XXXXk lines changed, XXXXk new lines of code
+* Internal database upgraded to Room @MilosKozak @Tebbe @AdrianLxm @Philoul @andyrozman
+* Lot of code rewritten to Kotlin @MilosKozak
+* New internal interface for pump drivers
+* NSClient rewritten for better synchronization and more detailed customization @MilosKozak
+  * Record deletion from NS is not allowed (only invalidation through NSClient)
+  * Record modification from NS is not allowed
+  * Sync setting available without engineering mode (for parents)
+* Profile switch behavior change. Now is distinguished between Profile Switch *(something that user wants)* and Profile change *(when change is executed by pump)* @MilosKozak
+* You can start activity temporary target during creation of profile switch @MilosKozak
+* NSProfile is gone. RIP. Only local profile is used and you can enable synchronization with NS @MilosKozak
+* Forgotten master password reset procedure. To reset master password put file of name PasswordReset to /AAPS/extra directory and restart AAPS. Then new master password will be serial number of your active pump @MilosKozak
+* User actions tracing @Philoul
+* New automation TempTargetValue trigger @Philoul
+* UI improvements @MilosKozak
+* History browser updated and fixed @MilosKozak
+* Objective9 removed @MilosKozak
+* Fixed bug associated to unstable CGM data @MilosKozak
+* DanaR and DanaRS communication improvement @MilosKozak
+* CircleCI integration @MilosKozak
+* Dana-i support @MilosKozak
+* DiaconnG8 support
+* Files location change: /AAPS/extra (engineering mode) /AAPS/logs /AAPS/exports /AAPS/preferences
+
+
+
 Version 2.8.2
 ================
 Release date: 23-01-2021

diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_01.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_01.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_02.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_02.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_03.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_03.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_04.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_04.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_05.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_05.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_06.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_06.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_07.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_07.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_08.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_08.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_09.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_09.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_10.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_10.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_11.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_11.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_12.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_12.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_13.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_13.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_14.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_14.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_15.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_15.jpg
diff --git a/docs/EN/images/DiaconnG8/DiaconnG8_16.jpg b/docs/EN/images/DiaconnG8/DiaconnG8_16.jpg