From 4456aaa0159195b1eb10a31b97a8b674b5a304e1 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Tue, 9 Feb 2021 19:44:26 +0100 Subject: [PATCH] Move omnipod package to omnipod.eros and fix some tests --- .../dependencyInjection/AppComponent.kt | 2 +- .../dependencyInjection/FragmentsModule.kt | 2 +- .../dependencyInjection/PluginsModule.kt | 2 +- .../dependencyInjection/ServicesModule.kt | 2 +- .../general/actions/ActionsFragment.kt | 2 +- .../general/overview/StatusLightHandler.kt | 4 +- .../androidaps/setupwizard/SWDefinition.kt | 2 +- omnipod-eros/src/main/AndroidManifest.xml | 10 +-- .../communication/action/GetStatusAction.java | 23 ----- .../communication/action/OmnipodAction.java | 7 -- .../message/IRawRepresentable.java | 5 -- .../definition/schedule/DeliverySchedule.java | 10 --- .../omnipod/{ => eros}/OmnipodPumpPlugin.java | 63 ++++++------- .../{ => eros}/dagger/OmnipodInjectHelpers.kt | 2 +- .../{ => eros}/dagger/OmnipodModule.kt | 18 ++-- .../{ => eros}/dagger/OmnipodWizardModule.kt | 26 +++--- .../omnipod/{ => eros}/data/ActiveBolus.java | 2 +- .../{ => eros}/data/RLHistoryItemOmnipod.java | 4 +- .../definition/OmnipodCommandType.java | 2 +- .../definition/OmnipodStorageKeys.java | 2 +- .../definition/PodHistoryEntryType.java | 2 +- .../action/AcknowledgeAlertsAction.java | 14 +-- .../action/AssignAddressAction.java | 22 ++--- .../communication/action/BolusAction.java | 16 ++-- .../action/CancelDeliveryAction.java | 22 ++--- .../action/ConfigureAlertsAction.java | 12 +-- .../action/ConfigureBeepAction.java | 12 +-- .../action/DeactivatePodAction.java | 14 +-- .../action/GetPodInfoAction.java | 12 +-- .../communication/action/GetStatusAction.java | 23 +++++ .../action/InsertCannulaAction.java | 18 ++-- .../communication/action/OmnipodAction.java | 7 ++ .../communication/action/PrimeAction.java | 12 +-- .../action/SetBasalScheduleAction.java | 16 ++-- .../action/SetTempBasalAction.java | 16 ++-- .../communication/action/SetupPodAction.java | 28 +++--- .../service/ExpirationReminderBuilder.java | 12 +-- .../action/service/PrimeService.java | 22 ++--- .../message/IRawRepresentable.java | 5 ++ .../communication/message/MessageBlock.java | 4 +- .../message/NonceResyncableMessageBlock.java | 2 +- .../communication/message/OmnipodMessage.java | 22 ++--- .../communication/message/OmnipodPacket.java | 10 +-- .../command/AcknowledgeAlertsCommand.java | 10 +-- .../message/command/AssignAddressCommand.java | 6 +- .../command/BasalScheduleExtraCommand.java | 12 +-- .../message/command/BeepConfigCommand.java | 8 +- .../message/command/BolusExtraCommand.java | 8 +- .../command/CancelDeliveryCommand.java | 10 +-- .../command/ConfigureAlertsCommand.java | 8 +- .../message/command/DeactivatePodCommand.java | 6 +- .../message/command/FaultConfigCommand.java | 6 +- .../message/command/GetStatusCommand.java | 8 +- .../command/SetInsulinScheduleCommand.java | 20 ++--- .../message/command/SetupPodCommand.java | 6 +- .../command/TempBasalExtraCommand.java | 10 +-- .../message/response/ErrorResponse.java | 10 +-- .../message/response/StatusResponse.java | 14 +-- .../response/StatusUpdatableResponse.java | 8 +- .../message/response/VersionResponse.java | 10 +-- .../message/response/podinfo/PodInfo.java | 4 +- .../response/podinfo/PodInfoActiveAlerts.java | 8 +- .../response/podinfo/PodInfoDataLog.java | 6 +- .../podinfo/PodInfoDetailedStatus.java | 18 ++-- .../PodInfoFaultAndInitializationTime.java | 6 +- .../podinfo/PodInfoOlderPulseLog.java | 4 +- .../podinfo/PodInfoRecentPulseLog.java | 4 +- .../response/podinfo/PodInfoResponse.java | 8 +- .../driver/definition/ActivationProgress.java | 2 +- .../driver/definition/AlertConfiguration.java | 2 +- .../driver/definition/AlertSet.java | 2 +- .../driver/definition/AlertSlot.java | 2 +- .../driver/definition/AlertTrigger.java | 2 +- .../driver/definition/AlertType.java | 2 +- .../driver/definition/BeepConfigType.java | 2 +- .../driver/definition/BeepRepeat.java | 2 +- .../driver/definition/BeepType.java | 2 +- .../driver/definition/DeliveryStatus.java | 2 +- .../driver/definition/DeliveryType.java | 2 +- .../driver/definition/ErrorEventInfo.java | 2 +- .../driver/definition/FaultEventCode.java | 2 +- .../driver/definition/FirmwareVersion.java | 2 +- .../driver/definition/MessageBlockType.java | 12 +-- .../driver/definition/OmnipodConstants.java | 2 +- .../driver/definition/OmnipodCrc.java | 2 +- .../driver/definition/PacketType.java | 2 +- .../driver/definition/PodInfoType.java | 16 ++-- .../driver/definition/PodProgressStatus.java | 2 +- .../driver/definition/TimerAlertTrigger.java | 2 +- .../UnitsRemainingAlertTrigger.java | 2 +- .../schedule/BasalDeliverySchedule.java | 4 +- .../schedule/BasalDeliveryTable.java | 4 +- .../definition/schedule/BasalSchedule.java | 2 +- .../schedule/BasalScheduleEntry.java | 4 +- .../definition/schedule/BasalTableEntry.java | 4 +- .../schedule/BolusDeliverySchedule.java | 6 +- .../definition/schedule/DeliverySchedule.java | 10 +++ .../schedule/InsulinScheduleType.java | 2 +- .../driver/definition/schedule/RateEntry.java | 8 +- .../schedule/TempBasalDeliverySchedule.java | 4 +- .../ActivationTimeExceededException.java | 2 +- ...dAfterChangingDeliveryStatusException.java | 2 +- .../exception/CrcMismatchException.java | 2 +- .../IllegalActivationProgressException.java | 4 +- .../IllegalDeliveryStatusException.java | 4 +- .../IllegalMessageAddressException.java | 2 +- ...IllegalMessageSequenceNumberException.java | 2 +- .../exception/IllegalPacketTypeException.java | 4 +- .../IllegalPodProgressException.java | 4 +- .../exception/IllegalResponseException.java | 4 +- .../IllegalVersionResponseTypeException.java | 2 +- .../exception/MessageDecodingException.java | 2 +- .../exception/NonceOutOfSyncException.java | 2 +- .../exception/NonceResyncException.java | 2 +- .../exception/NotEnoughDataException.java | 2 +- .../driver/exception/OmnipodException.java | 2 +- .../driver/exception/PodFaultException.java | 4 +- ...ressStatusVerificationFailedException.java | 4 +- .../PodReturnedErrorResponseException.java | 4 +- ...dingCommandFailedUncertainlyException.java | 2 +- .../RileyLinkInterruptedException.java | 2 +- .../exception/RileyLinkTimeoutException.java | 2 +- .../RileyLinkUnexpectedException.java | 2 +- .../RileyLinkUnreachableException.java | 2 +- .../driver/manager/OmnipodManager.java | 80 ++++++++--------- .../driver/manager/PodStateManager.java | 32 +++---- .../driver/util/AlertConfigurationUtil.java | 16 ++-- .../{ => eros}/driver/util/TimeUtil.java | 2 +- .../event/EventOmnipodActiveAlertsChanged.kt | 2 +- .../event/EventOmnipodFaultEventChanged.kt | 2 +- .../event/EventOmnipodPumpValuesChanged.kt | 2 +- .../event/EventOmnipodTbrChanged.kt | 2 +- .../EventOmnipodUncertainTbrRecovered.kt | 2 +- .../manager/AapsOmnipodManager.java | 90 +++++++++---------- .../manager/AapsPodStateManager.java | 14 +-- .../command/CommandAcknowledgeAlerts.java | 2 +- .../queue/command/CommandDeactivatePod.java | 2 +- .../queue/command/CommandGetPodStatus.java | 2 +- .../command/CommandHandleTimeChange.java | 2 +- .../queue/command/CommandPlayTestBeep.java | 4 +- .../queue/command/CommandReadPulseLog.java | 2 +- .../queue/command/CommandResumeDelivery.java | 2 +- .../queue/command/CommandSuspendDelivery.java | 2 +- .../CommandUpdateAlertConfiguration.java | 2 +- .../queue/command/OmnipodCustomCommand.java | 2 +- .../command/OmnipodCustomCommandType.java | 2 +- .../OmnipodRileyLinkCommunicationManager.java | 60 ++++++------- .../service/RileyLinkOmnipodService.java | 12 +-- .../{ => eros}/ui/OmnipodOverviewFragment.kt | 33 ++++--- .../{ => eros}/ui/PodHistoryActivity.java | 6 +- .../{ => eros}/ui/PodManagementActivity.kt | 23 +++-- .../activation/PodActivationWizardActivity.kt | 8 +- .../fragment/AttachPodInfoFragment.kt | 4 +- .../fragment/FillPodInfoFragment.kt | 4 +- .../fragment/InitializePodActionFragment.kt | 6 +- .../fragment/InsertCannulaActionFragment.kt | 6 +- .../fragment/PodActivatedInfoFragment.kt | 4 +- .../PodActivationActionFragmentBase.kt | 10 +-- .../viewmodel/InitializePodActionViewModel.kt | 6 +- .../viewmodel/InsertCannulaActionViewModel.kt | 6 +- .../activity/OmnipodWizardActivityBase.kt | 2 +- .../common/fragment/ActionFragmentBase.kt | 4 +- .../common/fragment/InfoFragmentBase.kt | 2 +- .../common/fragment/WizardFragmentBase.kt | 4 +- .../common/viewmodel/ActionViewModelBase.kt | 2 +- .../PodDeactivationWizardActivity.kt | 4 +- .../fragment/DeactivatePodActionFragment.kt | 10 +-- .../fragment/DeactivatePodInfoFragment.kt | 4 +- .../fragment/PodDeactivatedInfoFragment.kt | 4 +- .../fragment/PodDiscardedInfoFragment.kt | 4 +- .../viewmodel/DeactivatePodActionViewModel.kt | 8 +- .../{ => eros}/util/AapsOmnipodUtil.java | 10 +-- .../{ => eros}/util/OmnipodAlertUtil.java | 6 +- .../src/main/res/layout/omnipod_overview.xml | 2 +- ...pod_activation_wizard_navigation_graph.xml | 10 +-- ...d_deactivation_wizard_navigation_graph.xml | 8 +- .../command/FaultConfigCommandTest.java | 5 -- .../podinfo/PodInfoOlderPulseLogTest.java | 5 -- .../{ => eros}/OmnipodPumpPluginTest.java | 9 +- .../communication/AapsOmnipodManagerTest.java | 8 +- .../command/AcknowledgeAlertsCommandTest.java | 8 +- .../command/AssignAddressCommandTest.java | 2 +- .../BasalScheduleExtraCommandTest.java | 8 +- .../command/BeepConfigCommandTest.java | 4 +- .../command/BolusExtraCommandTest.java | 2 +- .../command/CancelDeliveryCommandTest.java | 6 +- .../command/ConfigureAlertsCommandTest.java | 16 ++-- .../command/DeactivatePodCommandTest.java | 4 +- .../command/FaultConfigCommandTest.java | 5 ++ .../message/command/GetStatusCommandTest.java | 4 +- .../SetInsulinScheduleCommandTest.java | 8 +- .../message/command/SetupPodCommandTest.java | 2 +- .../command/TempBasalExtraCommandTest.java | 2 +- .../defs/schedule/BasalTableEntryTest.java | 4 +- .../message/response/ErrorResponseTest.java | 6 +- .../message/response/StatusResponseTest.java | 10 +-- .../message/response/VersionResponseTest.java | 4 +- .../podinfo/PodInfoActiveAlertsTest.java | 2 +- .../response/podinfo/PodInfoDataLogTest.java | 4 +- .../podinfo/PodInfoDetailedStatusTest.java | 10 +-- ...PodInfoFaultAndInitializationTimeTest.java | 4 +- .../podinfo/PodInfoOlderPulseLogTest.java | 5 ++ .../podinfo/PodInfoRecentPulseLogTest.java | 2 +- .../response/podinfo/PodInfoResponseTest.java | 4 +- .../driver/definition/AlertSetTest.java | 2 +- .../schedule/BasalScheduleTest.java | 2 +- .../{ => eros}/driver/util/TimeUtilTest.java | 2 +- .../manager/AapsPodStateManagerTest.java | 9 +- 208 files changed, 810 insertions(+), 809 deletions(-) delete mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java delete mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java delete mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java delete mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/OmnipodPumpPlugin.java (94%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/dagger/OmnipodInjectHelpers.kt (94%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/dagger/OmnipodModule.kt (57%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/dagger/OmnipodWizardModule.kt (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/data/ActiveBolus.java (98%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/data/RLHistoryItemOmnipod.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/definition/OmnipodCommandType.java (95%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/definition/OmnipodStorageKeys.java (97%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/definition/PodHistoryEntryType.java (98%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/AcknowledgeAlertsAction.java (63%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/AssignAddressAction.java (72%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/BolusAction.java (70%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/CancelDeliveryAction.java (60%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/ConfigureAlertsAction.java (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/ConfigureBeepAction.java (75%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/DeactivatePodAction.java (62%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/GetPodInfoAction.java (57%) create mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/InsertCannulaAction.java (78%) create mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/PrimeAction.java (75%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/SetBasalScheduleAction.java (69%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/SetTempBasalAction.java (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/SetupPodAction.java (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/service/ExpirationReminderBuilder.java (82%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/action/service/PrimeService.java (57%) create mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/MessageBlock.java (82%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/NonceResyncableMessageBlock.java (63%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/OmnipodMessage.java (84%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/OmnipodPacket.java (86%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/AcknowledgeAlertsCommand.java (70%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/AssignAddressCommand.java (66%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/BasalScheduleExtraCommand.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/BeepConfigCommand.java (85%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/BolusExtraCommand.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/CancelDeliveryCommand.java (79%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/ConfigureAlertsCommand.java (74%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/DeactivatePodCommand.java (71%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/FaultConfigCommand.java (78%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/GetStatusCommand.java (59%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/SetInsulinScheduleCommand.java (75%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/SetupPodCommand.java (84%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/TempBasalExtraCommand.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/ErrorResponse.java (80%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/StatusResponse.java (86%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/StatusUpdatableResponse.java (51%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/VersionResponse.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfo.java (57%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java (86%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoDataLog.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java (85%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoResponse.java (71%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/ActivationProgress.java (94%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/AlertConfiguration.java (97%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/AlertSet.java (95%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/AlertSlot.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/AlertTrigger.java (80%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/AlertType.java (72%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/BeepConfigType.java (93%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/BeepRepeat.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/BeepType.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/DeliveryStatus.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/DeliveryType.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/ErrorEventInfo.java (96%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/FaultEventCode.java (98%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/FirmwareVersion.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/MessageBlockType.java (70%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/OmnipodConstants.java (95%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/OmnipodCrc.java (98%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/PacketType.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/PodInfoType.java (66%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/PodProgressStatus.java (96%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/TimerAlertTrigger.java (68%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/UnitsRemainingAlertTrigger.java (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BasalDeliverySchedule.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BasalDeliveryTable.java (95%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BasalSchedule.java (98%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BasalScheduleEntry.java (90%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BasalTableEntry.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BolusDeliverySchedule.java (86%) create mode 100644 omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/InsulinScheduleType.java (84%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/RateEntry.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/TempBasalDeliverySchedule.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/ActivationTimeExceededException.java (71%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java (74%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/CrcMismatchException.java (86%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalActivationProgressException.java (78%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalDeliveryStatusException.java (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalMessageAddressException.java (86%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalMessageSequenceNumberException.java (86%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalPacketTypeException.java (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalPodProgressException.java (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalResponseException.java (79%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/IllegalVersionResponseTypeException.java (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/MessageDecodingException.java (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/NonceOutOfSyncException.java (66%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/NonceResyncException.java (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/NotEnoughDataException.java (82%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/OmnipodException.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/PodFaultException.java (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/PodProgressStatusVerificationFailedException.java (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/PodReturnedErrorResponseException.java (67%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/PrecedingCommandFailedUncertainlyException.java (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/RileyLinkInterruptedException.java (68%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/RileyLinkTimeoutException.java (78%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/RileyLinkUnexpectedException.java (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/exception/RileyLinkUnreachableException.java (76%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/manager/OmnipodManager.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/manager/PodStateManager.java (96%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/util/AlertConfigurationUtil.java (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/util/TimeUtil.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/event/EventOmnipodActiveAlertsChanged.kt (67%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/event/EventOmnipodFaultEventChanged.kt (66%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/event/EventOmnipodPumpValuesChanged.kt (66%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/event/EventOmnipodTbrChanged.kt (65%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/event/EventOmnipodUncertainTbrRecovered.kt (67%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/manager/AapsOmnipodManager.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/manager/AapsPodStateManager.java (71%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandAcknowledgeAlerts.java (70%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandDeactivatePod.java (69%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandGetPodStatus.java (69%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandHandleTimeChange.java (83%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandPlayTestBeep.java (66%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandReadPulseLog.java (69%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandResumeDelivery.java (69%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandSuspendDelivery.java (70%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/CommandUpdateAlertConfiguration.java (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/OmnipodCustomCommand.java (87%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/queue/command/OmnipodCustomCommandType.java (89%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/rileylink/manager/OmnipodRileyLinkCommunicationManager.java (85%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/rileylink/service/RileyLinkOmnipodService.java (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/OmnipodOverviewFragment.kt (95%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/PodHistoryActivity.java (98%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/PodManagementActivity.kt (91%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/PodActivationWizardActivity.kt (82%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/fragment/AttachPodInfoFragment.kt (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/fragment/FillPodInfoFragment.kt (73%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/fragment/InitializePodActionFragment.kt (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt (77%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt (72%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt (72%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt (51%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt (60%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/common/activity/OmnipodWizardActivityBase.kt (93%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/common/fragment/ActionFragmentBase.kt (94%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/common/fragment/InfoFragmentBase.kt (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/common/fragment/WizardFragmentBase.kt (93%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/common/viewmodel/ActionViewModelBase.kt (92%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/deactivation/PodDeactivationWizardActivity.kt (69%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt (83%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt (74%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt (72%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt (72%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt (67%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/util/AapsOmnipodUtil.java (88%) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/util/OmnipodAlertUtil.java (79%) delete mode 100644 omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java delete mode 100644 omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/OmnipodPumpPluginTest.java (94%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/AapsOmnipodManagerTest.java (93%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/AcknowledgeAlertsCommandTest.java (77%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/AssignAddressCommandTest.java (83%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/BasalScheduleExtraCommandTest.java (95%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/BeepConfigCommandTest.java (83%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/BolusExtraCommandTest.java (96%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/CancelDeliveryCommandTest.java (84%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/ConfigureAlertsCommandTest.java (82%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/DeactivatePodCommandTest.java (74%) create mode 100644 omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/GetStatusCommandTest.java (83%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/SetInsulinScheduleCommandTest.java (96%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/SetupPodCommandTest.java (88%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/command/TempBasalExtraCommandTest.java (97%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/defs/schedule/BasalTableEntryTest.java (70%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/ErrorResponseTest.java (86%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/StatusResponseTest.java (91%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/VersionResponseTest.java (94%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java (93%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoDataLogTest.java (81%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java (95%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java (86%) create mode 100644 omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java (87%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/communication/message/response/podinfo/PodInfoResponseTest.java (91%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/AlertSetTest.java (88%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/definition/schedule/BasalScheduleTest.java (98%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/driver/util/TimeUtilTest.java (95%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/{ => eros}/manager/AapsPodStateManagerTest.java (90%) diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt index 1ec7d8b22a..e45e5ae42d 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt @@ -11,7 +11,7 @@ import info.nightscout.androidaps.danar.di.DanaRModule import info.nightscout.androidaps.danars.di.DanaRSModule import info.nightscout.androidaps.database.DatabaseModule import info.nightscout.androidaps.plugins.pump.common.dagger.RileyLinkModule -import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodModule +import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodModule import javax.inject.Singleton @Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt index c7cfec45eb..3424fc9872 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt @@ -36,7 +36,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic -import info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodOverviewFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodOverviewFragment import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment import info.nightscout.androidaps.plugins.source.BGSourceFragment import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt index 64b6353413..287ac11e99 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt @@ -42,7 +42,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt index 856ae3c106..50f8695bf9 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.service.RileyLinkOmnipodService +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService import info.nightscout.androidaps.services.AlarmSoundService import info.nightscout.androidaps.services.LocationService diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt index 8eeb10429a..84a34e1ccd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt @@ -26,7 +26,7 @@ import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.plugins.bus.RxBusWrapper import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.skins.SkinProvider import info.nightscout.androidaps.utils.FabricPrivacy diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt index 38cf5c815b..b3a5fe952f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt @@ -9,8 +9,8 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.db.CareportalEvent import info.nightscout.androidaps.interfaces.ActivePluginProvider import info.nightscout.androidaps.plugins.pump.common.defs.PumpType -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.WarnColors import info.nightscout.androidaps.utils.resources.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt index f2604264c5..fa8fc38b79 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt @@ -27,7 +27,7 @@ import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin import info.nightscout.androidaps.setupwizard.elements.* import info.nightscout.androidaps.setupwizard.events.EventSWUpdate import info.nightscout.androidaps.utils.AndroidPermission diff --git a/omnipod-eros/src/main/AndroidManifest.xml b/omnipod-eros/src/main/AndroidManifest.xml index 4c8d3b5305..011cd8a01f 100644 --- a/omnipod-eros/src/main/AndroidManifest.xml +++ b/omnipod-eros/src/main/AndroidManifest.xml @@ -3,13 +3,13 @@ - - - - + + + + \ No newline at end of file diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java deleted file mode 100644 index 27d1f3a129..0000000000 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java +++ /dev/null @@ -1,23 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; - -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.GetStatusCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; - -public class GetStatusAction implements OmnipodAction { - private final PodStateManager podStateManager; - - public GetStatusAction(PodStateManager podState) { - if (podState == null) { - throw new IllegalArgumentException("Pod state manager cannot be null"); - } - this.podStateManager = podState; - } - - @Override - public StatusResponse execute(OmnipodRileyLinkCommunicationManager communicationService) { - return communicationService.sendCommand(StatusResponse.class, podStateManager, new GetStatusCommand(PodInfoType.NORMAL)); - } -} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java deleted file mode 100644 index e979297a15..0000000000 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java +++ /dev/null @@ -1,7 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; - -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; - -public interface OmnipodAction { - T execute(OmnipodRileyLinkCommunicationManager communicationService); -} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java deleted file mode 100644 index 5d706e5087..0000000000 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java +++ /dev/null @@ -1,5 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message; - -public interface IRawRepresentable { - byte[] getRawData(); -} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java deleted file mode 100644 index c5cc98ccad..0000000000 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java +++ /dev/null @@ -1,10 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; - -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.IRawRepresentable; - -public abstract class DeliverySchedule implements IRawRepresentable { - - public abstract InsulinScheduleType getType(); - - public abstract int getChecksum(); -} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java similarity index 94% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java index bd91e28573..835dd527b0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod; +package info.nightscout.androidaps.plugins.pump.omnipod.eros; import android.content.ComponentName; import android.content.Context; @@ -66,35 +66,36 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpInfo; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData; import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.data.ActiveBolus; -import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCommandType; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.ExpirationReminderBuilder; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.TimeUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodActiveAlertsChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodFaultEventChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodTbrChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodUncertainTbrRecovered; -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager; -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandAcknowledgeAlerts; -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandHandleTimeChange; -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandPlayTestBeep; -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandUpdateAlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.OmnipodCustomCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.OmnipodCustomCommandType; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.service.RileyLinkOmnipodService; -import info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodOverviewFragment; -import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodAlertUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.ActiveBolus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.RLHistoryItemOmnipod; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodCommandType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodStorageKeys; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service.ExpirationReminderBuilder; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodActiveAlertsChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodFaultEventChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodPumpValuesChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodTbrChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodUncertainTbrRecovered; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandAcknowledgeAlerts; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandHandleTimeChange; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandPlayTestBeep; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandUpdateAlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.OmnipodCustomCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.OmnipodCustomCommandType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodOverviewFragment; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil; import info.nightscout.androidaps.queue.Callback; import info.nightscout.androidaps.queue.commands.CustomCommand; import info.nightscout.androidaps.utils.DateUtil; @@ -107,7 +108,7 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers; import info.nightscout.androidaps.utils.sharedPreferences.SP; import io.reactivex.disposables.CompositeDisposable; -import static info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants.BASAL_STEP_DURATION; +import static info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants.BASAL_STEP_DURATION; /** * Created by andy on 23.04.18. diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodInjectHelpers.kt similarity index 94% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodInjectHelpers.kt index cd932bad82..5228907c01 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodInjectHelpers.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.dagger +package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodModule.kt similarity index 57% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodModule.kt index fd2b49ae1c..fd9c3def50 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodModule.kt @@ -1,16 +1,16 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.dagger +package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger import dagger.Module import dagger.Provides import dagger.android.ContributesAndroidInjector -import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsPodStateManager -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager -import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodHistoryActivity -import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodManagementActivity -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.PodActivationWizardActivity -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.PodDeactivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.RLHistoryItemOmnipod +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsPodStateManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.PodHistoryActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.PodManagementActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.PodActivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.PodDeactivationWizardActivity @Module @Suppress("unused") diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodWizardModule.kt similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodWizardModule.kt index 338534da78..c69c769a7a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodWizardModule.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.dagger +package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -7,18 +7,18 @@ import dagger.Module import dagger.Provides import dagger.android.ContributesAndroidInjector import dagger.multibindings.IntoMap -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.AttachPodInfoFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.FillPodInfoFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.InitializePodActionFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.InsertCannulaActionFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.PodActivatedInfoFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InitializePodActionViewModel -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InsertCannulaActionViewModel -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.DeactivatePodActionFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.DeactivatePodInfoFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.PodDeactivatedInfoFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.PodDiscardedInfoFragment -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.viewmodel.DeactivatePodActionViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment.AttachPodInfoFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment.FillPodInfoFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment.InitializePodActionFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment.InsertCannulaActionFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment.PodActivatedInfoFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.InitializePodActionViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.InsertCannulaActionViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment.DeactivatePodActionFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment.DeactivatePodInfoFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment.PodDeactivatedInfoFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment.PodDiscardedInfoFragment +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.viewmodel.DeactivatePodActionViewModel import javax.inject.Provider @Module diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/ActiveBolus.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/ActiveBolus.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java index 481c78157b..171685878b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/ActiveBolus.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.data; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.data; import org.apache.commons.lang3.StringUtils; import org.json.JSONException; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java index fee331d4ac..cf1df3e683 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.data; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.data; import org.joda.time.LocalDateTime; @@ -7,7 +7,7 @@ import javax.inject.Inject; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCommandType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodCommandType; import info.nightscout.androidaps.utils.resources.ResourceHelper; public class RLHistoryItemOmnipod extends RLHistoryItem { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java similarity index 95% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java index c6a20bb874..c1a5ff660a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.definition; import info.nightscout.androidaps.plugins.pump.omnipod.R; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java similarity index 97% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java index 31070835d2..f1aeebcbcc 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.definition; import info.nightscout.androidaps.plugins.pump.omnipod.R; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java index b367b7476c..d89e287fdd 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.definition; import androidx.annotation.StringRes; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java similarity index 63% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java index 5b6da7d781..6252d6db56 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java @@ -1,13 +1,13 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import java.util.Collections; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.AcknowledgeAlertsCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.AcknowledgeAlertsCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class AcknowledgeAlertsAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AssignAddressAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java similarity index 72% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AssignAddressAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java index fb1127cecc..2d615177de 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AssignAddressAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.DateTimeZone; @@ -6,16 +6,16 @@ import java.util.Collections; import java.util.Random; import info.nightscout.androidaps.logging.AAPSLogger; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.AssignAddressCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.VersionResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageAddressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalVersionResponseTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.AssignAddressCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.VersionResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PacketType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageAddressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalVersionResponseTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class AssignAddressAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java similarity index 70% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java index b58935eeb5..465a68a9ca 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java @@ -1,16 +1,16 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.Duration; import java.util.Arrays; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.BolusExtraCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetInsulinScheduleCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BolusDeliverySchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.BolusExtraCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetInsulinScheduleCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BolusDeliverySchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class BolusAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java similarity index 60% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java index ffce09d903..5140edf673 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.Duration; @@ -6,16 +6,16 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.BeepConfigCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.CancelDeliveryCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.BeepConfigCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.CancelDeliveryCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class CancelDeliveryAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java index 345127e91e..39265c03a7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import java.util.List; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.ConfigureAlertsCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.ConfigureAlertsCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class ConfigureAlertsAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java similarity index 75% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java index e5c0e0dbb4..b8b8914256 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.Duration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.BeepConfigCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.BeepConfigCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class ConfigureBeepAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java similarity index 62% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java index 266396d6e4..2170a43e20 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java @@ -1,13 +1,13 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import java.util.EnumSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.DeactivatePodCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.DeactivatePodCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodFaultException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class DeactivatePodAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java similarity index 57% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java index 217c768a78..399309b4f7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.GetStatusCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.GetStatusCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class GetPodInfoAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java new file mode 100644 index 0000000000..9cb087e328 --- /dev/null +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java @@ -0,0 +1,23 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; + +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.GetStatusCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; + +public class GetStatusAction implements OmnipodAction { + private final PodStateManager podStateManager; + + public GetStatusAction(PodStateManager podState) { + if (podState == null) { + throw new IllegalArgumentException("Pod state manager cannot be null"); + } + this.podStateManager = podState; + } + + @Override + public StatusResponse execute(OmnipodRileyLinkCommunicationManager communicationService) { + return communicationService.sendCommand(StatusResponse.class, podStateManager, new GetStatusCommand(PodInfoType.NORMAL)); + } +} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java similarity index 78% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java index a6fdd139d9..994d3a8d07 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java @@ -1,18 +1,18 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.Duration; import java.util.List; import java.util.Optional; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.ExpirationReminderBuilder; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalActivationProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service.ExpirationReminderBuilder; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalActivationProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class InsertCannulaAction implements OmnipodAction { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java new file mode 100644 index 0000000000..8d717585b2 --- /dev/null +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java @@ -0,0 +1,7 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; + +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; + +public interface OmnipodAction { + T execute(OmnipodRileyLinkCommunicationManager communicationService); +} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java similarity index 75% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java index c1269e3e39..582df47447 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.PrimeService; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalActivationProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service.PrimeService; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalActivationProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class PrimeAction implements OmnipodAction { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java similarity index 69% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java index 4b35bb781c..a96d2c0853 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java @@ -1,16 +1,16 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.Duration; import java.util.Arrays; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.BasalScheduleExtraCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetInsulinScheduleCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.BasalScheduleExtraCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetInsulinScheduleCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class SetBasalScheduleAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java index e33de1f8c5..e26a2d803b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java @@ -1,17 +1,17 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.Duration; import java.util.Arrays; import java.util.List; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetInsulinScheduleCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.TempBasalExtraCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetInsulinScheduleCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.TempBasalExtraCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class SetTempBasalAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetupPodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetupPodAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java index 8cb2a1ddde..5188210bca 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetupPodAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java @@ -1,23 +1,23 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action; import org.joda.time.DateTime; import java.util.Collections; import info.nightscout.androidaps.logging.AAPSLogger; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetupPodCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.VersionResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageAddressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPodProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalVersionResponseTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetupPodCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.VersionResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PacketType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageAddressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPodProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalVersionResponseTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class SetupPodAction implements OmnipodAction { private final PodStateManager podStateManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java similarity index 82% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java index 0c39fefd99..3e208d87ba 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -8,11 +8,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.AlertConfigurationUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.AlertConfigurationUtil; public final class ExpirationReminderBuilder { private final Map alerts = new HashMap<>(); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/PrimeService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java similarity index 57% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/PrimeService.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java index ed75d439be..e5973ca1e9 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/PrimeService.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java @@ -1,19 +1,19 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service; import org.joda.time.Duration; import java.util.Collections; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.BolusAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.ConfigureAlertsAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.FaultConfigCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.AlertConfigurationUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.BolusAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.ConfigureAlertsAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.FaultConfigCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.AlertConfigurationUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class PrimeService { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java new file mode 100644 index 0000000000..6bab6350f5 --- /dev/null +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message; + +public interface IRawRepresentable { + byte[] getRawData(); +} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/MessageBlock.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java similarity index 82% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/MessageBlock.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java index 8cfb0277f2..1853570ae0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/MessageBlock.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message; import java.io.ByteArrayOutputStream; import java.io.IOException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public abstract class MessageBlock { protected byte[] encodedData = new byte[0]; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/NonceResyncableMessageBlock.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java similarity index 63% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/NonceResyncableMessageBlock.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java index 7aad28e522..69248e06c8 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/NonceResyncableMessageBlock.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message; public abstract class NonceResyncableMessageBlock extends MessageBlock { public abstract int getNonce(); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java similarity index 84% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java index bd30bf82a6..e289d9b76b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message; import java.util.ArrayList; import java.util.EnumSet; @@ -7,16 +7,16 @@ import java.util.List; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.LTag; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.CancelDeliveryCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.GetStatusCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodCrc; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CrcMismatchException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.MessageDecodingException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NotEnoughDataException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.CancelDeliveryCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.GetStatusCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodCrc; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PacketType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.CrcMismatchException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.MessageDecodingException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NotEnoughDataException; public class OmnipodMessage { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodPacket.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodPacket.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java index 34f28c0d3b..4d4d6d7d77 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodPacket.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodCrc; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CrcMismatchException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodCrc; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PacketType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.CrcMismatchException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException; /** * Created by andy on 6/1/18. diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java similarity index 70% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java index b46ee8cc73..1f11a10f92 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import java.util.Collections; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.NonceResyncableMessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.NonceResyncableMessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class AcknowledgeAlertsCommand extends NonceResyncableMessageBlock { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java similarity index 66% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java index 4c0951e1b7..72ac2f4f89 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import java.nio.ByteBuffer; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class AssignAddressCommand extends MessageBlock { private final int address; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java index 8021fbfd8f..e9ca5f916e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; @@ -6,11 +6,11 @@ import java.util.ArrayList; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.RateEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.RateEntry; public class BasalScheduleExtraCommand extends MessageBlock { private final boolean acknowledgementBeep; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java similarity index 85% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java index 47cf4533ba..a05a7563f0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class BeepConfigCommand extends MessageBlock { private final BeepConfigType beepType; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java index 6ec315aa16..18fcd7b740 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; public class BolusExtraCommand extends MessageBlock { private final boolean acknowledgementBeep; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java similarity index 79% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java index be8f09230f..82066bf4b7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import java.util.EnumSet; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.NonceResyncableMessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.NonceResyncableMessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class CancelDeliveryCommand extends NonceResyncableMessageBlock { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java similarity index 74% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java index f247174a45..86fdc6c062 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.NonceResyncableMessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.NonceResyncableMessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class ConfigureAlertsCommand extends NonceResyncableMessageBlock { private final List configurations; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java similarity index 71% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java index 67f50d0587..853e0520a0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.NonceResyncableMessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.NonceResyncableMessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class DeactivatePodCommand extends NonceResyncableMessageBlock { private int nonce; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java similarity index 78% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java index d09ce97702..0c4ae4cfd0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.NonceResyncableMessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.NonceResyncableMessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class FaultConfigCommand extends NonceResyncableMessageBlock { private final byte tab5sub16; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java similarity index 59% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java index d8664e4145..e8694f83d3 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class GetStatusCommand extends MessageBlock { private final PodInfoType podInfoType; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java similarity index 75% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java index c9089559cb..68195c839e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java @@ -1,17 +1,17 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.NonceResyncableMessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalDeliverySchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalDeliveryTable; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BolusDeliverySchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.DeliverySchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.TempBasalDeliverySchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.NonceResyncableMessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalDeliverySchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalDeliveryTable; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BolusDeliverySchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.DeliverySchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.TempBasalDeliverySchedule; public class SetInsulinScheduleCommand extends NonceResyncableMessageBlock { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java similarity index 84% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java index da383db564..689e7be301 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.DateTime; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class SetupPodCommand extends MessageBlock { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java index 8f5cf5053b..0a25712e56 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.RateEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.RateEntry; public class TempBasalExtraCommand extends MessageBlock { private final boolean acknowledgementBeep; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponse.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java similarity index 80% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponse.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java index 58f68ca6fd..dc70160bed 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponse.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public class ErrorResponse extends MessageBlock { public static final byte ERROR_RESPONSE_CODE_BAD_NONCE = (byte) 0x14; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponse.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponse.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java index 5976d80a97..a844b52862 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponse.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import org.joda.time.Duration; @@ -6,12 +6,12 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public class StatusResponse extends MessageBlock implements StatusUpdatableResponse { private static final int MESSAGE_LENGTH = 10; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusUpdatableResponse.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java similarity index 51% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusUpdatableResponse.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java index 4dee2127fc..799a484296 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusUpdatableResponse.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import org.joda.time.Duration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public interface StatusUpdatableResponse { DeliveryStatus getDeliveryStatus(); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponse.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponse.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java index e406715d2d..374f69d0cb 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponse.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FirmwareVersion; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public class VersionResponse extends MessageBlock { private static final int ASSIGN_ADDRESS_VERSION_RESPONSE_LENGTH = 0x15; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfo.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java similarity index 57% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfo.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java index 4a65b678cb..df05f5663c 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfo.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public abstract class PodInfo { private final byte[] encodedData; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java index 36e1b1a213..8ac03aa1a9 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.Duration; @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class PodInfoActiveAlerts extends PodInfo { private static final int MINIMUM_MESSAGE_LENGTH = 11; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLog.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLog.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java index 0151a761af..aa2353df6f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLog.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.Duration; @@ -7,8 +7,8 @@ import java.util.Collections; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class PodInfoDataLog extends PodInfo { private static final int MINIMUM_MESSAGE_LENGTH = 8; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java index 0db5ed2b53..3a9dea9178 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java @@ -1,16 +1,16 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.Duration; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusUpdatableResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ErrorEventInfo; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusUpdatableResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ErrorEventInfo; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public class PodInfoDetailedStatus extends PodInfo implements StatusUpdatableResponse { private static final int MINIMUM_MESSAGE_LENGTH = 21; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java similarity index 85% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java index f96b00b909..ede5541db5 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.DateTime; import org.joda.time.Duration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class PodInfoFaultAndInitializationTime extends PodInfo { private static final int MINIMUM_MESSAGE_LENGTH = 17; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java index ae10eca820..b104fbc69d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import android.text.TextUtils; @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class PodInfoOlderPulseLog extends PodInfo { private static final int MINIMUM_MESSAGE_LENGTH = 3; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java index 00527a74f1..8ca80ffe22 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import android.text.TextUtils; @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class PodInfoRecentPulseLog extends PodInfo { private static final int MINIMUM_MESSAGE_LENGTH = 3; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponse.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java similarity index 71% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponse.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java index cee243c45f..20c2155477 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponse.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; public class PodInfoResponse extends MessageBlock { private final PodInfoType subType; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ActivationProgress.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java similarity index 94% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ActivationProgress.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java index 9db21f5e59..cf0f695740 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ActivationProgress.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum ActivationProgress { NONE, diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertConfiguration.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java similarity index 97% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertConfiguration.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java index ab72fe323f..2432429f6a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertConfiguration.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import org.joda.time.Duration; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSet.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java similarity index 95% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSet.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java index 28c2268212..05ae2b34f5 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSet.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import java.util.ArrayList; import java.util.List; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSlot.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSlot.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java index 194f5f940b..749a8652cf 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSlot.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum AlertSlot { SLOT0((byte) 0x00), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertTrigger.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java similarity index 80% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertTrigger.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java index 533c465919..26146f179e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertTrigger.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public abstract class AlertTrigger { private final T value; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java similarity index 72% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java index e6cd161eb1..1161e2d6e3 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum AlertType { FINISH_PAIRING_REMINDER, diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepConfigType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java similarity index 93% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepConfigType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java index 00f91a0af7..5a36bcbd21 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepConfigType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; // BeepConfigType is used only for the $1E Beep Config Command. diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepRepeat.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepRepeat.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java index 3cf34bc247..a158c02988 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepRepeat.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum BeepRepeat { ONCE((byte) 0x00), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java index 17bbc855b2..28751ed7cd 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; // BeepType is used for the $19 Configure Alerts and $1F Cancel Commands public enum BeepType { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryStatus.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryStatus.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java index 5987cb69a0..d99e41f989 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryStatus.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum DeliveryStatus { SUSPENDED((byte) 0x00), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java index b0e80105f4..4f93aa1b97 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum DeliveryType { NONE((byte) 0x00), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ErrorEventInfo.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java similarity index 96% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ErrorEventInfo.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java index 2f3e064d36..2e4c4f9957 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ErrorEventInfo.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FaultEventCode.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FaultEventCode.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java index 0a42811848..bb55be0d51 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FaultEventCode.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import java.util.Locale; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FirmwareVersion.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FirmwareVersion.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java index a4ed7e2eea..6ea7cb332e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FirmwareVersion.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import java.util.Locale; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/MessageBlockType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java similarity index 70% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/MessageBlockType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java index 16002aa343..99285900a2 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/MessageBlockType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import org.apache.commons.lang3.NotImplementedException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.ErrorResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.VersionResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.ErrorResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.VersionResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoResponse; public enum MessageBlockType { VERSION_RESPONSE(0x01), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java similarity index 95% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java index 7dac90a207..e240a408cc 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import org.joda.time.Duration; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodCrc.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodCrc.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java index ebc461ee9a..f38fbc4e00 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodCrc.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public class OmnipodCrc { public static final int[] crc16lookup = new int[]{ diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PacketType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PacketType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java index cfc3bff947..cf10e67f09 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PacketType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum PacketType { INVALID((byte) 0), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodInfoType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java similarity index 66% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodInfoType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java index 4198810aa1..4f5b2c70d3 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodInfoType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfo; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoActiveAlerts; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoDataLog; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoDetailedStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoFaultAndInitializationTime; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoOlderPulseLog; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfo; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoActiveAlerts; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoDataLog; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoDetailedStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoFaultAndInitializationTime; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoOlderPulseLog; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; public enum PodInfoType { NORMAL((byte) 0x00), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodProgressStatus.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java similarity index 96% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodProgressStatus.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java index 9da2916997..1ebdd4af44 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodProgressStatus.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public enum PodProgressStatus { INITIALIZED((byte) 0x00), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/TimerAlertTrigger.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java similarity index 68% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/TimerAlertTrigger.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java index 5344d736b2..2f86fc6b2e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/TimerAlertTrigger.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import org.joda.time.Duration; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/UnitsRemainingAlertTrigger.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/UnitsRemainingAlertTrigger.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java index fd0fb4bae4..f12989df08 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/UnitsRemainingAlertTrigger.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; public class UnitsRemainingAlertTrigger extends AlertTrigger { public UnitsRemainingAlertTrigger(Double value) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliverySchedule.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliverySchedule.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java index 497b41e1b6..e65cd4c40b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliverySchedule.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java @@ -1,7 +1,7 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.IRawRepresentable; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.IRawRepresentable; public class BasalDeliverySchedule extends DeliverySchedule implements IRawRepresentable { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliveryTable.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java similarity index 95% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliveryTable.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java index df1c4161ec..20b54a4214 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliveryTable.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import org.joda.time.Duration; import java.util.ArrayList; import java.util.List; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; public class BasalDeliveryTable { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalSchedule.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalSchedule.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java index 24f2a72893..f960a6303f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalSchedule.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import org.joda.time.Duration; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleEntry.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java similarity index 90% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleEntry.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java index ac6527339c..1c75fde904 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleEntry.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import org.joda.time.Duration; import java.util.Objects; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; public class BasalScheduleEntry { private final double rate; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalTableEntry.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalTableEntry.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java index bec2a8ae9d..1f0485bdfd 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalTableEntry.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java @@ -1,7 +1,7 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.IRawRepresentable; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.IRawRepresentable; public class BasalTableEntry implements IRawRepresentable { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BolusDeliverySchedule.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BolusDeliverySchedule.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java index bd2100edd3..1698bf98bf 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BolusDeliverySchedule.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import org.joda.time.Duration; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.IRawRepresentable; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.IRawRepresentable; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; public class BolusDeliverySchedule extends DeliverySchedule implements IRawRepresentable { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java new file mode 100644 index 0000000000..193fbd6e62 --- /dev/null +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java @@ -0,0 +1,10 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; + +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.IRawRepresentable; + +public abstract class DeliverySchedule implements IRawRepresentable { + + public abstract InsulinScheduleType getType(); + + public abstract int getChecksum(); +} diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/InsulinScheduleType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java similarity index 84% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/InsulinScheduleType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java index 76872a98e1..10d2e8349b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/InsulinScheduleType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; public enum InsulinScheduleType { BASAL_SCHEDULE(0), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/RateEntry.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/RateEntry.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java index 51e6f297d0..150e32470d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/RateEntry.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import org.joda.time.Duration; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.IRawRepresentable; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.IRawRepresentable; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; -import static info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants.BASAL_STEP_DURATION; +import static info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants.BASAL_STEP_DURATION; public class RateEntry implements IRawRepresentable { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/TempBasalDeliverySchedule.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/TempBasalDeliverySchedule.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java index 8c08b21103..5fbf4b43b1 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/TempBasalDeliverySchedule.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java @@ -1,7 +1,7 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.IRawRepresentable; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.IRawRepresentable; public class TempBasalDeliverySchedule extends DeliverySchedule implements IRawRepresentable { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActivationTimeExceededException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java similarity index 71% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActivationTimeExceededException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java index 91e4c4bab3..af9ef2fb4a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActivationTimeExceededException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class ActivationTimeExceededException extends OmnipodException { public ActivationTimeExceededException() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java similarity index 74% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java index 225497853d..fb6c81f769 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class CommandFailedAfterChangingDeliveryStatusException extends OmnipodException { public CommandFailedAfterChangingDeliveryStatusException(String message, Throwable cause) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CrcMismatchException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CrcMismatchException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java index 5dcffa1e2e..cd9ed71fe7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CrcMismatchException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import java.util.Locale; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalActivationProgressException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java similarity index 78% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalActivationProgressException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java index 0dffb93517..912e8b418f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalActivationProgressException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import java.util.Locale; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; public class IllegalActivationProgressException extends OmnipodException { private final ActivationProgress expected; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalDeliveryStatusException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalDeliveryStatusException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java index a6f8d22714..6635b6248f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalDeliveryStatusException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import java.util.Locale; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; public class IllegalDeliveryStatusException extends OmnipodException { private final DeliveryStatus expected; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageAddressException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageAddressException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java index 1e6a036e63..366a2ae9c7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageAddressException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class IllegalMessageAddressException extends OmnipodException { private final int expected; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageSequenceNumberException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java similarity index 86% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageSequenceNumberException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java index 6d9c436145..07be852bb8 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageSequenceNumberException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class IllegalMessageSequenceNumberException extends OmnipodException { private final int expected; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPacketTypeException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPacketTypeException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java index 03d6a425e7..ffecf2d31f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPacketTypeException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import java.util.Locale; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PacketType; public class IllegalPacketTypeException extends OmnipodException { private final PacketType expected; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPodProgressException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPodProgressException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java index 18719fa1ce..5f081f65f3 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPodProgressException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import java.util.Locale; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public class IllegalPodProgressException extends OmnipodException { private final PodProgressStatus expected; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalResponseException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java similarity index 79% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalResponseException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java index d6226afe99..3a15286543 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalResponseException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import java.util.Locale; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; public class IllegalResponseException extends OmnipodException { private final String actualClass; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalVersionResponseTypeException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalVersionResponseTypeException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java index 4cfbd76ce9..c9b8c68c18 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalVersionResponseTypeException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class IllegalVersionResponseTypeException extends OmnipodException { public IllegalVersionResponseTypeException(String expected, String actual) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/MessageDecodingException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/MessageDecodingException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java index 05d61b19dd..93294bb869 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/MessageDecodingException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class MessageDecodingException extends OmnipodException { public MessageDecodingException(String message) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceOutOfSyncException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java similarity index 66% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceOutOfSyncException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java index 1b128b58fc..26b7b557dc 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceOutOfSyncException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class NonceOutOfSyncException extends OmnipodException { public NonceOutOfSyncException() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceResyncException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceResyncException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java index 4e534c20b3..cee2f50767 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceResyncException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class NonceResyncException extends OmnipodException { public NonceResyncException() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NotEnoughDataException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java similarity index 82% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NotEnoughDataException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java index c54ed82384..f656c706bc 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NotEnoughDataException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/OmnipodException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/OmnipodException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java index d4eb40ae94..3ac6a6d254 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/OmnipodException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public abstract class OmnipodException extends RuntimeException { private boolean certainFailure; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodFaultException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodFaultException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java index 4786f241c7..d5e63d4f07 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodFaultException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoDetailedStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoDetailedStatus; public class PodFaultException extends OmnipodException { private final PodInfoDetailedStatus detailedStatus; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java index d429e6a900..fbbfca2154 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; public class PodProgressStatusVerificationFailedException extends OmnipodException { private final PodProgressStatus expectedStatus; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodReturnedErrorResponseException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java similarity index 67% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodReturnedErrorResponseException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java index bc2bd92af9..a1e694f201 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodReturnedErrorResponseException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.ErrorResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.ErrorResponse; public class PodReturnedErrorResponseException extends OmnipodException { private final ErrorResponse errorResponse; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PrecedingCommandFailedUncertainlyException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PrecedingCommandFailedUncertainlyException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java index a1bbd6c7ab..61f1dda600 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PrecedingCommandFailedUncertainlyException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class PrecedingCommandFailedUncertainlyException extends OmnipodException { public PrecedingCommandFailedUncertainlyException(Throwable cause) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java similarity index 68% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java index 3cb5f18267..98131dc9b7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class RileyLinkInterruptedException extends OmnipodException { public RileyLinkInterruptedException() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java similarity index 78% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java index 7e4b48a226..bc56ea2ff6 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; // Response indicating that there was a timeout in communication between the RileyLink and the Pod public class RileyLinkTimeoutException extends OmnipodException { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java index e844eca158..9930393cf5 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; public class RileyLinkUnexpectedException extends OmnipodException { public RileyLinkUnexpectedException(Throwable cause) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java similarity index 76% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java index 05320c051d..173794abcb 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception; // Indicates that we didn't get any response from the RL public class RileyLinkUnreachableException extends OmnipodException { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java index 9338668177..d76b183cf6 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.manager; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -13,45 +13,45 @@ import java.util.function.Supplier; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.LTag; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.AcknowledgeAlertsAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.AssignAddressAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.BolusAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.CancelDeliveryAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.ConfigureAlertsAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.ConfigureBeepAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.DeactivatePodAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.GetPodInfoAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.GetStatusAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.InsertCannulaAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.PrimeAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.SetBasalScheduleAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.SetTempBasalAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.SetupPodAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.PrimeService; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.CancelDeliveryCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandFailedAfterChangingDeliveryStatusException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalActivationProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalDeliveryStatusException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPodProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NonceOutOfSyncException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.OmnipodException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodProgressStatusVerificationFailedException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PrecedingCommandFailedUncertainlyException; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.AcknowledgeAlertsAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.AssignAddressAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.BolusAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.CancelDeliveryAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.ConfigureAlertsAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.ConfigureBeepAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.DeactivatePodAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.GetPodInfoAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.GetStatusAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.InsertCannulaAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.PrimeAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.SetBasalScheduleAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.SetTempBasalAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.SetupPodAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service.PrimeService; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.CancelDeliveryCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.CommandFailedAfterChangingDeliveryStatusException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalActivationProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalDeliveryStatusException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPodProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NonceOutOfSyncException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.OmnipodException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodFaultException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodProgressStatusVerificationFailedException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PrecedingCommandFailedUncertainlyException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; import info.nightscout.androidaps.utils.rx.AapsSchedulers; import io.reactivex.Completable; import io.reactivex.Flowable; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java similarity index 96% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java index f84e76b589..adc56510bb 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.manager; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -21,21 +21,21 @@ import java.util.function.Supplier; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.logging.LTag; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusUpdatableResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoDetailedStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FirmwareVersion; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodCrc; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.TimeUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusUpdatableResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoDetailedStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodCrc; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil; // TODO add nullchecks on some setters public abstract class PodStateManager { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java index 92e2d2d74d..e380109b81 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java @@ -1,14 +1,14 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.util; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util; import org.joda.time.Duration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepRepeat; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.TimerAlertTrigger; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.UnitsRemainingAlertTrigger; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepRepeat; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.TimerAlertTrigger; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.UnitsRemainingAlertTrigger; public class AlertConfigurationUtil { public static AlertConfiguration createLowReservoirAlertConfiguration(boolean active, Double units) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtil.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java index dc37e42b54..777306a12a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtil.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.util; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodActiveAlertsChanged.kt similarity index 67% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodActiveAlertsChanged.kt index 743d321d69..ac4f97a103 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodActiveAlertsChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.event +package info.nightscout.androidaps.plugins.pump.omnipod.eros.event import info.nightscout.androidaps.events.Event diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodFaultEventChanged.kt similarity index 66% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodFaultEventChanged.kt index d9d2b1e11d..c3ba51ea77 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodFaultEventChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.event +package info.nightscout.androidaps.plugins.pump.omnipod.eros.event import info.nightscout.androidaps.events.Event diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodPumpValuesChanged.kt similarity index 66% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodPumpValuesChanged.kt index e54d7455dd..c81a800cd6 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodPumpValuesChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.event +package info.nightscout.androidaps.plugins.pump.omnipod.eros.event import info.nightscout.androidaps.events.Event diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodTbrChanged.kt similarity index 65% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodTbrChanged.kt index 2b212506cd..6a819ee33e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodTbrChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.event +package info.nightscout.androidaps.plugins.pump.omnipod.eros.event import info.nightscout.androidaps.events.Event diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodUncertainTbrRecovered.kt similarity index 67% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodUncertainTbrRecovered.kt index f2c4dc855a..5e4209b676 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodUncertainTbrRecovered.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.event +package info.nightscout.androidaps.plugins.pump.omnipod.eros.event import info.nightscout.androidaps.events.Event diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java index db17adff1e..3cbc4d847f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.manager; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager; import android.content.Context; import android.content.Intent; @@ -42,50 +42,50 @@ import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair; import info.nightscout.androidaps.plugins.pump.common.defs.PumpType; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; import info.nightscout.androidaps.plugins.pump.omnipod.R; -import info.nightscout.androidaps.plugins.pump.omnipod.data.ActiveBolus; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCommandType; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodHistoryEntryType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalScheduleEntry; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActivationTimeExceededException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandFailedAfterChangingDeliveryStatusException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CrcMismatchException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalActivationProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalDeliveryStatusException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageAddressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageSequenceNumberException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPodProgressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalResponseException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalVersionResponseTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.MessageDecodingException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NonceOutOfSyncException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NonceResyncException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NotEnoughDataException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.OmnipodException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodProgressStatusVerificationFailedException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodReturnedErrorResponseException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PrecedingCommandFailedUncertainlyException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkInterruptedException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkTimeoutException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnexpectedException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnreachableException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.OmnipodManager; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; -import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodAlertUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.ActiveBolus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodCommandType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodStorageKeys; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoRecentPulseLog; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalScheduleEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.ActivationTimeExceededException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.CommandFailedAfterChangingDeliveryStatusException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.CrcMismatchException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalActivationProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalDeliveryStatusException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageAddressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageSequenceNumberException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPodProgressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalResponseException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalVersionResponseTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.MessageDecodingException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NonceOutOfSyncException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NonceResyncException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NotEnoughDataException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.OmnipodException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodFaultException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodProgressStatusVerificationFailedException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodReturnedErrorResponseException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PrecedingCommandFailedUncertainlyException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkInterruptedException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkTimeoutException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnexpectedException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnreachableException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.OmnipodManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodPumpValuesChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil; import info.nightscout.androidaps.utils.DateUtil; import info.nightscout.androidaps.utils.resources.ResourceHelper; import info.nightscout.androidaps.utils.rx.AapsSchedulers; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsPodStateManager.java similarity index 71% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManager.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsPodStateManager.java index 085b16d9a9..ecbf9a8d42 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsPodStateManager.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.manager; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager; import javax.inject.Inject; import javax.inject.Singleton; @@ -7,12 +7,12 @@ import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.plugins.bus.RxBusWrapper; import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification; import info.nightscout.androidaps.plugins.general.overview.notifications.Notification; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodActiveAlertsChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodFaultEventChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodTbrChanged; -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodUncertainTbrRecovered; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodStorageKeys; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodActiveAlertsChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodFaultEventChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodTbrChanged; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodUncertainTbrRecovered; import info.nightscout.androidaps.utils.sharedPreferences.SP; @Singleton diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandAcknowledgeAlerts.java similarity index 70% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandAcknowledgeAlerts.java index 649623e05e..ce181a7912 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandAcknowledgeAlerts.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandAcknowledgeAlerts extends OmnipodCustomCommand { public CommandAcknowledgeAlerts() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandDeactivatePod.java similarity index 69% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandDeactivatePod.java index 3921ec19d7..0d099c4481 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandDeactivatePod.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandDeactivatePod extends OmnipodCustomCommand { public CommandDeactivatePod() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java similarity index 69% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java index 0dfe7880f8..85ee7b6fd4 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandGetPodStatus extends OmnipodCustomCommand { public CommandGetPodStatus() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandHandleTimeChange.java similarity index 83% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandHandleTimeChange.java index c760b401b5..d55cb11249 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandHandleTimeChange.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandHandleTimeChange extends OmnipodCustomCommand { private final boolean requestedByUser; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandPlayTestBeep.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandPlayTestBeep.java similarity index 66% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandPlayTestBeep.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandPlayTestBeep.java index 79b3d8a71f..f06dc0cda1 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandPlayTestBeep.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandPlayTestBeep.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; public class CommandPlayTestBeep extends OmnipodCustomCommand { private final BeepConfigType beepType; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java similarity index 69% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java index 5eb910c6db..d3317651ca 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandReadPulseLog extends OmnipodCustomCommand { public CommandReadPulseLog() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandResumeDelivery.java similarity index 69% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandResumeDelivery.java index fe3b07de9f..9398330ab2 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandResumeDelivery.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandResumeDelivery extends OmnipodCustomCommand { public CommandResumeDelivery() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandSuspendDelivery.java similarity index 70% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandSuspendDelivery.java index 12dc8e8d42..e3883b9105 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandSuspendDelivery.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandSuspendDelivery extends OmnipodCustomCommand { public CommandSuspendDelivery() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandUpdateAlertConfiguration.java similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandUpdateAlertConfiguration.java index 4edc243845..5dc5d00f7f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandUpdateAlertConfiguration.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public final class CommandUpdateAlertConfiguration extends OmnipodCustomCommand { public CommandUpdateAlertConfiguration() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/OmnipodCustomCommand.java similarity index 87% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/OmnipodCustomCommand.java index 06b2e2a051..9ddc4c1bd0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/OmnipodCustomCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; import androidx.annotation.NonNull; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/OmnipodCustomCommandType.java similarity index 89% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/OmnipodCustomCommandType.java index f88777638e..6a20ea2580 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/OmnipodCustomCommandType.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.queue.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; public enum OmnipodCustomCommandType { ACKNOWLEDGE_ALERTS("ACKNOWLEDGE ALERTS"), diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java similarity index 85% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java index 6ac15bc9b1..2e405af2ee 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager; import org.joda.time.DateTime; @@ -15,35 +15,35 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLink import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.OmnipodAction; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodMessage; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.OmnipodPacket; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.DeactivatePodCommand; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.ErrorResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusUpdatableResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfo; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoDetailedStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActivationTimeExceededException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageAddressException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageSequenceNumberException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalResponseException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NonceOutOfSyncException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NonceResyncException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NotEnoughDataException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.OmnipodException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodReturnedErrorResponseException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkTimeoutException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnexpectedException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnreachableException; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.OmnipodAction; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodPacket; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.DeactivatePodCommand; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.ErrorResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusUpdatableResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfo; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoDetailedStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoResponse; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PacketType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.ActivationTimeExceededException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageAddressException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageSequenceNumberException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalResponseException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NonceOutOfSyncException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NonceResyncException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.NotEnoughDataException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.OmnipodException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodFaultException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodReturnedErrorResponseException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkTimeoutException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnexpectedException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnreachableException; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; /** * Created by andy on 6/29/18. diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java index b51ab9012d..5f6ced399a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.rileylink.service; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service; import android.content.Intent; import android.content.res.Configuration; @@ -18,12 +18,12 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.Rile import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService; -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin; import info.nightscout.androidaps.plugins.pump.omnipod.R; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager; -import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager; -import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; /** diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt similarity index 95% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt index 0c074e3fd9..f199a2dd8e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui import android.content.Intent import android.graphics.Color @@ -22,23 +22,23 @@ import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDevic import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.R import info.nightscout.androidaps.plugins.pump.omnipod.databinding.OmnipodOverviewBinding -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager -import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.TimeUtil -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandAcknowledgeAlerts -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandGetPodStatus -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandHandleTimeChange -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandResumeDelivery -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandSuspendDelivery -import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil -import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodAlertUtil +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodPumpValuesChanged +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandAcknowledgeAlerts +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandGetPodStatus +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandHandleTimeChange +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandResumeDelivery +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandSuspendDelivery +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.queue.events.EventQueueChanged import info.nightscout.androidaps.utils.DateUtil @@ -50,7 +50,6 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.sharedPreferences.SP import info.nightscout.androidaps.utils.ui.UIRunnable -import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import org.apache.commons.lang3.StringUtils import org.joda.time.DateTime diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java index 9cc797b375..ed4c7db40a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui; import android.os.Bundle; import android.os.SystemClock; @@ -34,8 +34,8 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.androidaps.plugins.pump.common.defs.PumpType; import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil; import info.nightscout.androidaps.plugins.pump.omnipod.R; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodHistoryEntryType; -import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; import info.nightscout.androidaps.utils.resources.ResourceHelper; public class PodHistoryActivity extends NoSplashAppCompatActivity { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt similarity index 91% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt index bf87dd8e59..1296bfa447 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui import android.content.Context import android.content.Intent @@ -13,18 +13,18 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor -import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.R import info.nightscout.androidaps.plugins.pump.omnipod.databinding.OmnipodPodManagementBinding -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager -import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandPlayTestBeep -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandReadPulseLog -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.PodActivationWizardActivity -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.PodDeactivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodPumpValuesChanged +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandPlayTestBeep +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.PodActivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.PodDeactivationWizardActivity import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.queue.events.EventQueueChanged import info.nightscout.androidaps.utils.FabricPrivacy @@ -33,7 +33,6 @@ import info.nightscout.androidaps.utils.extensions.plusAssign import info.nightscout.androidaps.utils.extensions.toVisibility import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.ui.UIRunnable -import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import javax.inject.Inject diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt similarity index 82% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt index b5f4ee3114..bbbf41ab04 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation import android.os.Bundle import androidx.annotation.IdRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity.OmnipodWizardActivityBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.activity.OmnipodWizardActivityBase import javax.inject.Inject class PodActivationWizardActivity : OmnipodWizardActivityBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/AttachPodInfoFragment.kt similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/AttachPodInfoFragment.kt index a02462d5af..afade782d2 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/AttachPodInfoFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment import android.os.Bundle import android.view.View @@ -8,7 +8,7 @@ import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog import androidx.navigation.fragment.findNavController import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.InfoFragmentBase class AttachPodInfoFragment : InfoFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/FillPodInfoFragment.kt similarity index 73% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/FillPodInfoFragment.kt index f7a1053785..12dfb1e2f5 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/FillPodInfoFragment.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment import androidx.annotation.IdRes import androidx.annotation.StringRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.InfoFragmentBase class FillPodInfoFragment : InfoFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/InitializePodActionFragment.kt similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/InitializePodActionFragment.kt index 82af74414f..0d3ed954c0 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/InitializePodActionFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment import android.os.Bundle import androidx.annotation.IdRes @@ -6,8 +6,8 @@ import androidx.annotation.StringRes import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModelProvider import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodPluginQualifier -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InitializePodActionViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodPluginQualifier +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.InitializePodActionViewModel import javax.inject.Inject class InitializePodActionFragment : PodActivationActionFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt similarity index 77% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt index 76a470ee3a..0ab6eabdc8 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment import android.os.Bundle import androidx.annotation.IdRes @@ -6,8 +6,8 @@ import androidx.annotation.StringRes import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModelProvider import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodPluginQualifier -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InsertCannulaActionViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodPluginQualifier +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.InsertCannulaActionViewModel import javax.inject.Inject class InsertCannulaActionFragment : PodActivationActionFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt similarity index 72% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt index d0c807a4e3..d7d6cf9139 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment import androidx.annotation.IdRes import androidx.annotation.StringRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.InfoFragmentBase class PodActivatedInfoFragment : InfoFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt similarity index 72% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt index cea430f585..be3f3b6159 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt @@ -1,14 +1,14 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.fragment import android.content.Intent import android.os.Bundle import android.view.View import android.widget.Button import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.ActionFragmentBase -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.PodDeactivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.ActionFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.PodDeactivationWizardActivity import javax.inject.Inject abstract class PodActivationActionFragmentBase : ActionFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt similarity index 51% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt index 674ca9f8a7..a1316b51d6 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel import info.nightscout.androidaps.data.PumpEnactResult -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.viewmodel.ActionViewModelBase import javax.inject.Inject class InitializePodActionViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodManager) : ActionViewModelBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt similarity index 60% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt index 1b1bd126dc..87e34c28f7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.interfaces.ProfileFunction -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.viewmodel.ActionViewModelBase import javax.inject.Inject class InsertCannulaActionViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodManager, private val profileFunction: ProfileFunction) : ActionViewModelBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt similarity index 93% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt index 0621cd02d5..fbfaf84f7b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.activity import androidx.appcompat.app.AlertDialog import androidx.navigation.NavController diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/ActionFragmentBase.kt similarity index 94% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/ActionFragmentBase.kt index d15462c2eb..7a2f4794b7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/ActionFragmentBase.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -7,7 +7,7 @@ import android.widget.Button import androidx.annotation.LayoutRes import androidx.annotation.StringRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.viewmodel.ActionViewModelBase import info.nightscout.androidaps.utils.extensions.toVisibility abstract class ActionFragmentBase : WizardFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/InfoFragmentBase.kt similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/InfoFragmentBase.kt index 365d356246..73a52d8e9f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/InfoFragmentBase.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment import android.os.Bundle import android.view.View diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt similarity index 93% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt index 280b785c72..587c8e988d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment import android.content.res.ColorStateList import android.os.Bundle @@ -12,7 +12,7 @@ import androidx.navigation.fragment.findNavController import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.omnipod.R import info.nightscout.androidaps.plugins.pump.omnipod.databinding.OmnipodWizardBaseFragmentBinding -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity.OmnipodWizardActivityBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.activity.OmnipodWizardActivityBase import kotlin.math.roundToInt abstract class WizardFragmentBase : DaggerFragment() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/viewmodel/ActionViewModelBase.kt similarity index 92% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/viewmodel/ActionViewModelBase.kt index dc47132515..65f29dd3f5 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/viewmodel/ActionViewModelBase.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt similarity index 69% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt index dafba7fb4d..f39cdfa409 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation import android.os.Bundle import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity.OmnipodWizardActivityBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.activity.OmnipodWizardActivityBase class PodDeactivationWizardActivity : OmnipodWizardActivityBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt similarity index 83% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt index ddcbec9bb1..3e10d7d9b6 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment import android.os.Bundle import android.view.View @@ -10,10 +10,10 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodPluginQualifier -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.ActionFragmentBase -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.viewmodel.DeactivatePodActionViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodPluginQualifier +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.ActionFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.viewmodel.DeactivatePodActionViewModel import info.nightscout.androidaps.utils.extensions.toVisibility import javax.inject.Inject diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt similarity index 74% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt index 8a24e2767b..c41e4db357 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment import androidx.annotation.IdRes import androidx.annotation.StringRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.InfoFragmentBase class DeactivatePodInfoFragment : InfoFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt similarity index 72% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt index 240efe4735..7c167f2c67 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment import androidx.annotation.IdRes import androidx.annotation.StringRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.InfoFragmentBase class PodDeactivatedInfoFragment : InfoFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt similarity index 72% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt index ebbfa0b3fd..b6dc74d7b2 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.fragment import androidx.annotation.IdRes import androidx.annotation.StringRes import info.nightscout.androidaps.plugins.pump.omnipod.R -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.fragment.InfoFragmentBase class PodDiscardedInfoFragment : InfoFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt similarity index 67% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt index 9e0b75f2e3..24530b6c70 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.viewmodel +package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.viewmodel import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.interfaces.CommandQueueProvider -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandDeactivatePod -import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager +import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandDeactivatePod +import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.viewmodel.ActionViewModelBase import info.nightscout.androidaps.queue.Callback import io.reactivex.subjects.SingleSubject import javax.inject.Inject diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java similarity index 88% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java index 97c938825a..23fff2b0fb 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.util; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -17,10 +17,10 @@ import javax.inject.Inject; import javax.inject.Singleton; import info.nightscout.androidaps.plugins.pump.omnipod.R; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; import info.nightscout.androidaps.utils.resources.ResourceHelper; /** diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java similarity index 79% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java index 02cd645b16..0ad2b49c18 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.util; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.util; import org.joda.time.Duration; import javax.inject.Inject; import javax.inject.Singleton; -import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodStorageKeys; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; import info.nightscout.androidaps.utils.sharedPreferences.SP; @Singleton diff --git a/omnipod-eros/src/main/res/layout/omnipod_overview.xml b/omnipod-eros/src/main/res/layout/omnipod_overview.xml index 3ac0f4427c..42c7a84ac9 100644 --- a/omnipod-eros/src/main/res/layout/omnipod_overview.xml +++ b/omnipod-eros/src/main/res/layout/omnipod_overview.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodOverviewFragment"> + tools:context=".eros.ui.OmnipodOverviewFragment"> \ No newline at end of file diff --git a/omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml b/omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml index d1c431652c..3257353f2b 100644 --- a/omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml +++ b/omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml @@ -4,7 +4,7 @@ app:startDestination="@id/deactivatePodInfoFragment"> \ No newline at end of file diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java deleted file mode 100644 index cb27ca5023..0000000000 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; - -public class FaultConfigCommandTest { - // TODO add tests (obtain captures first) -} diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java deleted file mode 100644 index 388fc86c8f..0000000000 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; - -public class PodInfoOlderPulseLogTest { - // TODO -} diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPluginTest.java similarity index 94% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPluginTest.java index e6aeed9f79..82c2008017 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPluginTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod; +package info.nightscout.androidaps.plugins.pump.omnipod.eros; import android.os.Looper; @@ -26,8 +26,9 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper; import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair; import info.nightscout.androidaps.plugins.pump.common.defs.PumpType; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager; import info.nightscout.androidaps.utils.resources.ResourceHelper; +import info.nightscout.androidaps.utils.rx.TestAapsSchedulers; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -41,7 +42,7 @@ public class OmnipodPumpPluginTest { @Mock HasAndroidInjector injector; AAPSLogger aapsLogger = new AAPSLoggerTest(); - RxBusWrapper rxBusWrapper = new RxBusWrapper(); + RxBusWrapper rxBusWrapper = new RxBusWrapper(new TestAapsSchedulers()); @Mock ResourceHelper resourceHelper; @Mock(answer = Answers.RETURNS_DEEP_STUBS) ActivePluginProvider activePluginProvider; @Mock AapsOmnipodManager aapsOmnipodManager; @@ -57,7 +58,7 @@ public class OmnipodPumpPluginTest { // mock all the things PowerMockito.mockStatic(Looper.class); - OmnipodPumpPlugin plugin = new OmnipodPumpPlugin(injector, aapsLogger, rxBusWrapper, null, + OmnipodPumpPlugin plugin = new OmnipodPumpPlugin(injector, aapsLogger, new TestAapsSchedulers(), rxBusWrapper, null, resourceHelper, activePluginProvider, null, null, aapsOmnipodManager, commandQueueProvider, null, null, null, null, rileyLinkUtil, null, null, null, null diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/AapsOmnipodManagerTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodManagerTest.java similarity index 93% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/AapsOmnipodManagerTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodManagerTest.java index 7be6b20fa0..e376fd6d68 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/AapsOmnipodManagerTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodManagerTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication; import org.joda.time.Duration; import org.junit.Rule; @@ -9,9 +9,9 @@ import org.powermock.api.mockito.PowerMockito; import java.util.List; import info.nightscout.androidaps.data.Profile; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalScheduleEntry; -import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalScheduleEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java similarity index 77% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java index 1dbceb85f0..04e589d4b2 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.junit.Test; import java.util.Arrays; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java similarity index 83% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java index 55dedcb887..8680127290 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java similarity index 95% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java index e44009b0cf..947df39bde 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import org.junit.Test; @@ -8,9 +8,9 @@ import java.util.Collections; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalScheduleEntry; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.RateEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalScheduleEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.RateEntry; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java similarity index 83% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java index 384c0d6ea3..a777c5d082 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java similarity index 96% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java index 2e65895465..f37f6f09c7 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java similarity index 84% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java index 96f91069b8..c97a199340 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java @@ -1,12 +1,12 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.junit.Test; import java.util.EnumSet; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java similarity index 82% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java index 69f40a9d25..8937911a03 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import org.junit.Test; @@ -7,13 +7,13 @@ import java.util.Arrays; import java.util.Collections; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepRepeat; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.TimerAlertTrigger; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.UnitsRemainingAlertTrigger; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepRepeat; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.TimerAlertTrigger; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.UnitsRemainingAlertTrigger; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java similarity index 74% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java index d5920ec5c1..397fc5a3f7 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.junit.Test; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.MessageBlockType; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java new file mode 100644 index 0000000000..da92c6d2b7 --- /dev/null +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; + +public class FaultConfigCommandTest { + // TODO add tests (obtain captures first) +} diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java similarity index 83% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java index 65d8e9d7c2..2a92300f1a 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java similarity index 96% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java index fdea1deefa..03a0e3175e 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import org.junit.Test; @@ -8,9 +8,9 @@ import java.util.Collections; import java.util.List; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalScheduleEntry; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BolusDeliverySchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalScheduleEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BolusDeliverySchedule; import static org.junit.Assert.assertArrayEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java similarity index 88% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java index e44aa01c88..07f91df881 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.DateTime; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommandTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java similarity index 97% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java index 3e2e164a8a..69da4a64fc 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommandTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command; import org.joda.time.Duration; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/defs/schedule/BasalTableEntryTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java similarity index 70% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/defs/schedule/BasalTableEntryTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java index a379e3e697..5fda76dbd8 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/defs/schedule/BasalTableEntryTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.defs.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.defs.schedule; import org.junit.Test; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalTableEntry; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalTableEntry; import static junit.framework.Assert.assertEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponseTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java similarity index 86% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponseTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java index c24f5dd827..c61e7fded3 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponseTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java similarity index 91% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java index e095a57953..bbbc4d0a12 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java @@ -1,13 +1,13 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import org.joda.time.Duration; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponseTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java similarity index 94% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponseTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java index ab15e57234..0114d14fd6 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponseTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java similarity index 93% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java index 97b19ab1b8..21468200e1 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.Duration; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLogTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java similarity index 81% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLogTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java index c167d1f006..b3b0dec638 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLogTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.Duration; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java similarity index 95% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java index 1b3d5ed816..fc451eda07 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java @@ -1,13 +1,13 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.Duration; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryStatus; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ErrorEventInfo; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ErrorEventInfo; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java similarity index 86% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java index 042f61bb03..3cd87634f7 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Test; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FaultEventCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java new file mode 100644 index 0000000000..58813f4ffb --- /dev/null +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; + +public class PodInfoOlderPulseLogTest { + // TODO +} diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java similarity index 87% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java index eafa838f0d..d499a4b4b0 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponseTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java similarity index 91% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponseTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java index 99d05b7d03..388deb09a8 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponseTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java @@ -1,11 +1,11 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSetTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java similarity index 88% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSetTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java index ab5c8cc304..9487978603 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSetTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java similarity index 98% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java index 6853e565a8..8e0f3e11fd 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule; import org.joda.time.Duration; import org.junit.Test; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtilTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java similarity index 95% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtilTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java index 6165de683d..2c0704da42 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtilTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.driver.util; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsPodStateManagerTest.java similarity index 90% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsPodStateManagerTest.java index 66e2c0bf7a..c8f5ca44cd 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsPodStateManagerTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.omnipod.manager; +package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager; import org.joda.time.DateTime; import org.joda.time.DateTimeUtils; @@ -12,8 +12,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.nightscout.androidaps.logging.AAPSLogger; import info.nightscout.androidaps.plugins.bus.RxBusWrapper; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FirmwareVersion; -import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus; +import info.nightscout.androidaps.utils.rx.TestAapsSchedulers; import info.nightscout.androidaps.utils.sharedPreferences.SP; import static org.junit.Assert.assertEquals; @@ -23,7 +24,7 @@ public class AapsPodStateManagerTest { @Mock AAPSLogger aapsLogger; @Mock SP sp; - private RxBusWrapper rxBus = new RxBusWrapper(); + private RxBusWrapper rxBus = new RxBusWrapper(new TestAapsSchedulers()); @Test public void times() {