caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix upload virtual pump status

Browse source
This commit is contained in:
Milos Kozak 2017-03-23 10:48:49 +01:00
parent 8b357ac49e
commit 32fda0f0df
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
View file

@ -1025,7 +1025,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
deviceStatus.device = "openaps://" + deviceID(); deviceStatus.device = "openaps://" + deviceID();
JSONObject pumpstatus = getJSONStatus(); JSONObject pumpstatus = getJSONStatus();
if (pumpstatus != null) { if (pumpstatus != null) {
deviceStatus.pump = getJSONStatus(); deviceStatus.pump = pumpstatus;
} }
} }

14
app/src/main/java/info/nightscout/androidaps/plugins/VirtualPump/VirtualPumpPlugin.java
View file

@ -38,6 +38,8 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
public static Integer batteryPercent = 50; public static Integer batteryPercent = 50;
public static Integer reservoirInUnits = 50; public static Integer reservoirInUnits = 50;
Date lastDataTime = new Date(0);
boolean fragmentEnabled = true; boolean fragmentEnabled = true;
boolean fragmentVisible = true; boolean fragmentVisible = true;
@ -150,6 +152,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
@Override @Override
public int setNewBasalProfile(NSProfile profile) { public int setNewBasalProfile(NSProfile profile) {
// Do nothing here. we are using MainApp.getConfigBuilder().getActiveProfile().getProfile(); // Do nothing here. we are using MainApp.getConfigBuilder().getActiveProfile().getProfile();
lastDataTime = new Date();
return SUCCESS; return SUCCESS;
} }
@ -160,12 +163,13 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
@Override @Override
public Date lastDataTime() { public Date lastDataTime() {
return new Date(); return lastDataTime;
} }
@Override @Override
public void refreshDataFromPump(String reason) { public void refreshDataFromPump(String reason) {
// do nothing MainApp.getConfigBuilder().uploadDeviceStatus();
lastDataTime = new Date();
} }
@Override @Override
@ -251,6 +255,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
if (Config.logPumpComm) if (Config.logPumpComm)
log.debug("Delivering treatment insulin: " + insulin + "U carbs: " + carbs + "g " + result); log.debug("Delivering treatment insulin: " + insulin + "U carbs: " + carbs + "g " + result);
MainApp.bus().post(new EventVirtualPumpUpdateGui()); MainApp.bus().post(new EventVirtualPumpUpdateGui());
lastDataTime = new Date();
return result; return result;
} }
@ -285,6 +290,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
if (Config.logPumpComm) if (Config.logPumpComm)
log.debug("Setting temp basal absolute: " + result); log.debug("Setting temp basal absolute: " + result);
MainApp.bus().post(new EventVirtualPumpUpdateGui()); MainApp.bus().post(new EventVirtualPumpUpdateGui());
lastDataTime = new Date();
return result; return result;
} }
@ -318,6 +324,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
if (Config.logPumpComm) if (Config.logPumpComm)
log.debug("Settings temp basal percent: " + result); log.debug("Settings temp basal percent: " + result);
MainApp.bus().post(new EventVirtualPumpUpdateGui()); MainApp.bus().post(new EventVirtualPumpUpdateGui());
lastDataTime = new Date();
return result; return result;
} }
@ -349,6 +356,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
if (Config.logPumpComm) if (Config.logPumpComm)
log.debug("Setting extended bolus: " + result); log.debug("Setting extended bolus: " + result);
MainApp.bus().post(new EventVirtualPumpUpdateGui()); MainApp.bus().post(new EventVirtualPumpUpdateGui());
lastDataTime = new Date();
return result; return result;
} }
@ -375,6 +383,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
result.comment = MainApp.instance().getString(R.string.virtualpump_sqlerror); result.comment = MainApp.instance().getString(R.string.virtualpump_sqlerror);
} }
} }
lastDataTime = new Date();
return result; return result;
} }
@ -399,6 +408,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
if (Config.logPumpComm) if (Config.logPumpComm)
log.debug("Canceling extended basal: " + result); log.debug("Canceling extended basal: " + result);
MainApp.bus().post(new EventVirtualPumpUpdateGui()); MainApp.bus().post(new EventVirtualPumpUpdateGui());
lastDataTime = new Date();
return result; return result;
} }