Commit graph

2050 commits

Author SHA1 Message Date
Milos Kozak
4007049118 use MIN_DIA instead of DEFAULT_DIA 2017-11-21 22:29:50 +01:00
Milos Kozak
d2cba61354 allign dana plugin code 2017-11-21 19:27:43 +01:00
Milos Kozak
3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Milos Kozak
21ae42d37b Merge branch 'dev' into queue 2017-11-20 17:50:49 +01:00
Milos Kozak
1335887957 Merge branch 'dev' into dev2 2017-11-20 17:40:45 +01:00
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
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
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
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
Johannes Mockenhaupt
82dd8c2c5e
Log summary after 10s, then every 60s. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
785a8f21de
Log receivers of event. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9a1d7fd512
Log source of event. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
a6ae3ddd2d
Debug: wider thread column in log to improve readability. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
d830096482
Better log messages for events. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9d10563bd9
Group events in type hierarchy related to the LoopPlugin. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
3e24a6069d
Remove dead NSPingAck class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
302ed69564
Let event classes extend Event(UpdageGui) classes. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
8ad223e5e1
Add base event class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
5a446c9ab5
Log posted events. 2017-10-26 16:54:46 +02:00
AdrianLxM
707d2df345 No explicit service start 2017-10-25 20:10:59 +02:00
Johannes Mockenhaupt
4767809931 Start KeepAliveService after pump init. 2017-10-25 20:10:24 +02:00
AdrianLxM
41dcf8d6f4 Merge remote-tracking branch 'milosremote/dev' into servicestart 2017-10-25 19:57:00 +02:00
AdrianLxM
f3872cd934 Merge pull request #465 from jotomo/j2v8-removal
J2v8 removal
2017-10-25 19:56:29 +02:00
Milos Kozak
4f0bbda847 Merge branch 'dev' into dev2 2017-10-25 11:38:12 +02:00
Milos Kozak
7c99157d89 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-25 11:37:19 +02:00
Milos Kozak
606973d4ad use max absorption time for AAPS and weighted average sensitivity detection 2017-10-25 11:37:05 +02:00
Milos Kozak
f673d3a721 Merge branch 'dev' into dev2 2017-10-24 21:08:54 +02:00
Milos Kozak
8b020d72cd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-24 21:08:13 +02:00
Milos Kozak
2fb707b9ed log.debug -> log.error on RS comm 2017-10-24 21:08:03 +02:00
Milos Kozak
441c2beffc read status after bolus 2017-10-24 09:19:03 +02:00
Milos Kozak
1ad409754f move preparing graph series to extra class #2 2017-10-23 22:41:12 +02:00
Milos Kozak
d180d088f0 fix merge conflict 2017-10-22 21:11:31 +02:00
Milos Kozak
3cdca93b30 RS connectivity & bolus improvement 2017-10-21 20:09:21 +02:00
Milos Kozak
7dd678c917 Better bolusing with different speeds (R & Rv2) 2017-10-21 18:55:56 +02:00
Milos Kozak
8e82e341fd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-21 18:07:30 +02:00
Milos Kozak
39af399ea4 Merge pull request #478 from RadoslavR/patch-48
Update strings.xml
2017-10-21 18:06:44 +02:00
Milos Kozak
a8751bf35a Detailed onscreen history logging 2017-10-21 18:05:19 +02:00
McHoffi
986eab041d Merge pull request #1 from MilosKozak/dev
Dev
2017-10-21 17:43:33 +02:00
McHoffi
9c7c583aed Split to smaller pieces 2017-10-21 17:41:01 +02:00
Radoslav Radev
075b74ec84 Update strings.xml 2017-10-21 17:11:25 +03:00
Milos Kozak
dbf5a5e577 Sensitivity logging optional 2017-10-21 13:14:06 +02:00
Milos Kozak
881a745e32 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-20 21:36:56 +02:00
Milos Kozak
01d6f1594a RS synchronized change 2017-10-20 17:37:06 +02:00
Milos Kozak
e545f75d69 fix displaying XX:30 time intervals 2017-10-20 11:34:33 +02:00
Milos Kozak
b76cb755e0 CS translations 2017-10-19 20:37:37 +02:00
Milos Kozak
c258b41f11 allow to use actual profile in wizard 2017-10-19 19:35:35 +02:00
Milos Kozak
65cb095dfd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-19 19:23:52 +02:00
Milos Kozak
0b7832ec60 getUnits from active profile not interface 2017-10-19 19:23:19 +02:00
Milos Kozak
2e32fe51e2 Merge pull request #475 from diabetesdt1/patch-3
Update strings.xml
2017-10-19 18:11:52 +02:00
diabetesdt1
51caffa591 Update strings.xml 2017-10-19 16:40:36 +02:00
Milos Kozak
e7fb045f04 Merge pull request #474 from boysim/dev
dutch translation update
2017-10-19 16:16:27 +02:00
diabetesdt1
17eec803f4 Update strings.xml 2017-10-19 16:03:31 +02:00
Milos Kozak
19f107fe53 move preparing graph series to extra class #2 2017-10-18 23:56:13 +02:00
Simon Pauwels
28430d117d Update dutch 2017-10-18 21:19:12 +02:00
Milos Kozak
55b1dcb992 Merge branch 'dev' into dev2 2017-10-18 20:14:14 +02:00
Milos Kozak
fe9fefa601 Update strings.xml 2017-10-18 20:06:35 +02:00
Milos Kozak
d65a2d8f8c move preparing graph series to extra class 2017-10-18 19:01:39 +02:00
Radoslav Radev
f0ee2b8bed Update strings.xml 2017-10-18 14:25:34 +03:00
McHoffi
434f4474b5 DE_translations 2017-10-18 11:11:41 +02:00
warstar2187
e3d3664ac2 Update strings.xml 2017-10-18 16:39:55 +09:00
warstar2187
a35262840f Update strings.xml 2017-10-18 13:49:17 +09:00
Milos Kozak
6ff3d00f3c Merge remote-tracking branch 'origin/dev' into food 2017-10-17 20:55:55 +02:00
Milos Kozak
13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt
fee19db501
ConfigBuilder: hide disabled plugins by default. 2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt
f7a46d386e
Remove j2v8. 2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt
d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue."
This reverts commit 7c04787004.
2017-10-16 21:48:08 +02:00
Milos Kozak
d1a9398451 Merge pull request #463 from AdrianLxM/mr-profileRhino
sum on name for LP
2017-10-16 14:58:41 +02:00
AdrianLxM
414cb5fd8d sum on name for LP 2017-10-16 12:54:17 +02:00
Milos Kozak
5172a91ca1 Merge pull request #458 from jotomo/gh-417-new-treatment-validation
NewTreatmentDialog: sanitize inputs, fixes #417.
2017-10-16 08:38:30 +02:00
AdrianLxM
dbc5657003 log to debug not error 2017-10-15 23:21:55 +02:00
AdrianLxM
2a8ab96fe3 Merge pull request #461 from AdrianLxM/rhinoAMA
Rhino ama
2017-10-15 22:39:54 +02:00
AdrianLxM
3e7b7ced06 logger reformat 2017-10-15 22:34:03 +02:00
AdrianLxM
c499e5977c logging 2017-10-15 22:27:08 +02:00
AdrianLxM
1c49362415 rhinoAMA first full run 2017-10-15 20:42:36 +02:00
AdrianLxM
1494b7f5b3 rhinoAMA first crashfree call 2017-10-15 19:36:31 +02:00
AdrianLxM
564c882754 rhino some more cleanups 2017-10-15 16:19:29 +02:00
AdrianLxM
d32a874baa rhino logging and cleanups 2017-10-15 16:10:58 +02:00
AdrianLxM
e65b4bf858 rhino MA looping 2017-10-15 14:06:13 +02:00
AdrianLxM
190305c6df rhino first real detemine-basal call 2017-10-15 13:00:10 +02:00
AdrianLxM
124ec6e992 rhino small refactor 2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt
7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.

