Johannes Mockenhaupt
9b4f3f6e0e
Don't apply loop result if a bolus is in progress.
...
While an SMB is rejected by the queue in this scenario, a temp basal
would still be applied, so don't apply loop results if a bolus is
progress or queued at this point.
2018-06-21 22:58:15 +02:00
Milos Kozak
bd846e7526
Merge pull request #1117 from jotomo/1068-bolus-after-smb
...
WIP: Reject SMB if bolus is queued/running or outdated. Fixes 1068.
2018-06-21 09:30:56 +02:00
AdrianLxM
809ad97cb9
Merge pull request #1118 from jotomo/1096
...
Disable slope deviation unless on dev branch, fixes #1096 .
2018-06-21 06:00:17 +02:00
Johannes Mockenhaupt
49b84fb550
Reject SMB if bolus is queued/running or outdated. Fixes 1068.
2018-06-21 00:32:23 +02:00
Johannes Mockenhaupt
8036f8bcde
Disable slope deviation unless on dev branch, fixes #1096 .
2018-06-21 00:31:35 +02:00
Milos Kozak
5292e09535
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-20 23:56:50 +02:00
Milos Kozak
a02961da61
check for NPE
2018-06-20 23:56:38 +02:00
Milos Kozak
6eef71c4c0
Merge pull request #1116 from TebbeUbben/cb-fix
...
Fix for #1115
2018-06-20 20:43:29 +02:00
TebbeUbben
ed10c8cadc
Fix for #1115
2018-06-20 20:12:22 +02:00
Milos Kozak
df021a2dd2
Merge pull request #1111 from jotomo/combo-setup-notification
...
Combo setup notification
2018-06-19 18:41:43 +02:00
Johannes Mockenhaupt
3ed4aa468d
Combo: fix ReadQuickInfoCommand to handle empty bolus history.
2018-06-18 20:19:47 +02:00
Johannes Mockenhaupt
ef650b80a1
Combo: show notification on broken setup.
2018-06-18 20:19:30 +02:00
Milos Kozak
af8e1fb32f
Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1
...
restrict local profile DIA to min of 5 on the GUI
2018-06-18 18:58:29 +02:00
Milos Kozak
f14ba554f0
RS ble cleanup
2018-06-16 13:18:00 +02:00
Tebbe Ubben
1e4c7178f4
Merge branch 'dev' into dev
2018-06-15 21:10:33 +02:00
Milos Kozak
21b598edfa
Merge pull request #1100 from MilosKozak/rsoption
...
Rsoption
2018-06-15 00:19:08 +02:00
Milos Kozak
bcabeac228
Merge pull request #1104 from schmitzn/fix-careportalevent
...
Fix bug in CareportalEvent.getHoursFromStart()
2018-06-15 00:04:47 +02:00
Milos Kozak
5acb689eeb
Merge pull request #1102 from TebbeUbben/new-icon
...
New launcher icon
2018-06-14 23:10:43 +02:00
TebbeUbben
da9d586326
Also set round icon if available
2018-06-14 19:43:16 +02:00
TebbeUbben
f77e903721
Revert "Use icon for all build configurations"
...
This reverts commit e194e0d
2018-06-14 19:39:00 +02:00
Nico Schmitz
43d787ff88
Simplify isOlderThan()
2018-06-14 12:38:15 +02:00
Nico Schmitz
f82240a724
Fix bug in getHoursFromStart()
2018-06-14 12:34:42 +02:00
TebbeUbben
e194e0dc48
Use icon for all build configurations
2018-06-13 20:26:46 +02:00
TebbeUbben
9e0dc9bfe5
New launcher icon
2018-06-13 20:23:40 +02:00
Roumen Georgiev
904957d0d2
removing unneeded methods
2018-06-13 18:24:50 +03:00
PoweRGbg
a64364de4e
removed excessive debugging and unneeded source
2018-06-13 16:17:10 +03:00
PoweRGbg
5a197676fb
IT WORKS!!!
2018-06-13 15:57:42 +03:00
PoweRGbg
faab8fbc67
setting full userOptions
2018-06-13 11:43:44 +03:00
Milos Kozak
4d2e166620
try to fix crash
2018-06-13 10:41:15 +02:00
PoweRGbg
eaffa66946
latest
2018-06-13 11:11:03 +03:00
PoweRGbg
56651691a5
more more
2018-06-13 11:08:47 +03:00
PoweRGbg
64b5783e4a
more
2018-06-13 11:07:03 +03:00
PoweRGbg
71c474ef5f
danaR changes
2018-06-13 11:04:32 +03:00
PoweRGbg
5634aabd9f
more
2018-06-13 11:02:52 +03:00
PoweRGbg
2cb3c15d61
more update
2018-06-13 11:01:43 +03:00
PoweRGbg
cd337ecdc8
update to latest changes from Milos
2018-06-13 10:51:06 +03:00
PoweRGbg
434db333b1
reverting changes
2018-06-13 09:56:30 +03:00
PoweRGbg
87bc6ed798
Revert "more debugging output"
...
This reverts commit 1adf8718ae
.
2018-06-13 09:49:58 +03:00
PoweRGbg
0f067ef3a7
Revert "more debugging output"
...
This reverts commit f1f8bae2d1
.
2018-06-13 09:49:45 +03:00
PoweRGbg
90a3a66c30
Revert "Merge remote-tracking branch 'upstream/rsoption' into dev"
...
This reverts commit 233fb33659
, reversing
changes made to f1f8bae2d1
.
2018-06-13 09:49:37 +03:00
PoweRGbg
0e40d1e7ef
Revert "Revert "more debugging output""
...
This reverts commit 209fb79396
.
2018-06-13 09:49:35 +03:00
PoweRGbg
209fb79396
Revert "more debugging output"
...
This reverts commit f1f8bae2d1
.
2018-06-13 09:34:57 +03:00
PoweRGbg
233fb33659
Merge remote-tracking branch 'upstream/rsoption' into dev
2018-06-13 09:14:46 +03:00
Roumen Georgiev
f1f8bae2d1
more debugging output
2018-06-13 09:00:04 +03:00
Milos Kozak
082918c776
remove unneded code
2018-06-13 07:44:26 +02:00
Milos Kozak
6fa759a395
remove unneded code
2018-06-13 07:42:57 +02:00
Milos Kozak
ecdbe2ac37
setUserOptions cleanup
2018-06-12 23:43:04 +02:00
Milos Kozak
d051e081e2
Merge branch 'dev' into rsoption
2018-06-12 21:59:20 +02:00
Milos Kozak
d4ed6539d8
poctech units mmol/L
2018-06-12 21:57:33 +02:00
Roumen Georgiev
1adf8718ae
more debugging output
2018-06-12 13:30:07 +03:00