some Small improvements

This commit is contained in:
Sandra Keßler 2017-08-12 00:27:30 +02:00
parent 3fd6884d03
commit 92ca9aaede

View file

@ -121,7 +121,7 @@ public class SetTbrCommand implements Command {
scripter.waitScreen(1000); scripter.waitScreen(1000);
} }
if(currentPercentage<0 ||retries < 0) if(currentPercentage<0 ||retries < 0)
throw new Exception("unable to set basalrate"); throw new Exception("unable to set basalrate");
Log.v("SetTbrCommand","4. checking basal in "+scripter.currentMenu); Log.v("SetTbrCommand","4. checking basal in "+scripter.currentMenu);
scripter.waitScreen(1000); scripter.waitScreen(1000);
@ -179,12 +179,9 @@ public class SetTbrCommand implements Command {
Log.v("SetTbrCommand", "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);
} }
if (currentDuration < 0 || retries < 0) if (currentDuration < 0 || retries < 0)
throw new Exception("unable to set duration"); throw new Exception("unable to set duration");
@ -229,6 +226,7 @@ public class SetTbrCommand implements Command {
scripter.pressCheckKey(); scripter.pressCheckKey();
retries++; retries++;
canceledError = true; canceledError = true;
scripter.waitScreen(1000);
} }
else { else {
retries--; retries--;