Commit graph

200 commits

Author SHA1 Message Date
Bart Sopers
7840643ba2 Remove unused @ContributesAndroidInjectors in Omnipod module and remove unused Context reference in AapsOmnipodManager 2020-09-06 16:22:18 +02:00
Bart Sopers
efc384f39c Process review findings from upstream merge 2020-09-06 15:31:40 +02:00
Bart Sopers
b944c51372 Process review findings from upstream merge 2020-09-06 15:25:56 +02:00
Bart Sopers
503fc9dbf9 Allow to continue in Setup Wizard when Omnipod has been selected and a RL connection has been established 2020-09-05 04:26:22 +02:00
Bart Sopers
1d3f4d3591 Implement workaround for bolus with timeshift carbs, improve registering implicitly cancelled TBRs and remove some redundant code 2020-09-04 19:25:02 +02:00
Adi Barilan
2b7a0064b1
Fix Pulse Log option enabling both buttons
Previously, enable Pulse Log button showed both it and Suspend Delivery, while the Suspend Delivery option did nothing.
2020-09-04 17:15:11 +03:00
Bart Sopers
cd5bc21b17 Add BatteryReplaceable PumpCapability and hide Battery change button in Actions tab for pumps without this capability (Omnipod); create battery change and insulin change careportal event after activating new Pod 2020-09-03 23:35:03 +02:00
Bart Sopers
4f6e31a784 - Make Low Reservoir Alert & Expiration Advisory Alert optional and configurable
- Organize Omnipod settings
- Various small improvements
2020-09-03 22:04:01 +02:00
Bart Sopers
0a68e8111f Add PumpHistoryEntryGroup to Omnipod fake TBR history entries 2020-09-02 22:52:42 +02:00
Bart Sopers
591a939616 Minor Omnipod improvement 2020-09-02 22:49:26 +02:00
Bart Sopers
4e32761d48 More small Omnipod improvements 2020-09-02 22:10:44 +02:00
Bart Sopers
9b953d1bed Small Omnipod improvements 2020-09-02 21:40:06 +02:00
Bart Sopers
b1abc55def - Improve Pod state accuracy for basal profile & TBR
- Add certainty info about last bolus and temp basal to Pod state and display in OmnipodFragment
- Improve user notifications of delivery errors# Please enter the commit message for your changes. Lines starting
2020-09-02 20:48:56 +02:00
Bart Sopers
363b9242b9 Don't automatically cancel a fake suspended TBR from pod state changes 2020-09-02 02:09:03 +02:00
Bart Sopers
d994f2a184 Move Omnipod dagger module class to Omnipod gradle module 2020-09-02 02:04:31 +02:00
Bart Sopers
9c29a0643e Treat Pod Fault responses as successful communication 2020-09-02 01:37:20 +02:00
Bart Sopers
68ff228426 Fix automatically updating from PodInfoFaultEvent and improve detecting cancelled TBRs 2020-09-02 01:26:36 +02:00
Bart Sopers
d1074ac3eb Fix typo 2020-09-01 20:27:05 +02:00
Bart Sopers
01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Bart Sopers
75fa81f945 Read TBR in Omnipod tab from PodStateManager instead of TreatmentsPlugin, fix crash and some small improvements 2020-08-28 09:55:14 +02:00
Bart Sopers
0dac395b1a Fix wrong condition for determining whether or not Pod was suspended before setting basal schedule 2020-08-28 01:29:25 +02:00
Bart Sopers
aa7e57512a Move Omnipod RileyLink classes into subpackages 2020-08-28 01:22:50 +02:00
Bart Sopers
d26cd9f069 Create fake 0 TBR when Pod is not running 2020-08-28 01:18:32 +02:00
Bart Sopers
ede70fdf6c Fix reporting implicitly cancelled TBRs 2020-08-27 22:20:42 +02:00
Bart Sopers
77b359fa74 Try to verify delivery status in case of failures in commands that change delivery status 2020-08-27 22:18:23 +02:00
Bart Sopers
923294ed1f Add ticksDelivered to PodInfoFaultEventTest 2020-08-27 20:35:15 +02:00
Bart Sopers
ff72b0d474 Automatically update pod state from PodInfoFaultEvent 2020-08-26 21:58:54 +02:00
Bart Sopers
908c666d5f Show Suspend & resume button in the same place and don't show suspend button when the Pod is suspended 2020-08-26 14:57:40 +02:00
Bart Sopers
0dba553ebe Remove redundant null checks 2020-08-26 13:50:17 +02:00
Bart Sopers
14652ab917 Add optional Suspend delivery button; fix bug where AAPS tries to set bolus before Pod activation is completed; cleanup preferences & several enums; use String resources for RL History items 2020-08-26 13:45:32 +02:00
Bart Sopers
28df570a6a - Improve logging levels in Omnipod and RileyLink module
- Code improvements
- Minor translation improvements
- Add some TODOs
2020-08-25 22:45:24 +02:00
Bart Sopers
dc7ed96657 - Add alerts when pump is suspended & add button to resume delivery
- Improve status check loop in OmnipodPumpPlugin
2020-08-25 10:14:03 +02:00
Bart Sopers
6b6b4eb759 Restore command queue in Pod status, properly update it and disable buttons when queue is not empty 2020-08-25 02:07:59 +02:00
Bart Sopers
ae4b25af89 Decrease I/O load and number of events during command exchange; remove queue status from Omnipod tab and switch reservoir & units delivered; small bug fixes 2020-08-24 23:30:26 +02:00
Bart Sopers
c84798e368 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_state 2020-08-24 00:37:03 +02:00
Bart Sopers
ac922316a9 Improve fix for #149 by not trying to serialize non-serializable fields 2020-08-24 00:18:20 +02:00
Bart Sopers
78725ec013 Fix button state in Omnipod tab 2020-08-23 23:40:22 +02:00
Bart Sopers
15b0701d06 Add null check for total insulin delivered in Omnipod tab 2020-08-23 22:40:32 +02:00
Bart Sopers
8911bcd508 Small improvements and import order 2020-08-23 21:48:25 +02:00
Steffen Müthing
85048c9a02 Simplify total delivered insulin display as suggested by Bart 2020-08-23 19:27:34 +02:00
Bart Sopers
ddd9687425 Reorganized packages and removed a few unused classes 2020-08-23 19:21:01 +02:00
Steffen Müthing
633767ad3d Subtract setup units from displayed total insulin delivered 2020-08-23 18:28:51 +02:00
Steffen Müthing
f3a7a5a393 Add constant POD_SETUP_UNITS for the total number of units delivered during pod setup 2020-08-23 18:28:51 +02:00
Steffen Müthing
e66033ab1e Show total dose delivered by pod in OmnipodFragment
This includes the units delivered during priming and cannula insertion, but it
gives a nice approximation of the remaining insulin if you remember what you
injected.
2020-08-23 18:28:51 +02:00
Steffen Müthing
61d6c638b7 Provide total insulin delivered from Pod available in PodStateManager 2020-08-23 18:28:51 +02:00
Steffen Müthing
00b9379b8c Make delivered ticks available in status response 2020-08-23 18:28:51 +02:00
Bart Sopers
aede5648a9 Add/remove/update comments and TODOs in OmnipodPumpPlugin and rename a method 2020-08-23 17:35:12 +02:00
Bart Sopers
afd890a519 Remove redundant interface and split initPod into two separate methods 2020-08-23 17:12:49 +02:00
Bart Sopers
4a10a04f79 Remove OmnipodUiComm and OmnipodUiTask 2020-08-23 16:15:35 +02:00
Bart Sopers
887a1672dc Don't force overview to refresh immediately in Omnipod events 2020-08-23 15:01:08 +02:00
Bart Sopers
91d0da9f51 More cleanup in OmnipodPumpPlugin 2020-08-23 14:55:12 +02:00
Bart Sopers
5cd46a90a0 Remove excessive RefreshOverview events 2020-08-23 14:37:21 +02:00
Bart Sopers
c70fedbc72 Improve button state handling in Omnipod tab, read Pod status on AAPS startup and some cleanup 2020-08-23 14:32:05 +02:00
Bart Sopers
219b1e02ba Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_state 2020-08-23 13:07:10 +02:00
Bart Sopers
c9dcac6368 Improve Pod Status display 2020-08-23 13:06:42 +02:00
Bart Sopers
fd53725163 Remove redundant interface 2020-08-23 11:46:26 +02:00
Bart Sopers
25b6ddcbc0 Minor improvements in OmnipodPumpPlugin 2020-08-23 11:30:45 +02:00
Bart Sopers
9bce1fdc6c Small improvement in OmnipodPumpPlugin 2020-08-23 11:19:55 +02:00
Bart Sopers
b84296da14 Add missing @Override annotations 2020-08-23 11:05:07 +02:00
Bart Sopers
2745aed31a Remove OmnipodPumpStatus 2020-08-23 10:58:48 +02:00
Bart Sopers
c52987ab6c Remove empty if statement 2020-08-22 17:15:27 +02:00
Bart Sopers
0dab8965b4 Get rid of OmnipodPumpStatus in OmnipodFragment, OmnipodCommunicationManager, RileyLinkOmnipodService + some cleanup along the way 2020-08-22 17:02:35 +02:00
Bart Sopers
0ef4099eaf Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_without_pump_plugin_abstract 2020-08-22 15:25:13 +02:00
Bart Sopers
ad1158061d Add logging 2020-08-22 14:47:56 +02:00
Bart Sopers
fef12ae06b Small cleanup in OmnipodPumpPlugin 2020-08-22 10:51:56 +02:00
Bart Sopers
749851f249 OmnipodPumpPlugin formatting and ordering 2020-08-22 02:11:09 +02:00
Bart Sopers
e9d53eea52 Fix crash in OmnipodPumpPlugin.onStart() 2020-08-22 01:58:14 +02:00
Bart Sopers
c1e8a2026e Merge PumpPluginAbstract code into OmnipodPumpPlugin 2020-08-22 01:47:38 +02:00
Bart Sopers
d9891f2427 Preliminary cleanup in OmnipodPumpStatus 2020-08-22 00:50:29 +02:00
Bart Sopers
5b6ba9ea6d Remove unused methods 2020-08-21 22:52:35 +02:00
Bart Sopers
883bdb660e Remove unused import 2020-08-21 22:38:24 +02:00
Bart Sopers
28f1dbb47f Correctly display Omnipod information in RL stats 2020-08-21 22:28:42 +02:00
Bart Sopers
53c27b8078 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_status 2020-08-21 21:28:09 +02:00
Bart Sopers
bdccbf907e Show '-' instead of nothing in Omnipod tab when no TBR is active 2020-08-21 21:22:55 +02:00
Bart Sopers
5d426bf697 Add some methods to RileyLinkPumpDevice interface to replace access to PumpStatus in RileyLink module 2020-08-21 21:16:24 +02:00
Bart Sopers
127a369cbb Fix Omnipod tests and remove one unused and one inappropriate dependency from AapsPodStateManager 2020-08-21 17:53:59 +02:00
Bart Sopers
0e9adda3a4 Make sure that after restart, bolus treatment is added when the app is killed during a bolus 2020-08-20 02:20:05 +02:00
Steffen Müthing
303faf825a Clean up imports 2020-08-19 13:09:27 +02:00
Steffen Müthing
3191b54208 Turn OmnipodCommunicationManager into a singleton 2020-08-19 13:09:01 +02:00
Steffen Müthing
680f3f94d6 Inject AndroidInjector into RileyLinkCommunicationManager using dagger 2020-08-19 13:06:21 +02:00
Bart Sopers
5d83e2a26b Omnipod: if Cancel bolus has been pressed before the bolus command has been executed, await bolus command execution before cancelling 2020-08-19 02:36:33 +02:00
Bart Sopers
e39c222203 Small Dagger improvements 2020-08-18 23:52:45 +02:00
Bart Sopers
c753ed6859 Remove some more unused Omnipod code 2020-08-18 22:39:52 +02:00
Bart Sopers
56efc3e230 Add missing icons in Omnipod 2020-08-18 19:15:50 +02:00
Bart Sopers
4a0e8aa518 Refresh buttons in Pod Management fragment on EventRileyLinkDeviceStatusChange and indicate when we're still waiting for a RL connection 2020-08-18 19:15:35 +02:00
Steffen Müthing
75cbc87b4a Move SingleClickButton to core
SingleClickButton is a utility used in a number of modules and such should be
in core. While the app seems to built with the button in app, this wrong
structure should be fixed.

