AdrianLxM
e70791dc2f
gradle rc2
2018-05-01 18:07:08 +02:00
TebbeUbben
60d3cde0d3
Compat for SR 1.6.0
2018-05-01 17:29:21 +02:00
Johannes Mockenhaupt
4d1515769f
Make persistent notification not peak on every update on Oreo.
2018-05-01 14:59:40 +02:00
AdrianLxM
3d5fb96d7d
fix zeroTempIOB
2018-05-01 13:47:26 +02:00
AdrianLxM
55077d3ad8
Merge remote-tracking branch 'milosremote/dev' into aaps20_rc2
2018-05-01 13:29:23 +02:00
AdrianLxM
4789ac0616
fix zeroTempIOB
2018-05-01 13:29:15 +02:00
Johannes Mockenhaupt
7fbab357e8
Fix unit tests for added Combo plugin w/o engineering mode.
2018-05-01 13:25:12 +02:00
Johannes Mockenhaupt
8c3df40fdf
Don't create empty future carbs records. Fixes #940 .
...
When very few carbs are stretched out (e.g. 10g over 4h), there are
gaps, so that 1g is generated only every 30m. Don't create empty
records in between.
2018-05-01 12:22:01 +02:00
Milos Kozak
73d7d98354
Merge pull request #944 from winni67/patch-1
...
Update strings.xml
2018-05-01 09:20:00 +02:00
Andy Rozman
1da5fb2030
Merge pull request #2 from MilosKozak/master
...
merge master
2018-04-30 23:11:44 +01:00
Andy Rozman
904a3d5028
Merge pull request #1 from MilosKozak/dev
...
Merge dev from origin
2018-04-30 23:06:33 +01:00
Winfried Kuiper
d68f74bb68
Update strings.xml
2018-04-30 23:09:35 +02:00
Markus M. May
099cb6c4e4
add battery charging state
2018-04-29 22:49:43 +02:00
AdrianLxM
faa09f8505
2.0 rc1
2018-04-28 19:49:55 +02:00
AdrianLxM
81037cde5c
Merge pull request #935 from jotomo/calculator-carb-only
...
Calculator: carb-only handling.
2018-04-28 19:29:13 +02:00
AdrianLxM
c8ca904709
Merge pull request #936 from jotomo/ext-combo-carbs
...
Extended Combo carbs
2018-04-27 20:06:07 +02:00
Johannes Mockenhaupt
4813c9c163
Combo: minor cleanup.
2018-04-27 19:51:12 +02:00
Johannes Mockenhaupt
5746e37553
Enable Combo & extended carbs without engineering mode as well.
2018-04-27 19:50:59 +02:00
Johannes Mockenhaupt
21f231e2b3
Calculator: carb-only handling.
...
If only carbs where entered/calculated, send them to the pump only
if the pump supports it, otherwise just add it to the DB.
2018-04-27 19:49:50 +02:00
Milos Kozak
8577a94571
Merge pull request #925 from MilosKozak/safety-loop
...
Safety loop
2018-04-27 11:00:18 +02:00
Milos Kozak
e951a924c4
Merge pull request #931 from MilosKozak/cobchart
...
align failoverToMinAbsorbtionRate to cobtime
2018-04-27 10:54:39 +02:00
Milos Kozak
584b0f7824
Merge pull request #934 from MilosKozak/future-iob-array
...
For review: Future iob array
2018-04-27 10:52:21 +02:00
AdrianLxM
3631f685e2
cleanup
2018-04-27 00:03:08 +02:00
AdrianLxM
9889d34512
Treat future IOB as if the current TBR was cancelled
2018-04-26 23:59:04 +02:00
AdrianLxM
5df59d8fe3
Merge pull request #927 from MilosKozak/lastBolusTime
...
lastBolusTime - only treatments with insulin
2018-04-26 23:57:54 +02:00
AdrianLxM
ee0c811e0d
Merge pull request #912 from jotomo/display-cob
...
Add IobCobCalculatorPlugin.getCobInfo().
2018-04-26 23:52:52 +02:00
AdrianLxM
3356004065
don't hide IOB behind COB
2018-04-26 03:43:43 +02:00
AdrianLxM
c045a0a41e
align failoverToMinAbsorbtionRate to cobtime
2018-04-26 03:17:57 +02:00
Johannes Mockenhaupt
f3bc59003e
Space-optimize COB on watch.
2018-04-26 01:33:09 +02:00
Johannes Mockenhaupt
8d4e9f0043
Add future carbs on watch.
2018-04-26 01:16:31 +02:00
Johannes Mockenhaupt
2f846bc417
WatchUpdaterService: use IobCob.getCobInfo().
2018-04-26 01:10:27 +02:00
AdrianLxM
0962f5c5e5
Merge pull request #929 from osodebailar/dev
...
Proposal: Change iob and cob color for a better uniform look.
2018-04-26 00:18:48 +02:00
AdrianLxM
1eb2e59043
lastBolusTime - only treatments with insulin
2018-04-26 00:16:15 +02:00
AdrianLxM
3ec5eaea63
don't trigger loop on treatment
2018-04-26 00:14:51 +02:00
AdrianLxM
b6cd56b90a
cleanup logs
2018-04-25 23:31:15 +02:00
Markus M. May
55ea10e88f
Catch NetworkState changes correctly
2018-04-25 22:22:37 +02:00
Markus M. May
3fb17e6869
First step to use network activity receiver
2018-04-25 20:49:03 +02:00
osodebailar
5a74087632
Change iob and cob color for a better uniform look.
...
Insulin , iob etc. always in different blue colors,
Cob in orange (ocher) like color
2018-04-25 16:51:49 +02:00
AdrianLxM
e79ef7f018
always call callback on TBR-Request
2018-04-25 16:28:54 +02:00
AdrianLxM
a14345bb1a
synchronized loop invoke
2018-04-25 16:14:21 +02:00
AdrianLxM
18fc03ec78
Merge remote-tracking branch 'milosremote/safety-loop' into safety-loop
2018-04-25 12:54:35 +02:00
AdrianLxM
85bb085188
rename safety to tempBasalFallback
2018-04-25 12:51:27 +02:00
AdrianLxM
b5a6ef2ecc
make now part of the past
2018-04-25 12:15:29 +02:00
AdrianLxM
ac23750942
lastBolusTime - only treatments with insulin
2018-04-25 11:52:01 +02:00
AdrianLxM
2a50248ba5
travis re-invoke commit with cleanup
2018-04-25 01:37:48 +02:00
AdrianLxM
a6a4a8837d
safety run if SMB fails
2018-04-25 01:18:40 +02:00
Johannes Mockenhaupt
da96b2d87c
Round up to be sure.
2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt
60fbb1eeba
Fix another NPE.
2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt
f4bafc6260
Add IobCobCalculatorPlugin.getCobInfo().
2018-04-24 23:09:07 +02:00
Milos Kozak
4217e82e0a
Merge pull request #884 from swissalpine/patch-1
...
More generous values for colored iage warnings (careportal)
2018-04-24 09:13:34 +02:00
