From cc715cf76f0804e96a790fa34e9ab37843a42d97 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Sun, 23 Jul 2017 14:15:27 +0200 Subject: [PATCH] Notes, typo. --- app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java | 4 ++++ .../nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java index 5022b0e6cf..01409aa1ac 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java @@ -443,6 +443,10 @@ public class RuffyScripter { state.tbrRemainingDuration = durationMenuTime.getHour() * 60 + durationMenuTime.getMinute(); state.tbrRate = ((double) menu.getAttribute(MenuAttribute.BASAL_RATE)); } + // TODO v2, read current base basal rate, which is shown center when no TBR is active. + // Check if that holds true when an extended bolus is running. + // Add a field to PumpStatus, rather than renaming/overloading tbrRate to mean + // either TBR rate or basal rate depending on whether a TBR is active. } else if (menuType == MenuType.WARNING_OR_ERROR) { state.errorMsg = (String) menu.getAttribute(MenuAttribute.MESSAGE); } else if (menuType == MenuType.STOP) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java index b579cfefc9..d16a9a4494 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java @@ -133,7 +133,7 @@ public class ComboPlugin implements PluginBase, PumpInterface { log.error("Command result: " + localLastCmdResult); PumpState localPumpState = pumpState; if (localPumpState != null && localPumpState.errorMsg != null) { - log.warn("Pump is in error state, displayng; " + localPumpState.errorMsg); + log.warn("Pump is in error state, displaying; " + localPumpState.errorMsg); } long[] vibratePattern = new long[]{1000, 2000, 1000, 2000, 1000}; Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);