caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

add deliverAt safety

Browse source
This commit is contained in:
Milos Kozak 2017-12-10 17:04:22 +01:00
parent 890ef5978b
commit c714fead24
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
View file

@ -29,6 +29,7 @@ public class DetailedBolusInfo {
public Context context = null; // context for progress dialog public Context context = null; // context for progress dialog
public long pumpId = 0; // id of record if comming from pump history (not a newly created treatment) public long pumpId = 0; // id of record if comming from pump history (not a newly created treatment)
public boolean isSMB = false; // is a Super-MicroBolus public boolean isSMB = false; // is a Super-MicroBolus
public long deliverAt = 0; // SMB should be delivered within 1 min from this time
@Override @Override
public String toString() { public String toString() {
@ -37,6 +38,7 @@ public class DetailedBolusInfo {
" carbs: " + carbs + " carbs: " + carbs +
" isValid: " + isValid + " isValid: " + isValid +
" carbTime: " + carbTime + " carbTime: " + carbTime +
" isSMB: " + isSMB; " isSMB: " + isSMB +
" deliverAt: " + new Date(deliverAt).toLocaleString();
} }
} }

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

@ -426,6 +426,7 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
detailedBolusInfo.insulin = request.smb; detailedBolusInfo.insulin = request.smb;
detailedBolusInfo.isSMB = true; detailedBolusInfo.isSMB = true;
detailedBolusInfo.source = Source.USER; detailedBolusInfo.source = Source.USER;
detailedBolusInfo.deliverAt = request.deliverAt;
boolean smbDelivered = getCommandQueue().bolus(detailedBolusInfo, callback); boolean smbDelivered = getCommandQueue().bolus(detailedBolusInfo, callback);
if (smbDelivered) if (smbDelivered)
return true; return true;

13
app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
View file

@ -1,5 +1,8 @@
package info.nightscout.androidaps.queue.commands; package info.nightscout.androidaps.queue.commands;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.DetailedBolusInfo;
import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.data.PumpEnactResult;
@ -14,6 +17,7 @@ import info.nightscout.utils.DecimalFormatter;
*/ */
public class CommandSMBBolus extends Command { public class CommandSMBBolus extends Command {
private static Logger log = LoggerFactory.getLogger(CommandSMBBolus.class);
DetailedBolusInfo detailedBolusInfo; DetailedBolusInfo detailedBolusInfo;
public CommandSMBBolus(DetailedBolusInfo detailedBolusInfo, Callback callback) { public CommandSMBBolus(DetailedBolusInfo detailedBolusInfo, Callback callback) {
@ -24,7 +28,14 @@ public class CommandSMBBolus extends Command {
@Override @Override
public void execute() { public void execute() {
PumpEnactResult r = ConfigBuilderPlugin.getActivePump().deliverTreatment(detailedBolusInfo); PumpEnactResult r;
if (detailedBolusInfo.deliverAt != 0 && detailedBolusInfo.deliverAt + 60 * 1000L > System.currentTimeMillis())
r = ConfigBuilderPlugin.getActivePump().deliverTreatment(detailedBolusInfo);
else {
r = new PumpEnactResult().enacted(false).success(false).comment("SMB request too old");
log.debug("SMB bolus canceled. delivetAt=" + detailedBolusInfo.deliverAt + " now=" + System.currentTimeMillis());
}
BolusProgressDialog.bolusEnded = true; BolusProgressDialog.bolusEnded = true;
MainApp.bus().post(new EventDismissBolusprogressIfRunning(r)); MainApp.bus().post(new EventDismissBolusprogressIfRunning(r));