This excludes all libBleCommandUtil ibs except those that match j2v8.

Revert this when we switch away from j2v8.

(cherry picked from commit 09036dc)
2017-10-15 11:19:34 +02:00
Johannes Mockenhaupt
a9adcee974
NewTreatmentDialog: sanitize inputs, fixes #417.
Inputs are now check as they're being made and cleared if they
exceed constraints. This is the same behaviour the Calculator
dialog shows.
2017-10-15 10:45:12 +02:00
AdrianLxM
9008ef6f6f rhino complex parameter passing 2017-10-15 03:55:03 +02:00
AdrianLxM
303d35118e rhino first parameter passing 2017-10-15 03:50:18 +02:00
AdrianLxM
81b611ad92 rhino function passing 2017-10-15 03:21:32 +02:00
AdrianLxM
7f2451934c first rhino 2017-10-15 02:52:57 +02:00
Milos Kozak
1db158670a location permission for BLE scanning 2017-10-14 13:36:38 +02:00
Milos Kozak
1994cd707c use customized name only for LocalProfile 2017-10-14 10:39:32 +02:00
Milos Kozak
3b90d02e05 show status on Dana fragment too 2017-10-13 13:31:32 +02:00
Milos Kozak
02c57fb9a3 RS connection improvement 2017-10-13 13:17:17 +02:00
Milos Kozak
c99830968a adjust enforcing new temp basal on user request 2017-10-13 12:39:34 +02:00
Milos Kozak
f235b5fb02 use basalStep instead of fixed value 2017-10-13 12:07:33 +02:00
Milos Kozak
9a4e457d2b fix RS events parsing 2017-10-13 11:54:50 +02:00
Milos Kozak
e40033dcb8 formated=false 2017-10-13 09:24:02 +02:00
Milos Kozak
bee60eb0e3 CS translations 2017-10-13 09:16:15 +02:00
Milos Kozak
1f3c54eb73 split sgvs before broadcast 2017-10-13 08:35:29 +02:00
Milos Kozak
6124ef25a4 report wrong alarm data #2 2017-10-13 08:21:37 +02:00
Milos Kozak
91e286b2ae report wrong alarm data 2017-10-13 08:11:30 +02:00
Milos Kozak
45a2eba0c2 fix NPE 2017-10-13 08:06:27 +02:00
AdrianLxM
71d95bea92 fix ic isf 2017-10-13 02:56:49 +02:00
AdrianLxM
869b3eff5f Spinner set selection delayed 2017-10-12 23:56:58 +02:00
AdrianLxM
746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00
AdrianLxM
f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
AdrianLxM
944e334231 migrate CPP->LP working 2017-10-12 12:44:17 +02:00
AdrianLxM
6f97e52a07 migrate CPP->LP partial 2017-10-12 12:36:06 +02:00
AdrianLxM
45c07d4106 U/h -> U 2017-10-11 23:38:08 +02:00
AdrianLxM
4667a047ea add sum to basal in lp 2017-10-11 20:57:43 +02:00