Commit graph

2600 commits

Author SHA1 Message Date
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
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
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
swissalpine 2d797e8ce3
Update StatuslinePlugin.java 2018-03-06 16:23:56 +01:00
swissalpine 237d55ee85
Add whitespace to xDrip status line
... which was removed by the last fix.
2018-03-06 11:21:44 +01:00
AdrianLxM 414f92bdf8 no double whitespace 2018-03-05 20:50:21 +01:00
AdrianLxM 118cdb3dce
buttons gone by default in smallheight
... same as on default layout
2018-03-04 20:12:33 +01:00
AdrianLxM cdb58ed143
newinsulin dialog wrap content 2018-03-04 19:57:21 +01:00
AdrianLxM 5a4967e544
newcarb dialog wrap content 2018-03-04 19:56:34 +01:00
AdrianLxM d2919f9577 Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2 2018-03-04 19:25:26 +01:00
PoweRGbg ca9150ba5b more readable low TT message 2018-03-04 16:06:54 +02:00
PoweRGbg 37b96d7e31 remove unused import (RadioButton) 2018-03-04 15:59:17 +02:00
AdrianLxM 7d8674aa61 fix 5m-impact parameter - always was 0 2018-03-02 21:09:09 +01:00
Roumen Georgiev 6443502808 reduced if...else to single line as Adrian suggested 2018-03-02 16:41:25 +02:00
Roumen Georgiev ea29b6ad82 propper conversion from MMOL to MgDl 2018-03-02 16:33:53 +02:00
Roumen Georgiev 6c75b1b317 more readable var names and 2018-03-02 15:28:32 +02:00
Roumen Georgiev e923bf2156 As Adrian asked .... Profile.toMgDl() 2018-03-02 15:09:03 +02:00
Roumen Georgiev f3a12be0be renaming ESMCheckbox to startEsTTCheckbox 2018-03-02 14:53:19 +02:00
Roumen Georgiev 9dd129bbe6 Revert "Update MainApp.java"
This reverts commit d3a7176209.

reverting changess to app/src/main/java/info/nightscout/androidaps/MainApp.java
2018-03-02 10:37:12 +02:00
Roumen Georgiev ab39536876 Only one TT can be selected 2018-03-02 10:12:05 +02:00
Milos Kozak ed11bb1d70 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-02 00:00:09 +01:00
Milos Kozak c61fcdbe3f allow 15 & 30 pump disconnection 2018-03-01 23:59:44 +01:00
PoweRGbg b3a10b47ce undo the RadioButton tests 2018-03-01 21:57:30 +02:00