caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #708 from jotomo/watch-carb-only-request

Browse source 
Watch: don't bother pump with carbs if pump doesn't support it.
This commit is contained in:
Milos Kozak 2018-02-25 10:10:09 +01:00 committed by GitHub
parent 31f7670f43 87a7249997
commit b18c16ce3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
View file

@ -97,6 +97,8 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
pumpDescription.basalMinimumRate = 0.01d;
pumpDescription.isRefillingCapable = false;
pumpDescription.storesCarbInfo = false;
}
@Override

23
app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
View file

@ -1,5 +1,6 @@
package info.nightscout.androidaps.plugins.Wear;
import android.Manifest;
import android.os.HandlerThread;
import android.support.annotation.NonNull;
@ -644,16 +645,20 @@ public class ActionStringHandler {
detailedBolusInfo.insulin = amount;
detailedBolusInfo.carbs = carbs;
detailedBolusInfo.source = Source.USER;
ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
@Override
public void run() {
if (!result.success) {
sendError(MainApp.sResources.getString(R.string.treatmentdeliveryerror) +
"\n" +
result.comment);
if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
@Override
public void run() {
if (!result.success) {
sendError(MainApp.sResources.getString(R.string.treatmentdeliveryerror) +
"\n" +
result.comment);
}
}
}
});
});
} else {
MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
}
}
private synchronized static void sendError(String errormessage) {