caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ReadStateCommand: properly read TBR %.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-15 13:34:18 +02:00
parent fa039e6961
commit 375eb46695
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/de/jotomo/ruffyscripter/commands/ReadStateCommand.java
View file

@ -4,8 +4,6 @@ import org.monkey.d.ruffy.ruffy.driver.display.Menu;
import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute; 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.MenuType;
import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime; import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.jotomo.ruffyscripter.RuffyScripter; import de.jotomo.ruffyscripter.RuffyScripter;
@ -14,8 +12,6 @@ import de.jotomo.ruffyscripter.RuffyScripter;
* This command is 'read-only', no buttons are pushed and so no vibrations are caused. * This command is 'read-only', no buttons are pushed and so no vibrations are caused.
*/ */
public class ReadStateCommand implements Command { public class ReadStateCommand implements Command {
private static final Logger log = LoggerFactory.getLogger(ReadStateCommand.class);
@Override @Override
public CommandResult execute(RuffyScripter scripter) { public CommandResult execute(RuffyScripter scripter) {
try { try {
@ -26,6 +22,8 @@ public class ReadStateCommand implements Command {
Double tbrPercentage = (Double) displayedMenu.getAttribute(MenuAttribute.TBR); Double tbrPercentage = (Double) displayedMenu.getAttribute(MenuAttribute.TBR);
if (tbrPercentage != 100) { if (tbrPercentage != 100) {
state.tbrActive = true; state.tbrActive = true;
Double displayedTbr = (Double) scripter.currentMenu.getAttribute(MenuAttribute.TBR);
state.tbrPercent = displayedTbr.intValue();
MenuTime durationMenuTime = ((MenuTime) displayedMenu.getAttribute(MenuAttribute.RUNTIME)); MenuTime durationMenuTime = ((MenuTime) displayedMenu.getAttribute(MenuAttribute.RUNTIME));
state.tbrRemainingDuration = durationMenuTime.getHour() * 60 + durationMenuTime.getMinute(); state.tbrRemainingDuration = durationMenuTime.getHour() * 60 + durationMenuTime.getMinute();
} }
@ -41,4 +39,10 @@ public class ReadStateCommand implements Command {
return e.toCommandResult(); return e.toCommandResult();
} }
} }
@Override
public String toString() {
return "ReadStateCommand{}";
}
} }