Merge branch 'dev' into dev2
This commit is contained in:
commit
f673d3a721
|
@ -53,7 +53,7 @@ public class DanaRS_Packet_APS_Basal_Set_Temporary_Basal extends DanaRS_Packet {
|
||||||
int result = byteArrayToInt(getBytes(data, DATA_START, 1));
|
int result = byteArrayToInt(getBytes(data, DATA_START, 1));
|
||||||
if (result != 1) {
|
if (result != 1) {
|
||||||
failed = true;
|
failed = true;
|
||||||
log.debug("Set APS temp basal start result: " + result + " FAILED!!!");
|
log.error("Set APS temp basal start result: " + result + " FAILED!!!");
|
||||||
} else {
|
} else {
|
||||||
if (Config.logDanaMessageDetail)
|
if (Config.logDanaMessageDetail)
|
||||||
log.debug("Set APS temp basal start result: " + result);
|
log.debug("Set APS temp basal start result: " + result);
|
||||||
|
|
|
@ -63,7 +63,7 @@ public class DanaRS_Packet_APS_Set_Event_History extends DanaRS_Packet {
|
||||||
int result = intFromBuff(data, 0, 1);
|
int result = intFromBuff(data, 0, 1);
|
||||||
if (result != 1) {
|
if (result != 1) {
|
||||||
failed = true;
|
failed = true;
|
||||||
log.debug("Set history entry result: " + result + " FAILED!!!");
|
log.error("Set history entry result: " + result + " FAILED!!!");
|
||||||
} else {
|
} else {
|
||||||
if (Config.logDanaMessageDetail)
|
if (Config.logDanaMessageDetail)
|
||||||
log.debug("Set history entry result: " + result);
|
log.debug("Set history entry result: " + result);
|
||||||
|
|
|
@ -260,6 +260,9 @@ public class DanaRSService extends Service {
|
||||||
if (!(isConnected()))
|
if (!(isConnected()))
|
||||||
DanaRSPlugin.getPlugin().connect("loadEvents");
|
DanaRSPlugin.getPlugin().connect("loadEvents");
|
||||||
loadEvents();
|
loadEvents();
|
||||||
|
// reread bolus status
|
||||||
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingbolusstatus)));
|
||||||
|
bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information()); // last bolus
|
||||||
bolusingEvent.percent = 100;
|
bolusingEvent.percent = 100;
|
||||||
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.disconnecting)));
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.disconnecting)));
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -262,13 +262,13 @@ public class DanaRv2ExecutionService extends Service {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingbolusstatus)));
|
||||||
mSerialIOThread.sendMessage(statusMsg);
|
mSerialIOThread.sendMessage(statusMsg);
|
||||||
mSerialIOThread.sendMessage(statusBasicMsg);
|
mSerialIOThread.sendMessage(statusBasicMsg);
|
||||||
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingtempbasalstatus)));
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingtempbasalstatus)));
|
||||||
mSerialIOThread.sendMessage(tempStatusMsg);
|
mSerialIOThread.sendMessage(tempStatusMsg);
|
||||||
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingextendedbolusstatus)));
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingextendedbolusstatus)));
|
||||||
mSerialIOThread.sendMessage(exStatusMsg);
|
mSerialIOThread.sendMessage(exStatusMsg);
|
||||||
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingbolusstatus)));
|
|
||||||
|
|
||||||
if (!statusMsg.received) {
|
if (!statusMsg.received) {
|
||||||
mSerialIOThread.sendMessage(statusMsg);
|
mSerialIOThread.sendMessage(statusMsg);
|
||||||
|
@ -471,6 +471,9 @@ public class DanaRv2ExecutionService extends Service {
|
||||||
if (!(isConnected()))
|
if (!(isConnected()))
|
||||||
connect("loadEvents");
|
connect("loadEvents");
|
||||||
loadEvents();
|
loadEvents();
|
||||||
|
// load last bolus status
|
||||||
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingbolusstatus)));
|
||||||
|
mSerialIOThread.sendMessage(new MsgStatus());
|
||||||
bolusingEvent.percent = 100;
|
bolusingEvent.percent = 100;
|
||||||
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.disconnecting)));
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.disconnecting)));
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue