Commit graph

8981 commits

Author SHA1 Message Date
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
Milos Kozak 51396de73d
Merge pull request #2628 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Updates from Omnipod repo
2020-05-07 22:09:35 +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
Milos Kozak be21255915
Merge pull request #2623 from dlvoy/dev-prefs-dir
Support for preferences dir and preferences selection list during import
2020-05-05 20:03:05 +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