Johannes Mockenhaupt
65ca6cf895
ComboPlugin: fix handling benin warnings.
...
This change provides usable input to the check* methods. Since a dummy PumpState is returned when a command runs into a warning/alarm on the pump, the checkAndResolveTbrMismatch() reads that no TBR is active and creates a TBR-end record in the DB, which is wrong (and yes, returning a dummy PumpState rather than returning and handling null is a questionable design decision). Effectively this is only a concern when AAPS confirms a low cartridge or low battery alarm, so it's impact is small.
2020-04-11 00:23:59 +02:00
Milos Kozak
695e23c3bd
Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3
2020-04-08 20:30:08 +02:00
Milos Kozak
4768807a08
fix NPE
2020-04-08 20:24:22 +02:00
Milos Kozak
1696092844
Merge remote-tracking branch 'origin/dagger3' into rs
2020-04-08 17:29:15 +02:00
Milos Kozak
f1b3471cf4
Merge pull request #2550 from Tornado-Tim/AS0ref
...
Autosens Upgrade
2020-04-08 17:28:39 +02:00
Milos Kozak
42957d3e48
Merge remote-tracking branch 'origin/dagger3' into rs
2020-04-08 17:05:17 +02:00
Milos Kozak
0585ba80fa
Cleanup
2020-04-08 14:03:57 +02:00
Milos Kozak
1bed02a030
Forgotten change
2020-04-07 18:23:07 +02:00
Milos Kozak
4644159c82
Use coroutines for graph processing
2020-04-07 14:15:30 +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
61acfb8c92
Fix tests
2020-04-07 12:09:12 +02:00
Milos Kozak
4c0601bf46
Merge pull request #2555 from Tornado-Tim/refractor-algo
...
Refactor Algorithms (MA removal)
2020-04-07 11:59:11 +02:00
Milos Kozak
a10a62fc81
Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3
2020-04-07 11:56:15 +02:00
Milos Kozak
93784fc8be
Multiple graph support
2020-04-07 11:55:56 +02:00
Milos Kozak
7e89777853
Merge pull request #2558 from dlvoy/dagger3-cryptoinject
...
Making CryptoUtil injectable, additional checks in crypto-related tests
2020-04-07 10:54:03 +02:00
Dominik Dzienia
9dca938698
Refactored CryptoUtil to make it injectable and more testable
...
Added checks for vanilla JVM AES 256 issues in tests
2020-04-06 23:48:25 +02:00
Tim Gunn
babb97df24
remove old determine_basal
2020-04-06 22:26:21 +12:00
Tim Gunn
b009c7bed2
Move the APS logger to its own package
2020-04-06 22:01:15 +12:00
Tim Gunn
bebe9015e8
Remove MA
2020-04-06 22:00:17 +12:00
Tim Gunn
a88db5b457
Revert "Remove oref0"
...
This reverts commit 785b4540c9
.
2020-04-06 21:11:47 +12:00
Milos Kozak
a8d76cef4c
fix SmsPluginCommunicatorTest
2020-04-06 10:36:08 +02:00
Milos Kozak
0d89262dfa
fix SmsPluginCommunicatorTest
2020-04-06 10:35:00 +02: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
Milos Kozak
9f58270f88
Merge pull request #2553 from dlvoy/dagger3-patient-name
...
Introduced Patient name, refactored SMS OTP and Prefs Export to use it
2020-04-06 09:44:20 +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
Milos Kozak
2995999989
Merge remote-tracking branch 'origin/dev' into dagger3
2020-04-06 00:19:12 +02:00
Milos Kozak
0f6f344f63
Merge pull request #2552 from MilosKozak/2.6.1.1
...
2.6.1.1
2020-04-05 23:41:28 +02:00
Milos Kozak
d64edd486b
Merge branch 'master' into 2.6.1.1
2020-04-05 21:37:05 +02:00
Milos Kozak
27b433d773
bump 2.6.1.1
2020-04-05 21:36:01 +02:00
Dominik Dzienia
f1770c093b
Introduced Patient name, refactored SMS OTP and Prefs Export to use it
2020-04-05 21:35:19 +02:00
Winfried Kuiper
98af8531f0
Typo in log message ( #2547 )
2020-04-05 21:11:13 +02:00
Milos Kozak
93523d5828
Merge pull request #2551 from MilosKozak/l10n_dev
...
New Crowdin translations
2020-04-05 21:09:26 +02:00
Milos Kozak
970f553a9e
Merge pull request #2533 from jotomo/2742-2
...
SMS Carb command update
2020-04-05 21:09:12 +02:00
Milos Kozak
856ef12f16
New translations objectives.xml (Dutch)
2020-04-05 18:33:39 +02:00
Tim Gunn
91e36e01ba
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref
2020-04-05 23:04:49 +12:00
Tim Gunn
6d064fb56c
fix preference screen to conform to norms
2020-04-05 23:03:19 +12: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
Tim Gunn
d960cb038f
Remove options from exam that are no longer available
2020-04-05 22:10:25 +12:00
Tim Gunn
f707c72634
Remove oref0 sensitivity
2020-04-05 22:02:37 +12:00
Milos Kozak
e664ee027d
Merge pull request #2548 from dlvoy/dagger3-otpfix
...
Fixed crash on pre-26 API due to lack of java.time.Duration in depenent OTP lib
2020-04-05 10:04:59 +02:00
Milos Kozak
312d863e38
OverviewFragment refactor
2020-04-05 10:04:21 +02:00
Tim Gunn
1509fe2dea
merge into dagger
2020-04-05 14:22:19 +12:00
Tim Gunn
0a8d456d01
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref
2020-04-05 14:21:20 +12:00
Dominik Dzienia
033ca414f7
Fixed crash on pre-26 API due tu lack of java.time.Duration in dependent OTP lib
2020-04-05 01:37:05 +02:00
Andy Rozman
88554ee376
Merge branch 'dev' into omnipod_eros_dev
2020-04-04 20:25:09 +01:00
Andy Rozman
b689ddfc99
- changed PumpType
2020-04-04 17:15:06 +01:00