Commit graph

7690 commits

Author SHA1 Message Date
Tim Gunn
9070a1f394
Add Preferences for local carbs req alerts 2020-05-10 21:23:44 +12:00
Tim Gunn
e8062e1209
Add Red Carb Icon 2020-05-10 21:21:45 +12:00
Milos Kozak
311f9dd119 danar module 2020-05-10 11:03:19 +02:00
Tim Gunn
c9cf2cbae4
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-10 13:05:30 +12:00
Milos Kozak
a99be409eb dana module 2020-05-09 20:18:12 +02:00
Milos Kozak
7fc631a729 RS -> danaRS finished 2020-05-09 10:52:20 +02:00
Philoul
84f032a7a2 Revert "Temp Basal icon switched"
I replace first proposal with a new one with 3 icons

This reverts commit 24112eb4
2020-05-08 17:58:01 +02:00
Philoul
7708e5961a Add new icons for basal on ovenview fragment
I also add photoshop files (it's bitmap but it's easier to work with them)
2020-05-08 17:56:02 +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
73d132649d fix tests 2020-05-08 11:37:14 +02:00
Milos Kozak
67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Milos Kozak
15207d1bf1 Omni comments 2 2020-05-08 01:09:30 +02:00
Milos Kozak
7dc7c9528b Omni comments 2020-05-08 00:23:17 +02:00
Milos Kozak
25bf92300b Merge remote-tracking branch 'origin/dev' into dev2 2020-05-07 23:44:46 +02:00
Milos Kozak
70e9d3e88a fix tests 2020-05-07 23:40:59 +02:00
Bart Sopers
eb6eebe853 Restore version for upstream merge from Omnipod repo 2020-05-07 21:17:32 +02:00
Bart Sopers
7f2448adeb Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-05-07 21:16:36 +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
Philoul
24112eb437 Temp Basal icon switched 2020-05-07 08:29:03 +02:00
Andy Rozman
5527c3d70d - remove omnipod as option from config builder 2020-05-07 01:04:29 +01:00
Andy Rozman
674cd1c0ae Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-07 00:43:18 +01:00
Andy Rozman
4f79b49e10 - changed loader to OmnipodUtil
- Modules
2020-05-06 23:34:05 +01:00
Bart Sopers
25e0b8b190 Add dagger stuff 2020-05-06 23:38:56 +02:00
Bart Sopers
bafffad44a Use transient keyword instead of Gson annotation for PodSessionState members that should be exluded of (de)serialization 2020-05-06 21:41:33 +02:00
Milos Kozak
ad472beb4a danars di start 2020-05-06 01:27:38 +02:00
Milos Kozak
cf291b3adc fix after lib update 2020-05-06 01:18:04 +02:00
Milos Kozak
f964011724 Merge remote-tracking branch 'origin/dev' into rs 2020-05-06 00:05:33 +02:00
Milos Kozak
0c287bdef1 icon -> core 2020-05-06 00:04:53 +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
d114be7344 revert debug code 2020-05-05 22:43:26 +02:00
Milos Kozak
bba7adc9aa fix Runnables after protection check, cleanup 2020-05-05 22:42:16 +02:00
Milos Kozak
8858d3b5f9 Merge remote-tracking branch 'origin/dev' into layout 2020-05-05 22:00:54 +02:00
Milos Kozak
bbf5e6564f new icons 2020-05-05 22:00:35 +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
Andy Rozman
f3c4b4e5e7 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-05 13:50:53 +01:00
Andy Rozman
e51e3daeb1 - added Expose attribute to all varaiables in PodSessionState
- OmnipodUtil: Gson now uses only Expose fields
2020-05-05 13:49:55 +01:00
Bart Sopers
9b089621fa Use allowed default for SP.getString in RileyLinkOmnipodService 2020-05-05 13:35:49 +02:00
Andy Rozman
2de1761555 - look at current pump service (either MDT or POD), RL Boradcast Receiver worked with internal instance, which wasn't correct, might need to refactor RileyLinkBroadcastReceiver further to be singelton... 2020-05-05 10:32:25 +01:00
Bart Sopers
32ce3ee18a enable PUMPBTCOMM by default for Omnipod branch 2020-05-05 02:34:08 +02:00
Bart Sopers
53e6cd4ef2 Apply several fixed from @andyrozman after Omnipod dagger merge 2020-05-05 02:03:01 +02:00
Bart Sopers
e20d8a1ff5 Improve Omnipod preference screen 2020-05-05 01:35:39 +02:00
Bart Sopers
0f8503032e Use correct RL address preference in Omnipod preferences 2020-05-05 01:25:34 +02:00
Bart Sopers
20f9f88d4b Use allowed default for SP.getString 2020-05-05 01:05:57 +02:00
Bart Sopers
d78b921b1f Fix test case 2020-05-05 00:39:20 +02:00
Bart Sopers
f7f5e0ce19 Replace static reference with member reference 2020-05-05 00:28:27 +02:00
Andy Rozman
7db7e07a70 - added SP to OmnipodUtil 2020-05-04 23:25:03 +01: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
Bart Sopers
ce435be382 Fix merge error 2020-05-04 23:56:24 +02:00
Bart Sopers
5e3e947d8e Restore more formatting 2020-05-04 23:55:01 +02:00
Bart Sopers
e7fe05dbeb Restore more formatting 2020-05-04 23:52:51 +02:00
Bart Sopers
1bdc474b51 Properly ignore PodSessionState test cases 2020-05-04 23:52:44 +02:00
Bart Sopers
d8eb777b4c Restore more formatting 2020-05-04 23:36:00 +02:00
Bart Sopers
acf6b50b66 Restore formatting in AndroidManifest.xml 2020-05-04 23:22:42 +02:00
Bart Sopers
df2de82810 Apply @andyrozman's fixes for compilation errors 2020-05-04 23:06:15 +02:00
Bart Sopers
71d5409344 Revert "- removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent"
This reverts commit ea0b89cbf8.
2020-05-04 22:50:08 +02:00
Milos Kozak
4a17fdc9a0 Merge remote-tracking branch 'origin/dev' into layout 2020-05-04 21:55:20 +02:00
Milos Kozak
47fd4bd1fe libraries update 2020-05-04 21:37:03 +02:00
Milos Kozak
d0fc697183 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-04 21:03:34 +02:00
Milos Kozak
ee913cffd8 gradle tweaking 2020-05-04 21:03:30 +02:00
Andy Rozman
ea0b89cbf8 - removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent
- fixed commpiling problem
- removed OmnipodService from Manifest
2020-05-04 17:51:06 +01:00
TebbeUbben
1c075c526e 2.6.1.4 2020-05-04 17:36:37 +02:00
Bart Sopers
1798d260eb Merge branch 'dev' into omnipod_eros_dev_dagger_history_fix 2020-05-04 17:36:29 +02:00
Andy Rozman
5ed86e571d - fixed problem with RL selector in omnipod prefs 2020-05-04 12:09:57 +01:00
Andy Rozman
6aaca5899c - changed Omnipod module 2020-05-04 11:27:12 +01:00
Milos Kozak
d0221c34aa
Merge pull request #2616 from Philoul/Fix_TemporaryBasal_Crash
Fix Crash TemporyBasal
2020-05-04 11:53:22 +02:00
Milos Kozak
948bb8dc33
Merge pull request #2617 from Philoul/DatabaseHelper_Missing_Function
Add missing function in DatabaseHelper
2020-05-04 11:52:50 +02:00
Milos Kozak
ab9da6e2b6 AlertDialogs -> core 2020-05-04 10:49:19 +02:00
Philoul
3e63d32d60 Add missing function in DatabaseHelper
getExtendedBolusDataFromTime(long from, long to, boolean ascending)
=> I need it for autotune plugin...
2020-05-04 10:40:22 +02:00
Philoul
d44bc87d1b Fix Crash TemporyBasal
Injector missing with extendedbolus
2020-05-04 10:15:21 +02:00
Milos Kozak
2fb0198418 RxBus -> core 2020-05-04 01:36:46 +02:00
Milos Kozak
e1ddde9697 FabricPrivacy -> core 2020-05-04 01:27:47 +02:00
Milos Kozak
5be4a5dd97 AAPSLogger -> core 2020-05-04 00:42:13 +02:00
Milos Kozak
99907ed029 SP -> core 2020-05-04 00:33:27 +02:00
Milos Kozak
7e6f82d068 Lgging cleanup 2020-05-04 00:14:23 +02:00
Milos Kozak
db16434154 build.gradle unify 2020-05-03 22:18:58 +02:00
Milos Kozak
53383461f0 core module 2020-05-03 21:27:42 +02:00
Milos Kozak
591cef11e5
2.6.1.3 2020-05-03 19:48:48 +02:00
TebbeUbben
abb9505122 Insight: Disable vibration on bolus for firmware version 3 2020-05-03 18:52:26 +02:00
Milos Kozak
c17f8d10ad split dependency to IconsProvider 2020-05-03 17:50:33 +02:00
Andy Rozman
02366cad62 - small cosmetic change 2020-05-03 16:02:41 +01:00
Milos Kozak
a5f384f07f forgotten code 2020-05-03 16:10:48 +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
Bart Sopers
57be461fd4 Don't keep next Pod address in AapsOmnipodManager 2020-05-03 13:59:33 +02:00
Bart Sopers
5b96e18234 Don't log full stack trace of ignored Exception in OmnipodCommunicationService.exchangePackets 2020-05-03 13:50:11 +02:00
Bart Sopers
b676638942 Remove next pod address after succesful pairing 2020-05-03 13:43:06 +02:00
Bart Sopers
e01ac6f6be Fix failing Omnipod test cases 2020-05-03 13:37:50 +02:00
Bart Sopers
79d64dff64 Use static Pod address in between pairing retries and remove unused methods from OmnipodUtil 2020-05-03 13:31:19 +02:00
Tim Gunn
1598d0c45e
Use different defaults if using Medtronic Pump 2020-05-03 23:11:29 +12:00
Tim Gunn
39d011a4cc
Move to Medtronic driver 2020-05-03 23:10:46 +12:00
Tim Gunn
017b6187b5
Patch determine basal 2020-05-03 23:09:48 +12:00
Bart Sopers
a0b4e0c7ce Update PodProgressStatus values to match Omnikit Wiki 2020-05-03 12:59:24 +02:00
Andy Rozman
7df0bdd82c - removed tests, they need to be reworked 2020-05-03 11:59:09 +01:00
Andy Rozman
97ca0a2a2f - fixed test 2020-05-03 11:35:47 +01:00
Andy Rozman
91b3b67104 - fix the test 2020-05-03 11:01:40 +01: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
b1b6a1b6af
Further refractor and use shared preferences 2020-05-03 18:04:51 +12:00
Tim Gunn
e1e81ed3e4
Use Summary text 2020-05-03 17:24:25 +12:00
Tim Gunn
ad39aabeb3
Refactor messages used for carbs required 2020-05-03 17:23:51 +12:00
Tim Gunn
0e2de9d140
Convert to Kotlin 2020-05-03 17:06:10 +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
Milos Kozak
75251e3870 cache more pages in Pager 2020-05-03 01:06:36 +02:00
Milos Kozak
818e7cd6b6 Merge remote-tracking branch 'origin/dev' into layout 2020-05-03 00:32:30 +02:00
Milos Kozak
8fe57c9d7a unify layouts 2020-05-03 00:32:26 +02:00
Andy Rozman
634042b40d - omnipod eros driver and REQUIRED changes 2020-05-02 21:49:15 +01:00
Andy Rozman
0149378b13 - clean up after merge prepare 2020-05-02 21:42:49 +01:00
Milos Kozak
2723e6615d main layout finished 2020-05-02 20:37:37 +02:00
Andy Rozman
037d9e88df Merge branch 'dev' into omnipod_eros_dev_dagger 2020-05-02 15:30:59 +01:00
AdrianLxM
9995e7448b RandomBGPlugin - stay between min and max
The sinus is in interval [-1,1].
If we shift it by one interval it would map it to 0 to 2 times the interval -> divide by two.
2020-05-02 12:30:22 +02:00
Milos Kozak
9ed1a9ba69
Merge pull request #2607 from MilosKozak/AdrianLxM-patch-2
Removed internal function
2020-05-02 12:28:13 +02:00
Milos Kozak
2e50e4196d Merge remote-tracking branch 'origin/dev' into layout 2020-05-02 12:23:22 +02:00
Tim Gunn
5048111d1d
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into LGS 2020-05-02 21:53:59 +12:00
Andy Rozman
ce48bba868 Merge branch 'dev' into omnipod_eros_dev_dagger
Added Module Omnipod
2020-05-02 10:52:52 +01:00
Tim Gunn
40519b92a2
Fix further tests 2020-05-02 21:22:21 +12:00
Milos Kozak
9efbbd3c17 clanup 2020-05-02 10:49:55 +02:00
Tim Gunn
4c2fdef71a
Fix tests 2020-05-02 19:13:16 +12:00
Tim Gunn
0bbdca3b4a
Add test 2020-05-02 14:50:53 +12:00
Milos Kozak
bce3d3b6b9 Verify RSv1 password 2020-05-02 00:17:39 +02:00
Tim Gunn
5c38762178
Format code so its easier to read 2020-05-02 01:55:11 +12:00
Tim Gunn
9e2c3255e2
Remove not needed getter function 2020-05-02 01:54:46 +12:00
Tim Gunn
96757145bf
Use auto getter method 2020-05-02 01:54:08 +12:00
Tim Gunn
560a081c7c
Inherit from HardLimits class 2020-05-02 01:50:35 +12:00
Tim Gunn
b54e1a0af3
Add LGS 2020-05-02 00:07:24 +12:00
Tim Gunn
01e8934f7a
Add deterministic LGS function 2020-05-02 00:05:50 +12:00
Andy Rozman
48572d64fc - fully daggerized omnipod 2020-05-01 10:55:48 +01:00
Milos Kozak
9a929e4bcb aps status 2020-04-30 23:33:13 +02:00
Milos Kozak
25cc09ec26 Merge remote-tracking branch 'origin/dev' into rs 2020-04-30 18:40:28 +02:00
Milos Kozak
585b45fb97 MainApp cleanup 2020-04-30 18:39:52 +02:00
Milos Kozak
ddd58c37a3 move ongoing notification to extra class 2020-04-30 17:56:40 +02:00
Milos Kozak
18820441a4 remove some deprecated calls 2020-04-30 10:55:10 +02:00
Milos Kozak
42cfd87a2b injection cleanup 2020-04-30 00:37:58 +02:00
Milos Kozak
a5108ca4c4 RS injection refactor 2020-04-29 23:27:48 +02:00
Andy Rozman
4d39cbba95 - daggerizing omnipod 2020-04-29 17:35:55 +01:00
Andy Rozman
b1a220499d Merge branch 'dev' into omnipod_eros_dev_dagger
Refcator omnipod to work with Dagger - Phase 2
2020-04-29 16:40:53 +01:00
Tim Gunn
37756dc71c
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-04-30 00:53:06 +12:00
AdrianLxM
acf9f05928
Removed internal function
TypedArrayUtils is marked as `@RestrictTo(LIBRARY_GROUP_PREFIX)`.
getAttr() will chose between the two parameters, so if both are the same has no functionality anyway.
2020-04-29 00:39:20 +02: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
b482f0690f WIP on always retrying 0x07 and 0x03 messages together 2020-04-29 00:01:11 +02:00
Bart Sopers
b515fbae92 Update VersionResponse 2020-04-28 23:11:32 +02:00
Milos Kozak
99f6741f78
Merge pull request #2604 from MilosKozak/mdtrefactor
MDT refactor
2020-04-28 10:23:48 +02:00