Commit graph

2415 commits

Author SHA1 Message Date
Milos Kozak 73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00
AdrianLxM 92077dcb6a Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
diabetesdt1 64446f07c5 Update strings.xml
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
2017-08-17 12:40:14 +02:00
Milos Kozak f2755e0ae7 Merge pull request #370 from MilosKozak/AdrianLxM-patch-2
Check for tempbasal not RealTempbasal
2017-08-17 08:13:53 +02:00
AdrianLxM 47e295b3c1 Check for tempbasal not RealTempbasla 2017-08-17 00:42:26 +02:00
Milos Kozak e53bf6b728 Merge pull request #369 from MilosKozak/AdrianLxM-patch-1
Overlapping interval - regard first element on cut
2017-08-17 00:26:00 +02:00
AdrianLxM 776ae3f424 Overlapping interval - regard first element on cut 2017-08-16 23:56:14 +02:00
Milos Kozak 4ce173c3e9 Merge pull request #368 from MilosKozak/openloop-vertical
AcceptTempButton visible
2017-08-16 23:41:28 +02:00
AdrianLxM 8287fe22cf AcceptTempButton visible 2017-08-16 23:22:14 +02:00
Milos Kozak 6ca44fce84 Merge pull request #367 from MilosKozak/profile-switch-buttons
show notification on toast alarm
2017-08-16 22:58:34 +02:00
AdrianLxM e61d7a4442 show notification on toast alarm 2017-08-16 21:37:33 +02:00
Milos Kozak b93a153b23 parse 12h format properly 2017-08-16 19:33:41 +02:00
Milos Kozak e5cc34b975 fix merge conflict 2017-08-16 18:38:14 +02:00
Milos Kozak 7884c98f2f fix index 2017-08-16 18:26:47 +02:00
Milos Kozak 35db28f013 Merge pull request #365 from MilosKozak/dia-expecteddelta-fix
Restrict DIA for expectedDelta
2017-08-16 18:11:37 +02:00
Milos Kozak 69a378bb75 Merge pull request #366 from MilosKozak/profile-switch-buttons
Show profile switch button in profiles
2017-08-16 18:11:26 +02:00
AdrianLxM 63793ed358 Show profile switch button in profiles
Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written.
Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE".

This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.
2017-08-16 17:56:57 +02:00
Milos Kozak e005a6172b set pump time only if needed 2017-08-16 17:26:58 +02:00
AdrianLxM 5fc63d8f16 restrict DIA for expectedDelta 2017-08-16 14:23:22 +02:00
Milos Kozak e1d2c557af Merge pull request #364 from MilosKozak/overlappin-intervals-fix
Overlappinginterfals - find first element
2017-08-16 08:11:04 +02:00
Milos Kozak d907aa9eb1 Merge pull request #363 from jotomo/target-format
Overview: format target using unit specific format.
2017-08-16 08:10:39 +02:00
Milos Kozak 898e162300 initial work on SMB 2017-08-15 23:13:37 +02:00
AdrianLxM 2e382267d4 Overlappinginterfals - find first element 2017-08-15 22:38:48 +02:00
Johannes Mockenhaupt 759afcec7a
Extract method Profile.toTargetRangeString. 2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt 754a0097b9
Simplify. 2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt 6dcdeb2bbc
Overview: format target using unit specific format. 2017-08-15 14:51:09 +02:00
Milos Kozak 4c490c32f7 Merge pull request #361 from MilosKozak/oref-insulincurves
Oref Insulincurves
2017-08-15 10:13:50 +02:00
Milos Kozak 151165809e Dutch language 2017-08-14 21:57:49 +02:00
AdrianLxM ee7b3cca22 insulincurves - notification on short DIA 2017-08-14 20:41:24 +02:00
AdrianLxM f23c3e7ae1 insulincurves - forgotten string updated 2017-08-14 16:44:39 +02:00
AdrianLxM 707d5a480c insulincurves - rename peak to peak time 2017-08-14 16:02:07 +02:00
AdrianLxM 94fbd620f4 insulincurves - remove unused base fragment 2017-08-14 15:53:47 +02:00
AdrianLxM ced1da09cf insulincurves - i18n 2017-08-14 15:25:37 +02:00
AdrianLxM 13cd7dbda1 insulincurves - ActivityGraph fix double plotting 2017-08-14 15:25:21 +02:00
AdrianLxM 085caddeee insulincurves - freepeak 2017-08-14 15:24:55 +02:00
AdrianLxM 63d46aed56 insulincurves - minimum 5 2017-08-14 15:24:41 +02:00
AdrianLxM a538160e76 insulincurves - rapid and ultra both with adjustable dia 2017-08-14 15:24:30 +02:00
AdrianLxM 8adff150f7 AdriAPS diaadaption 2017-08-14 15:23:39 +02:00
AdrianLxM b8496e3208 insulincurves - working with default params 2017-08-14 15:22:27 +02:00
Milos Kozak 82d3289602 add oref1 asssets 2017-08-14 12:20:12 +02:00
Milos Kozak 2d2ccde6e4 log Bundle 2017-08-14 12:11:53 +02:00
Milos Kozak c2733fb992 Merge pull request #358 from jotomo/logging-linenumber
Logging: Print filename and line instead of logger name.
2017-08-13 23:54:29 +02:00
Johannes Mockenhaupt d49356a922
Logging: Print filename and line instead of logger name. 2017-08-13 21:31:21 +02:00
Milos Kozak 377b711896 Merge pull request #352 from diabetesdt1/patch-1
Update strings.xml
2017-08-13 20:31:54 +02:00
Milos Kozak a49a496651 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into force 2017-08-13 20:31:45 +02:00
Milos Kozak d4642b3958 do not enforce stop for v2 driver 2017-08-13 20:31:15 +02:00
Milos Kozak 2a2b5dbb31 Merge pull request #357 from savek-cc/logfile-name
change logfile name pattern
2017-08-13 15:55:53 +02:00
Timm Korte 8caaeeff2a change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename 2017-08-13 14:32:37 +02:00
Timm Korte 6bbb785574 rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute 2017-08-12 13:36:35 +02:00
AdrianLxM f861546e12 Quickfix to avoid crashes after staleData merge 2017-08-12 11:20:56 +02:00