From ef2189fec6ba14e947d8a7f2fb7866b8ce687cac Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Mon, 29 Jan 2018 21:31:06 +0000
Subject: [PATCH] Insight faux cancel tbr option

---
 .../PumpInsight/InsightPumpPlugin.java        | 29 +++++++++++++------
 app/src/main/res/xml/pref_insightpump.xml     |  7 ++++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java
index 49ecf1f07d..f374ec7cbf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java
@@ -83,6 +83,8 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
     private TaskRunner taskRunner;
     private boolean fragmentEnabled = true;
     private boolean fragmentVisible = true;
+    private boolean fauxTBRcancel = true;
+    private static final long BUSY_WAIT_TIME = 20000;
     private PumpDescription pumpDescription = new PumpDescription();
     private double basalRate = 0;
     private Connector connector;
@@ -297,8 +299,6 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
     public void disconnect(String reason) {
         log("InsightPumpPlugin::disconnect()");
         try {
-
-            // TODO Timeout timer?
             if (!SP.getBoolean("insight_always_connected", false)) {
                 log("Requesting disconnect");
                 connector.getServiceConnector().disconnect();
@@ -383,7 +383,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
             if (cmd == null) {
                 return pumpEnactFailure();
             }
-            final Cstatus cs = async.busyWaitForCommandResult(cmd, 10000);
+            final Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
             result.success = cs.success();
         } else {
             result.success = true; // always true with carb only treatments
@@ -431,7 +431,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
             return pumpEnactFailure();
         }
 
-        Cstatus cs = async.busyWaitForCommandResult(cmd, 10000);
+        Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
         log("Got command status: " + cs);
 
         PumpEnactResult pumpEnactResult = new PumpEnactResult().enacted(true).isPercent(false).duration(durationInMinutes);
@@ -473,7 +473,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
             return pumpEnactFailure();
         }
 
-        Cstatus cs = async.busyWaitForCommandResult(cmd, 10000);
+        Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
         log("Got command status: " + cs);
 
         PumpEnactResult pumpEnactResult = new PumpEnactResult().enacted(true).isPercent(true).duration(durationInMinutes);
@@ -507,15 +507,26 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
     @Override
     public PumpEnactResult cancelTempBasal(boolean enforceNew) {
         log("Cancel TBR");
-        final UUID cmd = aSyncSingleCommand(new CancelTBRMessage(), "Cancel Temp Basal");
 
+
+        fauxTBRcancel = !SP.getBoolean("insight_real_tbr_cancel", false);
+
+        final UUID cmd;
+
+        if (fauxTBRcancel) {
+            final int faux_percent = 90;
+            final int faux_duration = 15;
+            cmd = aSyncTaskRunner(new SetTBRTaskRunner(connector.getServiceConnector(), faux_percent, 15), "Faux Cancel TBR - setting " + faux_percent + "%" + " " + faux_duration + "m");
+        } else {
+            cmd = aSyncSingleCommand(new CancelTBRMessage(), "Cancel Temp Basal");
+        }
         if (cmd == null) {
             return pumpEnactFailure();
         }
 
         // TODO isn't conditional on one apparently being in progress only the history change
         boolean enacted = false;
-        final Cstatus cs = async.busyWaitForCommandResult(cmd, 10000);
+        final Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
 
         if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
             enacted = true;
@@ -547,7 +558,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
             return pumpEnactFailure();
         }
 
-        final Cstatus cs = async.busyWaitForCommandResult(cmd, 10000);
+        final Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
         log("Got command status: " + cs);
 
         PumpEnactResult pumpEnactResult = new PumpEnactResult().enacted(true).bolusDelivered(insulin).duration(durationInMinutes);
@@ -587,7 +598,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
             return pumpEnactFailure();
         }
 
-        final Cstatus cs = async.busyWaitForCommandResult(cmd, 10000);
+        final Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
 
         if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
             ExtendedBolus exStop = new ExtendedBolus(System.currentTimeMillis());
diff --git a/app/src/main/res/xml/pref_insightpump.xml b/app/src/main/res/xml/pref_insightpump.xml
index b7037897cd..fc542676e3 100644
--- a/app/src/main/res/xml/pref_insightpump.xml
+++ b/app/src/main/res/xml/pref_insightpump.xml
@@ -8,4 +8,9 @@
         android:defaultValue="false"
         android:key="insight_always_connected"
         android:title="Stay always connected" />
-</PreferenceScreen>
\ No newline at end of file
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="insight_real_tbr_cancel"
+        android:title="Use Real TBR cancels"
+        android:summary="Actually cancel a TBR (creates pump alarm) instead of setting 90% or 110% TBR for 15 minutes"/>
+</PreferenceScreen  >
\ No newline at end of file