Commit graph

2583 commits

Author SHA1 Message Date
Milos Kozak
a40afd0948 1.5g 2017-08-06 14:28:01 +02:00
Milos Kozak
848863aca5 calculateFromTreatmentsAndTempsSynchronized 2017-08-06 14:25:25 +02:00
Milos Kozak
f1f7a6ca6c check for null 2017-08-06 14:14:03 +02:00
Milos Kozak
066283a4b0 add SMB flag to treatments 2017-08-06 12:19:25 +02:00
Milos Kozak
6de154d16d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into move-to-range-in-profile 2017-08-06 11:43:13 +02:00
Milos Kozak
6ab6f82b10 more debug on setting temp basal 2017-08-06 11:42:20 +02:00
Milos Kozak
1bfc0011a1 Merge pull request #340 from MilosKozak/move-to-range-in-profile
Move to range in profile - WIP
2017-08-06 11:21:55 +02:00
Milos Kozak
4e4088f164 remove unneeded strings 2017-08-05 18:47:01 +02:00
Milos Kozak
4fda4fd547 convert target values to mdgl before passing to openaps 2017-08-05 18:14:10 +02:00
Milos Kozak
e295c8a2dc target range change confirm dialog 2017-08-05 18:09:19 +02:00
Milos Kozak
f834b3b7e0 remove unneeded texts 2017-08-05 17:43:31 +02:00
Milos Kozak
1604b85d34 Merge branch 'dev' into move-to-range-in-profile 2017-08-05 14:48:41 +02:00
RoumenGeorgiev
78236b674c Update overview_fragment.xml 2017-08-05 12:28:28 +03:00
RoumenGeorgiev
9546c6f493 Update overview_fragment.xml 2017-08-05 12:27:43 +03:00
RoumenGeorgiev
222c357456 Added check for enabled openAPS stale data alarm in NS 2017-08-05 11:58:49 +03:00
RoumenGeorgiev
ad122153a9 added openAPSEnabledAlerts()
check for OpenAPS alerts enabled
2017-08-05 11:26:12 +03:00
RoumenGeorgiev
3d9df4e18e Using equals() instead of == on line 1811 2017-08-05 11:20:09 +03:00
RoumenGeorgiev
cdee9bf703 Get staleData setting from NS first 2017-08-04 17:04:57 +03:00
RoumenGeorgiev
aff62d86b1 Changed name of button to snooze if it's staleDataAlarm 2017-08-04 16:43:46 +03:00
RoumenGeorgiev
714a292d78 fixed wrong pasting 2017-08-04 15:05:09 +03:00
RoumenGeorgiev
837dcdb23b If alarm is staledata dismis snoozes it 2017-08-04 14:51:25 +03:00
RoumenGeorgiev
82541a50e4 Added functions for snoozing and unsnoozing 2017-08-04 14:49:46 +03:00
RoumenGeorgiev
a8b17a1f22 adding staleDataThreshold as snooze time 2017-08-04 14:48:44 +03:00
RoumenGeorgiev
529d267b9d Added check for staleData and notification
with every loop
2017-08-04 12:29:48 +03:00
RoumenGeorgiev
232590e707 Added staleData 2017-08-03 18:48:45 +03:00
RoumenGeorgiev
450634418e added isAlarmForStaleData() 2017-08-03 18:47:51 +03:00
RoumenGeorgiev
74bb05a654 added staledataalarm 2017-08-03 17:14:14 +03:00
Milos Kozak
541a261dda Merge pull request #334 from AdrianLxM/colored-activetemp
Colored activetemp
2017-08-03 09:11:30 +02:00
AdrianLxM
36e6cb8497 remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
AdrianLxM
053004bbbd correct logging 2017-08-03 08:20:11 +02:00
Milos Kozak
b5cfe1c727 Merge pull request #332 from AdrianLxM/cancel-userRequesed-flag
remove translated string not in default strings and add flag to cance…
2017-08-03 08:08:45 +02:00
AdrianLxM
7a7f75db01 fix cancel real temp basals from actions 2017-08-03 03:22:30 +02:00
AdrianLxM
0ac7357ee9 color for active temp 2017-08-03 03:12:47 +02:00
AdrianLxM
1ac1b77fd4 remove translated string not in default strings and add flag to cancel method 2017-08-03 02:01:52 +02:00
Milos Kozak
9b87d34cc7 Merge pull request #330 from AdrianLxM/1.5-german
Some German translations, remove unused strings, App name for all
2017-08-02 11:22:24 +02:00
AdrianLxM
23abc0e4e5 Some more German 2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9 Some more German 2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab Some German translations, remove unused strings, App name for all 2017-08-01 23:46:58 +02:00
Milos Kozak
43757951e0 Merge pull request #329 from slavidex/patch-40
Update strings.xml
2017-08-01 22:51:01 +02:00
Radoslav Radev
39891bbad9 Update strings.xml 2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330 CS translations 2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3 hide all overview buttons by default 2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556 move cancel temp to actions 2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35 new temp basal dialog refactor 2017-08-01 20:02:17 +02:00
Milos Kozak
d2a5939ce3 fix virtual pump crash 2017-08-01 17:53:28 +02:00
Milos Kozak
a24cbfda50 Disconnect pump: cancel temp before setting new to make sure it will last as expected 2017-08-01 17:37:32 +02:00
Milos Kozak
6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +02:00
Milos Kozak
6f9f72d849 remove notes from temp basal upload 2017-08-01 17:21:32 +02:00
Milos Kozak
668008e1c1 cancel current temp before activating superbolus 2017-07-31 19:53:09 +02:00
Milos Kozak
39d41e8e7d Merge pull request #324 from AdrianLxM/wear-wizard-percentage
wear wizard percentage
2017-07-27 00:44:22 +02:00