Minor non-code tweaks.
This commit is contained in:
parent
2468f23e97
commit
216359312a
|
@ -86,7 +86,7 @@ Setup:
|
|||
Usage:
|
||||
- Keep in mind that this is not a product, esp. in the beginning the user needs to monitor and understand the system,
|
||||
its limitations and how it can fail. It is strongly advised NOT to use this system when the person
|
||||
using is not able to fully understand the system.
|
||||
using it is not able to fully understand the system.
|
||||
- This integration uses the same functionality which the meter provides that comes with the Combo.
|
||||
The meter allows to mirror the pump screen and forwards button presses to the pump. The connection
|
||||
to the pump and this forwarding is what the ruffy app does. A `scripter` components reads the screen
|
||||
|
|
|
@ -98,8 +98,13 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
|
|||
|
||||
private Bolus lastRequestedBolus;
|
||||
|
||||
/** this is set whenever a connection to the pump is made and indicates if new history
|
||||
records on the pump have been found */
|
||||
/**
|
||||
* This is set whenever a connection to the pump is made and indicates if new history
|
||||
* records on the pump have been found. This effectively blocks high temps and boluses
|
||||
* till the queue is empty and the connection is shut down. The next reconnect will
|
||||
* then reset this flag. This might cause some grief when attempting to bolus again within
|
||||
* the 5s of idling it takes before the connecting is shut down.
|
||||
*/
|
||||
private volatile boolean pumpHistoryChanged = false;
|
||||
private volatile long timestampOfLastKnownPumpBolusRecord;
|
||||
|
||||
|
@ -362,7 +367,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
|
|||
}
|
||||
}
|
||||
|
||||
CommandResult stateResult = runCommand(MainApp.gs(R.string.combo_pump_action_refreshing),1, ruffyScripter::readPumpState);
|
||||
CommandResult stateResult = runCommand(MainApp.gs(R.string.combo_pump_action_refreshing),1, ruffyScripter::readQuickInfo);
|
||||
if (!stateResult.success) {
|
||||
return;
|
||||
}
|
||||
|
@ -394,8 +399,9 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
|
|||
pump.initialized = true;
|
||||
MainApp.bus().post(new EventInitializationChanged());
|
||||
|
||||
// ComboFragment updates state fully only after the pump has initialized, so read full state here
|
||||
updateLocalData(runCommand(null, 1, ruffyScripter::readQuickInfo));
|
||||
// ComboFragment updates state fully only after the pump has initialized,
|
||||
// so force an update after initialization completed
|
||||
updateLocalData(stateResult);
|
||||
}
|
||||
|
||||
/** Updates local cache with state (reservoir level, last bolus ...) returned from the pump */
|
||||
|
|
|
@ -854,7 +854,7 @@
|
|||
<string name="combo_notification_check_time_date">Pump clock update needed</string>
|
||||
<string name="combo_history">History</string>
|
||||
<string name="combo_warning">Warning</string>
|
||||
<string name="combo_read_full_history_info">Long press this button to (re)read all history data and basal profile from the pump. This is generally not needed, but can be useful if the pump\'s date and time was significantly off or the basal profile was changed on the pump (which should never be done under normal circumstances).</string>
|
||||
<string name="combo_read_full_history_info">Long press this button to force a full read of history and basal profile from the pump. This is generally not needed, but can be useful if the pump\'s date and time was significantly off or the basal profile was changed on the pump (which should never be done under normal circumstances).</string>
|
||||
<string name="combo_read_full_history_warning">This will read the full history and state of the pump. Everything in \"My Data\" and the basal rate. Boluses and TBRs will be added to Treatments if they don\'t already exist. This can cause entries to be duplicated because the pump\'s time is imprecise. Using this when normally looping with the pump is highly discouraged and reserved for special circumstances. If you still want to do this, long press this button again.\n\nWARNING: this can trigger a bug which causes the pump to reject all connection attempts and requires pressing a button on the pump to recover and should therefore be avoided.</string>
|
||||
<string name="combo_read_full_history_confirmation">Are you really sure you want to read all pump data and take the consequences of this action?</string>
|
||||
<string name="combo_pump_tbr_cancelled_warrning">TBR CANCELLED warning was confirmed</string>
|
||||
|
|
Loading…
Reference in a new issue