caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fixes and cleanups.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-18 19:37:31 +01:00
parent 2c0975994d
commit 46fdd47ac0
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
9 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -142,10 +142,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
} else if (plugin.getPump().lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis()) {
lastConnectionView.setText(getString(R.string.combo_no_pump_connection, min));
lastConnectionView.setTextColor(Color.RED);
} else if (plugin.getPump().lastCmdTime > plugin.getPump().lastSuccessfulCmdTime) {
String lastFailed = minAgo + "\n" + getString(R.string.combo_connect_attempt_failed);
lastConnectionView.setText(lastFailed);
lastConnectionView.setTextColor(Color.YELLOW);
} else {
lastConnectionView.setText(minAgo);
lastConnectionView.setTextColor(Color.WHITE);

4
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -631,8 +631,6 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
* NO history, reservoir level fields are updated, this make be done separately if desired.
*/
private synchronized CommandResult runCommand(String activity, int retries, CommandExecution commandExecution) {
pump.lastCmdTime = System.currentTimeMillis();
CommandResult commandResult;
try {
if (activity != null) {
@ -661,7 +659,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
}
if (commandResult.success) {
pump.lastSuccessfulCmdTime = pump.lastCmdTime;
pump.lastSuccessfulCmdTime = System.currentTimeMillis();
}
pump.lastCmdResult = commandResult;

1
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java
View file

@ -12,7 +12,6 @@ import de.jotomo.ruffy.spi.history.PumpHistory;
class ComboPump {
boolean initialized = false;
volatile long lastSuccessfulCmdTime;
volatile long lastCmdTime;
@Nullable
volatile CommandResult lastCmdResult;

2
app/src/main/res/values-de/strings.xml
View file

@ -678,7 +678,7 @@
<string name="combo_tbr_remaining">%d%% (%d verbleibend)</string>
<string name="combopump_settings">Accu-Chek Combo settings Einstellungen</string>
<string name="combo_connect_attempt_failed">Verbindungsaufbau fehlgeschlagen</string>
<string name="combo_no_pump_connection">Keine Verbindung zur Pumpe seit %s</string>
<string name="combo_no_pump_connection">Keine Verbindung zur Pumpe seit %d min</string>
<string name="bolusstopped">Bolusabgabe gestopped</string>
<string name="bolusstopping">Bolusabgabe wird abgebrochen</string>
<string name="pump_errors_history">Fehlerprotokol</string>

9
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -415,6 +415,7 @@ public class RuffyScripter implements RuffyCommands {
MenuType type = menu.getType();
if (type != MenuType.WARNING_OR_ERROR && type != MenuType.MAIN_MENU) {
try {
log.debug("Command execution yielded an error, returning to main menu");
returnToRootMenu();
} catch (Exception e) {
log.warn("Error returning to main menu, when trying to recover from command failure", e);
@ -617,17 +618,17 @@ public class RuffyScripter implements RuffyCommands {
}
public void navigateToMenu(MenuType desiredMenu) {
int moviesLeft = 20;
int retries = 20;
while (getCurrentMenu().getType() != desiredMenu) {
moviesLeft--;
MenuType currentMenuType = getCurrentMenu().getType();
log.debug("Navigating to menu " + desiredMenu + ", current menu: " + currentMenuType);
if (moviesLeft == 0) {
retries--;
if (retries == 0) {
throw new CommandException("Menu not found searching for " + desiredMenu
+ ". Check menu settings on your pump to ensure it's not hidden.");
}
pressMenuKey();
waitForScreenUpdate();
SystemClock.sleep(200);
}
}

1
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
View file

@ -158,7 +158,6 @@ public class BolusCommand extends BaseCommand {
scripter.navigateToMenu(MenuType.BOLUS_MENU);
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_MENU);
scripter.pressCheckKey();
scripter.waitForScreenUpdate();
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
}

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

@ -70,7 +70,6 @@ public class SetTbrCommand extends BaseCommand {
// switch to TBR_DURATION menu by pressing menu key
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
scripter.pressMenuKey();
scripter.waitForScreenUpdate();
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
boolean increasingDuration = inputTbrDuration();
@ -88,7 +87,6 @@ public class SetTbrCommand extends BaseCommand {
scripter.navigateToMenu(MenuType.TBR_MENU);
scripter.verifyMenuIsDisplayed(MenuType.TBR_MENU);
scripter.pressCheckKey();
scripter.waitForScreenUpdate();
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
}

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java
View file

@ -80,7 +80,7 @@ public class BolusActivity extends ViewSelectorActivity {
if (editCarbs != null){
def = SafeParse.stringToDouble(editCarbs.editText.getText().toString());
}
editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), false);
editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 5d, new DecimalFormat("0"), false);
setLabelToPlusMinusView(view, "carbs");
container.addView(view);
return view;

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java
View file

@ -96,7 +96,7 @@ public class TempTargetActivity extends ViewSelectorActivity {
if (lowRange != null){
def = SafeParse.stringToDouble(lowRange.editText.getText().toString());
}
lowRange = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 72d, 180d, 1d, new DecimalFormat("0"), false);
lowRange = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 72d, 180d, 10d, new DecimalFormat("0"), false);
} else {
double def = 5.5;
if (lowRange != null){