Commit graph

1413 commits

Author SHA1 Message Date
Tim Gunn c9cf2cbae4
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-10 13:05:30 +12:00
Milos Kozak 7fc631a729 RS -> danaRS finished 2020-05-09 10:52:20 +02:00
Milos Kozak 040c76d839 move pass 1 2020-05-08 14:59:30 +02:00
Milos Kozak 61a077542c DanaRPump -> danars 2020-05-08 11:56:02 +02:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Milos Kozak 25bf92300b Merge remote-tracking branch 'origin/dev' into dev2 2020-05-07 23:44:46 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 120c526b80 move to core 2020-05-07 09:54:36 +02:00
Milos Kozak ad472beb4a danars di start 2020-05-06 01:27:38 +02:00
Milos Kozak a02bd59dc0 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 23:28:22 +02:00
Milos Kozak 1f4f5600bc NoSplashAppCompatActivity -> core 2020-05-05 23:27:01 +02:00
Milos Kozak 25c1100330 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 22:49:49 +02:00
Milos Kozak 8858d3b5f9 Merge remote-tracking branch 'origin/dev' into layout 2020-05-05 22:00:54 +02:00
Dominik Dzienia 9a3cc5af82 Adds support for preferences directory, list of preferences to import, additional check on imported preferences metadata 2020-05-05 18:42:53 +02:00
Bart Sopers 7fa1ebfe38 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_dagger_with_initialization_fixes 2020-05-05 00:15:44 +02:00
Milos Kozak 0a63e1f29d Merge branch 'dev' into rs 2020-05-05 00:08:29 +02:00
Milos Kozak d8f27c609c BlePreCheck -> core 2020-05-05 00:02:31 +02:00
Milos Kozak 4a17fdc9a0 Merge remote-tracking branch 'origin/dev' into layout 2020-05-04 21:55:20 +02:00
Milos Kozak ab9da6e2b6 AlertDialogs -> core 2020-05-04 10:49:19 +02:00
Milos Kozak e1ddde9697 FabricPrivacy -> core 2020-05-04 01:27:47 +02:00
Milos Kozak 53383461f0 core module 2020-05-03 21:27:42 +02:00
Tim Gunn 6e4a94f62b
Merge branch 'carbs-required' of github.com:Tornado-Tim/AndroidAPS into carbs-required 2020-05-04 01:45:55 +12:00
Tim Gunn 3c60b0ff73
Remove not needed entry and fix keys 2020-05-04 01:41:09 +12:00
Milos Kozak 22d8b6bcff Merge remote-tracking branch 'origin/dev' into rs 2020-05-03 15:37:02 +02:00
Milos Kozak 3e533f4818
Merge branch 'dev' into carbs-required 2020-05-03 15:17:25 +02:00
Milos Kozak 027bc64f0f Skins 2020-05-03 15:04:08 +02:00
Tim Gunn d5293d896d
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-03 21:06:07 +12:00
Tim Gunn ad39aabeb3
Refactor messages used for carbs required 2020-05-03 17:23:51 +12:00
Tim Gunn a1450feb2b
Merge branch 'display-carsReq' of github.com:twain47/AndroidAPS into carbs-required 2020-05-03 16:45:45 +12:00
Andy Rozman 634042b40d - omnipod eros driver and REQUIRED changes 2020-05-02 21:49:15 +01:00
Milos Kozak 2723e6615d main layout finished 2020-05-02 20:37:37 +02:00
Milos Kozak 2e50e4196d Merge remote-tracking branch 'origin/dev' into layout 2020-05-02 12:23:22 +02:00
Milos Kozak bce3d3b6b9 Verify RSv1 password 2020-05-02 00:17:39 +02:00
Tim Gunn b54e1a0af3
Add LGS 2020-05-02 00:07:24 +12:00
Bart Sopers a0e5ec74fa Improve exception handling 2020-04-29 00:10:53 +02:00
Milos Kozak 90f08279d3 Merge remote-tracking branch 'origin/dev' into rs 2020-04-29 00:07:25 +02:00
Bart Sopers 5d25e39dd1 Verify the message address before accepting 2020-04-27 23:14:00 +02:00
Bart Sopers 45ef41d1a3 Accept packets with a packet address of 0xFFFFFFFF to match PDM & Pod 2020-04-27 22:51:44 +02:00
Tim Gunn 2e89e410d9
clarify definition 2020-04-27 20:33:41 +12:00
Tim Gunn b42304d836
Add skip Neutral Temps preference 2020-04-27 20:09:46 +12:00
Bart Sopers 9a5cd3c902 Add some checks and logging in Omnipod packet and message exchange 2020-04-26 21:11:47 +02:00
Andy Rozman 973403e944 - changes from omnipod tree
- changed PumpInterface for TimeDateOrTZChangeReceiver changes, and changes on all the pumps (method name and parameters)
    - some RL changes
    - added something to profile
