caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Unbreak RuffyCommandsV1Impl.readHistory, cleanups.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-12-12 00:42:54 +01:00
parent be446145c0
commit f83dd1cb67
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
4 changed files with 7 additions and 6 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/ComboPlugin.java
View file

@ -556,8 +556,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
tempStart.percentRate = adjustedPercent; tempStart.percentRate = adjustedPercent;
tempStart.isAbsolute = false; tempStart.isAbsolute = false;
tempStart.source = Source.USER; tempStart.source = Source.USER;
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder(); MainApp.getConfigBuilder().addToHistoryTempBasal(tempStart);
treatmentsInterface.addToHistoryTempBasal(tempStart);
MainApp.bus().post(new EventComboPumpUpdateGUI()); MainApp.bus().post(new EventComboPumpUpdateGUI());
} }
@ -771,6 +770,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
* Checks the main screen to determine if TBR on pump matches app state. * Checks the main screen to determine if TBR on pump matches app state.
*/ */
private void checkAndResolveTbrMismatch(PumpState state) { private void checkAndResolveTbrMismatch(PumpState state) {
// compare with: info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal.updateTempBasalInDB()
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
TemporaryBasal aapsTbr = MainApp.getConfigBuilder().getTempBasalFromHistory(now); TemporaryBasal aapsTbr = MainApp.getConfigBuilder().getTempBasalFromHistory(now);
if (aapsTbr == null && state.tbrActive && state.tbrRemainingDuration > 2) { if (aapsTbr == null && state.tbrActive && state.tbrRemainingDuration > 2) {

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

@ -679,7 +679,7 @@
<string name="pump_unreachable_threshold">Pumpe ist nicht erreichbar Grenze [min]</string> <string name="pump_unreachable_threshold">Pumpe ist nicht erreichbar Grenze [min]</string>
<string name="combo_refresh">Aktualisieren</string> <string name="combo_refresh">Aktualisieren</string>
<string name="combo_pump_activity_label">Aktivität</string> <string name="combo_pump_activity_label">Aktivität</string>
<string name="combo_tbr_remaining">%d%% (%d verbleibend)</string> <string name="combo_tbr_remaining">%d%% (%d Min. verbleibend)</string>
<string name="combopump_settings">Accu-Chek Combo settings Einstellungen</string> <string name="combopump_settings">Accu-Chek Combo settings Einstellungen</string>
<string name="combo_no_pump_connection">Keine Verbindung zur Pumpe seit %d min</string> <string name="combo_no_pump_connection">Keine Verbindung zur Pumpe seit %d min</string>
<string name="bolusstopped">Bolusabgabe gestopped</string> <string name="bolusstopped">Bolusabgabe gestopped</string>

5
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyCommandsV1Impl.java
View file

@ -28,9 +28,10 @@ public class RuffyCommandsV1Impl implements RuffyCommands {
private RuffyCommandsV1Impl() {} private RuffyCommandsV1Impl() {}
/** Not supported by RuffyScripter */
@Override @Override
public CommandResult getDateAndTime() { public CommandResult getDateAndTime() {
return delegate.getDateAndTime(); return new CommandResult().success(false);
} }
@Override @Override
@ -90,7 +91,7 @@ public class RuffyCommandsV1Impl implements RuffyCommands {
@Override @Override
public CommandResult readHistory(PumpHistoryRequest request) { public CommandResult readHistory(PumpHistoryRequest request) {
return delegate.readPumpState().history(new PumpHistory()); return delegate.readHistory(request);
} }
@Override @Override

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

@ -787,7 +787,7 @@ public class RuffyScripter implements RuffyCommands {
@Override @Override
public CommandResult getDateAndTime() { public CommandResult getDateAndTime() {
return new CommandResult().success(false); throw new RuntimeException("Not supported");
} }
@Override @Override