Commit graph

4385 commits

Author SHA1 Message Date
AdrianLxM e710ef81a4
Merge pull request #736 from swissalpine/patch-2
Readd lost whitespace to xDrip status line
2018-03-08 14:19:45 +01:00
Milos Kozak 3b18413eb6
Merge pull request #733 from MilosKozak/treatmentdialog-smallscreen
Treatmentdialog smallscreen
2018-03-06 22:15:22 +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
unknown 336578e87a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-05 23:12:02 +01:00
Johannes Mockenhaupt 090e1b13f8
Add basic Engineering mode.
- Insight plugin disabled unless EM enabled
- Closed loop constrainted unless EM enabled.
2018-03-05 22:45:00 +01:00
AdrianLxM 414f92bdf8 no double whitespace 2018-03-05 20:50:21 +01:00
AdrianLxM 0818f3b419 Merge remote-tracking branch 'swissalpineremote/patch-4' into watchsmb2 2018-03-04 20:18:43 +01:00
AdrianLxM d7deaa15eb wear COB string better default 2018-03-04 20:14:58 +01:00
AdrianLxM 62295d001f wear COB in status 2018-03-04 20:13:16 +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
AdrianLxM 2f40feef65 wear empty label needed 2018-03-04 15:41:32 +01:00
AdrianLxM d500b15947 wear carbs always colour 2018-03-04 15:40:36 +01:00
AdrianLxM e2b829a60a wear first carbs 2018-03-04 15:37:55 +01:00
AdrianLxM ef75e2759c wear carbonly is valid 2018-03-04 15:09:59 +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 b98dc5c72f wear timeframe bolus 2018-03-04 14:47:30 +01:00
AdrianLxM a4eb82c524 wear bgGraphbuilder isValid bolus 2018-03-04 14:06:19 +01:00
AdrianLxM acf7e36d61 wear bgGraphbuilder switch to non-deprecated methods 2018-03-04 13:56:17 +01:00
AdrianLxM 5a80215578 wear timeticks 2018-03-04 13:35:17 +01:00
AdrianLxM a503bfaeef wear endtime in lowres 2018-03-04 12:50:06 +01:00
AdrianLxM e088b4df78
Merge pull request #730 from MilosKozak/5m-impact-fix
fix 5m-impact parameter - always was 0
2018-03-02 21:28:06 +01: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
PoweRGbg 3edec79b8d fixing identation and equals() to == 2018-03-01 21:41:52 +02:00
PoweRGbg 2fb0e6edc1 format using the Profile class method and Constants 2018-03-01 18:40:06 +02:00
PoweRGbg c6a46129df format using the Profile class method and Constants 2018-03-01 18:38:56 +02:00
PoweRGbg 65ddf5ced5 format using the Profile class method and Constants 2018-03-01 18:31:29 +02:00
Johannes Mockenhaupt d679481698
Remove unused method. 2018-03-01 16:12:41 +01:00
Johannes Mockenhaupt 8f813d52fa
WatchUpdaterService: process requests in a separate thread.
Previously, requests were executed on the main thread (base class
is Service, not IntentService), which prompted Android to kill
AAPS multiple times a day due to timeouts (of currently unknown
origins).

(cherry picked from commit 5ae45d5)
2018-03-01 16:12:41 +01:00
Roumen Georgiev bea486d816
Don't show confirmation on empty message/input 2018-03-01 16:57:36 +02:00
Roumen Georgiev 38933ac323
Adding Eating soon TT check to carbs
I use that a lot for meal anouncement only
2018-03-01 16:27:52 +02:00
Roumen Georgiev 9456a24655
Adding Eating soon mode to options 2018-03-01 16:22:05 +02:00
Milos Kozak 75a6366115 translations cleanup 2018-03-01 15:08:55 +01:00
Roumen Georgiev d3a7176209
Update MainApp.java 2018-03-01 15:20:00 +02:00
Roumen Georgiev 5b003c62e2
added fix for mmol profiles & targets 2018-03-01 14:07:35 +02:00
AdrianLxM 8cfd8a7082
Merge pull request #724 from MilosKozak/AdrianLxM-patch-1
Disable Insight by default
2018-03-01 11:10:22 +01:00