2020-04-25 21:10:58 +01:00
Milos Kozak 29f71f283d Merge remote-tracking branch 'origin/dev' into rs 2020-04-24 23:03:46 +02:00
Milos Kozak 8f8fe39bfe typo 2020-04-24 16:22:43 +02:00
Milos Kozak 55ecac882d translatable=false 2020-04-24 10:46:43 +02:00
Milos Kozak 7b4cba14d1 Merge remote-tracking branch 'origin/dev' into rs 2020-04-23 23:54:21 +02:00
Milos Kozak e068bf4337 StatusLights thresholds adjustable in preferences 2020-04-23 22:54:28 +02:00
Milos Kozak 639dfd3f77 remove unused code 2020-04-23 02:48:38 +02:00
Milos Kozak 9d83ff0cc3 StatusLights cleanup 2020-04-23 02:42:50 +02:00
Milos Kozak 07e681f35f Merge branch 'dev' into rs 2020-04-21 22:20:27 +02:00
Milos Kozak 1ed2923119
Merge pull request #2586 from xJoe/dev
auto_gate docs + link
2020-04-21 20:10:03 +02:00
Milos Kozak 05433d7b3e Merge remote-tracking branch 'origin/dev' into rs 2020-04-21 19:32:34 +02:00
Milos Kozak d2c9f13932 better password processing, master password to setup wizard 2020-04-21 14:50:28 +02:00
xJoe 365a270ece
auto_gate docs + link
docs instead of wiki + link to wiki page
2020-04-21 11:50:44 +02:00
Milos Kozak b3db476533 Merge remote-tracking branch 'origin/dev' into rs 2020-04-21 10:57:04 +02:00
Milos Kozak 3d68b28179 objective 11 automation 2020-04-21 10:32:14 +02:00
Milos Kozak e526ad4617 model string 2020-04-20 21:28:29 +02:00
Milos Kozak 164a092857 Merge remote-tracking branch 'origin/dev' into rs 2020-04-20 21:02:47 +02:00
Milos Kozak 2517a10a5c Show Absolute insulin 2020-04-20 14:18:39 +02:00
Milos Kozak 228bd76e78 No protection by default 2020-04-20 01:18:10 +02:00
Milos Kozak d933cc5817 move arrays out of protection.xml 2020-04-19 18:48:54 +02:00
Milos Kozak 1ed08e8daa fix protection.xml 2020-04-19 18:24:29 +02:00
Milos Kozak 955d75ed79 bug in strings 2020-04-19 17:59:05 +02:00
Milos Kozak e185d3d7f2 bug in strings 2020-04-19 17:58:21 +02:00
Milos Kozak 23289bd68f bug in strings 2020-04-19 17:56:52 +02:00
Milos Kozak f595560baa RS insulin and canula change logging 2020-04-19 12:57:08 +02:00
Milos Kozak 1696092844 Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-08 17:29:15 +02:00
Milos Kozak 453a55db7b Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-07 13:15:06 +02:00
Milos Kozak a4e7d1ee1f
Merge branch 'dagger3' into AS0ref 2020-04-07 12:49:21 +02:00
Milos Kozak 93784fc8be Multiple graph support 2020-04-07 11:55:56 +02:00
Tim Gunn a88db5b457
Revert "Remove oref0"
This reverts commit 785b4540c9.
2020-04-06 21:11:47 +12:00
Milos Kozak aa8ddc67e5 Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-06 09:53:20 +02:00
Milos Kozak 731bd1c8cb
Merge pull request #2228 from Tornado-Tim/update-oref
Update Oref to 0.7.0
2020-04-06 09:45:15 +02:00
Tim Gunn f0bdafc1d6
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-04-06 18:46:58 +12:00
Tim Gunn a87681a31a
fix variable 2020-04-06 18:45:47 +12:00
Dominik Dzienia f1770c093b Introduced Patient name, refactored SMS OTP and Prefs Export to use it 2020-04-05 21:35:19 +02:00
Tim Gunn 63fb50a2e6
Update oref1 text. 2020-04-05 22:35:49 +12:00
Tim Gunn 785b4540c9
Remove oref0 2020-04-05 22:33:20 +12:00
Andy Rozman 88554ee376 Merge branch 'dev' into omnipod_eros_dev 2020-04-04 20:25:09 +01:00
Tim Gunn acab0b87be
Merge branch 'dagger3' of github.com:MilosKozak/AndroidAPS into update-oref 2020-04-05 00:45:47 +13:00
Milos Kozak 013018ac7b Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-02 22:06:17 +02:00
Milos Kozak dbc199d00c Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2020-04-02 18:48:49 +02:00
Milos Kozak 615b025600 Merge branch 'pull/2542' into dagger3 2020-04-02 18:48:37 +02:00
Dominik Dzienia 1c97f8a720 Preferences Encryption:
- encrypted JSON format support
 - using master password & password prompt
