Commit graph

1923 commits

Author SHA1 Message Date
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
AdrianLxM 39b18915d0 Align LP GUI 2017-10-11 20:19:42 +02:00
AdrianLxM 339c33bd75 Spinner - selection events only after first touch 2017-10-11 19:25:09 +02:00
AdrianLxM 374983e1ae only inflate elements when needed 2017-10-11 07:59:41 +02:00
AdrianLxM c181aaaf34 Basal sum in label 2017-10-11 02:32:17 +02:00
AdrianLxM e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
AdrianLxM 02369b952b a little safer< 2017-10-10 22:54:24 +02:00
AdrianLxM 398e950f8e fix percentage concatenation on profile names 2017-10-10 22:11:06 +02:00
AdrianLxM 549b72b032 fix percentage/shift from watch 2017-10-10 21:51:58 +02:00
AdrianLxM b60ff8ceef max timeshift to 23 2017-10-10 20:47:38 +02:00
AdrianLxM 36784b983e remove cpp import 2017-10-10 20:42:29 +02:00
AdrianLxM 1410b2e706 wear cpp -> general profile 2017-10-10 20:32:43 +02:00
Milos Kozak 982e46d958 prepare profileswitch function for watch 2017-10-10 19:25:21 +02:00
Milos Kozak 77ec52ff23 fix sending profile switch to pump 2017-10-10 19:19:39 +02:00
Milos Kozak da71cdfca0 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 19:15:07 +02:00
Milos Kozak 24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak 50de4a5979 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 18:03:50 +02:00
Milos Kozak d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00
Milos Kozak c6392ec625 Merge remote-tracking branch 'origin/dev' into profile 2017-10-09 23:15:02 +02:00
Milos Kozak 9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Milos Kozak 230dd5f0a8 Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
Overview: align checkboxes and labels vertically.
2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt e586e1389e
Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt 62803f2a4d
Use existing string resource. 2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt 70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile. 2017-10-09 21:03:25 +02:00
Milos Kozak 4687b001e0 more cpp functionality to Profile 2017-10-08 14:41:51 +02:00
Milos Kozak a617d591b0 fix NPE 2017-10-07 22:29:55 +02:00
Milos Kozak 8f259042d6 fix NPE 2017-10-07 22:24:42 +02:00
Milos Kozak 6618d2fef2 fix negative timeshift 2017-10-07 20:42:56 +02:00