Milos Kozak
a05c1f947e
Merge branch 'nsoffline' into bgsource
2017-12-14 23:35:01 +01:00
Johannes Mockenhaupt
cac38c2401
Make RuffyScripter.isConnected more robust, remove debug code.
2017-12-14 22:14:05 +01:00
Milos Kozak
5f60e7cf2b
G5 upload to xdrip
2017-12-14 21:49:11 +01:00
AdrianLxM
9602bde6a1
fake Esel new file
2017-12-13 22:39:44 +01:00
AdrianLxM
0151dbd496
fake Esel
2017-12-13 22:14:47 +01:00
Johannes Mockenhaupt
e7e7c2a18d
Merge pull request #18 from jotomo/bolus-delivery-failure-recovery
...
Bolus delivery failure recovery
2017-12-13 21:38:07 +01:00
Johannes Mockenhaupt
b6bc957813
Minor tewaks and cleanups.
2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt
618e00d71d
Update bolus progress dialog when recovery kicks in.
2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt
97a9d65b52
Fix reading pump time.
2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt
27922a045e
Log who requested the disconnect.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
67eb6b20ed
Handle errors when reading the history for verification fails.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
25f46fe601
Cleanup.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
7eb40653b2
The pump doesn't accept connections while a bolus delivery is in progress.
...
Remove the code which checked for a bolus delivery in progress
and waited.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
5654a8ee6e
Make RuffyScripter.readPumpStateInternal more robust.
2017-12-13 20:39:08 +01:00
Johannes Mockenhaupt
a169245dc3
On bolusing failure, attempt verify by reading last bolus from history.
2017-12-13 20:39:08 +01:00
Milos Kozak
fa4e80444d
NSOffline remove from queue as well
2017-12-13 20:03:24 +01:00
Johannes Mockenhaupt
71355f0421
Typo that typo and other minor cleanups.
2017-12-13 16:29:53 +01:00
Johannes Mockenhaupt
d0c494fb56
ReadHistoryCommand: minor cleanup.
2017-12-13 15:49:19 +01:00
Johannes Mockenhaupt
5072273599
Merge pull request #17 from jotomo/endings-and-new-beginnings
...
SetTbr: wait if an existing TBR is about to run out.
2017-12-13 15:45:49 +01:00
Johannes Mockenhaupt
03e75ab23f
Typos.
2017-12-13 15:44:07 +01:00
Johannes Mockenhaupt
5b31d39f28
Extract method checkAndWaitIfExistingTbrIsAboutToEnd.
2017-12-13 14:26:41 +01:00
Johannes Mockenhaupt
7ed64c5a7d
SetTbrCommand: verify current menu when checking running TBR.
2017-12-13 14:22:06 +01:00
Johannes Mockenhaupt
3156efaaf6
SetTbr: wait if an existing TBR is about to run out.
...
See code comment.
2017-12-13 13:17:04 +01:00
Johannes Mockenhaupt
536bd10e9b
Raise hard limit of max duration for zero-temp from 2h to 3h.
...
(cherry picked from commit 4bf6369)
2017-12-13 13:16:19 +01:00
Milos Kozak
2a284ce052
Merge pull request #532 from AdrianLxM/adrain156work01
...
remove wear-overview notifications as replaced by system notifications
2017-12-13 00:00:20 +01:00
Johannes Mockenhaupt
f6721f628c
Apply bolus constraint before applying.
2017-12-12 22:30:42 +01:00
Milos Kozak
e14272c083
Rv2,RS: always load last 45 min
2017-12-12 18:18:41 +01:00
Johannes Mockenhaupt
f83dd1cb67
Unbreak RuffyCommandsV1Impl.readHistory, cleanups.
2017-12-12 00:57:04 +01:00
Milos Kozak
b98c321cbc
NS offline
2017-12-12 00:12:35 +01:00
Johannes Mockenhaupt
be446145c0
Update Testing-Combo.md to be in line with code.
2017-12-11 20:44:29 +01:00
Johannes Mockenhaupt
a6cba8b2d1
RuffyCommandsV1Impl: actually do delegation.
...
(cherry picked from commit 5e447ad)
2017-12-10 22:24:07 +01:00
Johannes Mockenhaupt
dfcf0a7e2a
Update README-Combo.
...
* Add bits on taking over TBR CANCELLED via refresh
* Note on bolus not being recorded in a small number of error situations.
2017-12-10 14:21:39 +01:00
Johannes Mockenhaupt
a5ea94de7d
Fix #12 : properly update TBR from pump on mismatch.
2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt
6c5d5fa71e
README-Combo: add Combo config step to set 15m TBR step size.
2017-12-10 13:54:23 +01:00
Johannes Mockenhaupt
7e4164e16f
Testing-Combo: clarify late bolus cancel
2017-12-10 12:17:46 +01:00
Johannes Mockenhaupt
ca9fe3e755
Fixes around bolus cancellation.
2017-12-10 01:39:58 +01:00
Johannes Mockenhaupt
fe281b9224
Minor cleanups.
2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt
6527b13934
Ignore disconnect failures.
2017-12-09 22:21:24 +01:00
Johannes Mockenhaupt
bb1c1f79f1
RuffyScripter: fix on-connect checks to detect running bolus properly.
2017-12-09 22:11:41 +01:00
Johannes Mockenhaupt
26fa63d571
ComboFragment: always show refresh button.
...
To allow force starting a conecting attempt if the pump is still
in disconnected state.
2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt
4a7b2b3da2
Add note on ruffy pairing to Readme.
2017-12-09 21:39:53 +01:00
Johannes Mockenhaupt
471beae14c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
remove unused imports
adapt wear actions to command queue
RS report unsupported firmware
removing the whole if() statement
fix NPE when profile not loaded
fix of extended bolus size
Added profile's target BG in NSClient mode
2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt
97d13fd14a
Merge branch 'buttons-business' into combo-scripter-v2
...
* buttons-business:
Fix TDDS dialog title.
ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s
Fix ReadHistoryCommand to not ignore TDD requests.
Add missing listener registration.
Overhaul Combo tab buttons and dialogs.
Only read Tdd and Alerts through buttons on Combo tab, not treatment history.
2017-12-09 19:46:37 +01:00
Johannes Mockenhaupt
c386d0ba03
Fix TDDS dialog title.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
3316ab2081
ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
b8ad44ba43
Fix ReadHistoryCommand to not ignore TDD requests.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
8699d9a384
Add missing listener registration.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
27e9cfda6f
Overhaul Combo tab buttons and dialogs.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
063a5ba6b9
Only read Tdd and Alerts through buttons on Combo tab, not treatment history.
2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt
279d322c53
Merge branch 're-add-pump-time-check' into combo-scripter-v2
...
* re-add-pump-time-check:
Shorten/make clearer message on pump clock being off.
Pump time warning: urgency level based on how much the time is off.
Check pump time not last connection time
Re-add warning if pump time is off (needed for basal rates).
RuffyScripter: read/infer pump time from menu.
2017-12-09 19:45:30 +01:00