- refactored alerts
2020-04-01 13:59:10 +02:00
Roumen Georgiev b95f882956 initial work 2020-03-30 15:53:12 +03:00
Milos Kozak a85ec262d3 Display Dana model 2020-03-28 22:40:56 +01:00
Milos Kozak 502eb59089 Merge remote-tracking branch 'origin/dagger3' into rs 2020-03-27 21:49:20 +01:00
Milos Kozak 5ce8b998d9 RS v3 encryption 2020-03-26 20:25:20 +01:00
Tim Gunn d8ccaadc03
Merge branch 'dagger3' of github.com:MilosKozak/AndroidAPS into update-oref 2020-03-26 12:17:08 +13:00
Dominik Dzienia c58c62d4bc Tost shown when password is set now show when password is not set at end (cancel) or unset 2020-03-25 14:47:28 +01:00
Tim Gunn e1d8691af2
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into update-oref 2020-03-25 13:30:12 +13:00
Dominik Dzienia 6e9ccc593f Support for master password and storing password as hashes (HMAC) instead of plaintext,
additional crypto utils with tests (partialy for in-progress pref export encryption),
changed PasswordCheck to more common UI and to use lambdas (will need given password in lambda callback for prefs enc)
2020-03-25 01:21:20 +01:00
Milos Kozak 0e9f643241 Merge branch 'biometric' into dagger3 2020-03-22 19:59:35 +01:00
Milos Kozak 34434ffc62
Merge pull request #2452 from StephenBrown2/add_mdt_nimh
Add NiMH battery option for Medtronic pumps
2020-03-21 15:34:54 +01:00
Milos Kozak a12762f034 Move OTP settings to preferences 2020-03-20 17:31:30 +01:00
Milos Kozak 4d88786fb6 Force TOTP 2020-03-20 16:22:38 +01:00
Milos Kozak 5d32bfec95 Merge branch 'dagger3' into TOTP 2020-03-20 15:58:17 +01:00
Milos Kozak e27ddc1772 Merge branch 'dev' into dagger3 2020-03-17 18:47:43 +01:00
Milos Kozak d6997f8190 Objectives text change 2020-03-15 12:07:09 +01:00
Milos Kozak 99aec40534 Merge branch 'dev' into dagger3 2020-03-10 22:39:26 +01:00
Brian Quinion b1097880f4 Add carbs required to overview. Add notification with option to ignore carbs suggestions for 5, 15 or 30min 2020-03-10 18:46:14 +00:00
Brian Quinion 063d3685e1 Show carb suggestions from OpenAPS 2020-03-10 11:30:13 +00:00
TebbeUbben 7d9c1f8af9 Use "Display time-sensitive notifications" for Insight alerts 2020-03-09 23:07:55 +01:00
Andy Rozman f482250b70 Merge branch 'omnipod_eros_dev' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-03-07 19:51:25 +00:00
Andy Rozman 44cc3f6119 - problem with settings 2020-03-07 19:50:51 +00:00
Bart Sopers 3eea2598f2 Merge tag '2.6.0' into omnipod_eros_dev 2020-03-03 21:33:31 +01:00
Andy Rozman bba4c36294 - changed TimeDateOrTZChangeReceiver, to not reach on date change (bug), and extended detections (and also logs)...
- Pump drivers will now be notified that there was time/timezone change with more details. TimeChangeType is sent that tells if change was TZ or DST Start/End or Time change
- added setting to Omnipod settings, that can disable event
- partitial fix for #55
2020-02-29 16:27:42 +00:00
Stephen Brown II 413553a9c2 Add NiMH battery option for Medtronic pumps 2020-02-22 11:34:07 -07:00
Dominik Dzienia 0f0452a1c4 Support for Time-based One-time Passwords (TOTP) in SMS Communicator 2020-02-11 12:16:41 +01:00
Milos Kozak 2d321d2a5b Merge branch 'dev' into dagger3 2020-02-03 23:15:34 +01:00
Milos Kozak db47cd6fe9 Android 10 permission 2020-02-03 18:23:20 +01:00
Milos Kozak b5a64f4d85 better timestamps on Loop tab 2020-02-02 22:12:54 +01:00
Andy Rozman 595f838d0f - fixed display bolus and basal #71
- for bolus we needed to change translation (it was displaying one decmal places)
2020-02-01 15:44:13 +00:00
Tim Gunn 0ea13b5671
Merge Upstream 2020-01-29 22:37:44 +13:00
Andy Rozman bc6e4be3ad - reworking pump suspended / initialization of driver problem 2020-01-28 19:00:16 +00:00
Milos Kozak d559961c12 DataBroadcastPlugin 2020-01-28 18:00:46 +01:00
Milos Kozak cf2855ab02 Merge branch 'dev' into dagger3 2020-01-26 21:15:57 +01:00
Milos Kozak 75fad1b18e convert layouts to Constraint 2020-01-25 21:31:13 +01:00
Bart Sopers db2c95af46 make preference key non-translatable 2020-01-19 21:48:11 +01:00
Bart Sopers 6f2e39dca7 Remove pump unreachable preferences for pumps that have a fixed unreachable warning 2020-01-19 21:40:37 +01:00
Milos Kozak 7607185086 show duration of careportal events 2020-01-15 21:55:53 +01:00
Milos Kozak ab51cb4d01 Merge branch 'dev' into dagger3 2020-01-15 20:47:08 +01:00
Milos Kozak 1e3c979b51 PhoneChecker 2020-01-15 19:56:57 +01:00
Milos Kozak 9fd71ea538 Merge branch 'dev' into dagger3 2020-01-13 23:28:53 +01:00
Milos Kozak 94dd843825 Allow EB in open loop mode 2020-01-13 22:16:13 +01:00
Milos Kozak ac5ea83d38 more of dagger 2020-01-10 23:14:58 +01:00
Milos Kozak 0d85ad4f69 Preference xml files cleanup 2020-01-09 21:41:02 +01:00
Milos Kozak 5c8c263c17
Textvalidator (#2343), Preference to jetpack 2020-01-08 20:20:20 +01:00
Andy Rozman 18145d91d9 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-07 22:40:28 +01:00
Andy Rozman 39ce23ec86 - notification that pod is not available... Will be refreshed every 15 minutes. 2020-01-07 22:37:37 +01:00
Bart Sopers ceca00ca50 Fix cancel TBR type in Pod history 2020-01-06 22:35:24 +01:00
Bart Sopers d4df928aac Change insert cannula text a little 2020-01-05 18:09:00 +01:00
Andy Rozman 9f215e607c - moving classes around a little for init pod
- change text
2020-01-05 15:33:35 +01:00
Milos Kozak bd1b1d8d76 DanaRS refactor 2020-01-04 13:44:50 +01:00
Milos Kozak 0ea47a333c Merge branch 'dev' into dagger3 2020-01-03 22:58:33 +01:00
Milos Kozak a5393eff84 revert TRB displaying 2020-01-03 22:52:21 +01:00
Milos Kozak a622bfa559 FabricPrivacy, notifications 2020-01-03 14:30:39 +01:00
Milos Kozak 45afd5ec34 DstHelperPlugin refactor 2020-01-02 20:48:36 +01:00
Milos Kozak 88994d1b54 Merge branch 'dev', remote-tracking branch 'origin' into dagger3 2020-01-02 19:38:06 +01:00
Milos Kozak d71f036dba Revert in range color 2020-01-01 23:44:13 +01:00
Milos Kozak bcc3829915 NSClient rafactor 2020-01-01 23:23:16 +01:00
Andy Rozman 5230a2dda0 - moved PumpHistoryEntryGroup to commons package
- added ProfileUtil with method to show basal profile so that we can display it
- changed PodHistoryActivity to display values (for Bolus, TBR and SetProfile)
2020-01-01 18:45:15 +01:00
Milos Kozak 65f107b01d wearplugin -> dagger 2019-12-30 19:23:17 +01:00
Bart Sopers 05d09e3530 Revert "Prevent TBR from being cancelled twice when setting a new TBR"
This reverts commit 12a71b8d3e.
2019-12-30 13:11:30 -05:00
Andy Rozman f110ab2ba3 - database bolus + treatments AAPS
- database TBR + treatments AAPS
- refactoring bolus a little
2019-12-30 17:30:54 +01:00
Bart Sopers 943a9f0e20 Knit in Omnipod translations 2019-12-29 12:21:35 -05:00
Bart Sopers 991bde8182 Processed @ZandMarc's suggestions for init Pod wizard strings 2019-12-29 12:16:18 -05:00
Milos Kozak 1ac0094f48 Merge branch 'dev' into dagger3 2019-12-29 11:50:15 +01:00
Milos Kozak 82882c52e6
Merge pull request #2305 from osodebailar/refactor-header-area
refactor overview with new header area and better formated user value…
2019-12-28 22:06:49 +01:00
Milos Kozak 377b5a9991 StatusLinePlugin -> kt, dagger 2019-12-28 15:00:16 +01:00