Commit graph

4235 commits

Author SHA1 Message Date
Milos Kozak
e92e05cfbd
Merge pull request #759 from TebbeUbben/dev
Save new profile when updating it to fix "endless loop"
2018-03-13 20:31:38 +01:00
TebbeUbben
11295b1e96 Save new profile when updating it 2018-03-13 20:15:58 +01:00
Markus M. May
b10f8f2fe1 Add environment variable to handle testCoverage 2018-03-13 19:24:08 +01:00
Johannes Mockenhaupt
a398d95bb4
Add info to About dialog when engineering mode is enabled. 2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt
637b0c6189
On start, show notification if on dev-branch, but not EM, so CL is disabled. 2018-03-12 23:01:58 +01:00
Milos Kozak
8219332a2c do not pass DIA to SMB determine_basal 2018-03-12 22:23:15 +01:00
Milos Kozak
4ff09a0125 show Dana model properly after communication error 2018-03-12 22:16:10 +01:00
Milos Kozak
5b064cd8f8
Merge pull request #756 from TebbeUbben/dev
Read maximum basal and bolus amount from pump
2018-03-12 21:46:29 +01:00
Milos Kozak
e134b94f13 fix deviation slope calculations 2018-03-12 21:13:48 +01:00
TebbeUbben
ffb7b068a8 Read maximum basal and bolus amount from pump 2018-03-12 20:53:39 +01:00
Milos Kozak
30d12622f7 update maxIOB hard limits 2018-03-12 17:59:42 +01:00
Milos Kozak
eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak
fc070c95a7 use safeGetString 2018-03-12 11:22:19 +01:00
Milos Kozak
601dbc1036 JsonHelper test 2018-03-12 11:12:41 +01:00
Milos Kozak
a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak
38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
Milos Kozak
c249fb1dc0
Merge pull request #755 from TebbeUbben/dev
Show bolus progress
2018-03-12 09:13:27 +01:00
Tebbe Ubben
d4ede0a5b3
Merge branch 'dev' into dev 2018-03-11 22:59:11 +01:00
TebbeUbben
8fd68a082c Show bolus progress 2018-03-11 22:53:18 +01:00
TebbeUbben
21dbeb299e Missing import statement 2018-03-11 21:00:08 +01:00
Tebbe Ubben
d353a10187
Merge pull request #1 from AdrianLxM/patch-19
Insight: add treatment to progress event
2018-03-11 20:58:13 +01:00
AdrianLxM
3068089297
Insight: add treatment to progress event 2018-03-11 20:56:11 +01:00
AdrianLxM
f2d6b92394
Merge pull request #750 from TebbeUbben/dev
Improved rounding
2018-03-11 18:34:10 +01:00
TebbeUbben
ccabb099f0 Improved rounding 2018-03-11 17:52:53 +01:00
Milos Kozak
3ad783260b max_daily_basal min value 0.1 -> 0.05 2018-03-11 17:17:34 +01:00
Milos Kozak
bd03c678d1
Merge pull request #748 from TebbeUbben/dev
Added some debug lines and missing digit in isThisProfileSet
2018-03-11 16:54:55 +01:00
TebbeUbben
46a1be97f7 Added some debug lines and missing digit in isThisProfileSet 2018-03-11 16:42:47 +01:00
Milos Kozak
2c21571cf4 fix NPE 2018-03-11 16:38:30 +01:00
Milos Kozak
6cf849ce76 allow 30min basal rates when pump supports it 2018-03-11 16:03:21 +01:00
Milos Kozak
714abbbb6e
Merge pull request #747 from PoweRGbg/patch-13
Removed unneeded conversion to Md/dl which leads to a mgDl targets
2018-03-11 09:10:10 +01:00
Roumen Georgiev
60c4986ffa
Removed unneeded conversion to Md/dl which leads to a mgDl targets always 2018-03-11 09:06:50 +02:00
Milos Kozak
6117ac97cf
Merge pull request #745 from TebbeUbben/dev
Update to SightRemote 1.4.0
2018-03-10 23:39:52 +01:00
AdrianLxM
1aaec9142c
Merge pull request #746 from swissalpine/patch-3
Better layout of the Calculator Dialogue (German)
2018-03-10 22:37:09 +01:00
Milos Kozak
13933e6bb7 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-10 22:19:27 +01:00
swissalpine
203288e93a
Better layout of the Calculator Dialogue (German)
The string "15-Min.-Trend" was too long, at least on my phone.
2018-03-10 22:12:16 +01:00
TebbeUbben
51da08bf97 Undo history sync delay change 2018-03-10 21:27:50 +01:00
TebbeUbben
d47b067855 Updated SightParser library 2018-03-10 21:25:14 +01:00
TebbeUbben
7329d3abff Merge branch 'dev' of https://github.com/TebbeUbben/AndroidAPS into dev 2018-03-10 21:24:04 +01:00
TebbeUbben
cd309780d1 Update to Asclepenius
Ability to change basal profile
2018-03-10 21:21:53 +01:00
Milos Kozak
2cd7a8e8df
Merge pull request #738 from MilosKozak/unify-target
Unify target
2018-03-10 21:19:49 +01:00
Milos Kozak
39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak
8a197f41dc Merge branch 'dialogmmol' into dev 2018-03-10 19:25:41 +01:00
Milos Kozak
ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
Milos Kozak
951ad26590 cleanup 2018-03-10 17:58:45 +01:00
AdrianLxM
6904cb8807
Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true
enable SMB notify by default
2018-03-08 15:17:28 +01:00
AdrianLxM
5a5e0ca8b6
Merge pull request #734 from MilosKozak/watchsmb2
Watchface overhaul
2018-03-08 15:10:53 +01:00
AdrianLxM
b880a9bb10 unify target calculation 2 2018-03-08 15:04:48 +01:00
AdrianLxM
768f61bc07 unify target calculation 2018-03-08 15:04:38 +01:00
AdrianLxM
5f614b4072 TT unify target calculation 2018-03-08 15:04:30 +01:00
Johannes Mockenhaupt
7bd85c5972 Use meal color parameter. 2018-03-08 14:26:50 +01:00