Commit graph

977 commits

Author SHA1 Message Date
Roumen Georgiev e12217ae69 Copy&paste from ActionNotification 2019-10-04 10:55:33 +03:00
Bart Sopers 953210be78 Merge branch 'dev' into omnipod_eros_bart 2019-10-02 19:18:44 +02:00
Milos Kozak c44101ce76
Merge pull request #2089 from PoweRGbg/ChangeProfileAction
Automation ActionCahangeProfile
2019-10-02 16:33:58 +02:00
Milos Kozak ac69d1069e
Merge pull request #2017 from PoweRGbg/TriggerTOD
Trigger for time of day
2019-10-02 14:41:24 +02:00
Roumen Georgiev 157028c4fd initial work 2019-10-02 10:54:04 +03:00
Milos Kozak 2d395b625e Do not allow too low max basal 2019-10-01 11:46:54 +02:00
Milos Kozak 2f1bfc8f66
Merge branch 'dev' into TriggerTOD 2019-09-25 15:00:56 +02:00
Milos Kozak 4d9088b63e objectives: links for another tasks 2019-09-25 14:33:23 +02:00
Milos Kozak 5fa9d4df62 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-09-23 19:37:42 +02:00
Milos Kozak 2e2c9c5d8f better info in wizard confirmation dialog 2019-09-23 19:36:25 +02:00
Andy Rozman 529d0111c5 - some error fixes, and changes around profile 2019-09-18 18:00:30 +01:00
Bart Sopers b9d0c8f875 Merge branch 'dev' into omnipod_eros_bart 2019-09-16 00:59:32 +02:00
Rob Kresha 4546ffa838 Consistency, typos, and labels
Small tweaks to make things more uniform.
2019-09-15 11:25:52 -05:00
Milos Kozak 5828e90f83 improved description 2019-09-15 15:54:43 +02:00
Milos Kozak 50041e1733 simplify statuslights preferences 2019-09-15 11:42:01 +02:00
Roumen Georgiev d525c3f220
Merge branch 'dev' into TriggerTOD 2019-09-10 10:30:20 +03:00
Roumen Georgiev e3d7d4cb67 fixed name and tests 2019-09-10 10:01:36 +03:00
Roumen Georgiev c88841b361 reworked to have start and end of time range 2019-09-09 16:50:48 +03:00
Milos Kozak 13a03c362b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-09-07 22:40:31 +02:00
Milos Kozak 7871addaad change text 2019-09-07 22:40:16 +02:00
Milos Kozak c57a6335d9
Merge pull request #2027 from triplem/ext_statusline
Add extended statuslight to overview fragment
2019-09-07 22:38:11 +02:00
Milos Kozak 23aedb0c6c more exams 2019-09-07 19:34:31 +02:00
Milos Kozak 9b15d9da89 more exams 2019-09-07 19:27:31 +02:00
Milos Kozak c0d65df330 exams cleanup 2019-09-07 18:52:17 +02:00
Milos Kozak 940d413d1e
Merge branch 'dev' into dev 2019-09-07 11:58:19 +02:00
Milos Kozak 45638ef5eb more exams 2019-09-07 11:56:16 +02:00
Milos Kozak b5e4c044ac display hint in exam 2019-09-07 11:32:24 +02:00
Milos Kozak 88c263bb39 better hypott question 2019-09-07 11:21:14 +02:00
typ1-brods 18269b66d6
Update strings.xml 2019-09-06 23:29:15 +02:00
triplem cc298f81b8 add extended statuslight to overview fragment 2019-09-05 21:39:53 +02:00
Milos Kozak 64a2b45866 add rice to objective bypass code 2019-09-05 20:53:53 +02:00
Milos Kozak 91ebc11d9b ObjectivesExamDialog fine tunning 2019-09-05 20:26:23 +02:00
Roumen Georgiev a77835d541 Initial work 2019-09-04 15:50:37 +03:00
Milos Kozak 37d10fbcbf Exam objective 2019-09-04 00:00:52 +02:00
Milos Kozak 05bb5a660b simplify manual actions code 2019-09-02 23:38:14 +02:00
Milos Kozak b9e91f3d20 confirm dialog on entering code 2019-09-02 23:10:31 +02:00
Milos Kozak 99893a3ab1 allow bypass objectives 2019-09-02 08:42:25 +02:00
Milos Kozak 80efc9369c new objective Using AAPS 2019-09-01 13:43:11 +02:00
Milos Kozak 3274f372ef show accomplished 2019-09-01 10:33:17 +02:00
Andy Rozman 86a7117e63 Merge branch 'dev' into omnipod_eros_andy 2019-08-30 10:51:19 +01:00
Milos Kozak 67fe19ee2c
Merge pull request #2003 from aviau/typo/setup-it
strings.xml: 'setup it' -> 'set it up'
2019-08-29 08:37:32 +02:00
aviau ee217e2bfa
typo: offline available -> available offline 2019-08-28 23:47:10 -04:00
aviau a0b1b26460
strings.xml: 'setup it' -> 'set it up' 2019-08-28 23:25:21 -04:00
Milos Kozak 7d9d70fba8 better notification layout 2019-08-28 17:57:48 +02:00
Milos Kozak 7e5d96f3f3 remove unused resources 2019-08-28 16:55:20 +02:00
Milos Kozak b9c965ac95
Merge branch 'dev' into bw 2019-08-27 21:36:51 +02:00
Milos Kozak f184aa0c6a TriggerDelta show units 2019-08-27 19:35:37 +02:00
Milos Kozak 4c7b8ef210 fast >>>Loading ...<<< notification on app start 2019-08-26 17:33:20 +02:00
Milos Kozak 792a1d7ddd code cleanup 2019-08-24 18:58:17 +02:00
Milos Kozak 0a77fb9bcb implement percentage in wizard, refactoring to kotlin 2019-08-23 16:31:30 +02:00
Milos Kozak 6ed0f9b40e more detailed message 2019-08-22 20:55:58 +02:00
Brian Quinion 450a25c3b8 Allow for Battery Optimization failing on some platforms 2019-08-21 17:38:01 +01:00
Milos Kozak 0bdaa17082 Insulin activity scale detection 2019-08-15 17:54:57 +02:00
Milos Kozak b5bc80bc52 Merge branch 'pull/1956' into dev 2019-08-15 14:40:19 +02:00
Milos Kozak 956b9947b6 fix string format 2019-08-15 14:39:42 +02:00
Milos Kozak 56d6a04e2b MDT prefs translatable=false 2019-08-14 17:49:01 +02:00
Andy Rozman 3203ad5cde - added dash package so that I can split the two implementations
- working on omnipod implementation
- changed display fragment
2019-08-14 16:22:19 +01:00
Andy Rozman 9a1262cc4e - refactoring to use OmnipodCommunicationManager with existing code
- added kt for OmnipodFragment
2019-08-13 12:30:23 +01:00
Andy Rozman a1bbf29230 - added check before bolus is attempted, if we have enough in reservoir (from local info, we don't query the pump,
while this might not always be 100% correct, it is updated every hour (if under 50 U and every 4h if over
50U and every 15 minutes if under 20U, so it should be accurate, information is not accurate only if you cancel bolus midway...
2019-08-12 17:20:38 +01:00
Bart Sopers ca325c18e9 Merge branch 'omnipod_eros_andy' into omnipod_eros_bart 2019-08-11 15:56:45 +02:00
Milos Kozak 8f3c4e25c5 DanaRFragment -> kotlin 2019-08-07 15:50:37 +02:00
Milos Kozak c1a1cc3108 ProfileViewerDialog -> kotlin 2019-08-06 01:19:24 +02:00
Milos Kozak 49ae8747fd remove code redundancy 2019-08-03 21:22:24 +02:00
Andy Rozman 1047403923 - first commit for Omnipod 2019-07-30 17:49:56 +01:00
Milos Kozak 3ffa75aede
Merge pull request #1899 from MarieT1D/patch-1
string.xml: specify description for Open Loop setting
2019-07-28 14:25:27 +02:00
Marie 0ea9118fc6
string.xml: specify description for Open Loop setting
Adding "Open" to description of 'Minimum request change' in open loop mode and adding " in %" to value,

so that people immediatly know for what it's for
2019-07-28 13:32:16 +02:00
Milos Kozak a0854a895c Language cleanup 2019-07-28 10:20:31 +02:00
Milos Kozak b448bbe670
Merge branch 'dev' into signature_verifier 2019-07-26 22:28:22 +02:00
Milos Kozak 76439777b0 Better bolus wizard warning 2019-07-25 23:32:00 +02:00
Milos Kozak 97c75052e5 Merge branch 'dev' into automation 2019-07-25 18:22:46 +02:00
Milos Kozak 838e19877b add Lithuanian language 2019-07-25 16:43:00 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak 0b28c92c2d
Merge pull request #1868 from andyrozman/medtronic_andy_merge
Medtronic driver merge
2019-07-25 16:15:17 +02:00
Milos Kozak 283fa0debf fix string 2019-07-25 15:17:58 +02:00
Milos Kozak 51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Andy Rozman da0b3c84f9 - added translatable="false" to all new keys 2019-07-24 16:42:10 +01:00
Andy Rozman b1320c4bcb - added keys for preferences and fixes on all other places 2019-07-23 16:09:56 +01:00
Milos Kozak e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Milos Kozak b26b583f2b
Merge pull request #1867 from Paulusma/IA-in-BG-graph
Insulin Activity in bg graph
2019-07-15 15:27:04 +02:00
Milos Kozak 7ddf5dd5f6 make translation easier 2019-07-15 12:33:03 +02:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Milos Kozak 72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Johannes Mockenhaupt 0e37228a07
Tidepool: remove category summary (is never displayed). 2019-07-14 11:54:03 +02:00
Milos Kozak 968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus 96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Paulus 4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02:00
Andy Rozman 992f69daaa medtronic-0.12.0-SNAPSHOT
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Andy Rozman a77f10dc94 - small fix for 0.11.8 2019-06-29 18:25:12 +01:00
Andy Rozman 32fad688fc Merge branch 'dev' into medtronic_andy 2019-06-25 14:50:41 +01:00
Milos Kozak 7e8059c3d8
Merge branch 'automation' into triggerLastBolus 2019-06-21 15:34:06 +02:00
Milos Kozak a9d8420451
Merge branch 'automation' into deltaTrigger 2019-06-21 15:22:40 +02:00
Roumen Georgiev 046e2b7495 added triggerCob 2019-06-20 11:12:03 +03:00
Roumen Georgiev 15f6a577c2 trigger bolusAgo 2019-06-19 14:58:13 +03:00