caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

PUMP SMS command, connect to pump before reporting SMS STATUS

Browse source
This commit is contained in:
Milos Kozak 2018-03-28 10:22:10 +02:00
parent ce07cd560b
commit e9b499314d
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java
View file

@ -31,12 +31,11 @@ import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.events.EventRefreshOverview;
import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.Loop.LoopPlugin; import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification; import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.Overview.notifications.Notification; import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventNewSMS; import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventNewSMS;
import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventSmsCommunicatorUpdateGui; import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventSmsCommunicatorUpdateGui;
import info.nightscout.androidaps.queue.Callback; import info.nightscout.androidaps.queue.Callback;
@ -389,19 +388,25 @@ public class SmsCommunicatorPlugin implements PluginBase {
break; break;
} }
break; break;
case "PUMP":
case "DANAR": case "DANAR":
DanaRPlugin danaRPlugin = MainApp.getSpecificPlugin(DanaRPlugin.class); ConfigBuilderPlugin.getCommandQueue().readStatus("SMS", new Callback() {
if (danaRPlugin != null && danaRPlugin.isEnabled(PluginBase.PUMP)) { @Override
reply = danaRPlugin.shortStatus(true); public void run() {
PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
if (result.success) {
if (pump != null) {
String reply = pump.shortStatus(true);
sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, new Date()));
}
} else {
String reply = MainApp.sResources.getString(R.string.readstatusfailed);
sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
} }
DanaRKoreanPlugin danaRKoreanPlugin = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class);
if (danaRKoreanPlugin != null && danaRKoreanPlugin.isEnabled(PluginBase.PUMP)) {
reply = danaRKoreanPlugin.shortStatus(true);
sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
} }
});
receivedSms.processed = true; receivedSms.processed = true;
FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Danar")); FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Pump"));
break; break;
case "BASAL": case "BASAL":
if (splited.length > 1) { if (splited.length > 1) {
@ -492,17 +497,17 @@ public class SmsCommunicatorPlugin implements PluginBase {
ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() { ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
@Override @Override
public void run() { public void run() {
DanaRPlugin danaRPlugin = MainApp.getSpecificPlugin(DanaRPlugin.class); PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
if (result.success) { if (result.success) {
String reply = String.format(MainApp.sResources.getString(R.string.smscommunicator_bolusdelivered), result.bolusDelivered); String reply = String.format(MainApp.sResources.getString(R.string.smscommunicator_bolusdelivered), result.bolusDelivered);
if (danaRPlugin != null) if (pump != null)
reply += "\n" + danaRPlugin.shortStatus(true); reply += "\n" + pump.shortStatus(true);
lastRemoteBolusTime = new Date(); lastRemoteBolusTime = new Date();
sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, new Date())); sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, new Date()));
} else { } else {
String reply = MainApp.sResources.getString(R.string.smscommunicator_bolusfailed); String reply = MainApp.sResources.getString(R.string.smscommunicator_bolusfailed);
if (danaRPlugin != null) if (pump != null)
reply += "\n" + danaRPlugin.shortStatus(true); reply += "\n" + pump.shortStatus(true);
sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
} }
} }

1
app/src/main/res/values/strings.xml
View file

@ -989,5 +989,6 @@
<string name="key_treatmentssafety_maxcarbs">treatmentssafety_maxcarbs</string> <string name="key_treatmentssafety_maxcarbs">treatmentssafety_maxcarbs</string>
<string name="unsafeusage">unsafe usage</string> <string name="unsafeusage">unsafe usage</string>
<string name="key_openapsama_useautosens" translatable="false">openapsama_useautosens</string> <string name="key_openapsama_useautosens" translatable="false">openapsama_useautosens</string>
<string name="readstatusfailed">Read status failed</string>
</resources> </resources>