From d6938c20e6c2c55176763aba299368a1b8593202 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Tue, 21 Nov 2017 10:53:47 +0100
Subject: [PATCH] Updating README.

---
 README-Combo.md                               | 37 +++++++++++++------
 .../plugins/PumpCombo/ComboPlugin.java        |  3 +-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/README-Combo.md b/README-Combo.md
index b01f200d3a..5b2308d672 100644
--- a/README-Combo.md
+++ b/README-Combo.md
@@ -1,13 +1,28 @@
-**This software is part of a DIY solution. You're solely responsible for everything that might happen**
+**This software is part of a DIY solution and is not a product.
+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.
+- 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.
 - A compatible phone:
-    - An Android phone with either Android < 4.2 (and possibly >= 8.1 in the future) or a phone running LineageOS 14.1 (formerly CyanogenMod)
-    - With a phone running LineageOS a pairing can be created that can then be transfered to a rooted phone which can then be used as a loop
-      phone using these instructions:  http://github.com/gregorybel/combo-pairing/
+    - An Android phone with either Android < 4.2 (and possibly >= 8.1
+      in the future) or a phone running LineageOS 14.1
+      (formerly CyanogenMod)
+    - With a phone running LineageOS a pairing can be created that can
+      then be transfered to a rooted phone which can then be used as a
+      loop phone using these instructions:
+      http://github.com/gregorybel/combo-pairing/
+
+Setup v2
+- Configure pump using 360 config software
+- ruffy https://github.com/jotomo/ruffy (Branch `combo-scripter-v2`)
+  Pairing should work, if not, switch to the `pairing` branch, pair,
+  then switch back
+- AndroidAPS from https://gitlab.com/jotomo/KEF (Branch `combo-scripter-v2`)
+
+TODO clean up stuff below
 
 How to use v1:
 - Note: Documentation on how to use AndroidAPS is available at https://github.com/MilosKozak/AndroidAPS/wiki
@@ -41,11 +56,11 @@ Testing v1:
 v2
 Limitations
 - Extended bolus and multiwave bolus are not supported.
-- If multiple boluses are given within a single minute, only one might be recognized.
-  This is due to the Combo saving history records with minute-precision only.
-  However, this case is only possible for very small boluses and is unlikely to occur
-  in non-testing scenarios (e.g. bolusing from the pump and then immediately bolusing
-  from AAPS).
+- If multiple boluses are given within a single minute, only one might
+  be recognized. This is due to the Combo saving history records with
+  minute-precision only. However, this case is only possible for very
+  small boluses and is unlikely to occur in non-testing scenarios
+  (e.g. bolusing from the pump and then immediately bolusing from AAPS).
 
 Usage
 - This is not a product, esp. in the beginning the user needs to monitor and understand the system, its limitations and how it
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index bbc6143b73..5a58ae3ef6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -862,7 +862,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
     /**
      * Reads the pump's history and updates the DB accordingly.
      */
-    private synchronized boolean readHistory(final PumpHistoryRequest request) {
+    private boolean readHistory(final PumpHistoryRequest request) {
         CommandResult historyResult = runCommand(MainApp.sResources.getString(R.string.combo_activity_reading_pump_history), 3, () -> ruffyScripter.readHistory(request));
         if (!historyResult.success) {
             return false;
@@ -921,6 +921,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
         }
     }
 
+    // TODO, opt doesn't seem to work
     void readAllPumpData() {
         readHistory(new PumpHistoryRequest()
                 .bolusHistory(pump.history.bolusHistory.isEmpty() ? PumpHistoryRequest.FULL : pump.history.bolusHistory.get(0).timestamp)