From 7ce282dc4e03ca6efac8e98b75f66123132b0a38 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 4 Oct 2017 19:38:42 +0200 Subject: [PATCH 1/2] korean percent fix --- .../androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java index fbd9d17e5c..2366f9c15f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java @@ -503,7 +503,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf } if (percent > getPumpDescription().maxTempPercent) percent = getPumpDescription().maxTempPercent; - TemporaryBasal runningTB = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()); + TemporaryBasal runningTB = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()); if (runningTB != null && runningTB.percentRate == percent) { result.enacted = false; result.success = true; From d6089bef73d0f6ee0fb09d997209ee10a5bf6463 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 4 Oct 2017 19:39:41 +0200 Subject: [PATCH 2/2] Rv2 percent fix --- .../androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java index fc82c4bebd..66284b255c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java @@ -429,7 +429,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface, } if (percent > getPumpDescription().maxTempPercent) percent = getPumpDescription().maxTempPercent; - TemporaryBasal runningTB = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()); + TemporaryBasal runningTB = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()); if (runningTB != null && runningTB.percentRate == percent) { result.enacted = false; result.success = true;