From 2738cf7fcecce9eb08810f36e1db3cdace5421ac Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Sun, 7 Mar 2021 00:46:53 +0000
Subject: [PATCH] - TBR was incorrectly interpretted for high TBR values

---
 .../pump/MedtronicPumpHistoryDecoder.java     | 14 ++++++++---
 .../medtronic/data/dto/TempBasalPair.java     | 25 +++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
index 124b98f880..682d887ff2 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
@@ -106,7 +106,7 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
                 int els = getUnsignedInt(elements);
 
                 for (int k = 0; k < (els - 2); k++) {
-                    if (counter<1022) {
+                    if (counter < 1022) {
                         listRawData.add(dataClear.get(counter));
                         counter++;
                     }
@@ -621,8 +621,16 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
             tbrRate = tbrPreviousRecord;
         }
 
-        TempBasalPair tbr = new TempBasalPair(tbrRate.getHead()[0], tbrDuration.getHead()[0], (ByteUtil.asUINT8(tbrRate
-                .getDatetime()[4]) >> 3) == 0);
+//        TempBasalPair tbr = new TempBasalPair(
+//                tbrRate.getHead()[0],
+//                tbrDuration.getHead()[0],
+//                (ByteUtil.asUINT8(tbrRate.getDatetime()[4]) >> 3) == 0);
+
+        TempBasalPair tbr = new TempBasalPair(
+                tbrRate.getHead()[0],
+                tbrRate.getBody()[0],
+                tbrDuration.getHead()[0],
+                (ByteUtil.asUINT8(tbrRate.getDatetime()[4]) >> 3) == 0);
 
         // System.out.println("TBR: amount=" + tbr.getInsulinRate() + ", duration=" + tbr.getDurationMinutes()
         // // + " min. Packed: " + tbr.getValue()
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
index 5fa8f3966e..0a5e78427c 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
@@ -38,6 +40,29 @@ public class TempBasalPair extends info.nightscout.androidaps.plugins.pump.commo
     }
 
 
+    /**
+     * This constructor is for use with PumpHistoryDecoder
+     *
+     * @param rateByte0
+     * @param startTimeByte
+     * @param isPercent
+     */
+    public TempBasalPair(byte rateByte0, byte rateByte1, int startTimeByte, boolean isPercent) {
+        // int rateInt = ByteUtil.asUINT8(rateByte0);
+
+        if (isPercent) {
+            this.insulinRate = rateByte0;
+        } else {
+            int rateInt2 = ByteUtil.toInt(rateByte1, rateByte0);
+            int rateInt3 = (rateByte1 & 0x7) << 8 | rateByte0;
+            this.insulinRate = rateInt2 * 0.025;
+            Log.d("ddd", "OldRate=" + this.insulinRate + ", NewRate=" + rateInt2 * 0.025 + ", NewRate2="
+                    + rateInt2 * 0.1 + ", NNNRate=" + rateInt3 * 0.025);
+        }
+        this.durationMinutes = startTimeByte * 30;
+        this.isPercent = isPercent;
+    }
+
     public TempBasalPair(AAPSLogger aapsLogger, byte[] response) {
         super();