Commit graph

1644 commits

Author SHA1 Message Date
Radoslav Radev
e1c4074663 Update strings.xml 2017-08-31 09:09:26 +03:00
Milos Kozak
7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak
13b8a9ecf2 Merge pull request #404 from kakoni/master
Adding out_units support for determine-basal.js
2017-08-29 18:23:36 +02:00
Milos Kozak
981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Karri Niemelä
034faa4f6e Adding support out_units 2017-08-29 15:06:53 +03:00
Milos Kozak
03bf1abdd4 add WakeLock#isHeld() 2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb add WakeLock#isHeld() 2017-08-27 11:53:36 +02:00
Milos Kozak
162389a7e0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-27 11:46:25 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak
c9bfd27d93 Merge pull request #396 from warstar2187/dev
KR translation update
2017-08-27 00:38:44 +02:00
warstar2187
761f9f5075 Update strings.xml 2017-08-27 06:09:17 +09:00
Radoslav Radev
6bf120e9da Update strings.xml 2017-08-26 22:59:14 +03:00
Milos Kozak
b02b1829ad put back sensitivity plugins 2017-08-26 21:26:40 +02:00
Milos Kozak
3369ce1759 temporary remove untested plugin for release 2017-08-26 20:42:25 +02:00
Milos Kozak
40d86eb87a fix strings 2017-08-26 14:37:38 +02:00
Milos Kozak
6ea7549e4f update languages 2017-08-26 12:07:37 +02:00
boysim
196e0bb309 Update strings.xml 2017-08-24 23:18:21 +02:00
Milos Kozak
4e8d92a74b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02 better handling DetailedBolusInfo in v2 driver 2017-08-23 23:03:28 +02:00
Milos Kozak
d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Milos Kozak
c98cd3c834 Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak
0551f7f16d Merge pull request #387 from MilosKozak/invalid-overview
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586 Merge pull request #389 from jotomo/cleanups
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema. 2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment. 2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08 correct supercall 2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97 Use bolusstep granularity in fill dialog 2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4 bugfix: fill as invalid treatments if triggered from phone 2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197 add invalid treatments to charts in "invalid" colour 2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c Use bolusstep as step for insulin correction in wizard 2017-08-22 00:41:23 +02:00
Patrik Nilsson
c91988081f Update strings.xml
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
2017-08-21 00:01:12 +02:00
Milos Kozak
33cf707d45 Merge pull request #380 from MilosKozak/dia-divisor-fix
Dia divisor / bolussnooze fix
2017-08-20 21:52:42 +02:00
Milos Kozak
ab035e3949 Merge pull request #371 from diabetesdt1/patch-2
Update strings.xml
2017-08-20 21:44:21 +02:00
Milos Kozak
a18e2b4641 fix of fix :( 2017-08-20 19:42:41 +02:00
Milos Kozak
86d791d93f Merge pull request #378 from jotomo/profile-default-values
Fix initalizing profile with default values.
2017-08-20 19:08:55 +02:00
AdrianLxM
9c2808bf6f small refactoring 2017-08-19 20:37:25 +02:00
AdrianLxM
d49eea854c Multiply time passed instead of divide dia. 2017-08-19 20:12:37 +02:00
warstar2187
36c25cbd45 Update strings.xml 2017-08-19 21:35:03 +09:00
Johannes Mockenhaupt
ce4aee67d0
Fix initalizing profile with default values. 2017-08-19 12:28:10 +02:00
Susan
4f3b5f551a moved the code of the bg update to the top before all the loop logic happens, so there would be no delay 2017-08-18 20:58:54 +02:00
Milos Kozak
6b8dd5868d fix displaying target in mmol 2017-08-18 11:46:04 +02:00
diabetesdt1
efb9bed3fa Update strings.xml 2017-08-17 22:21:09 +02:00
diabetesdt1
ef42193d95 Update strings.xml
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)

objectives_*_ updated

dia_too_short updated
2017-08-17 22:06:10 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
a6351f4455
Fix some warnings. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
4f2357e9fb
Use OK/Cancel buttons for profile removal dialog. 2017-08-17 22:01:59 +02:00
AdrianLxM
5d6327bfaa static variables -> object variables 2017-08-17 21:34:30 +02:00
AdrianLxM
5769915f8c Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer 2017-08-17 21:29:15 +02:00
AdrianLxM
0cc9ee4193 Avoid npe if no string is assigned to the profile switch 2017-08-17 21:24:31 +02:00
Milos Kozak
ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
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
AdrianLxM
47e295b3c1 Check for tempbasal not RealTempbasla 2017-08-17 00:42:26 +02:00
AdrianLxM
776ae3f424 Overlapping interval - regard first element on cut 2017-08-16 23:56:14 +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
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
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
b8496e3208 insulincurves - working with default params 2017-08-14 15:22:27 +02:00
Milos Kozak
2d2ccde6e4 log Bundle 2017-08-14 12:11:53 +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
Timm Korte
8db9cb8887 add cancelTempBasal to setTempBasal if forced 2017-08-11 23:06:35 +02:00
Milos Kozak
73b6235188 APSRequest Answers event 2017-08-11 22:46:08 +02:00
Timm Korte
7839299530 add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50 2017-08-11 22:08:33 +02:00
Milos Kozak
2770e93ed4 Merge pull request #337 from RoumenGeorgiev/dev
Alarm for StaleData
2017-08-11 18:45:52 +02:00
diabetesdt1
8cd24fd919 Update strings.xml
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00