Commit graph

4616 commits

Author SHA1 Message Date
Milos Kozak 048c1c6cfc
Merge pull request #1226 from jotomo/hb-is-wip
Disable history browser unless on dev-branch.
2018-07-18 11:20:55 +03:00
Milos Kozak e6baf3ff47 Merge branch 'dev' into last-2.0-something-stuff-update1 2018-07-17 23:05:08 +02:00
Milos Kozak 782e7939bc history browser: remove seek bar until gets implemented 2018-07-17 23:00:45 +02:00
Milos Kozak ebb97be8c5 Dana pumps: better detect wrong profile in pump 2018-07-17 22:56:25 +02:00
Johannes Mockenhaupt 54be28388b
Disable history browser unless on dev-branch. 2018-07-17 21:57:06 +02:00
Milos Kozak 5f4db31e80 fix multiple code 2018-07-17 19:42:18 +02:00
Milos Kozak 7d6674267b
Merge branch 'dev' into last-2.0-something-stuff-update1 2018-07-17 19:53:43 +03:00
PoweRGbg 141bfda099 wizard is ready also 2018-07-17 15:04:07 +03:00
PoweRGbg edbeddf8b0 carbsDialog done also 2018-07-17 14:43:34 +03:00
PoweRGbg 15b9cb5b3c removed dummy message 2018-07-17 12:19:36 +03:00
Roumen Georgiev cd4e7c2d4f
Save & restore dialog state on screen rotate 2018-07-17 12:01:21 +03:00
AdrianLxM b689aff02d
Merge pull request #1205 from swissalpine/patch-3
Überarbeitung/Vereinheitlichung der deutschen Übersetzung
2018-07-16 15:39:32 +02:00
swissalpine 7774830ea2
Bye bye "-"
Careportal buttons without "-"
2018-07-16 15:25:48 +02:00
swissalpine b0e96d93a9
Thanks to Adrian 2018-07-16 13:36:36 +02:00
AdrianLxM 6054501b5f
Merge pull request #1219 from jotomo/auto-hypo-tt
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
2018-07-16 13:27:06 +02:00
Johannes Mockenhaupt f5ecb9811e
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l. 2018-07-15 22:33:42 +02:00
Milos Kozak 97d9f7866c Rv2: prevent carbs x insulin 2018-07-15 19:48:33 +02:00
Milos Kozak 357b947c1d RS: prevent carbs x insulin 2018-07-15 19:45:51 +02:00
swissalpine c0a5e3d1c6
Das endet nie ... 2018-07-14 18:43:43 +02:00
swissalpine d5a8723577
Und "Vordefinierte Ziele" ... 2018-07-14 18:40:55 +02:00
swissalpine 2bcbd6f2f1
Übersehenes ... 2018-07-14 17:28:04 +02:00
swissalpine 55cf0aa8e5
"Feste temporäre Ziele" + Zeichensetzung + min
- "Feste temporäre Ziele" (besser?)
- Interpunktion (die Punkte habe ich teilweise wieder entfernt, immer dann, wenn es keine Erklärungen waren)
- Abkürzung "min" statt "Min." (die "offizielle" halt)
2018-07-14 11:36:22 +02:00
Milos Kozak 8f641f994f RSv3 firmware error reporting 2018-07-13 18:03:04 +03:00
Milos Kozak 695997ebb9 RS: delay before reading history 2018-07-13 09:50:04 +03:00
Milos Kozak 8a3d3d580f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-12 22:03:28 +03:00
AdrianLxM 5f5a2b6a0d
insight constraints 2018-07-12 20:30:19 +02:00
Milos Kozak efefe8ed18
Merge pull request #1211 from jotomo/pluginstats
PluginStats: used simple class named instead of translated name.
2018-07-12 21:30:12 +03:00
Milos Kozak 35e93ffafd more debug to autosens 2018-07-12 21:28:35 +03:00
AdrianLxM cb826da403
Revert "Fixed problem with Corr numberpicker when using Insightpump" 2018-07-12 19:37:21 +02:00
swissalpine dcfcd14e96
Update strings.xml 2018-07-12 19:21:47 +02:00
swissalpine 6b24eea5ae
Update strings.xml 2018-07-12 18:57:47 +02:00
Johannes Mockenhaupt 5b9ede15ea
PluginStats: used simple class named instead of translated name. 2018-07-12 15:47:45 +02:00
Milos Kozak e8c1dd5e3b
Merge pull request #1209 from harispoljo/CorrInsight
Fixed problem with Corr numberpicker when using Insightpump
2018-07-12 16:10:10 +03:00
Milos Kozak ba945f334b
Merge pull request #1204 from jotomo/pluginstats
Fabric-log enabled plugins once a day.
2018-07-12 16:06:10 +03:00
Johannes Mockenhaupt 6302769652
Log app usage type daily. 2018-07-11 20:51:09 +02:00
harispoljo 8b200ba9de
Fixed bug 2018-07-11 19:53:19 +02:00
harisp 395f2313fd Implemented feedback 2018-07-11 18:17:09 +02:00
Milos Kozak d97e195ad1 revert wrong autosens fix 2018-07-11 18:23:58 +03:00
Milos Kozak e4e0e64eef another fix of displaying ext bolus 2018-07-11 18:02:20 +03:00
Milos Kozak 798199852b CS translation 2018-07-11 17:34:41 +03:00
Milos Kozak 613802b12c
Merge pull request #1183 from triplem/autosens_fix
Autosens fix
2018-07-11 17:30:29 +03:00
harisp b42ce70daa Fixed problem with corr numberpicker when using insight pump 2018-07-11 14:14:01 +02:00
swissalpine 20b6709ae4
Update strings.xml 2018-07-10 22:54:39 +02:00
swissalpine dbee8e6224
Update strings.xml 2018-07-10 22:50:58 +02:00
swissalpine 9d899a140e
Überarbeitung/Vereinheitlichung der deutschen Übersetzung 2018-07-10 19:08:50 +02:00
Johannes Mockenhaupt 09a1d23bc8
Move logging of app start to Fabric class. 2018-07-10 17:55:50 +02:00
Johannes Mockenhaupt ccaf68d043
Fabric-log enabled plugins once a day. 2018-07-10 13:00:20 +02:00
Johannes Mockenhaupt afe9a845d3
(Hopefully) fix iob(AMA|SMB)shouldBeLimited tests.
By making sure there is exactly one APS plugin enabled.
2018-07-09 22:59:30 +02: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
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
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
Milos Kozak 720e938ebf allow longer lowtemp on RS an Rv2 2018-06-28 10:30:45 +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
Nico Schmitz 49e10dcaa9 Fix wrong argument in values-cs/strings.xml 2018-06-27 18:46:49 +02:00
Nico Schmitz 44eaa2d2f2 Use positional format strings in translations 2018-06-26 22:52:25 +02:00
Milos Kozak 2b799d9f71 SW: ask for import after storage permission 2018-06-26 13:15:50 +02:00
Milos Kozak 4df3561b4b setup wizard cleanup 2018-06-26 12:53:43 +02:00
Milos Kozak 520f2e1518 plugin descritpions to setup wizard 2018-06-26 12:28:53 +02:00
Milos Kozak 77245c027e prevent NPE 2018-06-26 10:45:56 +02:00
Milos Kozak f7f4385d5d cleanup 2018-06-26 00:20:43 +02:00