Commit graph

2613 commits

Author SHA1 Message Date
Milos Kozak
2f0599fbc7 missing return 2017-11-20 17:38:06 +01:00
Milos Kozak
d8d8b150b6 Merge branch 'dev2' into queue 2017-11-20 17:34:03 +01:00
Milos Kozak
973b9d50c1 Merge branch 'dev' into dev2 2017-11-20 17:28:15 +01:00
Milos Kozak
0f0f39dfb4 log profiles if different 2017-11-20 17:26:03 +01:00
Milos Kozak
777aedd5db fix setting of TRB when low basal rate is running 2017-11-20 15:25:44 +01:00
Milos Kozak
297617467e fix format and add test for fromISODateString 2017-11-20 13:34:13 +01:00
Milos Kozak
d8798e0bcf use mills from status if available 2017-11-20 13:23:25 +01:00
Andrew Warrington
78dd6d165b Addition of the "airplane cockpit" watch face -- unfinished. This commit is not yet ready to be merged into dev as more work is required for compatibility with multiple watches. 2017-11-19 22:14:28 +01:00
Andrew Warrington
bc485a4783 Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Milos Kozak
c5cd0e38ab
Merge pull request #496 from jotomo/fix-prefs-npe
Fix prefs NPE
2017-11-13 07:32:23 +01:00
Johannes Mockenhaupt
e0df4646f9
Remove dead code. 2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt
5839ad6a93
Ctors Android-style. 2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt
9a4acbe052
Fix NPE initialising MyPreferencesFragment. 2017-11-13 01:12:05 +01:00
Andrew Warrington
45a26da8b3 Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-12 21:46:32 +01:00
Milos Kozak
7374545046 refactor all deliverTreatment 2017-11-12 00:08:25 +01:00
Milos Kozak
620a54a31b bolus from wizard to queue 2017-11-11 23:44:30 +01:00
Milos Kozak
c7faf2a5e7 bolus progress dialog during connection 2017-11-11 23:03:31 +01:00
Milos Kozak
25aa5094a4 alarm for failed bolus 2017-11-11 22:32:00 +01:00
Milos Kozak
a5227fc773 add bolus sound 2017-11-11 16:20:34 +01:00
Milos Kozak
86b11edd58 RS connection and status reading 2017-11-11 14:05:29 +01:00
Milos Kozak
a186ce6468 more command queue code 2017-11-10 00:27:18 +01:00
Milos Kozak
d40e0c97c4 simplify active pump access where possible 2017-11-08 23:40:54 +01:00
Milos Kozak
8bae1a18e4 CommandQueue 2017-11-08 22:22:51 +01:00
Milos Kozak
3a773feeeb RS fix last bolus time 2017-11-08 19:23:48 +01:00
Milos Kozak
676dfcc5d1 RS remove duplicated message 2017-11-08 19:18:17 +01:00
Milos Kozak
30f16c7d3e RS fix extended bolus result 2017-11-08 19:13:44 +01:00
Milos Kozak
0af51bb6ea show timeshift if not zero 2017-11-07 13:24:08 +01:00
Andrew Warrington
d70860bd97 Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-05 21:41:50 +01:00
Milos Kozak
5ad564e0e3 CS translation 2017-11-03 10:13:23 +01:00
Milos Kozak
e063f3a2cb removed unneeded code 2017-11-02 18:03:40 +01:00
Milos Kozak
a7077a8a6a long click on name to open settings 2017-11-02 17:47:41 +01:00
Milos Kozak
20c66e3b6f add link to advanced settings 2017-11-02 17:39:25 +01:00
Milos Kozak
a162343cd4 add getPreferenceId to food plugin 2017-11-01 20:47:16 +01:00
Milos Kozak
f67bd291cd Merge branch 'dev' into dev2 2017-11-01 20:44:24 +01:00
Milos Kozak
60699eddbb preferences update 2017-11-01 20:43:59 +01:00
Milos Kozak
00152eaffa
Merge pull request #490 from MilosKozak/tt-remaining
Show remaining time of TT
2017-11-01 18:29:54 +01:00
Milos Kozak
f7871e64e0
Merge pull request #489 from MilosKozak/NPE-fix
NSTreatments NPE fix
2017-11-01 18:29:34 +01:00
Milos Kozak
440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
AdrianLxM
f9ed104fe3
use DateUtil#agoString 2017-10-29 02:08:43 +02:00
AdrianLxM
3121fa3e84
use DateUtil#untilString 2017-10-29 02:07:17 +02:00
AdrianLxM
9e8752b096
timeframe strings 2017-10-29 02:06:06 +02:00
AdrianLxM
7d82870203
Show remaining time of TT 2017-10-28 02:16:30 +02:00
AdrianLxM
88e22c5f17 NSTreatments NPE fix
When the dialog was open and the phone goes to sleep/lock screen, Android may garbage collect and options is no longer available. -> NPE

I think as quick fix it is ok to not show a dialog at all. If the user stopped using the dialog and lets the phone sleep for a longer while with the phone going to sleep... he can open it again, if he wants it.
2017-10-27 16:56:17 +02:00
Milos Kozak
8a6e811c95 Merge branch 'dev' into dev2 2017-10-26 21:13:10 +02:00
Milos Kozak
ae47183459 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-26 21:12:37 +02:00
Milos Kozak
26b216a8ee fix RS response code 2017-10-26 20:40:24 +02:00
Milos Kozak
3389a5da97 Merge pull request #486 from MilosKozak/servicestart
Servicestart
2017-10-26 18:35:25 +02:00
Johannes Mockenhaupt
91df07ca8f
Cleanup. 2017-10-26 17:35:46 +02:00
Johannes Mockenhaupt
79316bf948
Revert "Debug: wider thread column in log to improve readability."
This reverts commit 5fe2d19e6363c4efcaad90fe5aa627b58d230cd1.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
e5cb5386e3
Disable event logging by default. 2017-10-26 16:54:46 +02:00