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 |
|
|
Roumen Georgiev
|
3f0c2958c7
|
WIP: change of language works
|
2018-04-30 16:41:40 +03: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 |
|
|
Roumen Georgiev
|
a0463742fa
|
WIP: language set and validation
|
2018-04-27 17:04:08 +03:00 |
|
|
Roumen Georgiev
|
bb38d7644b
|
move onClick in SWRadioButton
|
2018-04-27 13:30:45 +03: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 |
|
|
Roumen Georgiev
|
11dc20faca
|
code cleanup
|
2018-04-26 16:59:56 +03:00 |
|
|
Roumen Georgiev
|
ef171dbccd
|
get SP value and check if it is already set
|
2018-04-26 16:13:08 +03:00 |
|
|
Roumen Georgiev
|
67ed699ca5
|
save() before showing next
|
2018-04-26 15:59:08 +03:00 |
|
|
Roumen Georgiev
|
59f654f918
|
show "NEXT" only when isValid() == true
|
2018-04-26 15:28:23 +03:00 |
|
|
Roumen Georgiev
|
d75de2f645
|
show "NEXT" only when isValid() == true
|
2018-04-26 15:18:01 +03: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 |
|
|
Roumen Georgiev
|
dc91e3a544
|
currentScreen not updating - fixed & center fields
|
2018-04-25 17:02:10 +03:00 |
|
|
Roumen Georgiev
|
8333fe8975
|
get radiobutton values from arrays.xml & no header
|
2018-04-25 16:45:15 +03:00 |
|
|
Roumen Georgiev
|
ddf3c44928
|
rename show() to generateDialog()
|
2018-04-25 15:34:07 +03:00 |
|
|
Roumen Georgiev
|
7fb1b32188
|
moved show() method to SWItem classes
|
2018-04-25 15:29:20 +03: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 |
|
|
Roumen Georgiev
|
dda7ca3f95
|
radio group is generated dynamically
|
2018-04-25 11:03:33 +03: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 |
|