From 831b45fac581d750356936131a744d8ed19d5428 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 12 May 2017 13:05:29 +0200 Subject: [PATCH] DanaRv2 mod7 --- .../comm/MessageHashTable.java | 21 +------- .../services/DanaRKoreanExecutionService.java | 6 +-- .../PumpDanaRv2/comm/MessageHashTable.java | 51 +----------------- .../PumpDanaRv2/comm/MsgHistoryEvents.java | 6 +-- .../comm/MsgStatusAPSTempBasal.java | 50 ----------------- .../PumpDanaRv2/comm/MsgStatusTempBasal.java | 10 +++- .../services/DanaRv2ExecutionService.java | 54 ++----------------- 7 files changed, 21 insertions(+), 177 deletions(-) delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPSTempBasal.java diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable.java index 36cf8c8edb..526e405718 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable.java @@ -6,26 +6,7 @@ import org.slf4j.LoggerFactory; import java.util.HashMap; import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgError; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAll; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryNew; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryNewDone; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetSingleBasalProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop; +import info.nightscout.androidaps.plugins.PumpDanaR.comm.*; /** * Created by mike on 28.05.2016. diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java index b858cae1a8..82dfb9b089 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java @@ -62,6 +62,9 @@ import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus; import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPump; import info.nightscout.androidaps.plugins.PumpDanaRKorean.SerialIOThread; +import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile; +import info.nightscout.androidaps.plugins.Overview.Notification; +import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification; import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgCheckValue; import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingBasal; import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingGlucose; @@ -73,9 +76,6 @@ import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingShippin import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgStatusBasic; import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgStatusBolusExtended; import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgStatusTempBasal; -import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile; -import info.nightscout.androidaps.plugins.Overview.Notification; -import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification; import info.nightscout.utils.SP; import info.nightscout.utils.ToastUtils; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable.java index 39c0cd25c3..0336407e20 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable.java @@ -6,55 +6,7 @@ import org.slf4j.LoggerFactory; import java.util.HashMap; import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgCheckValue; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgError; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAll; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAllDone; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBasalHour; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDone; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryError; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryNew; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryNewDone; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryRefill; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistorySuspend; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgInitConnStatusBasic; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgInitConnStatusBolus; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgInitConnStatusOption; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgInitConnStatusTime; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetActivateBasalProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetBasalProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetSingleBasalProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingActiveProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasalProfileAll; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatiosAll; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingUserOptions; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatus; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal; +import info.nightscout.androidaps.plugins.PumpDanaR.comm.*; /** @@ -120,7 +72,6 @@ public class MessageHashTable { put(new MsgStatusAPS()); // 0xE001 CMD_PUMP_APS put(new MsgSetAPSTempBasalStart()); // 0xE002 CMD_PUMPSET_APSTEMP put(new MsgHistoryEvents()); // 0xE003 CMD_HISTORY_EVENTS - put(new MsgStatusAPSTempBasal()); // 0xE004 CMD_PUMP_APSTEMP } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents.java index cad1d827b1..d673ff061d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents.java @@ -41,9 +41,9 @@ public class MsgHistoryEvents extends MessageBase { return; } - Date datetime = dateTimeFromBuff(bytes, 1); // 5 bytes - int param1 = intFromBuff(bytes, 6, 2); - int param2 = intFromBuff(bytes, 8, 2); + Date datetime = dateTimeSecFromBuff(bytes, 1); // 6 bytes + int param1 = intFromBuff(bytes, 7, 2); + int param2 = intFromBuff(bytes, 9, 2); switch (recordCode) { case 1: diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPSTempBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPSTempBasal.java deleted file mode 100644 index f76738ce39..0000000000 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPSTempBasal.java +++ /dev/null @@ -1,50 +0,0 @@ -package info.nightscout.androidaps.plugins.PumpDanaRv2.comm; - -import android.support.annotation.NonNull; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Date; - -import info.nightscout.androidaps.Config; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; - -public class MsgStatusAPSTempBasal extends MessageBase { - private static Logger log = LoggerFactory.getLogger(MsgStatusAPSTempBasal.class); - - public MsgStatusAPSTempBasal() { - SetCommand(0xE004); - } - - public void handleMessage(byte[] bytes) { - boolean isTempBasalInProgress = intFromBuff(bytes, 0, 1) == 1; - int tempBasalPercent = intFromBuff(bytes, 1, 2); - int tempBasalTotalSec = intFromBuff(bytes, 3, 1) * 60; - int tempBasalRunningSeconds = intFromBuff(bytes, 4, 3); - int tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60; - Date tempBasalStart = isTempBasalInProgress ? getDateFromTempBasalSecAgo(tempBasalRunningSeconds) : new Date(0); - - DanaRPump pump = DanaRPump.getInstance(); - pump.isTempBasalInProgress = isTempBasalInProgress; - pump.tempBasalPercent = tempBasalPercent; - pump.tempBasalRemainingMin = tempBasalRemainingMin; - pump.tempBasalTotalSec = tempBasalTotalSec; - pump.tempBasalStart = tempBasalStart; - - if (Config.logDanaMessageDetail) { - log.debug("Is temp basal running: " + isTempBasalInProgress); - log.debug("Current temp basal percent: " + tempBasalPercent); - log.debug("Current temp basal remaining min: " + tempBasalRemainingMin); - log.debug("Current temp basal total sec: " + tempBasalTotalSec); - log.debug("Current temp basal start: " + tempBasalStart); - } - } - - @NonNull - private Date getDateFromTempBasalSecAgo(int tempBasalAgoSecs) { - return new Date((long) (Math.ceil(new Date().getTime() / 1000d) - tempBasalAgoSecs) * 1000); - } - -} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal.java index 844d303bb4..c8c59b4f1a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal.java @@ -24,9 +24,14 @@ public class MsgStatusTempBasal extends MessageBase { } public void handleMessage(byte[] bytes) { - boolean isTempBasalInProgress = intFromBuff(bytes, 0, 1) == 1; + boolean isTempBasalInProgress = (intFromBuff(bytes, 0, 1) & 0x01) == 0x01; + boolean isAPSTempBasalInProgress = (intFromBuff(bytes, 0, 1) & 0x02) == 0x02; int tempBasalPercent = intFromBuff(bytes, 1, 1); - int tempBasalTotalSec = intFromBuff(bytes, 2, 1) * 60 * 60; + if (tempBasalPercent > 200) tempBasalPercent = (tempBasalPercent - 200) * 10; + int tempBasalTotalSec; + if (intFromBuff(bytes, 2, 1) == 150) tempBasalTotalSec = 15 * 60; + else if (intFromBuff(bytes, 2, 1) == 160) tempBasalTotalSec = 30 * 60; + else tempBasalTotalSec = intFromBuff(bytes, 2, 1) * 60 * 60; int tempBasalRunningSeconds = intFromBuff(bytes, 3, 3); int tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60; Date tempBasalStart = isTempBasalInProgress ? getDateFromTempBasalSecAgo(tempBasalRunningSeconds) : new Date(0); @@ -42,6 +47,7 @@ public class MsgStatusTempBasal extends MessageBase { if (Config.logDanaMessageDetail) { log.debug("Is temp basal running: " + isTempBasalInProgress); + log.debug("Is APS temp basal running: " + isAPSTempBasalInProgress); log.debug("Current temp basal percent: " + tempBasalPercent); log.debug("Current temp basal remaining min: " + tempBasalRemainingMin); log.debug("Current temp basal total sec: " + tempBasalTotalSec); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java index db9cfd5ec7..631aa59ec3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java @@ -37,45 +37,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile; import info.nightscout.androidaps.plugins.Overview.Notification; import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgCheckValue; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBasalHour; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDone; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryError; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryRefill; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistorySuspend; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetActivateBasalProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetBasalProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTime; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingActiveProfile; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatiosAll; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatus; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes; +import info.nightscout.androidaps.plugins.PumpDanaR.comm.*; import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRBolusStart; import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus; import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; @@ -83,7 +45,9 @@ import info.nightscout.androidaps.plugins.PumpDanaRv2.SerialIOThread; import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgHistoryEvents; import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetAPSTempBasalStart; import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusAPS; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusAPSTempBasal; +import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgCheckValue; +import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusBolusExtended; +import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusTempBasal; import info.nightscout.utils.SP; import info.nightscout.utils.ToastUtils; @@ -285,7 +249,6 @@ public class DanaRv2ExecutionService extends Service { MsgStatus statusMsg = new MsgStatus(); MsgStatusBasic statusBasicMsg = new MsgStatusBasic(); MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(); - MsgStatusAPSTempBasal tempAPSStatusMsg = new MsgStatusAPSTempBasal(); MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(); MsgCheckValue checkValue = new MsgCheckValue(); @@ -297,7 +260,6 @@ public class DanaRv2ExecutionService extends Service { } mSerialIOThread.sendMessage(tempStatusMsg); // do this before statusBasic because here is temp duration - mSerialIOThread.sendMessage(tempAPSStatusMsg); mSerialIOThread.sendMessage(exStatusMsg); mSerialIOThread.sendMessage(statusMsg); mSerialIOThread.sendMessage(statusBasicMsg); @@ -312,17 +274,13 @@ public class DanaRv2ExecutionService extends Service { // Load of status of current basal rate failed, give one more try mSerialIOThread.sendMessage(tempStatusMsg); } - if (!tempAPSStatusMsg.received) { - // Load of status of current basal rate failed, give one more try - mSerialIOThread.sendMessage(tempAPSStatusMsg); - } if (!exStatusMsg.received) { // Load of status of current extended bolus failed, give one more try mSerialIOThread.sendMessage(exStatusMsg); } // Check we have really current status of pump - if (!statusMsg.received || !statusBasicMsg.received || !tempStatusMsg.received || !tempAPSStatusMsg.received || !exStatusMsg.received) { + if (!statusMsg.received || !statusBasicMsg.received || !tempStatusMsg.received || !exStatusMsg.received) { waitMsec(10 * 1000); log.debug("getPumpStatus failed"); return false; @@ -369,7 +327,6 @@ public class DanaRv2ExecutionService extends Service { MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal))); mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours)); mSerialIOThread.sendMessage(new MsgStatusTempBasal()); - mSerialIOThread.sendMessage(new MsgStatusAPSTempBasal()); MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING)); return true; } @@ -381,7 +338,6 @@ public class DanaRv2ExecutionService extends Service { mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart(percent)); mSerialIOThread.sendMessage(new MsgStatusAPS()); mSerialIOThread.sendMessage(new MsgStatusTempBasal()); - mSerialIOThread.sendMessage(new MsgStatusAPSTempBasal()); MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING)); return true; }