Johannes Mockenhaupt
8dd714b390
UI crimes
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8ecf6922f7
Misc improvements:
...
* Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading).
* Return all possible states in PumpState
* Add absolute TBR to PumpState
* Add NoOpCommand to fetch state data from pump
* Display returned pump state in Combo fragment/tab.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f251427d1b
Remove ReadStateCommand, all state will be return through the PumpState field on CommandResult, so it's passed back after every command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
ec6491fcb7
Return absolute TBR rate in PumpState.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
69b98c54c6
Polish.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
9653af5501
RuffyScripter.navigateToMenu: detect if we're wrapping around not finding a menu (likely because it's hidden)
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
7e538cbcf6
Update PumpState s/errorCode/errorMsg/g
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
99830b05b6
Fix detecting error state on connection and fix cancelling TBR.
...
When there's an error, timing is crucial. Waiting for the blinking error code
to be readable hangs the thread running the command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f6c8f3638b
Reflect reject TBR change in comment.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
4ff81e885c
Simplify reading alerts (message doesn't blink)
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
e01e85c54f
On connect, check if pump is in an error state.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
364123c261
Fix carb only treatment.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
d0dabf34da
Fix handling TBR CANCELLED alert, remove ill-advised attempts to fake a command queue and have all commands return a state object.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
952aa0e8a2
RuffyScripter.waitForMenuToBeLeft: add timeout.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
77711b2174
ComboPlugin.runCommand: wait if pump is busy with a command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
d8011aeaa4
Make cancelling TBR more robust to dismiss TBR cancelled alert specifially and only if it is raised.
...
Cancelling a TBR with a runtime < 60s (0:01 in the display) does NOT raise a TBR cancelled alert.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
2c706e7c22
Remove status logging in Ruffy, now done by command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8bc4cd255a
Don't close connection when other cmds are about to be run.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f5ef666061
Add timestamp to State and rename to PumpState.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f28a27a93f
Read pump state.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
9d8d12fcb9
Cleanups.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
eab9d8dcd7
Fix reducing duration of OpenAPS TBRs
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
e76524a539
Include state in CommandResult.toString.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
375eb46695
ReadStateCommand: properly read TBR %.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
fa039e6961
Note on cancelling TBRs that don't trigger a pump alert.
2017-07-18 21:20:18 +02:00
Johannes Mockenhaupt
0345a01fc1
Make CancelTbrCommand more robust.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
30fc385970
Apply pump specific modifications to OpenAPS suggestion in ComboPlugin.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
5631488cc8
Add ReadStateCommand.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
8b21bb1203
Skip TBR changes smaller than 20%.
...
~50 TBR changes in a 6 hour night seem excessive, even if pump was
handicapped by not being connected and thus not having any effect
to work with.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
a2b3c26b33
Log pump status on connect.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
347890496b
SetTbrCommand: wain for menu update when switching to TBR_DURATION to make it safer, hopefully.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
8c107cb48a
RuffyScripter: Log button presses.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
df58b6d1c2
CancelTbrCommand: log running TBR to be cancelled.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
8e2cd844a5
Round requested absolute TBR to percent TBR.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
a21da8aba7
Remove pointless events about connection status.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
848a32eade
Logging cleanup.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
9674db8d85
CancelTbrCommand: set enacted=true, even when there was no TBR to cancel.
...
This helps recover when there was an issue. AAPS thinks there's a TBR
running and by reporting back 'enacted', the plugin will create a
"Cancel temp" treatment.
2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt
264e252300
Set last command date.
...
Though this is only relevant when starting to fetch data from the pump.
2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt
336315823e
ComboPlugin.getBaseBasalRate: return profile value.
2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt
0729d7a114
RuffyScripter: Abort a running command after 90s timeout
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
f34fed1f05
Semi-fix bolusing not logging a treatment when there was an error.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
e29ef5ffce
Update treatment history when setting/cancelling a TBR.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
a27bb28e87
ComboPlugin.deliverTreatment: return command message as comment in PumpEnactResult.
...
Important when there's an error.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
d35d93ed44
RuffyScripter.verifyMenuIsDisplayed: wait a bit longer if needed.
...
Sometimes the pump seems to take a bit longer.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
76578872d1
ComoPlugin.deliverTreatment: take more time.
...
Even if not interacting with the pump, AAPS calculator doesn't dismiss the
dialog if we return within the first 5s.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
d39d58913d
Implement #8 , add treatment to history.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
e07d62bf79
Fix setting TBR when existing TBR has runtime < 15m.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
97f9e99437
toString methods for Commands.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
1c1a28f0a8
Ignore requests to issue BolusCommands for zero units.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
5f1ab4e45c
Set duration in PumpEnactResult when issuing SetTbrCommand.
2017-07-18 20:55:47 +02:00
