Commit graph

7593 commits

Author SHA1 Message Date
Milos Kozak 8f647460b8
Merge pull request #1202 from MarieT1D/dev
Adding text about  temp target to objective 2
2018-07-09 23:11:51 +03:00
marie d7cea7883e Adding ')' to the German translation 2018-07-09 20:48:41 +02:00
marie 351bda0240 Adding english text about temp target to objective 2 to in all languages 2018-07-09 19:23:36 +02:00
marie 8b7c552dcb Adding text about temp target to objective 2 2018-07-09 18:51:42 +02:00
Milos Kozak 5a6b7f9dad Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-09 18:16:55 +03:00
Milos Kozak 0d8a4e4951
Merge pull request #1190 from jotomo/ecarbs-note
Create note for eCarbs, so it's easier to see what amount/time was used.
2018-07-09 11:19:03 +03:00
Johannes Mockenhaupt 2cd3ec82de
Create note for eCarbs, so it's easier to see what amount/time was used.
Otherwise iterating on parameters is tedious with only the generated carbs.
2018-07-07 12:02:44 +02:00
Milos Kozak 506971292e cleanup 2018-07-05 15:36:13 +02:00
Markus M. May afaf729df1 Try to rework the ugly fix 2018-07-04 20:42:31 +02:00
Markus M. May c78117e356 recall getAutosensData, if it is null 2018-07-03 22:35:06 +02:00
Markus M. May a978225428 Cleanup Imports 2018-07-03 22:11:01 +02:00
Markus M. May 5422a8bc20 Cleanup Imports, added a TODO 2018-07-03 22:10:33 +02:00
AdrianLxM e5d8eb163b
Update Treatment.java 2018-07-03 19:25:23 +02:00
AdrianLxM 006528ae4c
Update TreatmentService.java 2018-07-03 19:24:44 +02:00
Milos Kozak 2c06a9cdf9 fixed typo 2018-07-02 19:45:38 +02:00
Milos Kozak 3a0fb59aee Merge branch 'dev' into last-2.0-something-stuff 2018-07-02 18:54:32 +02:00
Milos Kozak 375025f7f0 remove unused string 2018-07-02 15:55:52 +02:00
Milos Kozak 60e9ea05a8 fix objectives typo 2018-07-02 15:52:20 +02:00
Milos Kozak 917ddf0cbe CS translations 2018-07-02 15:04:09 +02:00
Milos Kozak 4919986dc0 setup wizard for pumpcontrol 2018-07-02 12:18:49 +02:00
Milos Kozak bb30171777 fix typo in poctech driver 2018-07-02 10:53:09 +02:00
AdrianLxM 297fe487f7 update with data from pump 2018-07-02 06:54:02 +02:00
AdrianLxM b39fa514c2 alarm on clashes, not on identical treatments 2018-07-02 02:11:25 +02:00
Nico Schmitz 2ce38702e2
Merge branch 'dev' into dev-wip 2018-07-01 22:44:11 +02:00
Milos Kozak 98dedf117f
Merge pull request #1167 from triplem/date_util
Do calculations in a central place
2018-07-01 22:43:49 +02:00
Johannes Mockenhaupt bf3b4502bf
log origin of offending call 2018-07-01 19:15:27 +02:00
Johannes Mockenhaupt 21313bd418
obligatory format specifier fixes 2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt 290effcd7c
simplyify defaulting to hypo tt. 2018-07-01 18:53:45 +02:00
Johannes Mockenhaupt 5df054a999
more fixes 2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt 9b7d36ffed
bugfix 2018-07-01 18:25:32 +02:00
Johannes Mockenhaupt 6ebb13d28d
alarm on failure to add treatment to db. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt 658af4bcfd
combo: don't attempt to add a bolus record if it already exists in db. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt f12db81f96
treatmentservice: add method to check if record with pump id exists. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt 780a4dda36
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l. 2018-07-01 17:21:40 +02:00
AdrianLxM 86ef6a155c
Merge pull request #1171 from jotomo/revert-901
Revert "Merge pull request #1131 from jotomo/901"
2018-07-01 17:02:26 +02:00
Markus M. May 6bc60cd8a8 Rework to use already existing method 2018-07-01 13:50:37 +02:00
Johannes Mockenhaupt 33b66e2ce7
Revert "Merge pull request #1131 from jotomo/901"
This reverts commit 268dec0059, reversing
changes made to ab41541c69.
2018-06-29 22:43:54 +02:00
Milos Kozak a3862aca2a
Merge pull request #1161 from schmitzn/refactor-strings
Use positional format strings in translations
2018-06-29 22:22:44 +02:00
Milos Kozak 2291472b01
Merge pull request #1168 from MilosKozak/milosremote/dev
ask user if he switches to a HW pump for the first time
2018-06-29 15:43:48 +02:00
AdrianLxM dccb675198
anrdoid -> android 2018-06-29 14:15:30 +02:00
AdrianLxM 4af7e6c1e6
update warning text 2018-06-29 14:13:33 +02:00
AdrianLxM 5a1d696ab1 ask user if he switches to a HW pump for the first time 2018-06-29 03:52:58 +02:00
Milos Kozak 268dec0059
Merge pull request #1131 from jotomo/901
Don't loop for values from non-active BG sources
2018-06-28 22:51:56 +02:00
Markus M. May 468b645486 Do calculations in a central place 2018-06-28 22:36:08 +02:00
Milos Kozak ab41541c69 fix NPE 2018-06-28 22:31:42 +02:00
AdrianLxM 7d4eec6c99
Merge pull request #1163 from MilosKozak/wear-confirm
For testing: Wear confirm dialog
2018-06-28 20:51:49 +02:00
Milos Kozak 720e938ebf allow longer lowtemp on RS an Rv2 2018-06-28 10:30:45 +02:00
AdrianLxM d8603f07be remove debug clause and smaller fonts 2018-06-27 20:22:19 +02:00
Milos Kozak a99b478eea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-27 20:13:37 +02:00
Milos Kozak 29032e658f show predictions in nsclient mode 2018-06-27 20:13:25 +02:00