AdrianLxM
928635dbe9
Merge pull request #545 from MilosKozak/alarmfix-master3
...
Alarmfix
2017-12-19 08:02:52 +01:00
AdrianLxM
88adc31dbc
Add SP to imports
2017-12-19 07:16:41 +01:00
Johannes Mockenhaupt
28ce67ae42
Typo fixes.
2017-12-19 00:07:15 +01:00
Johannes Mockenhaupt
28961da253
Declare profile switches being supported by the Combo.
2017-12-19 00:00:00 +01:00
Andrew Warrington
b180569695
Show watch basal rates, whether temporary or normal.
2017-12-18 21:58:02 +01:00
Johannes Mockenhaupt
9eefae4f67
Merge branch 'queue-bolus-constraints' into combo-scripter-v2
...
* queue-bolus-constraints:
Apply bolus constraint before applying.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-18 21:06:31 +01:00
Johannes Mockenhaupt
559dbdf0b1
Undo over-eager optimization.
...
Makes setting actual 90/110% TBRs impossiblee and will result in
ComboPlugin starting TBRs with 100% (and failing because duration
is not readable or 0).
(cherry picked from commit 5a4e7d4)
2017-12-18 20:43:00 +01:00
Simon Pauwels
8c4ccf8b49
Merge pull request #9 from MilosKozak/dev
...
Dev
2017-12-18 20:25:04 +01:00
Johannes Mockenhaupt
8e68a23225
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
G5 upload to xdrip
fake Esel new file
fake Esel
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-18 20:22:26 +01:00
Andrew Warrington
bc8b93045b
Steampunk watchface (mmol support)
...
Includes delta granularity in the watch preferences.
2017-12-17 23:07:44 +01:00
Johannes Mockenhaupt
d2339f0a5b
Merge pull request #24 from jotomo/cleanups
...
Cleanups
2017-12-17 21:23:02 +01:00
Johannes Mockenhaupt
7996acceb7
RuffyScripter.isConnected: one millisecond is a long time.
...
(cherry picked from commit 796b9a0)
2017-12-17 18:50:56 +01:00
Johannes Mockenhaupt
3ac63a980c
Clean up Testing-Combo.md a bit.
2017-12-17 16:56:52 +01:00
AdrianLxM
00f13d0479
refactor cancelAlarm back to KeepAliveReceiver
2017-12-17 15:46:43 +01:00
AdrianLxM
9bd0a1f144
push next alert on read status
2017-12-17 15:46:33 +01:00
Johannes Mockenhaupt
e0d77b9b0c
Don't bother setting a fake TBR if we waited for a TBR to run out.
...
(cherry picked from commit 3a5ecea)
2017-12-17 15:39:38 +01:00
Johannes Mockenhaupt
34f3428d99
ComboPlugin.setTempBasal: clean up, fix potential bug.
...
(cherry picked from commit 41c45a1)
2017-12-17 15:39:38 +01:00
Johannes Mockenhaupt
5f4a90d068
Explicit disconnect during recovery.
...
BT connection might still be there, but no menu updates coming in.
Thus, explicitely close the connection before attempting to
reconnect.
2017-12-17 15:39:38 +01:00
Johannes Mockenhaupt
a85da1d9ec
README updates.
2017-12-17 15:38:33 +01:00
Johannes Mockenhaupt
4e526bba96
Merge pull request #23 from jotomo/alarmfix
...
Alarmfix
2017-12-17 15:34:59 +01:00
Andrew Warrington
a0983a99b9
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-17 11:52:34 +01:00
AdrianLxM
ca9b68da0d
refactor cancelAlarm back to KeepAliveReceiver
2017-12-17 01:40:27 +01:00
AdrianLxM
14810a142d
push next alert on read status
2017-12-17 01:37:27 +01:00
Johannes Mockenhaupt
da652c2e99
README-Combo.med: Add 'known issues' section.
2017-12-16 14:05:01 +01:00
Johannes Mockenhaupt
fd71ab6b68
Update fake reservoir numbers to trigger default NS warnings.
...
(cherry picked from commit 6e5f9fc)
2017-12-16 12:09:44 +01:00
Johannes Mockenhaupt
92d0630c55
Fix partial bolus displayed in error popup.
2017-12-15 23:05:09 +01:00
Johannes Mockenhaupt
7e7b11ba14
Bolusing: make cancellation during 'confirmation wait window' robust.
2017-12-15 22:38:28 +01:00
Johannes Mockenhaupt
b9f12aeddb
Fix formatting.
2017-12-15 21:53:33 +01:00
Johannes Mockenhaupt
1b5b06d349
BolusCommand: log steps.
2017-12-15 21:52:51 +01:00
Johannes Mockenhaupt
a6a87d0790
Minor fixes and polish around bolus cancellation.
2017-12-15 10:41:07 +01:00
Johannes Mockenhaupt
f0f34d03df
Merge pull request #20 from jotomo/recovery-fix
...
Make RuffyScripter.isConnected more robust, remove debug code.
2017-12-15 10:39:38 +01:00
Milos Kozak
8cb4921bab
BG viewer
2017-12-15 01:03:31 +01:00
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
