Johannes Mockenhaupt
1cbfefffb8
RuffyScripter: wait for command thread to finish up.
2017-12-06 16:06:16 +01:00
Johannes Mockenhaupt
b548d092d1
Remove unneeded dependencies.
2017-12-06 11:50:44 +01:00
Johannes Mockenhaupt
960cb92789
Remove idle-disconnect-monitor and let the command queue take care of that.
2017-12-05 23:17:05 +01:00
Johannes Mockenhaupt
f9867c69fb
Remove warning if pump time is off.
2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt
4c1c1c43a3
Use timestamp for TBR, not pump minutes.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
47718723fe
RuffyScripter.confirmAlert: wait till alarm isn't displayed anymore.
...
(cherry picked from commit 2af7df3)
2017-11-26 12:52:24 +01:00
Johannes Mockenhaupt
a0ba857279
Move WarningOrErrorCode class to parent package.
...
(cherry picked from commit 38922ba)
2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt
63afb7bd84
SetBasalProfileCommand: fix waiting for input scrolling to complete.
2017-11-24 23:06:21 +01:00
Johannes Mockenhaupt
71b32ac078
Fix RuffyScripter.navigateToMenu one last time.
2017-11-24 23:05:46 +01:00
Johannes Mockenhaupt
5bd010d8f1
When recovering from connection loss, return to main menu to be ready for the net command.
2017-11-24 23:04:37 +01:00
Johannes Mockenhaupt
5e79900411
Small robustness improvements.
2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt
a95a00377b
RuffyScripter: extract and extend runPreCommandChecks().
2017-11-24 23:03:06 +01:00
Johannes Mockenhaupt
b8e320ae6f
Increase timeouts.
...
* Disconnect timeout: back from 2.5 to 5s.
* Overall command timeout: 4 to 10m (setting basal profile toke 5.5m
shifting by 12h and increasing from 100% to 200%.
2017-11-24 23:00:29 +01:00
Johannes Mockenhaupt
2d7a8a2e4d
SetBasalProfileCommand, calculating steps: revert to Adrian's simpler version, add clarifying comments.
2017-11-24 21:03:49 +01:00
Johannes Mockenhaupt
9698863f90
SetBasalProfileCommand: step calculation for all ranges.
2017-11-24 08:55:36 +01:00
Johannes Mockenhaupt
90611a1792
Fix menu overshoots hopefully finally.
2017-11-23 20:54:28 +01:00
AdrianLxM
3f10c316a4
combo set basal: account for different granularity > 1 U/h
2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt
0558e23eb4
SetBasalCommand: actually confirm entered values.
2017-11-23 00:11:45 +01:00
Johannes Mockenhaupt
83be0a8315
Setting basal rate on pump (combo side).
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
1f14f37373
Make code more robust against sluggish screen updates.
...
Pump might take longer than a screen refresh to react to a button press,
so call waitForScreenUpdate() until we see the next desired screen has
actually arrived (used to work previously with fixed times, but that's
even less desirable).
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
1897051782
Fix taking over low* alerts on connect.
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
f3bbf861f3
In Stop mode pump shows menus not supported by ruffy, thus require run mode for most commands.
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
b4d2d9f71d
Rename 'error' to 'alert' when referring to Combo pump alerts.
2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt
bb2e885b95
RuffyScripter: fix pump state check before running command.
2017-11-22 00:41:52 +01:00
Johannes Mockenhaupt
28b80697f9
Make RuffyScripter.returnToRootMenu more robust.
2017-11-22 00:05:59 +01:00
Johannes Mockenhaupt
a3fe804c3d
Fix overshoot navigating to menu (again).
2017-11-22 00:05:59 +01:00
Johannes Mockenhaupt
b27ee06ebe
Fix issues during history read.
2017-11-22 00:05:59 +01:00
Johannes Mockenhaupt
066d138e59
Double comparisons.
2017-11-21 22:31:28 +01:00
Johannes Mockenhaupt
426379c6d3
Remoe SetBasalProfileCommand.
...
Too slow, unclear usage (ProfileInterface), likely superseeded soon.
2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt
d3ed0f2753
Reduce disconnect timeout 5s -> 2.5s
2017-11-21 00:51:31 +01:00
Johannes Mockenhaupt
a5bee4aac3
Incomplete SetBasalProfileCommand.
2017-11-21 00:23:08 +01:00
Johannes Mockenhaupt
75855f3f05
Implement reading basal profile.
2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt
86eb33403d
Fix overshoots navigating to a menu.
2017-11-20 19:14:43 +01:00
Johannes Mockenhaupt
1375ee053c
Call rtDisconnect after connect timeout.
2017-11-20 19:14:21 +01:00
Johannes Mockenhaupt
16c97acf4e
Clean up ReadHistoryCommand.
2017-11-20 19:13:39 +01:00
Johannes Mockenhaupt
a5ce3f85f6
RuffyCommandsV1Impl: Return error for unsupported commands
2017-11-19 23:13:20 +01:00
Johannes Mockenhaupt
dafb6d225b
Display active alert in Combo tab.
2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt
3070cba612
Increase connection timeout to 90s.
2017-11-19 21:25:36 +01:00
Johannes Mockenhaupt
46fdd47ac0
Fixes and cleanups.
2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt
f03b9669d5
Minor improvements.
2017-11-18 16:41:25 +01:00
Johannes Mockenhaupt
b85b6f85f4
Major cleanup and some new features.
...
* PumpState.timestamp: round to second (format used in DB)
* Raise notification about wrong pump clock time since setting
clock isn't possible with current ruffy
* Set TempBasal.pumpId when setting/cancelling TBR
* Checking state of pump on connect
* Better checks whether pump is ready to execute command
* Rework dynamic command timeout
* Confirm benign warnings on connect and turn into notifications
* Some groundwork for reading/setting basal profile
* Check pump history every 15m
2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt
51d242a3fb
Add method RuffyCommands.isConnected().
2017-11-14 22:57:23 +01:00
Johannes Mockenhaupt
7c662345ae
Recover after command failure by returning to pump main menu, so
...
subsequent commands won't fail.
2017-11-14 19:00:23 +01:00
Johannes Mockenhaupt
21a2c688c6
Cleanups.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
b99513aafb
Round timestamps from pump history to full second to align with DB.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
d76740dda7
Clean up access to RuffyScripter.currentMenu.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
104cead555
Lots of work around properly reading pump history.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
f2569b587a
Fix ReadHistoryCommand to read the 30th record as well.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
7b7bc6efb6
RuffyScripter: increase overall command timeout to 4m.
2017-11-12 17:07:59 +01:00
Johannes Mockenhaupt
ab8d3051b3
Untested: don't false trigger dynamic timeout in RS.runCommand.
2017-11-12 12:37:16 +01:00
Johannes Mockenhaupt
c11086d9ea
Stuff:
...
* Read all history
* Simple viewer for TDDs, errors
* Clean up cancelling TBR (incomplete)
* Initializing pump robustness
2017-11-12 00:01:01 +01:00
Johannes Mockenhaupt
a1b0240088
Finish ReadHistoryCommand for TBR, TDD.
2017-11-11 21:40:50 +01:00
Johannes Mockenhaupt
d7e5a88757
Fake setting date/time and reading profile.
2017-11-11 16:19:17 +01:00
Johannes Mockenhaupt
5e6b014ef4
Decrease connecting timeout.
2017-11-11 16:04:45 +01:00
Johannes Mockenhaupt
0a1b8f5b14
Better dection of a command hanging.
2017-11-11 16:04:33 +01:00
Johannes Mockenhaupt
e9d3e90758
Some templating around setting time/date.
2017-11-08 23:33:41 +01:00
Johannes Mockenhaupt
cda621f32b
Disable loop when selected basal rate is not 1.
2017-11-08 14:28:02 +01:00
Johannes Mockenhaupt
be5f7e68a7
unsafe usage checks update.
2017-11-06 23:15:16 +01:00
Johannes Mockenhaupt
7c44761f25
WIP
2017-11-04 17:42:47 +01:00
Johannes Mockenhaupt
011409a6e5
Minor cleanups.
2017-11-03 23:40:57 +01:00
Johannes Mockenhaupt
6ba57ff1f7
WIP Cleaning up ComboPlugin/Ruffyscripter.cancelTbr
2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
598fbe40cc
Unsource ruffy.
2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
780f4901f4
Fail command if currentMenu becomes null.
2017-11-03 22:03:40 +01:00
Johannes Mockenhaupt
4da160a951
Disable closed loop under unsafe conditions.
2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt
74bbab9cf1
More bolus work.
2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt
9544b49a37
Small cleanups.
2017-10-31 11:10:49 +01:00
Johannes Mockenhaupt
4ffdae4a8c
RuffyScripter.readPumpStateInternal: read time.
2017-10-31 11:06:00 +01:00
Johannes Mockenhaupt
f64e00fc79
Auto-retrying repeatable commands when there's a connection loss.
2017-10-31 11:05:07 +01:00
Johannes Mockenhaupt
9121aa5217
Bolus cancellation for all stages.
2017-10-31 11:01:58 +01:00
Johannes Mockenhaupt
39b89df484
BolusCommand: cancel earlier if requested.
2017-10-31 02:13:30 +01:00
Johannes Mockenhaupt
50cbcaba52
CancelTbrCommand: shortcut requests to cancel TBR when none is active.
2017-10-31 00:49:16 +01:00
Johannes Mockenhaupt
1658ed14c9
Clean up using warning codes instead of message.
2017-10-30 21:47:44 +01:00
Johannes Mockenhaupt
bffd1239c0
Disable reading history while incomplete.
2017-10-30 16:20:43 +01:00
Johannes Mockenhaupt
598d7f8de0
Cleanup.
2017-10-30 01:32:57 +01:00
Johannes Mockenhaupt
cccf6f175c
ruffy: catch race-condition sending keep alive during disconnect.
2017-10-30 00:48:11 +01:00
Johannes Mockenhaupt
03443f3358
Dead code be gone.
2017-10-29 21:39:25 +01:00
Johannes Mockenhaupt
a2460180f9
Remove unclear error message field from CommandResult, use codes from pump warnings/errors.
2017-10-29 21:19:03 +01:00
Johannes Mockenhaupt
6b6d252173
Day 1
...
* Some UI rework
* Start removing (retry) logic from ruffyscripter to ComboPlugin
* Cleanups all over
* Remove TDD stuff, this can be done independently of a pump
* New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus
* Add warning and error codes from Combo manual
* Rework commands to just execute an action (verification will be in
ComboPlugin eventually, together with retry logic)
* Rework commands to update state in field as command progresses
rather than returnin/throwing.
* Initial version reading bolus and error history (no DB sync yet).
2017-10-29 11:36:35 +01:00
Johannes Mockenhaupt
14307cb77b
ruffy: log a few things on error level instead of info.
2017-10-29 02:14:43 +01:00
Johannes Mockenhaupt
394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
...
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt
b47559647f
wip
2017-10-27 00:03:01 +02:00
Johannes Mockenhaupt
22bac709fb
Cleanups around ComboPlugin.refreshDataFromPump.
2017-10-25 18:17:19 +02:00
Johannes Mockenhaupt
6a01ca1d4d
Work on reconnect & retry logic, incomplete.
2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
e800bd5092
Add Command.getReconnectAlarm() to safely confirm alerts caused by an interrupted command.
2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
2b8b6828e5
Cleanup.
2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
34861960ea
Bolus command: ensure the progress dialog is always closed.
2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
454cb49ec5
Cleanup.
2017-10-24 09:23:45 +02:00
Johannes Mockenhaupt
01def4c9b3
Optimize programming TBR and bolus.
2017-10-23 02:21:35 +02:00
Johannes Mockenhaupt
2d8b3a7cb8
wip
2017-10-22 10:40:24 +02:00
Johannes Mockenhaupt
fc60edc15a
wip
2017-10-21 17:44:16 +02:00
Johannes Mockenhaupt
dddcfb02f0
ruffy: unbound existing pump on pairing reset.
2017-10-21 13:14:41 +02:00
Johannes Mockenhaupt
6ec1011bd7
ruffy: add empty battery symbol and parsing.
2017-10-21 11:22:40 +02:00
Johannes Mockenhaupt
491caadd71
Check for active alerts on the pump, confirm and re-raise in AAPS.
2017-10-20 15:23:16 +02:00
Johannes Mockenhaupt
8b8a135804
Add (back) last bolus to ComboFragment.
2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt
c29b4d13a3
Support pump suspend status (and misc other ...).
2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
523de96c8c
Remove dead commands.
2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
723388acdf
scripter: try removing 10s wait between connections.
2017-10-19 02:45:05 +02:00
Johannes Mockenhaupt
8fd198c674
Ruffy: hopefully unbreak doRTConnect.
2017-10-19 02:44:42 +02:00
Johannes Mockenhaupt
9300179ace
ruffy: Menu.toString.
2017-10-19 02:44:32 +02:00
Johannes Mockenhaupt
eb87dfb3f1
WIP scripter: reading history
2017-10-19 01:12:46 +02:00
