caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

just rewrote SetTbrCommand to be a scripted command, maybe fixed some errors along the way, Runs very smooth on my shitty pump

Browse source
This commit is contained in:
Sandra Keßler 2017-08-12 00:12:11 +02:00
parent abe4c1ff3a
commit 3fd6884d03
1 changed files with 199 additions and 290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

407
app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
View file

@ -15,22 +15,17 @@ import java.util.Locale;
import de.jotomo.ruffyscripter.PumpState; import de.jotomo.ruffyscripter.PumpState;
import de.jotomo.ruffyscripter.RuffyScripter; import de.jotomo.ruffyscripter.RuffyScripter;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.AFTER; import static org.monkey.d.ruffy.ruffy.driver.display.MenuType.MAIN_MENU;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.BEFORE; import static org.monkey.d.ruffy.ruffy.driver.display.MenuType.TBR_DURATION;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.ERROR; import static org.monkey.d.ruffy.ruffy.driver.display.MenuType.TBR_MENU;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.MAIN; import static org.monkey.d.ruffy.ruffy.driver.display.MenuType.TBR_SET;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.SET; import static org.monkey.d.ruffy.ruffy.driver.display.MenuType.WARNING_OR_ERROR;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.SET_TBR;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.SET_TIME;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.TBR;
import static de.jotomo.ruffyscripter.commands.SetTbrCommand.State.TIME;
public class SetTbrCommand implements Command { public class SetTbrCommand implements Command {
private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class); private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class);
private final long percentage; private final long percentage;
private final long duration; private final long duration;
private RuffyScripter scripter;
public SetTbrCommand(long percentage, long duration) { public SetTbrCommand(long percentage, long duration) {
this.percentage = percentage; this.percentage = percentage;
@ -64,169 +59,116 @@ public class SetTbrCommand implements Command {
return violations; return violations;
} }
enum State {
BEFORE,
MAIN,
TBR,
SET_TBR,
TIME,
SET_TIME,
SET,
AFTER,
ERROR
};
private State lastState,state;
private long last;
private long timeout;
private Thread timeoutThread = new Thread()
{
@Override @Override
public void run() { public CommandResult execute(RuffyScripter scripter, PumpState initialPumpState) {
while(state != ERROR && state!=AFTER) {
if (timeout + last < System.currentTimeMillis()) {
lastState = state;
state = ERROR;
log.debug("timeout reached -> state:ERROR");
}
tick();
try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
tick();
}
};
private void updateState(State newState,long timeoutSec)
{
lastState = state;
state = newState;
last = System.currentTimeMillis();
timeout = timeoutSec*1000;
}
private MenuType lastMenu;
private int retries = 0;
private void tick()
{
Log.v("SetTbrCommand:tick",state+": "+scripter.currentMenu);
switch (state)
{
case BEFORE:
if(scripter.currentMenu!=null && scripter.currentMenu.getType()==MenuType.MAIN_MENU)
{
updateState(MAIN,120);
lastMenu = MenuType.MAIN_MENU;
log.debug("found MAIN_MENU -> state:MAIN");
retries=3;
}
break;
case MAIN:
if(retries>0)
if(scripter.goToMainMenuScreen(MenuType.TBR_MENU,30000))
{
updateState(TBR,30);
retries=0;
}
else
retries--;
else
{
Log.v("SetTbrCommand:tick",state+": no retries left for adjusting basals");
updateState(ERROR,30);
}
break;
case TBR:
if(scripter.enterMenu(MenuType.TBR_MENU,MenuType.TBR_SET, RuffyScripter.Key.CHECK,20000))
{
updateState(SET_TBR,60);
retries = 10;
}
else
{
Log.v("SetTbrCommand:tick",state+": no retries left for adjusting basals");
updateState(ERROR,30);
}
break;
case SET_TBR:
if(scripter.currentMenu!=null && scripter.currentMenu.getType()==MenuType.TBR_SET)
{
Object percentageObj = scripter.currentMenu.getAttribute(MenuAttribute.BASAL_RATE);
Log.v("SetTbrCommand:tick",state+": requested basal: "+percentage+" actual percetage: "+percentageObj);
if(percentageObj != null && percentageObj instanceof Double)
{
double currentPercentage = ((Double) percentageObj).doubleValue();
if(currentPercentage!=percentage) try {
Log.v("SetTbrCommand","1. going from "+scripter.currentMenu+" to TBR_MENU");
int retries = 5;
while(!scripter.goToMainMenuScreen(TBR_MENU,3000))
{ {
if(retries>0) {
retries--; retries--;
if(retries==0)
throw new Exception("not able to find TBR_MENU: stuck in "+scripter.currentMenu);
Thread.sleep(500);
if(scripter.currentMenu.getType()== TBR_MENU)
break;
}
if(scripter.currentMenu.getType()!=TBR_MENU)
throw new Exception("not able to find TBR_MENU: stuck in "+scripter.currentMenu);
Log.v("SetTbrCommand","2. entering "+scripter.currentMenu);
retries = 5;
while(!scripter.enterMenu(TBR_MENU,MenuType.TBR_SET, RuffyScripter.Key.CHECK,2000))
{
retries--;
if(retries==0)
throw new Exception("not able to find TBR_SET: stuck in "+scripter.currentMenu);
Thread.sleep(500);
if(scripter.currentMenu.getType()== TBR_SET)
break;
if(scripter.currentMenu.getType()== TBR_DURATION)
{
scripter.pressMenuKey();
scripter.waitScreen(1000);
}
}
Log.v("SetTbrCommand","3. getting/setting basal in "+scripter.currentMenu);
retries = 30;
double currentPercentage = -100;
while(currentPercentage!=percentage && retries>=0) {
retries--;
Object percentageObj = scripter.currentMenu.getAttribute(MenuAttribute.BASAL_RATE);
if (percentageObj != null && (percentageObj instanceof Double)) {
currentPercentage = ((Double) percentageObj).doubleValue();
if (currentPercentage != percentage) {
int requestedPercentage = (int) percentage; int requestedPercentage = (int) percentage;
int actualPercentage = (int) currentPercentage; int actualPercentage = (int) currentPercentage;
int steps = (requestedPercentage - actualPercentage) / 10; int steps = (requestedPercentage - actualPercentage) / 10;
Log.v("SetTbrCommand:tick",state+": adjusting basal("+requestedPercentage+"/"+actualPercentage+") with "+steps+" steps and "+retries+" retries left"); Log.v("SetTbrCommand", "Adjusting basal(" + requestedPercentage + "/" + actualPercentage + ") with " + steps + " steps and " + retries + " retries left");
scripter.step(steps, (steps < 0 ? RuffyScripter.Key.DOWN : RuffyScripter.Key.UP), 500); scripter.step(steps, (steps < 0 ? RuffyScripter.Key.DOWN : RuffyScripter.Key.UP), 500);
scripter.waitScreen(1000); scripter.waitScreen(1000);
} }
else
{
Log.v("SetTbrCommand:tick",state+": no retries left for adjusting basals");
updateState(ERROR,30);
}
} }
else else
{ currentPercentage=-100;
if(percentage==100) scripter.waitScreen(1000);
{
Log.v("SetTbrCommand:tick",state+": percentage 100 going to SET");
scripter.pressCheckKey();
updateState(SET,30);
}
else {
Log.v("SetTbrCommand:tick",state+": basal set, going to TIME");
updateState(TIME, 30);
} }
if(currentPercentage<0 ||retries < 0)
throw new Exception("unable to set basalrate");
Log.v("SetTbrCommand","4. checking basal in "+scripter.currentMenu);
scripter.waitScreen(1000);
currentPercentage= -1000;
retries=10; retries=10;
} while(currentPercentage<0 && retries>=0) {
}
}
else
{
Log.v("SetTbrCommand:tick",state+": not in correct menu: "+scripter.currentMenu+" expected "+MenuType.TBR_SET);
updateState(ERROR,30);
}
break;
case TIME:
if((scripter.currentMenu!=null && scripter.currentMenu.getType()==MenuType.TBR_DURATION) || scripter.enterMenu(MenuType.TBR_SET,MenuType.TBR_DURATION, RuffyScripter.Key.MENU,20000))
{
Log.v("SetTbrCommand:tick",state+": going to SET_TIME");
updateState(SET_TIME,60);
retries = 10;
}
else if(retries==0)
{
Log.v("SetTbrCommand:tick",state+": no retries left");
updateState(ERROR,30);
}
else
{
retries--; retries--;
Log.v("SetTbrCommand:tick",state+": next retry "+retries+"left"); Object percentageObj = scripter.currentMenu.getAttribute(MenuAttribute.BASAL_RATE);
if (percentageObj != null && (percentageObj instanceof Double)) {
currentPercentage = ((Double) percentageObj).doubleValue();
} }
else
scripter.waitScreen(1000);
}
if(retries<0 ||currentPercentage!=percentage)
throw new Exception("wrong rate!");
if(currentPercentage!=100) {
Log.v("SetTbrCommand", "5. change to TBR_DURATION from " + scripter.currentMenu);
retries = 5;
while (retries >=0 && !scripter.enterMenu(TBR_SET, MenuType.TBR_DURATION, RuffyScripter.Key.MENU, 2000)) {
retries--;
if (retries == 0)
throw new Exception("not able to find TBR_SET: stuck in " + scripter.currentMenu);
Thread.sleep(500);
if (scripter.currentMenu.getType() == TBR_DURATION)
break; break;
case SET_TIME: if (scripter.currentMenu.getType() == TBR_SET) {
if(scripter.currentMenu!=null && scripter.currentMenu.getType()==MenuType.TBR_DURATION) scripter.pressMenuKey();
{ scripter.waitScreen(1000);
}
}
Log.v("SetTbrCommand", "6. getting/setting duration in " + scripter.currentMenu);
retries = 30;
double currentDuration = -100;
while (currentDuration != duration && retries >= 0) {
retries--;
Object durationObj = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME); Object durationObj = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME);
Log.v("SetTbrCommand:tick",state+": requested time: "+duration+" actual time: "+durationObj); Log.v("SetTbrCommand", "Requested time: " + duration + " actual time: " + durationObj);
if(durationObj != null && durationObj instanceof MenuTime) if (durationObj != null && durationObj instanceof MenuTime) {
{
MenuTime time = (MenuTime) durationObj; MenuTime time = (MenuTime) durationObj;
double currentDuration = (time.getHour()*60)+time.getMinute(); currentDuration = (time.getHour() * 60) + time.getMinute();
if(currentDuration!=duration) if (currentDuration != duration) {
{
if(retries>0) {
retries--;
int requestedDuration = (int) duration; int requestedDuration = (int) duration;
int actualDuration = (int) currentDuration; int actualDuration = (int) currentDuration;
int steps = (requestedDuration - actualDuration) / 15; int steps = (requestedDuration - actualDuration) / 15;
@ -234,127 +176,94 @@ public class SetTbrCommand implements Command {
steps++; steps++;
else if (currentDuration + (steps * 15) > requestedDuration) else if (currentDuration + (steps * 15) > requestedDuration)
steps--; steps--;
Log.v("SetTbrCommand:tick",state+": adjusting duration("+requestedDuration+"/"+actualDuration+") with "+steps+" steps and "+retries+" retries left"); Log.v("SetTbrCommand", "Adjusting duration(" + requestedDuration + "/" + actualDuration + ") with " + steps + " steps and " + retries + " retries left");
scripter.step(steps, (steps > 0 ? RuffyScripter.Key.UP : RuffyScripter.Key.DOWN), 500); scripter.step(steps, (steps > 0 ? RuffyScripter.Key.UP : RuffyScripter.Key.DOWN), 500);
scripter.waitScreen(1000); scripter.waitScreen(1000);
} else {
break;
}
}
else
scripter.waitScreen(1000); scripter.waitScreen(1000);
} }
else if (currentDuration < 0 || retries < 0)
{ throw new Exception("unable to set duration");
Log.v("SetTbrCommand:tick",state+": no retry left");
updateState(ERROR,30); Log.v("SetTbrCommand", "7. checking time in " + scripter.currentMenu);
} scripter.waitScreen(1000);
} currentDuration = -1000;
else { retries = 10;
Log.v("SetTbrCommand:tick",state+": setting"); while (currentDuration < 0 && retries >= 0) {
scripter.pressCheckKey();
scripter.waitScreen(500);
if(scripter.currentMenu.getType()==MenuType.MAIN_MENU || scripter.currentMenu.getType()==MenuType.WARNING_OR_ERROR)
{
Log.v("SetTbrCommand:tick",state+": set and going to SET");
updateState(SET, 30);
}
else if(retries>0)
{
Log.v("SetTbrCommand:tick",state+": not set, wait");
retries--; retries--;
Object durationObj = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME);
if (durationObj != null && durationObj instanceof MenuTime) {
MenuTime time = (MenuTime) durationObj;
currentDuration = (time.getHour() * 60) + time.getMinute();
} }
else else
{ scripter.waitScreen(1000);
Log.v("SetTbrCommand:tick",state+": no retry left"); }
updateState(ERROR,30); if (retries < 0 || currentDuration != duration)
throw new Exception("wrong time!");
} }
} Log.v("SetTbrCommand", "8. setting from " + scripter.currentMenu);
} retries=5;
} while(retries>= 0 && (scripter.currentMenu.getType()==TBR_DURATION ||scripter.currentMenu.getType()==TBR_SET))
else if(scripter.currentMenu.getType()==MenuType.MAIN_MENU || scripter.currentMenu.getType()==MenuType.WARNING_OR_ERROR)
{ {
Log.v("SetTbrCommand:tick",state+": set and going to SET"); retries--;
updateState(SET, 30);
}
else
{
Log.v("SetTbrCommand:tick",state+": not in "+ MenuType.TBR_DURATION+" but in "+scripter.currentMenu);
updateState(ERROR,60);
}
break;
case SET:
if(scripter.currentMenu!=null && scripter.currentMenu.getType()==MenuType.WARNING_OR_ERROR)
{
Log.v("SetTbrCommand:tick",state+": in ERROR_WARNING acking");
lastMenu = scripter.currentMenu.getType();
scripter.pressCheckKey(); scripter.pressCheckKey();
updateState(SET, 30); scripter.waitScreen(1000);
} }
else if(scripter.currentMenu!=null && scripter.currentMenu.getType()==MenuType.MAIN_MENU) { if(retries<0 || scripter.currentMenu.getType()==TBR_DURATION ||scripter.currentMenu.getType()==TBR_SET)
Object setPercentage = scripter.currentMenu.getAttribute(MenuAttribute.TBR); throw new Exception("failed setting basal!");
Object setDuration = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME); retries=10;
Log.v("SetTbrCommand:tick",state+": got percentage: "+setPercentage+" requestes: "+percentage+" duration: "+setDuration+" request: "+duration); boolean canceledError = true;
if (setPercentage== null ||setDuration==null) { if(percentage==100)
if(percentage!=100) canceledError=false;
while(retries>=0 && scripter.currentMenu.getType()!=MAIN_MENU )
{ {
Log.v("SetTbrCommand:tick",state+": fail because nothign set"); if(percentage==100 && scripter.currentMenu.getType()==WARNING_OR_ERROR)
updateState(ERROR,10);
}
else
{ {
Log.v("SetTbrCommand:tick",state+": finished"); scripter.pressCheckKey();
if(lastMenu==MenuType.WARNING_OR_ERROR) retries++;
updateState(AFTER,10); canceledError = true;
else
updateState(SET,10);
}
} }
else { else {
double mmTbrPercentage = (Double) setPercentage; retries--;
MenuTime mmTbrDuration = (MenuTime) setDuration; if (scripter.currentMenu.getType() == MAIN_MENU && canceledError)
// ... and be the same as what we set
// note that displayed duration might have already counted down, e.g. from 30 minutes to
// 29 minutes and 59 seconds, so that 29 minutes are displayed
int mmTbrDurationInMinutes = mmTbrDuration.getHour() * 60 + mmTbrDuration.getMinute();
if (mmTbrPercentage == percentage && mmTbrDurationInMinutes <= duration) {
Log.v("SetTbrCommand:tick",state+": finished, correctly set");
updateState(AFTER, 10);
} else {
Log.v("SetTbrCommand:tick",state+": failed");
updateState(ERROR, 10);
}
}
}
break;
case ERROR:
case AFTER:
synchronized(SetTbrCommand.this) {
SetTbrCommand.this.notify();
}
break; break;
} }
} }
@Override if(retries<0 || scripter.currentMenu.getType()!=MAIN_MENU )
public CommandResult execute(RuffyScripter scripter, PumpState initialPumpState) { throw new Exception("failed going to main!");
state = BEFORE;
this.scripter = scripter; Object percentageObj = scripter.currentMenu.getAttribute(MenuAttribute.TBR);
updateState(BEFORE,120); Object durationObj = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME);
timeoutThread.start();
if(percentageObj == null || !(percentageObj instanceof Double))
throw new Exception("not percentage");
if(((double)percentageObj)!=percentage)
throw new Exception("wrong percentage set!");
try {
synchronized (this) {
this.wait();
}
} catch (InterruptedException e) {
e.printStackTrace();
return new CommandResult().success(false).message("failed to wait: "+e.getMessage());
}
if(state==AFTER)
{
if(percentage==100) if(percentage==100)
return new CommandResult().success(true).enacted(true).message("TBR was cancelled"); return new CommandResult().success(true).enacted(true).message("TBR was cancelled");
if(durationObj==null || !(durationObj instanceof MenuTime))
throw new Exception("not time");
MenuTime t = (MenuTime) durationObj;
if(t.getMinute()+(60*t.getHour())> duration || t.getMinute()+(60*t.getHour())< duration-5)
throw new Exception("wrong time set!");
return new CommandResult().success(true).enacted(true).message( return new CommandResult().success(true).enacted(true).message(
String.format(Locale.US, "TBR set to %d%% for %d min", percentage, duration)); String.format(Locale.US, "TBR set to %d%% for %d min", percentage, duration));
} catch (Exception e) {
Log.e("SetTbrCommand", "got exception: ", e);
return new CommandResult().success(false).message("failed to wait: " + e.getMessage());
} }
return new CommandResult().success(false).message("failed with state: "+state+" from: "+lastState);
} }
@Override @Override