caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Small fixes

Browse source
This commit is contained in:
Bart Sopers 2020-11-19 18:21:29 +01:00
parent a2de14a44a
commit 084c8fd02f
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
View file

@ -249,11 +249,10 @@ public class OmnipodManager {
} }
try { try {
podStateManager.setTempBasal(DateTime.now().minus(OmnipodConstants.AVERAGE_TEMP_BASAL_COMMAND_COMMUNICATION_DURATION), rate, duration); podStateManager.setTempBasal(DateTime.now().plus(OmnipodConstants.AVERAGE_TEMP_BASAL_COMMAND_COMMUNICATION_DURATION), rate, duration);
podStateManager.setTempBasalCertain(false); podStateManager.setTempBasalCertain(false);
executeAndVerify(() -> communicationService.executeAction(new SetTempBasalAction( executeAndVerify(() -> communicationService.executeAction(new SetTempBasalAction(
podStateManager, rate, duration, acknowledgementBeep, completionBeep))); podStateManager, rate, duration, acknowledgementBeep, completionBeep)));
podStateManager.setTempBasal(DateTime.now().minus(OmnipodConstants.AVERAGE_TEMP_BASAL_COMMAND_COMMUNICATION_DURATION), rate, duration);
} catch (OmnipodException ex) { } catch (OmnipodException ex) {
if (ex.isCertainFailure()) { if (ex.isCertainFailure()) {
podStateManager.clearTempBasal(); podStateManager.clearTempBasal();

14
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
View file

@ -438,8 +438,18 @@ class OmnipodOverviewFragment : DaggerFragment() {
omnipod_overview_temp_basal.setTextColor(textColor) omnipod_overview_temp_basal.setTextColor(textColor)
} }
} else { } else {
omnipod_overview_temp_basal.text = PLACEHOLDER var text = PLACEHOLDER
omnipod_overview_temp_basal.setTextColor(Color.WHITE) val textColor: Int
if (podStateManager.isTempBasalCertain) {
textColor = Color.WHITE
} else {
textColor = Color.RED
text += " (" + resourceHelper.gs(R.string.omnipod_uncertain) + ")"
}
omnipod_overview_temp_basal.text = text
omnipod_overview_temp_basal.setTextColor(textColor)
} }
} }