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 1f8e7d38ff..bbc6143b73 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 @@ -220,28 +220,11 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf @Override public int setNewBasalProfile(Profile profile) { return PumpInterface.FAILED; -/* BasalProfile basalProfile = convertProfileToComboProfile(profile); - if (pump.basalProfile.equals(basalProfile)) { - return PumpInterface.NOT_NEEDED; - } - CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_activity_setting_basal_profile), 2, - () -> ruffyScripter.setBasalProfile(basalProfile)); - // Note: no verification here, command checks summary of inputs (total basal) at the end - return commandResult.success ? PumpInterface.SUCCESS : PumpInterface.FAILED;*/ } @Override public boolean isThisProfileSet(Profile profile) { - return pump.basalProfile.equals(convertProfileToComboProfile(profile)); - } - - @NonNull - private BasalProfile convertProfileToComboProfile(Profile profile) { - BasalProfile basalProfile = new BasalProfile(); - for (int i = 0; i < 24; i++) { - basalProfile.hourlyRates[i] = profile.getBasal(i * 60 * 60); - } - return basalProfile; + return true; } @NonNull @@ -276,7 +259,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf } // ensure time and date(!) are current; connect triggers a notification on mismatch - /* menu not supported by ruffy + /* menu not supported by ruffy v1 if (!pump.initialized) { if (!runCommand("Updating pump clock", 2, ruffyScripter::setDateAndTime).success) { return; @@ -284,7 +267,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf } */ - // read basal profile into cache, update pump profile if needed + // read basal profile into cache if (!pump.initialized) { CommandResult readBasalResult = runCommand("Reading basal profile", 2, ruffyScripter::readBasalProfile); if (!readBasalResult.success) { diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java index 5c58fa565c..41ec1687f5 100644 --- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java @@ -41,7 +41,6 @@ import de.jotomo.ruffyscripter.commands.ReadBasalProfileCommand; import de.jotomo.ruffyscripter.commands.ReadHistoryCommand; import de.jotomo.ruffyscripter.commands.ReadPumpStateCommand; import de.jotomo.ruffyscripter.commands.ReadReservoirLevelAndLastBolus; -import de.jotomo.ruffyscripter.commands.SetBasalProfileCommand; import de.jotomo.ruffyscripter.commands.SetDateAndTimeCommand; import de.jotomo.ruffyscripter.commands.SetTbrCommand; @@ -745,7 +744,7 @@ public class RuffyScripter implements RuffyCommands { @Override public CommandResult setBasalProfile(BasalProfile basalProfile) { - return runCommand(new SetBasalProfileCommand(basalProfile)); + throw new CommandException("Setting basal profile is not supported"); } @Override diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java deleted file mode 100644 index 48f14d00e6..0000000000 --- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java +++ /dev/null @@ -1,142 +0,0 @@ -package de.jotomo.ruffyscripter.commands; - -import android.os.SystemClock; - -import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute; -import org.monkey.d.ruffy.ruffy.driver.display.MenuType; -import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; - -import de.jotomo.ruffy.spi.BasalProfile; - -public class SetBasalProfileCommand extends BaseCommand { - private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class); - - private final BasalProfile basalProfile; - - public SetBasalProfileCommand(BasalProfile basalProfile) { - this.basalProfile = basalProfile; - } - - @Override - public void execute() { - if (1==1) { - throw new RuntimeException("Not implemented yet"); - } - scripter.navigateToMenu(MenuType.BASAL_1_MENU); - scripter.verifyMenuIsDisplayed(MenuType.BASAL_1_MENU); - scripter.pressCheckKey(); - - // summary screen is shown; press menu to page through hours, wraps around to summary; - scripter.verifyMenuIsDisplayed(MenuType.BASAL_TOTAL); - for (int i = 0; i < 24; i++) { - scripter.pressMenuKey(); - scripter.waitForScreenUpdate(); - scripter.verifyMenuIsDisplayed(MenuType.BASAL_SET); - MenuTime startTime = (MenuTime) scripter.getCurrentMenu().getAttribute(MenuAttribute.BASAL_START); - - while (i > startTime.getHour()) { -// if (i > startTime.getHour()) { -// throw new CommandException("Attempting to read basal rate for hour " + i + ", but hour " + startTime.getHour() + " is displayed"); - scripter.waitForScreenUpdate(); - startTime = (MenuTime) scripter.getCurrentMenu().getAttribute(MenuAttribute.BASAL_START); - } - double requestedRate = basalProfile.hourlyRates[i]; - Boolean increasing = inputBasalRate(requestedRate); - if (increasing != null) { - verifyDisplayedRate(requestedRate, increasing); - } - - log.debug("Set basal profile, hour " + i + ": " + requestedRate); - } - - Double pumpTotal = (Double) scripter.getCurrentMenu().getAttribute(MenuAttribute.BASAL_TOTAL); - Double requestedTotal = 0d; - for (int i = 0; i < 24; i++) { - requestedTotal += basalProfile.hourlyRates[i]; - } - if (Math.abs(pumpTotal - requestedTotal) > 0.05) { // TODO leniency actually needed? - throw new CommandException("Basal total of " + pumpTotal + " differs from requested total of " + requestedTotal); - } - - scripter.returnToRootMenu(); - scripter.verifyRootMenuIsDisplayed(); - - result.success(true).basalProfile(basalProfile); - } - - private Boolean inputBasalRate(double requestedRate) { - // 0.05 steps; jumps to 0.10 steps if buttons are kept pressed, so there's room for optimization - double currentRate = scripter.readBlinkingValue(Double.class, MenuAttribute.BASAL_RATE); - if (Math.abs(currentRate - requestedRate) < 0.01) { - return null; - } - log.debug("Current rate: " + currentRate + " = requested => " + requestedRate); - double change = requestedRate - currentRate; - long steps = Math.round(change * 100); - boolean increasing = steps > 0; - log.debug("Pressing " + (increasing ? "up" : "down") + " " + steps + " times"); - for (int i = 0; i < Math.abs(steps); i++) { - scripter.verifyMenuIsDisplayed(MenuType.BASAL_SET); - log.debug("Push #" + (i + 1) + "/" + Math.abs(steps)); - if (increasing) scripter.pressUpKey(); - else scripter.pressDownKey(); - SystemClock.sleep(50); - } - return increasing; - } - - private void verifyDisplayedRate(double requestedRate, boolean increasingPercentage) { - scripter.verifyMenuIsDisplayed(MenuType.BASAL_SET); - // wait up to 5s for any scrolling to finish - double displayedRate = scripter.readBlinkingValue(Double.class, MenuAttribute.BASAL_RATE); - long timeout = System.currentTimeMillis() + 10 * 1000; - while (timeout > System.currentTimeMillis() - && ((increasingPercentage && displayedRate < requestedRate) - || (!increasingPercentage && displayedRate > requestedRate))) { - log.debug("Waiting for pump to process scrolling input for rate, current: " - + displayedRate + ", desired: " + requestedRate + ", scrolling " - + (increasingPercentage ? "up" : "down")); -// SystemClock.sleep(50); - scripter.waitForScreenUpdate(); - displayedRate = scripter.readBlinkingValue(Double.class, MenuAttribute.BASAL_RATE); - } - log.debug("Final displayed basal rate: " + displayedRate); - if (displayedRate != requestedRate) { - throw new CommandException("Failed to set basal rate, requested: " - + requestedRate + ", actual: " + displayedRate); - } - - // check again to ensure the displayed value hasn't change and scrolled past the desired - // value due to due scrolling taking extremely long - SystemClock.sleep(1000); - scripter.verifyMenuIsDisplayed(MenuType.BASAL_SET); - double refreshedDisplayedRate = scripter.readBlinkingValue(Double.class, MenuAttribute.BASAL_RATE); - if (displayedRate != refreshedDisplayedRate) { - throw new CommandException("Failed to set basal rate: " + - "percentage changed after input stopped from " - + displayedRate + " -> " + refreshedDisplayedRate); - } - } - - @Override - public List validateArguments() { - ArrayList violations = new ArrayList<>(); - if (basalProfile == null) { - violations.add("No basal profile supplied"); - } - - return violations; - } - - @Override - public String toString() { - return "SetBasalProfileCommand{" + - "basalProfile=" + basalProfile + - '}'; - } -}