As the button is a UI element, the patch also moves the class to the package
info.nightscout.androidaps.utils.ui.
2020-08-18 15:09:14 +02:00
Steffen Müthing
8f7ba93c47 Daggerize AapsOmnipodManager 2020-08-18 00:29:08 +02:00
Steffen Müthing
0fef4128ef Don't try to access injected omnipodPumpStatus in constructor 2020-08-18 00:25:17 +02:00
Steffen Müthing
e432346fc5 Turn RFSpy and RileyLinkBLE into Dagger singletons 2020-08-18 00:25:17 +02:00
Bart Sopers
69da89b19b Improve display of Firmware version in Omnipod fragment 2020-08-18 00:12:42 +02:00
Bart Sopers
8c5683faaa Improve readable durations in Omnipod fragment 2020-08-17 23:57:24 +02:00
Bart Sopers
02e818c92d Restore Omnipod firebase event 2020-08-17 23:46:55 +02:00
Bart Sopers
6442271320 Make OmnipodConst inner classes static 2020-08-17 22:40:17 +02:00
Bart Sopers
8452840cfd Fix missing string resources in Omnipod module 2020-08-17 22:39:44 +02:00
Bart Sopers
fb95f267e8 Use updated constructor in RileyLinkOmnipodService 2020-08-17 22:22:15 +02:00
Bart Sopers
7b9cbe7497 Restore RL history for Omnipod 2020-08-17 22:00:56 +02:00
Bart Sopers
18a515e5f7 Removed redundant method on OmnipodPumpPlugin 2020-08-17 19:55:19 +02:00
Bart Sopers
5c4b9846e6 WIP on moving Omnipod into a separate module 2020-08-17 19:53:43 +02:00
Bart Sopers
2a55c6413c Remove redundant DeviceCommandExecutor interface 2020-08-17 00:07:56 +02:00
Bart Sopers
b5c46e3bcf WIP on moving Omnipod to a separate module 2020-08-16 23:54:41 +02:00