caspervk/AndroidAPS
1
Code Releases Activity

Add additionnal setting for automated deliveries and add both in pumpcontrol pref

Browse source 
- previous setting is for manual bolus and extended bolus
- This new setting is for SMB and temp basal with TBR emulation
You can change settings name and summary if you find better...
This commit is contained in:
Philoul 2020-05-23 16:30:03 +02:00
parent 1dd579fd19
commit 4f41890add
4 changed files with 31 additions and 8 deletions
app/src/main
java/info/nightscout/androidaps/plugins/pump/insight
LocalInsightPlugin.java
res
values
strings.xml
xml
pref_insight_local_full.xmlpref_insight_local_pumpcontrol.xml

11
app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
View file

@ -597,7 +597,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
bolusMessage.setDuration(0); bolusMessage.setDuration(0);
bolusMessage.setExtendedAmount(0); bolusMessage.setExtendedAmount(0);
bolusMessage.setImmediateAmount(insulin); bolusMessage.setImmediateAmount(insulin);
bolusMessage.setVibration(sp.getBoolean("insight_disable_vibration",false)); bolusMessage.setVibration(sp.getBoolean(detailedBolusInfo.isSMB ? R.string.key_disable_vibration_auto : R.string.key_disable_vibration ,false));
bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId(); bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
bolusCancelled = false; bolusCancelled = false;
} }
@ -721,7 +721,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
PumpEnactResult cancelTBRResult = cancelTempBasalOnly(); PumpEnactResult cancelTBRResult = cancelTempBasalOnly();
if (cancelTBRResult.success) { if (cancelTBRResult.success) {
PumpEnactResult ebResult = setExtendedBolusOnly((absoluteRate - getBaseBasalRate()) / 60D PumpEnactResult ebResult = setExtendedBolusOnly((absoluteRate - getBaseBasalRate()) / 60D
* ((double) durationInMinutes), durationInMinutes); * ((double) durationInMinutes), durationInMinutes,
sp.getBoolean(R.string.key_disable_vibration_auto,false));
if (ebResult.success) { if (ebResult.success) {
result.success = true; result.success = true;
result.enacted = true; result.enacted = true;
@ -799,7 +800,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
@NonNull @Override @NonNull @Override
public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) { public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
PumpEnactResult result = cancelExtendedBolusOnly(); PumpEnactResult result = cancelExtendedBolusOnly();
if (result.success) result = setExtendedBolusOnly(insulin, durationInMinutes); if (result.success) result = setExtendedBolusOnly(insulin, durationInMinutes, sp.getBoolean(R.string.key_disable_vibration,false));
try { try {
fetchStatus(); fetchStatus();
readHistory(); readHistory();
@ -813,7 +814,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
return result; return result;
} }
public PumpEnactResult setExtendedBolusOnly(Double insulin, Integer durationInMinutes) { public PumpEnactResult setExtendedBolusOnly(Double insulin, Integer durationInMinutes, boolean disableVibration) {
PumpEnactResult result = new PumpEnactResult(getInjector()); PumpEnactResult result = new PumpEnactResult(getInjector());
try { try {
DeliverBolusMessage bolusMessage = new DeliverBolusMessage(); DeliverBolusMessage bolusMessage = new DeliverBolusMessage();
@ -821,7 +822,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
bolusMessage.setDuration(durationInMinutes); bolusMessage.setDuration(durationInMinutes);
bolusMessage.setExtendedAmount(insulin); bolusMessage.setExtendedAmount(insulin);
bolusMessage.setImmediateAmount(0); bolusMessage.setImmediateAmount(0);
bolusMessage.setVibration(sp.getBoolean("insight_disable_vibration",false)); bolusMessage.setVibration(disableVibration);
int bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId(); int bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
InsightBolusID insightBolusID = new InsightBolusID(); InsightBolusID insightBolusID = new InsightBolusID();
insightBolusID.bolusID = bolusID; insightBolusID.bolusID = bolusID;

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

@ -1016,8 +1016,12 @@
<string name="log_alerts">Log alerts</string> <string name="log_alerts">Log alerts</string>
<string name="enable_tbr_emulation">Enable TBR emulation</string> <string name="enable_tbr_emulation">Enable TBR emulation</string>
<string name="enable_tbr_emulation_summary">Use extended boluses instead of TBRs to bypass the 250%% limit</string> <string name="enable_tbr_emulation_summary">Use extended boluses instead of TBRs to bypass the 250%% limit</string>
<string name="disable_vibration">Disable vibrations on bolus delivery</string> <string name="key_disable_vibration" translatable="false">insight_disable_vibration</string>
<string name="disable_vibration_summary">This setting is only available with Insight firmware 3.x</string> <string name="disable_vibration">Disable vibrations on manual bolus delivery</string>
<string name="disable_vibration_summary">For bolus and extended bolus (only available with Insight firmware 3.x)</string>
<string name="key_disable_vibration_auto" translatable="false">insight_disable_vibration_auto</string>
<string name="disable_vibration_auto">Disable vibrations on automated bolus delivery</string>
<string name="disable_vibration_auto_summary">For SMB and Temp Basal with TBR emulation (only available with Insight firmware 3.x)</string>
<string name="disconnect_delay">Disconnect delay [s]</string> <string name="disconnect_delay">Disconnect delay [s]</string>
<string name="serial_number">Serial number</string> <string name="serial_number">Serial number</string>
<string name="release_software_version">Release software version</string> <string name="release_software_version">Release software version</string>

8
app/src/main/res/xml/pref_insight_local_full.xml
View file

@ -50,10 +50,16 @@
<SwitchPreference <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="insight_disable_vibration" android:key="@string/key_disable_vibration"
android:summary="@string/disable_vibration_summary" android:summary="@string/disable_vibration_summary"
android:title="@string/disable_vibration" /> android:title="@string/disable_vibration" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_disable_vibration_auto"
android:summary="@string/disable_vibration_auto_summary"
android:title="@string/disable_vibration_auto" />
<EditTextPreference <EditTextPreference
android:defaultValue="5" android:defaultValue="5"
android:inputType="number" android:inputType="number"

12
app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
View file

@ -48,6 +48,18 @@
android:summary="@string/enable_tbr_emulation_summary" android:summary="@string/enable_tbr_emulation_summary"
android:title="@string/enable_tbr_emulation" /> android:title="@string/enable_tbr_emulation" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_disable_vibration"
android:summary="@string/disable_vibration_summary"
android:title="@string/disable_vibration" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_disable_vibration_auto"
android:summary="@string/disable_vibration_auto_summary"
android:title="@string/disable_vibration_auto" />
<EditTextPreference <EditTextPreference
android:defaultValue="5" android:defaultValue="5"
android:inputType="number" android:inputType="number"