From 8224f141badb2d01fb4536fec4e1e1a09e81be03 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Tue, 9 Feb 2021 19:37:27 +0100 Subject: [PATCH 01/20] Rename module omnipod to omnipod-eros --- app/build.gradle | 2 +- {omnipod => omnipod-eros}/.gitignore | 0 {omnipod => omnipod-eros}/build.gradle | 0 {omnipod => omnipod-eros}/consumer-rules.pro | 0 {omnipod => omnipod-eros}/proguard-rules.pro | 0 {omnipod => omnipod-eros}/src/main/AndroidManifest.xml | 0 .../androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java | 0 .../plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt | 0 .../androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt | 0 .../plugins/pump/omnipod/dagger/OmnipodWizardModule.kt | 0 .../androidaps/plugins/pump/omnipod/data/ActiveBolus.java | 0 .../plugins/pump/omnipod/data/RLHistoryItemOmnipod.java | 0 .../plugins/pump/omnipod/definition/OmnipodCommandType.java | 0 .../plugins/pump/omnipod/definition/OmnipodStorageKeys.java | 0 .../plugins/pump/omnipod/definition/PodHistoryEntryType.java | 0 .../driver/communication/action/AcknowledgeAlertsAction.java | 0 .../driver/communication/action/AssignAddressAction.java | 0 .../pump/omnipod/driver/communication/action/BolusAction.java | 0 .../driver/communication/action/CancelDeliveryAction.java | 0 .../driver/communication/action/ConfigureAlertsAction.java | 0 .../driver/communication/action/ConfigureBeepAction.java | 0 .../driver/communication/action/DeactivatePodAction.java | 0 .../omnipod/driver/communication/action/GetPodInfoAction.java | 0 .../omnipod/driver/communication/action/GetStatusAction.java | 0 .../driver/communication/action/InsertCannulaAction.java | 0 .../pump/omnipod/driver/communication/action/OmnipodAction.java | 0 .../pump/omnipod/driver/communication/action/PrimeAction.java | 0 .../driver/communication/action/SetBasalScheduleAction.java | 0 .../omnipod/driver/communication/action/SetTempBasalAction.java | 0 .../omnipod/driver/communication/action/SetupPodAction.java | 0 .../communication/action/service/ExpirationReminderBuilder.java | 0 .../driver/communication/action/service/PrimeService.java | 0 .../omnipod/driver/communication/message/IRawRepresentable.java | 0 .../pump/omnipod/driver/communication/message/MessageBlock.java | 0 .../communication/message/NonceResyncableMessageBlock.java | 0 .../omnipod/driver/communication/message/OmnipodMessage.java | 0 .../omnipod/driver/communication/message/OmnipodPacket.java | 0 .../communication/message/command/AcknowledgeAlertsCommand.java | 0 .../communication/message/command/AssignAddressCommand.java | 0 .../message/command/BasalScheduleExtraCommand.java | 0 .../driver/communication/message/command/BeepConfigCommand.java | 0 .../driver/communication/message/command/BolusExtraCommand.java | 0 .../communication/message/command/CancelDeliveryCommand.java | 0 .../communication/message/command/ConfigureAlertsCommand.java | 0 .../communication/message/command/DeactivatePodCommand.java | 0 .../communication/message/command/FaultConfigCommand.java | 0 .../driver/communication/message/command/GetStatusCommand.java | 0 .../message/command/SetInsulinScheduleCommand.java | 0 .../driver/communication/message/command/SetupPodCommand.java | 0 .../communication/message/command/TempBasalExtraCommand.java | 0 .../driver/communication/message/response/ErrorResponse.java | 0 .../driver/communication/message/response/StatusResponse.java | 0 .../communication/message/response/StatusUpdatableResponse.java | 0 .../driver/communication/message/response/VersionResponse.java | 0 .../driver/communication/message/response/podinfo/PodInfo.java | 0 .../message/response/podinfo/PodInfoActiveAlerts.java | 0 .../communication/message/response/podinfo/PodInfoDataLog.java | 0 .../message/response/podinfo/PodInfoDetailedStatus.java | 0 .../response/podinfo/PodInfoFaultAndInitializationTime.java | 0 .../message/response/podinfo/PodInfoOlderPulseLog.java | 0 .../message/response/podinfo/PodInfoRecentPulseLog.java | 0 .../communication/message/response/podinfo/PodInfoResponse.java | 0 .../pump/omnipod/driver/definition/ActivationProgress.java | 0 .../pump/omnipod/driver/definition/AlertConfiguration.java | 0 .../plugins/pump/omnipod/driver/definition/AlertSet.java | 0 .../plugins/pump/omnipod/driver/definition/AlertSlot.java | 0 .../plugins/pump/omnipod/driver/definition/AlertTrigger.java | 0 .../plugins/pump/omnipod/driver/definition/AlertType.java | 0 .../plugins/pump/omnipod/driver/definition/BeepConfigType.java | 0 .../plugins/pump/omnipod/driver/definition/BeepRepeat.java | 0 .../plugins/pump/omnipod/driver/definition/BeepType.java | 0 .../plugins/pump/omnipod/driver/definition/DeliveryStatus.java | 0 .../plugins/pump/omnipod/driver/definition/DeliveryType.java | 0 .../plugins/pump/omnipod/driver/definition/ErrorEventInfo.java | 0 .../plugins/pump/omnipod/driver/definition/FaultEventCode.java | 0 .../plugins/pump/omnipod/driver/definition/FirmwareVersion.java | 0 .../pump/omnipod/driver/definition/MessageBlockType.java | 0 .../pump/omnipod/driver/definition/OmnipodConstants.java | 0 .../plugins/pump/omnipod/driver/definition/OmnipodCrc.java | 0 .../plugins/pump/omnipod/driver/definition/PacketType.java | 0 .../plugins/pump/omnipod/driver/definition/PodInfoType.java | 0 .../pump/omnipod/driver/definition/PodProgressStatus.java | 0 .../pump/omnipod/driver/definition/TimerAlertTrigger.java | 0 .../omnipod/driver/definition/UnitsRemainingAlertTrigger.java | 0 .../driver/definition/schedule/BasalDeliverySchedule.java | 0 .../omnipod/driver/definition/schedule/BasalDeliveryTable.java | 0 .../pump/omnipod/driver/definition/schedule/BasalSchedule.java | 0 .../omnipod/driver/definition/schedule/BasalScheduleEntry.java | 0 .../omnipod/driver/definition/schedule/BasalTableEntry.java | 0 .../driver/definition/schedule/BolusDeliverySchedule.java | 0 .../omnipod/driver/definition/schedule/DeliverySchedule.java | 0 .../omnipod/driver/definition/schedule/InsulinScheduleType.java | 0 .../pump/omnipod/driver/definition/schedule/RateEntry.java | 0 .../driver/definition/schedule/TempBasalDeliverySchedule.java | 0 .../driver/exception/ActivationTimeExceededException.java | 0 .../CommandFailedAfterChangingDeliveryStatusException.java | 0 .../pump/omnipod/driver/exception/CrcMismatchException.java | 0 .../driver/exception/IllegalActivationProgressException.java | 0 .../driver/exception/IllegalDeliveryStatusException.java | 0 .../driver/exception/IllegalMessageAddressException.java | 0 .../driver/exception/IllegalMessageSequenceNumberException.java | 0 .../omnipod/driver/exception/IllegalPacketTypeException.java | 0 .../omnipod/driver/exception/IllegalPodProgressException.java | 0 .../pump/omnipod/driver/exception/IllegalResponseException.java | 0 .../driver/exception/IllegalVersionResponseTypeException.java | 0 .../pump/omnipod/driver/exception/MessageDecodingException.java | 0 .../pump/omnipod/driver/exception/NonceOutOfSyncException.java | 0 .../pump/omnipod/driver/exception/NonceResyncException.java | 0 .../pump/omnipod/driver/exception/NotEnoughDataException.java | 0 .../plugins/pump/omnipod/driver/exception/OmnipodException.java | 0 .../pump/omnipod/driver/exception/PodFaultException.java | 0 .../exception/PodProgressStatusVerificationFailedException.java | 0 .../driver/exception/PodReturnedErrorResponseException.java | 0 .../exception/PrecedingCommandFailedUncertainlyException.java | 0 .../omnipod/driver/exception/RileyLinkInterruptedException.java | 0 .../omnipod/driver/exception/RileyLinkTimeoutException.java | 0 .../omnipod/driver/exception/RileyLinkUnexpectedException.java | 0 .../omnipod/driver/exception/RileyLinkUnreachableException.java | 0 .../plugins/pump/omnipod/driver/manager/OmnipodManager.java | 0 .../plugins/pump/omnipod/driver/manager/PodStateManager.java | 0 .../pump/omnipod/driver/util/AlertConfigurationUtil.java | 0 .../androidaps/plugins/pump/omnipod/driver/util/TimeUtil.java | 0 .../pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt | 0 .../plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt | 0 .../plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt | 0 .../plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt | 0 .../pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt | 0 .../plugins/pump/omnipod/manager/AapsOmnipodManager.java | 0 .../plugins/pump/omnipod/manager/AapsPodStateManager.java | 0 .../pump/omnipod/queue/command/CommandAcknowledgeAlerts.java | 0 .../pump/omnipod/queue/command/CommandDeactivatePod.java | 0 .../plugins/pump/omnipod/queue/command/CommandGetPodStatus.java | 0 .../pump/omnipod/queue/command/CommandHandleTimeChange.java | 0 .../plugins/pump/omnipod/queue/command/CommandPlayTestBeep.java | 0 .../plugins/pump/omnipod/queue/command/CommandReadPulseLog.java | 0 .../pump/omnipod/queue/command/CommandResumeDelivery.java | 0 .../pump/omnipod/queue/command/CommandSuspendDelivery.java | 0 .../omnipod/queue/command/CommandUpdateAlertConfiguration.java | 0 .../pump/omnipod/queue/command/OmnipodCustomCommand.java | 0 .../pump/omnipod/queue/command/OmnipodCustomCommandType.java | 0 .../rileylink/manager/OmnipodRileyLinkCommunicationManager.java | 0 .../pump/omnipod/rileylink/service/RileyLinkOmnipodService.java | 0 .../plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt | 0 .../androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java | 0 .../androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt | 0 .../omnipod/ui/wizard/activation/PodActivationWizardActivity.kt | 0 .../ui/wizard/activation/fragment/AttachPodInfoFragment.kt | 0 .../ui/wizard/activation/fragment/FillPodInfoFragment.kt | 0 .../wizard/activation/fragment/InitializePodActionFragment.kt | 0 .../wizard/activation/fragment/InsertCannulaActionFragment.kt | 0 .../ui/wizard/activation/fragment/PodActivatedInfoFragment.kt | 0 .../activation/fragment/PodActivationActionFragmentBase.kt | 0 .../wizard/activation/viewmodel/InitializePodActionViewModel.kt | 0 .../wizard/activation/viewmodel/InsertCannulaActionViewModel.kt | 0 .../ui/wizard/common/activity/OmnipodWizardActivityBase.kt | 0 .../omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt | 0 .../pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt | 0 .../omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt | 0 .../omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt | 0 .../ui/wizard/deactivation/PodDeactivationWizardActivity.kt | 0 .../wizard/deactivation/fragment/DeactivatePodActionFragment.kt | 0 .../wizard/deactivation/fragment/DeactivatePodInfoFragment.kt | 0 .../wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt | 0 .../ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt | 0 .../deactivation/viewmodel/DeactivatePodActionViewModel.kt | 0 .../androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java | 0 .../androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java | 0 .../res/drawable/ic_omnipod_overview_acknowledge_alerts.xml | 0 .../main/res/drawable/ic_omnipod_overview_pod_management.xml | 0 .../res/drawable/ic_omnipod_overview_refresh_pod_status.xml | 0 .../main/res/drawable/ic_omnipod_overview_resume_delivery.xml | 0 .../src/main/res/drawable/ic_omnipod_overview_set_time.xml | 0 .../main/res/drawable/ic_omnipod_overview_suspend_delivery.xml | 0 .../src/main/res/drawable/ic_omnipod_wizard_success.xml | 0 {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod.xml | 0 {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_128.xml | 0 .../res/drawable/ic_pod_activity_reset_rileylink_config.xml | 0 .../src/main/res/drawable/ic_pod_management_activate_pod.xml | 0 .../src/main/res/drawable/ic_pod_management_deactivate_pod.xml | 0 .../src/main/res/drawable/ic_pod_management_discard_pod.xml | 0 .../src/main/res/drawable/ic_pod_management_play_test_beep.xml | 0 .../src/main/res/drawable/ic_pod_management_pod_history.xml | 0 .../src/main/res/drawable/ic_pod_management_pulse_log.xml | 0 .../src/main/res/drawable/ic_pod_management_rl_stats.xml | 0 .../src/main/res/layout/omnipod_overview.xml | 0 .../main/res/layout/omnipod_pod_activation_wizard_activity.xml | 0 .../res/layout/omnipod_pod_deactivation_wizard_activity.xml | 0 .../src/main/res/layout/omnipod_pod_history_activity.xml | 0 .../src/main/res/layout/omnipod_pod_history_item.xml | 0 .../src/main/res/layout/omnipod_pod_management.xml | 0 .../src/main/res/layout/omnipod_wizard_action_page_fragment.xml | 0 .../src/main/res/layout/omnipod_wizard_base_fragment.xml | 0 .../src/main/res/layout/omnipod_wizard_info_page_fragment.xml | 0 .../src/main/res/layout/omnipod_wizard_nav_buttons.xml | 0 .../src/main/res/layout/omnipod_wizard_progress_indication.xml | 0 .../omnipod_pod_activation_wizard_navigation_graph.xml | 0 .../omnipod_pod_deactivation_wizard_navigation_graph.xml | 0 .../src/main/res/values-af-rZA/strings.xml | 0 .../src/main/res/values-bg-rBG/strings.xml | 0 .../src/main/res/values-ca-rES/strings.xml | 0 .../src/main/res/values-cs-rCZ/strings.xml | 0 .../src/main/res/values-da-rDK/strings.xml | 0 .../src/main/res/values-de-rDE/strings.xml | 0 .../src/main/res/values-el-rGR/strings.xml | 0 .../src/main/res/values-es-rES/strings.xml | 0 .../src/main/res/values-fr-rFR/strings.xml | 0 .../src/main/res/values-ga-rIE/strings.xml | 0 .../src/main/res/values-hr-rHR/strings.xml | 0 .../src/main/res/values-it-rIT/strings.xml | 0 .../src/main/res/values-iw-rIL/strings.xml | 0 .../src/main/res/values-ko-rKR/strings.xml | 0 .../src/main/res/values-lt-rLT/strings.xml | 0 .../src/main/res/values-nl-rNL/strings.xml | 0 .../src/main/res/values-no-rNO/strings.xml | 0 .../src/main/res/values-pl-rPL/strings.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rPT/strings.xml | 0 .../src/main/res/values-ro-rRO/strings.xml | 0 .../src/main/res/values-ru-rRU/strings.xml | 0 .../src/main/res/values-sk-rSK/strings.xml | 0 .../src/main/res/values-sl-rSI/strings.xml | 0 .../src/main/res/values-sv-rSE/strings.xml | 0 .../src/main/res/values-tr-rTR/strings.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 {omnipod => omnipod-eros}/src/main/res/values/colors.xml | 0 {omnipod => omnipod-eros}/src/main/res/values/dimens.xml | 0 {omnipod => omnipod-eros}/src/main/res/values/strings.xml | 0 {omnipod => omnipod-eros}/src/main/res/values/styles.xml | 0 {omnipod => omnipod-eros}/src/main/res/xml/pref_omnipod.xml | 0 .../androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java | 0 .../omnipod/driver/communication/AapsOmnipodManagerTest.java | 0 .../message/command/AcknowledgeAlertsCommandTest.java | 0 .../communication/message/command/AssignAddressCommandTest.java | 0 .../message/command/BasalScheduleExtraCommandTest.java | 0 .../communication/message/command/BeepConfigCommandTest.java | 0 .../communication/message/command/BolusExtraCommandTest.java | 0 .../message/command/CancelDeliveryCommandTest.java | 0 .../message/command/ConfigureAlertsCommandTest.java | 0 .../communication/message/command/DeactivatePodCommandTest.java | 0 .../communication/message/command/FaultConfigCommandTest.java | 0 .../communication/message/command/GetStatusCommandTest.java | 0 .../message/command/SetInsulinScheduleCommandTest.java | 0 .../communication/message/command/SetupPodCommandTest.java | 0 .../message/command/TempBasalExtraCommandTest.java | 0 .../message/defs/schedule/BasalTableEntryTest.java | 0 .../communication/message/response/ErrorResponseTest.java | 0 .../communication/message/response/StatusResponseTest.java | 0 .../communication/message/response/VersionResponseTest.java | 0 .../message/response/podinfo/PodInfoActiveAlertsTest.java | 0 .../message/response/podinfo/PodInfoDataLogTest.java | 0 .../message/response/podinfo/PodInfoDetailedStatusTest.java | 0 .../response/podinfo/PodInfoFaultAndInitializationTimeTest.java | 0 .../message/response/podinfo/PodInfoOlderPulseLogTest.java | 0 .../message/response/podinfo/PodInfoRecentPulseLogTest.java | 0 .../message/response/podinfo/PodInfoResponseTest.java | 0 .../plugins/pump/omnipod/driver/definition/AlertSetTest.java | 0 .../omnipod/driver/definition/schedule/BasalScheduleTest.java | 0 .../plugins/pump/omnipod/driver/util/TimeUtilTest.java | 0 .../plugins/pump/omnipod/manager/AapsPodStateManagerTest.java | 0 settings.gradle | 2 +- 260 files changed, 2 insertions(+), 2 deletions(-) rename {omnipod => omnipod-eros}/.gitignore (100%) rename {omnipod => omnipod-eros}/build.gradle (100%) rename {omnipod => omnipod-eros}/consumer-rules.pro (100%) rename {omnipod => omnipod-eros}/proguard-rules.pro (100%) rename {omnipod => omnipod-eros}/src/main/AndroidManifest.xml (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/ActiveBolus.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AssignAddressAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetupPodAction.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/PrimeService.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/MessageBlock.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/NonceResyncableMessageBlock.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodPacket.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponse.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponse.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusUpdatableResponse.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponse.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfo.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLog.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponse.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ActivationProgress.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertConfiguration.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSet.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSlot.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertTrigger.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepConfigType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepRepeat.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/BeepType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryStatus.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/DeliveryType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/ErrorEventInfo.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FaultEventCode.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/FirmwareVersion.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/MessageBlockType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodCrc.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PacketType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodInfoType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/PodProgressStatus.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/TimerAlertTrigger.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/UnitsRemainingAlertTrigger.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliverySchedule.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalDeliveryTable.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalSchedule.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleEntry.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalTableEntry.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BolusDeliverySchedule.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/InsulinScheduleType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/RateEntry.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/TempBasalDeliverySchedule.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActivationTimeExceededException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CrcMismatchException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalActivationProgressException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalDeliveryStatusException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageAddressException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalMessageSequenceNumberException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPacketTypeException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalPodProgressException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalResponseException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/IllegalVersionResponseTypeException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/MessageDecodingException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceOutOfSyncException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NonceResyncException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/NotEnoughDataException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/OmnipodException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodFaultException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodReturnedErrorResponseException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PrecedingCommandFailedUncertainlyException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtil.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManager.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandPlayTestBeep.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java (100%) rename {omnipod => omnipod-eros}/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_overview_pod_management.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_overview_set_time.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_omnipod_wizard_success.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_128.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_activate_pod.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_deactivate_pod.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_discard_pod.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_play_test_beep.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_pod_history.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_pulse_log.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/drawable/ic_pod_management_rl_stats.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_overview.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_pod_history_activity.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_pod_history_item.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_pod_management.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_wizard_action_page_fragment.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_wizard_base_fragment.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_wizard_info_page_fragment.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_wizard_nav_buttons.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/layout/omnipod_wizard_progress_indication.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-af-rZA/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-bg-rBG/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-ca-rES/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-cs-rCZ/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-da-rDK/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-de-rDE/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-el-rGR/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-es-rES/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-fr-rFR/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-ga-rIE/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-hr-rHR/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-it-rIT/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-iw-rIL/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-ko-rKR/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-lt-rLT/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-nl-rNL/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-no-rNO/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-pl-rPL/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-pt-rBR/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-pt-rPT/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-ro-rRO/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-ru-rRU/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-sk-rSK/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-sl-rSI/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-sv-rSE/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-tr-rTR/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values-zh-rCN/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values/colors.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values/dimens.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values/strings.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/values/styles.xml (100%) rename {omnipod => omnipod-eros}/src/main/res/xml/pref_omnipod.xml (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/AapsOmnipodManagerTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AcknowledgeAlertsCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/AssignAddressCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BasalScheduleExtraCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BeepConfigCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/CancelDeliveryCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/ConfigureAlertsCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/DeactivatePodCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/GetStatusCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetupPodCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommandTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/defs/schedule/BasalTableEntryTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/ErrorResponseTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/VersionResponseTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDataLogTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoResponseTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/AlertSetTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/BasalScheduleTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/TimeUtilTest.java (100%) rename {omnipod => omnipod-eros}/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java (100%) diff --git a/app/build.gradle b/app/build.gradle index 8d71d287b1..c9c7c5fa18 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -241,7 +241,7 @@ dependencies { implementation project(':danar') implementation project(':rileylink') implementation project(':medtronic') - implementation project(':omnipod') + implementation project(':omnipod-eros') implementation fileTree(include: ['*.jar'], dir: 'libs') diff --git a/omnipod/.gitignore b/omnipod-eros/.gitignore similarity index 100% rename from omnipod/.gitignore rename to omnipod-eros/.gitignore diff --git a/omnipod/build.gradle b/omnipod-eros/build.gradle similarity index 100% rename from omnipod/build.gradle rename to omnipod-eros/build.gradle diff --git a/omnipod/consumer-rules.pro b/omnipod-eros/consumer-rules.pro similarity index 100% rename from omnipod/consumer-rules.pro rename to omnipod-eros/consumer-rules.pro diff --git a/omnipod/proguard-rules.pro b/omnipod-eros/proguard-rules.pro similarity index 100% rename from omnipod/proguard-rules.pro rename to omnipod-eros/proguard-rules.pro diff --git a/omnipod/src/main/AndroidManifest.xml b/omnipod-eros/src/main/AndroidManifest.xml similarity index 100% rename from omnipod/src/main/AndroidManifest.xml rename to omnipod-eros/src/main/AndroidManifest.xml diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java similarity index 100% rename from omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt similarity index 100% rename from omnipod/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/dagger/OmnipodInjectHelpers.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt similarity index 100% rename from omnipod/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/dagger/OmnipodModule.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt similarity index 100% rename from omnipod/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/dagger/OmnipodWizardModule.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/ActiveBolus.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/ActiveBolus.java similarity index 100% rename from omnipod/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/data/ActiveBolus.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java similarity index 100% rename from omnipod/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/data/RLHistoryItemOmnipod.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java similarity index 100% rename from omnipod/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/definition/OmnipodCommandType.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java similarity index 100% rename from omnipod/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/definition/OmnipodStorageKeys.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java similarity index 100% rename from omnipod/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/definition/PodHistoryEntryType.java diff --git a/omnipod/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/driver/communication/action/AcknowledgeAlertsAction.java similarity index 100% rename from omnipod/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/driver/communication/action/AcknowledgeAlertsAction.java diff --git a/omnipod/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/driver/communication/action/AssignAddressAction.java similarity index 100% rename from omnipod/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/driver/communication/action/AssignAddressAction.java diff --git a/omnipod/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/driver/communication/action/BolusAction.java similarity index 100% rename from omnipod/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/driver/communication/action/BolusAction.java diff --git a/omnipod/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/driver/communication/action/CancelDeliveryAction.java similarity index 100% rename from omnipod/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/driver/communication/action/CancelDeliveryAction.java diff --git a/omnipod/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/driver/communication/action/ConfigureAlertsAction.java similarity index 100% rename from omnipod/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/driver/communication/action/ConfigureAlertsAction.java diff --git a/omnipod/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/driver/communication/action/ConfigureBeepAction.java similarity index 100% rename from omnipod/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/driver/communication/action/ConfigureBeepAction.java diff --git a/omnipod/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/driver/communication/action/DeactivatePodAction.java similarity index 100% rename from omnipod/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/driver/communication/action/DeactivatePodAction.java diff --git a/omnipod/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/driver/communication/action/GetPodInfoAction.java similarity index 100% rename from omnipod/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/driver/communication/action/GetPodInfoAction.java diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java diff --git a/omnipod/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/driver/communication/action/InsertCannulaAction.java similarity index 100% rename from omnipod/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/driver/communication/action/InsertCannulaAction.java diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/OmnipodAction.java diff --git a/omnipod/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/driver/communication/action/PrimeAction.java similarity index 100% rename from omnipod/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/driver/communication/action/PrimeAction.java diff --git a/omnipod/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/driver/communication/action/SetBasalScheduleAction.java similarity index 100% rename from omnipod/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/driver/communication/action/SetBasalScheduleAction.java diff --git a/omnipod/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/driver/communication/action/SetTempBasalAction.java similarity index 100% rename from omnipod/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/driver/communication/action/SetTempBasalAction.java diff --git a/omnipod/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/driver/communication/action/SetupPodAction.java similarity index 100% rename from omnipod/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/driver/communication/action/SetupPodAction.java diff --git a/omnipod/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/driver/communication/action/service/ExpirationReminderBuilder.java similarity index 100% rename from omnipod/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/driver/communication/action/service/ExpirationReminderBuilder.java diff --git a/omnipod/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/driver/communication/action/service/PrimeService.java similarity index 100% rename from omnipod/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/driver/communication/action/service/PrimeService.java diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/IRawRepresentable.java diff --git a/omnipod/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/driver/communication/message/MessageBlock.java similarity index 100% rename from omnipod/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/driver/communication/message/MessageBlock.java diff --git a/omnipod/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/driver/communication/message/NonceResyncableMessageBlock.java similarity index 100% rename from omnipod/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/driver/communication/message/NonceResyncableMessageBlock.java diff --git a/omnipod/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/driver/communication/message/OmnipodMessage.java similarity index 100% rename from omnipod/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/driver/communication/message/OmnipodMessage.java diff --git a/omnipod/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/driver/communication/message/OmnipodPacket.java similarity index 100% rename from omnipod/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/driver/communication/message/OmnipodPacket.java diff --git a/omnipod/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/driver/communication/message/command/AcknowledgeAlertsCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/AcknowledgeAlertsCommand.java diff --git a/omnipod/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/driver/communication/message/command/AssignAddressCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/AssignAddressCommand.java diff --git a/omnipod/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/driver/communication/message/command/BasalScheduleExtraCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/BasalScheduleExtraCommand.java diff --git a/omnipod/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/driver/communication/message/command/BeepConfigCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/BeepConfigCommand.java diff --git a/omnipod/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/driver/communication/message/command/BolusExtraCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/BolusExtraCommand.java diff --git a/omnipod/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/driver/communication/message/command/CancelDeliveryCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/CancelDeliveryCommand.java diff --git a/omnipod/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/driver/communication/message/command/ConfigureAlertsCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/ConfigureAlertsCommand.java diff --git a/omnipod/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/driver/communication/message/command/DeactivatePodCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/DeactivatePodCommand.java diff --git a/omnipod/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/driver/communication/message/command/FaultConfigCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/FaultConfigCommand.java diff --git a/omnipod/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/driver/communication/message/command/GetStatusCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/GetStatusCommand.java diff --git a/omnipod/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/driver/communication/message/command/SetInsulinScheduleCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/SetInsulinScheduleCommand.java diff --git a/omnipod/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/driver/communication/message/command/SetupPodCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/SetupPodCommand.java diff --git a/omnipod/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/driver/communication/message/command/TempBasalExtraCommand.java similarity index 100% rename from omnipod/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/driver/communication/message/command/TempBasalExtraCommand.java diff --git a/omnipod/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/driver/communication/message/response/ErrorResponse.java similarity index 100% rename from omnipod/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/driver/communication/message/response/ErrorResponse.java diff --git a/omnipod/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/driver/communication/message/response/StatusResponse.java similarity index 100% rename from omnipod/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/driver/communication/message/response/StatusResponse.java diff --git a/omnipod/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/driver/communication/message/response/StatusUpdatableResponse.java similarity index 100% rename from omnipod/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/driver/communication/message/response/StatusUpdatableResponse.java diff --git a/omnipod/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/driver/communication/message/response/VersionResponse.java similarity index 100% rename from omnipod/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/driver/communication/message/response/VersionResponse.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfo.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfo.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoDataLog.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoDataLog.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoResponse.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoResponse.java diff --git a/omnipod/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/driver/definition/ActivationProgress.java similarity index 100% rename from omnipod/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/driver/definition/ActivationProgress.java diff --git a/omnipod/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/driver/definition/AlertConfiguration.java similarity index 100% rename from omnipod/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/driver/definition/AlertConfiguration.java diff --git a/omnipod/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/driver/definition/AlertSet.java similarity index 100% rename from omnipod/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/driver/definition/AlertSet.java diff --git a/omnipod/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/driver/definition/AlertSlot.java similarity index 100% rename from omnipod/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/driver/definition/AlertSlot.java diff --git a/omnipod/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/driver/definition/AlertTrigger.java similarity index 100% rename from omnipod/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/driver/definition/AlertTrigger.java diff --git a/omnipod/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/driver/definition/AlertType.java similarity index 100% rename from omnipod/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/driver/definition/AlertType.java diff --git a/omnipod/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/driver/definition/BeepConfigType.java similarity index 100% rename from omnipod/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/driver/definition/BeepConfigType.java diff --git a/omnipod/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/driver/definition/BeepRepeat.java similarity index 100% rename from omnipod/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/driver/definition/BeepRepeat.java diff --git a/omnipod/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/driver/definition/BeepType.java similarity index 100% rename from omnipod/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/driver/definition/BeepType.java diff --git a/omnipod/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/driver/definition/DeliveryStatus.java similarity index 100% rename from omnipod/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/driver/definition/DeliveryStatus.java diff --git a/omnipod/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/driver/definition/DeliveryType.java similarity index 100% rename from omnipod/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/driver/definition/DeliveryType.java diff --git a/omnipod/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/driver/definition/ErrorEventInfo.java similarity index 100% rename from omnipod/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/driver/definition/ErrorEventInfo.java diff --git a/omnipod/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/driver/definition/FaultEventCode.java similarity index 100% rename from omnipod/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/driver/definition/FaultEventCode.java diff --git a/omnipod/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/driver/definition/FirmwareVersion.java similarity index 100% rename from omnipod/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/driver/definition/FirmwareVersion.java diff --git a/omnipod/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/driver/definition/MessageBlockType.java similarity index 100% rename from omnipod/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/driver/definition/MessageBlockType.java diff --git a/omnipod/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/driver/definition/OmnipodConstants.java similarity index 100% rename from omnipod/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/driver/definition/OmnipodConstants.java diff --git a/omnipod/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/driver/definition/OmnipodCrc.java similarity index 100% rename from omnipod/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/driver/definition/OmnipodCrc.java diff --git a/omnipod/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/driver/definition/PacketType.java similarity index 100% rename from omnipod/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/driver/definition/PacketType.java diff --git a/omnipod/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/driver/definition/PodInfoType.java similarity index 100% rename from omnipod/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/driver/definition/PodInfoType.java diff --git a/omnipod/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/driver/definition/PodProgressStatus.java similarity index 100% rename from omnipod/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/driver/definition/PodProgressStatus.java diff --git a/omnipod/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/driver/definition/TimerAlertTrigger.java similarity index 100% rename from omnipod/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/driver/definition/TimerAlertTrigger.java diff --git a/omnipod/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/driver/definition/UnitsRemainingAlertTrigger.java similarity index 100% rename from omnipod/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/driver/definition/UnitsRemainingAlertTrigger.java diff --git a/omnipod/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/driver/definition/schedule/BasalDeliverySchedule.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BasalDeliverySchedule.java diff --git a/omnipod/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/driver/definition/schedule/BasalDeliveryTable.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BasalDeliveryTable.java diff --git a/omnipod/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/driver/definition/schedule/BasalSchedule.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BasalSchedule.java diff --git a/omnipod/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/driver/definition/schedule/BasalScheduleEntry.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BasalScheduleEntry.java diff --git a/omnipod/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/driver/definition/schedule/BasalTableEntry.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BasalTableEntry.java diff --git a/omnipod/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/driver/definition/schedule/BolusDeliverySchedule.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BolusDeliverySchedule.java diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/schedule/DeliverySchedule.java diff --git a/omnipod/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/driver/definition/schedule/InsulinScheduleType.java similarity index 100% rename from omnipod/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/driver/definition/schedule/InsulinScheduleType.java diff --git a/omnipod/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/driver/definition/schedule/RateEntry.java similarity index 100% rename from omnipod/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/driver/definition/schedule/RateEntry.java diff --git a/omnipod/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/driver/definition/schedule/TempBasalDeliverySchedule.java similarity index 100% rename from omnipod/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/driver/definition/schedule/TempBasalDeliverySchedule.java diff --git a/omnipod/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/driver/exception/ActivationTimeExceededException.java similarity index 100% rename from omnipod/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/driver/exception/ActivationTimeExceededException.java diff --git a/omnipod/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/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java similarity index 100% rename from omnipod/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/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java diff --git a/omnipod/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/driver/exception/CrcMismatchException.java similarity index 100% rename from omnipod/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/driver/exception/CrcMismatchException.java diff --git a/omnipod/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/driver/exception/IllegalActivationProgressException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalActivationProgressException.java diff --git a/omnipod/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/driver/exception/IllegalDeliveryStatusException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalDeliveryStatusException.java diff --git a/omnipod/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/driver/exception/IllegalMessageAddressException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalMessageAddressException.java diff --git a/omnipod/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/driver/exception/IllegalMessageSequenceNumberException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalMessageSequenceNumberException.java diff --git a/omnipod/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/driver/exception/IllegalPacketTypeException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalPacketTypeException.java diff --git a/omnipod/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/driver/exception/IllegalPodProgressException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalPodProgressException.java diff --git a/omnipod/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/driver/exception/IllegalResponseException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalResponseException.java diff --git a/omnipod/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/driver/exception/IllegalVersionResponseTypeException.java similarity index 100% rename from omnipod/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/driver/exception/IllegalVersionResponseTypeException.java diff --git a/omnipod/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/driver/exception/MessageDecodingException.java similarity index 100% rename from omnipod/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/driver/exception/MessageDecodingException.java diff --git a/omnipod/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/driver/exception/NonceOutOfSyncException.java similarity index 100% rename from omnipod/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/driver/exception/NonceOutOfSyncException.java diff --git a/omnipod/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/driver/exception/NonceResyncException.java similarity index 100% rename from omnipod/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/driver/exception/NonceResyncException.java diff --git a/omnipod/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/driver/exception/NotEnoughDataException.java similarity index 100% rename from omnipod/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/driver/exception/NotEnoughDataException.java diff --git a/omnipod/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/driver/exception/OmnipodException.java similarity index 100% rename from omnipod/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/driver/exception/OmnipodException.java diff --git a/omnipod/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/driver/exception/PodFaultException.java similarity index 100% rename from omnipod/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/driver/exception/PodFaultException.java diff --git a/omnipod/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/driver/exception/PodProgressStatusVerificationFailedException.java similarity index 100% rename from omnipod/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/driver/exception/PodProgressStatusVerificationFailedException.java diff --git a/omnipod/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/driver/exception/PodReturnedErrorResponseException.java similarity index 100% rename from omnipod/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/driver/exception/PodReturnedErrorResponseException.java diff --git a/omnipod/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/driver/exception/PrecedingCommandFailedUncertainlyException.java similarity index 100% rename from omnipod/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/driver/exception/PrecedingCommandFailedUncertainlyException.java diff --git a/omnipod/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/driver/exception/RileyLinkInterruptedException.java similarity index 100% rename from omnipod/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/driver/exception/RileyLinkInterruptedException.java diff --git a/omnipod/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/driver/exception/RileyLinkTimeoutException.java similarity index 100% rename from omnipod/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/driver/exception/RileyLinkTimeoutException.java diff --git a/omnipod/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/driver/exception/RileyLinkUnexpectedException.java similarity index 100% rename from omnipod/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/driver/exception/RileyLinkUnexpectedException.java diff --git a/omnipod/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/driver/exception/RileyLinkUnreachableException.java similarity index 100% rename from omnipod/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/driver/exception/RileyLinkUnreachableException.java diff --git a/omnipod/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/driver/manager/OmnipodManager.java similarity index 100% rename from omnipod/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/driver/manager/OmnipodManager.java diff --git a/omnipod/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/driver/manager/PodStateManager.java similarity index 100% rename from omnipod/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/driver/manager/PodStateManager.java diff --git a/omnipod/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/driver/util/AlertConfigurationUtil.java similarity index 100% rename from omnipod/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/driver/util/AlertConfigurationUtil.java diff --git a/omnipod/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/driver/util/TimeUtil.java similarity index 100% rename from omnipod/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/driver/util/TimeUtil.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodActiveAlertsChanged.kt similarity index 100% rename from omnipod/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/event/EventOmnipodActiveAlertsChanged.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodFaultEventChanged.kt similarity index 100% rename from omnipod/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/event/EventOmnipodFaultEventChanged.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodPumpValuesChanged.kt similarity index 100% rename from omnipod/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/event/EventOmnipodPumpValuesChanged.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodTbrChanged.kt similarity index 100% rename from omnipod/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/event/EventOmnipodTbrChanged.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/event/EventOmnipodUncertainTbrRecovered.kt similarity index 100% rename from omnipod/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/event/EventOmnipodUncertainTbrRecovered.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java similarity index 100% rename from omnipod/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/manager/AapsOmnipodManager.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManager.java similarity index 100% rename from omnipod/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/manager/AapsPodStateManager.java diff --git a/omnipod/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/queue/command/CommandAcknowledgeAlerts.java similarity index 100% rename from omnipod/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/queue/command/CommandAcknowledgeAlerts.java diff --git a/omnipod/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/queue/command/CommandDeactivatePod.java similarity index 100% rename from omnipod/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/queue/command/CommandDeactivatePod.java diff --git a/omnipod/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/queue/command/CommandGetPodStatus.java similarity index 100% rename from omnipod/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/queue/command/CommandGetPodStatus.java diff --git a/omnipod/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/queue/command/CommandHandleTimeChange.java similarity index 100% rename from omnipod/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/queue/command/CommandHandleTimeChange.java diff --git a/omnipod/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/queue/command/CommandPlayTestBeep.java similarity index 100% rename from omnipod/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/queue/command/CommandPlayTestBeep.java diff --git a/omnipod/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/queue/command/CommandReadPulseLog.java similarity index 100% rename from omnipod/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/queue/command/CommandReadPulseLog.java diff --git a/omnipod/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/queue/command/CommandResumeDelivery.java similarity index 100% rename from omnipod/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/queue/command/CommandResumeDelivery.java diff --git a/omnipod/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/queue/command/CommandSuspendDelivery.java similarity index 100% rename from omnipod/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/queue/command/CommandSuspendDelivery.java diff --git a/omnipod/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/queue/command/CommandUpdateAlertConfiguration.java similarity index 100% rename from omnipod/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/queue/command/CommandUpdateAlertConfiguration.java diff --git a/omnipod/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/queue/command/OmnipodCustomCommand.java similarity index 100% rename from omnipod/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/queue/command/OmnipodCustomCommand.java diff --git a/omnipod/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/queue/command/OmnipodCustomCommandType.java similarity index 100% rename from omnipod/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/queue/command/OmnipodCustomCommandType.java diff --git a/omnipod/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/rileylink/manager/OmnipodRileyLinkCommunicationManager.java similarity index 100% rename from omnipod/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/rileylink/manager/OmnipodRileyLinkCommunicationManager.java diff --git a/omnipod/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/rileylink/service/RileyLinkOmnipodService.java similarity index 100% rename from omnipod/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/rileylink/service/RileyLinkOmnipodService.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt similarity index 100% rename from omnipod/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/ui/OmnipodOverviewFragment.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java similarity index 100% rename from omnipod/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/ui/PodHistoryActivity.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt similarity index 100% rename from omnipod/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/ui/PodManagementActivity.kt diff --git a/omnipod/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/ui/wizard/activation/PodActivationWizardActivity.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/PodActivationWizardActivity.kt diff --git a/omnipod/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/ui/wizard/activation/fragment/AttachPodInfoFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/fragment/AttachPodInfoFragment.kt diff --git a/omnipod/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/ui/wizard/activation/fragment/FillPodInfoFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/fragment/FillPodInfoFragment.kt diff --git a/omnipod/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/ui/wizard/activation/fragment/InitializePodActionFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/fragment/InitializePodActionFragment.kt diff --git a/omnipod/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/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt diff --git a/omnipod/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/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt diff --git a/omnipod/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/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt diff --git a/omnipod/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/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt diff --git a/omnipod/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/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt similarity index 100% rename from omnipod/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/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt diff --git a/omnipod/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/ui/wizard/common/activity/OmnipodWizardActivityBase.kt similarity index 100% rename from omnipod/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/ui/wizard/common/activity/OmnipodWizardActivityBase.kt diff --git a/omnipod/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/ui/wizard/common/fragment/ActionFragmentBase.kt similarity index 100% rename from omnipod/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/ui/wizard/common/fragment/ActionFragmentBase.kt diff --git a/omnipod/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/ui/wizard/common/fragment/InfoFragmentBase.kt similarity index 100% rename from omnipod/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/ui/wizard/common/fragment/InfoFragmentBase.kt diff --git a/omnipod/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/ui/wizard/common/fragment/WizardFragmentBase.kt similarity index 100% rename from omnipod/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/ui/wizard/common/fragment/WizardFragmentBase.kt diff --git a/omnipod/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/ui/wizard/common/viewmodel/ActionViewModelBase.kt similarity index 100% rename from omnipod/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/ui/wizard/common/viewmodel/ActionViewModelBase.kt diff --git a/omnipod/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/ui/wizard/deactivation/PodDeactivationWizardActivity.kt similarity index 100% rename from omnipod/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/ui/wizard/deactivation/PodDeactivationWizardActivity.kt diff --git a/omnipod/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/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt diff --git a/omnipod/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/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt diff --git a/omnipod/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/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt diff --git a/omnipod/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/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt similarity index 100% rename from omnipod/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/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt diff --git a/omnipod/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/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt similarity index 100% rename from omnipod/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/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/AapsOmnipodUtil.java similarity index 100% rename from omnipod/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/util/AapsOmnipodUtil.java diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodAlertUtil.java similarity index 100% rename from omnipod/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/util/OmnipodAlertUtil.java diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_pod_management.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_overview_pod_management.xml diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_set_time.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_overview_set_time.xml diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml diff --git a/omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml b/omnipod-eros/src/main/res/drawable/ic_omnipod_wizard_success.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml rename to omnipod-eros/src/main/res/drawable/ic_omnipod_wizard_success.xml diff --git a/omnipod/src/main/res/drawable/ic_pod.xml b/omnipod-eros/src/main/res/drawable/ic_pod.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod.xml rename to omnipod-eros/src/main/res/drawable/ic_pod.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_128.xml b/omnipod-eros/src/main/res/drawable/ic_pod_128.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_128.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_128.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml b/omnipod-eros/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_activate_pod.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_activate_pod.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_deactivate_pod.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_deactivate_pod.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_discard_pod.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_discard_pod.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_play_test_beep.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_play_test_beep.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_pod_history.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_pod_history.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_pulse_log.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_pulse_log.xml diff --git a/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml b/omnipod-eros/src/main/res/drawable/ic_pod_management_rl_stats.xml similarity index 100% rename from omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml rename to omnipod-eros/src/main/res/drawable/ic_pod_management_rl_stats.xml diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod-eros/src/main/res/layout/omnipod_overview.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_overview.xml rename to omnipod-eros/src/main/res/layout/omnipod_overview.xml diff --git a/omnipod/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml b/omnipod-eros/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml rename to omnipod-eros/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml diff --git a/omnipod/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml b/omnipod-eros/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml rename to omnipod-eros/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml diff --git a/omnipod/src/main/res/layout/omnipod_pod_history_activity.xml b/omnipod-eros/src/main/res/layout/omnipod_pod_history_activity.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_pod_history_activity.xml rename to omnipod-eros/src/main/res/layout/omnipod_pod_history_activity.xml diff --git a/omnipod/src/main/res/layout/omnipod_pod_history_item.xml b/omnipod-eros/src/main/res/layout/omnipod_pod_history_item.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_pod_history_item.xml rename to omnipod-eros/src/main/res/layout/omnipod_pod_history_item.xml diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod-eros/src/main/res/layout/omnipod_pod_management.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_pod_management.xml rename to omnipod-eros/src/main/res/layout/omnipod_pod_management.xml diff --git a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml b/omnipod-eros/src/main/res/layout/omnipod_wizard_action_page_fragment.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml rename to omnipod-eros/src/main/res/layout/omnipod_wizard_action_page_fragment.xml diff --git a/omnipod/src/main/res/layout/omnipod_wizard_base_fragment.xml b/omnipod-eros/src/main/res/layout/omnipod_wizard_base_fragment.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_wizard_base_fragment.xml rename to omnipod-eros/src/main/res/layout/omnipod_wizard_base_fragment.xml diff --git a/omnipod/src/main/res/layout/omnipod_wizard_info_page_fragment.xml b/omnipod-eros/src/main/res/layout/omnipod_wizard_info_page_fragment.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_wizard_info_page_fragment.xml rename to omnipod-eros/src/main/res/layout/omnipod_wizard_info_page_fragment.xml diff --git a/omnipod/src/main/res/layout/omnipod_wizard_nav_buttons.xml b/omnipod-eros/src/main/res/layout/omnipod_wizard_nav_buttons.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_wizard_nav_buttons.xml rename to omnipod-eros/src/main/res/layout/omnipod_wizard_nav_buttons.xml diff --git a/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml b/omnipod-eros/src/main/res/layout/omnipod_wizard_progress_indication.xml similarity index 100% rename from omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml rename to omnipod-eros/src/main/res/layout/omnipod_wizard_progress_indication.xml diff --git a/omnipod/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml b/omnipod-eros/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml similarity index 100% rename from omnipod/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml rename to omnipod-eros/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml rename to omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml diff --git a/omnipod/src/main/res/values-af-rZA/strings.xml b/omnipod-eros/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from omnipod/src/main/res/values-af-rZA/strings.xml rename to omnipod-eros/src/main/res/values-af-rZA/strings.xml diff --git a/omnipod/src/main/res/values-bg-rBG/strings.xml b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from omnipod/src/main/res/values-bg-rBG/strings.xml rename to omnipod-eros/src/main/res/values-bg-rBG/strings.xml diff --git a/omnipod/src/main/res/values-ca-rES/strings.xml b/omnipod-eros/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from omnipod/src/main/res/values-ca-rES/strings.xml rename to omnipod-eros/src/main/res/values-ca-rES/strings.xml diff --git a/omnipod/src/main/res/values-cs-rCZ/strings.xml b/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from omnipod/src/main/res/values-cs-rCZ/strings.xml rename to omnipod-eros/src/main/res/values-cs-rCZ/strings.xml diff --git a/omnipod/src/main/res/values-da-rDK/strings.xml b/omnipod-eros/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from omnipod/src/main/res/values-da-rDK/strings.xml rename to omnipod-eros/src/main/res/values-da-rDK/strings.xml diff --git a/omnipod/src/main/res/values-de-rDE/strings.xml b/omnipod-eros/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from omnipod/src/main/res/values-de-rDE/strings.xml rename to omnipod-eros/src/main/res/values-de-rDE/strings.xml diff --git a/omnipod/src/main/res/values-el-rGR/strings.xml b/omnipod-eros/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from omnipod/src/main/res/values-el-rGR/strings.xml rename to omnipod-eros/src/main/res/values-el-rGR/strings.xml diff --git a/omnipod/src/main/res/values-es-rES/strings.xml b/omnipod-eros/src/main/res/values-es-rES/strings.xml similarity index 100% rename from omnipod/src/main/res/values-es-rES/strings.xml rename to omnipod-eros/src/main/res/values-es-rES/strings.xml diff --git a/omnipod/src/main/res/values-fr-rFR/strings.xml b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from omnipod/src/main/res/values-fr-rFR/strings.xml rename to omnipod-eros/src/main/res/values-fr-rFR/strings.xml diff --git a/omnipod/src/main/res/values-ga-rIE/strings.xml b/omnipod-eros/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from omnipod/src/main/res/values-ga-rIE/strings.xml rename to omnipod-eros/src/main/res/values-ga-rIE/strings.xml diff --git a/omnipod/src/main/res/values-hr-rHR/strings.xml b/omnipod-eros/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from omnipod/src/main/res/values-hr-rHR/strings.xml rename to omnipod-eros/src/main/res/values-hr-rHR/strings.xml diff --git a/omnipod/src/main/res/values-it-rIT/strings.xml b/omnipod-eros/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from omnipod/src/main/res/values-it-rIT/strings.xml rename to omnipod-eros/src/main/res/values-it-rIT/strings.xml diff --git a/omnipod/src/main/res/values-iw-rIL/strings.xml b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from omnipod/src/main/res/values-iw-rIL/strings.xml rename to omnipod-eros/src/main/res/values-iw-rIL/strings.xml diff --git a/omnipod/src/main/res/values-ko-rKR/strings.xml b/omnipod-eros/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from omnipod/src/main/res/values-ko-rKR/strings.xml rename to omnipod-eros/src/main/res/values-ko-rKR/strings.xml diff --git a/omnipod/src/main/res/values-lt-rLT/strings.xml b/omnipod-eros/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from omnipod/src/main/res/values-lt-rLT/strings.xml rename to omnipod-eros/src/main/res/values-lt-rLT/strings.xml diff --git a/omnipod/src/main/res/values-nl-rNL/strings.xml b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from omnipod/src/main/res/values-nl-rNL/strings.xml rename to omnipod-eros/src/main/res/values-nl-rNL/strings.xml diff --git a/omnipod/src/main/res/values-no-rNO/strings.xml b/omnipod-eros/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from omnipod/src/main/res/values-no-rNO/strings.xml rename to omnipod-eros/src/main/res/values-no-rNO/strings.xml diff --git a/omnipod/src/main/res/values-pl-rPL/strings.xml b/omnipod-eros/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from omnipod/src/main/res/values-pl-rPL/strings.xml rename to omnipod-eros/src/main/res/values-pl-rPL/strings.xml diff --git a/omnipod/src/main/res/values-pt-rBR/strings.xml b/omnipod-eros/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from omnipod/src/main/res/values-pt-rBR/strings.xml rename to omnipod-eros/src/main/res/values-pt-rBR/strings.xml diff --git a/omnipod/src/main/res/values-pt-rPT/strings.xml b/omnipod-eros/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from omnipod/src/main/res/values-pt-rPT/strings.xml rename to omnipod-eros/src/main/res/values-pt-rPT/strings.xml diff --git a/omnipod/src/main/res/values-ro-rRO/strings.xml b/omnipod-eros/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from omnipod/src/main/res/values-ro-rRO/strings.xml rename to omnipod-eros/src/main/res/values-ro-rRO/strings.xml diff --git a/omnipod/src/main/res/values-ru-rRU/strings.xml b/omnipod-eros/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from omnipod/src/main/res/values-ru-rRU/strings.xml rename to omnipod-eros/src/main/res/values-ru-rRU/strings.xml diff --git a/omnipod/src/main/res/values-sk-rSK/strings.xml b/omnipod-eros/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from omnipod/src/main/res/values-sk-rSK/strings.xml rename to omnipod-eros/src/main/res/values-sk-rSK/strings.xml diff --git a/omnipod/src/main/res/values-sl-rSI/strings.xml b/omnipod-eros/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from omnipod/src/main/res/values-sl-rSI/strings.xml rename to omnipod-eros/src/main/res/values-sl-rSI/strings.xml diff --git a/omnipod/src/main/res/values-sv-rSE/strings.xml b/omnipod-eros/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from omnipod/src/main/res/values-sv-rSE/strings.xml rename to omnipod-eros/src/main/res/values-sv-rSE/strings.xml diff --git a/omnipod/src/main/res/values-tr-rTR/strings.xml b/omnipod-eros/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from omnipod/src/main/res/values-tr-rTR/strings.xml rename to omnipod-eros/src/main/res/values-tr-rTR/strings.xml diff --git a/omnipod/src/main/res/values-zh-rCN/strings.xml b/omnipod-eros/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from omnipod/src/main/res/values-zh-rCN/strings.xml rename to omnipod-eros/src/main/res/values-zh-rCN/strings.xml diff --git a/omnipod/src/main/res/values/colors.xml b/omnipod-eros/src/main/res/values/colors.xml similarity index 100% rename from omnipod/src/main/res/values/colors.xml rename to omnipod-eros/src/main/res/values/colors.xml diff --git a/omnipod/src/main/res/values/dimens.xml b/omnipod-eros/src/main/res/values/dimens.xml similarity index 100% rename from omnipod/src/main/res/values/dimens.xml rename to omnipod-eros/src/main/res/values/dimens.xml diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod-eros/src/main/res/values/strings.xml similarity index 100% rename from omnipod/src/main/res/values/strings.xml rename to omnipod-eros/src/main/res/values/strings.xml diff --git a/omnipod/src/main/res/values/styles.xml b/omnipod-eros/src/main/res/values/styles.xml similarity index 100% rename from omnipod/src/main/res/values/styles.xml rename to omnipod-eros/src/main/res/values/styles.xml diff --git a/omnipod/src/main/res/xml/pref_omnipod.xml b/omnipod-eros/src/main/res/xml/pref_omnipod.xml similarity index 100% rename from omnipod/src/main/res/xml/pref_omnipod.xml rename to omnipod-eros/src/main/res/xml/pref_omnipod.xml diff --git a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java similarity index 100% rename from omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java diff --git a/omnipod/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/driver/communication/AapsOmnipodManagerTest.java similarity index 100% rename from omnipod/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/driver/communication/AapsOmnipodManagerTest.java diff --git a/omnipod/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/driver/communication/message/command/AcknowledgeAlertsCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/AcknowledgeAlertsCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/AssignAddressCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/AssignAddressCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/BasalScheduleExtraCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/BasalScheduleExtraCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/BeepConfigCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/BeepConfigCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/BolusExtraCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/BolusExtraCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/CancelDeliveryCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/CancelDeliveryCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/ConfigureAlertsCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/ConfigureAlertsCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/DeactivatePodCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/DeactivatePodCommandTest.java diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/FaultConfigCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/GetStatusCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/GetStatusCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/SetInsulinScheduleCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/SetInsulinScheduleCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/SetupPodCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/SetupPodCommandTest.java diff --git a/omnipod/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/driver/communication/message/command/TempBasalExtraCommandTest.java similarity index 100% rename from omnipod/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/driver/communication/message/command/TempBasalExtraCommandTest.java diff --git a/omnipod/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/driver/communication/message/defs/schedule/BasalTableEntryTest.java similarity index 100% rename from omnipod/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/driver/communication/message/defs/schedule/BasalTableEntryTest.java diff --git a/omnipod/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/driver/communication/message/response/ErrorResponseTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/ErrorResponseTest.java diff --git a/omnipod/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/driver/communication/message/response/StatusResponseTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/StatusResponseTest.java diff --git a/omnipod/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/driver/communication/message/response/VersionResponseTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/VersionResponseTest.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoDataLogTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoDataLogTest.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java diff --git a/omnipod/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 similarity index 100% rename from omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java diff --git a/omnipod/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/driver/communication/message/response/podinfo/PodInfoResponseTest.java similarity index 100% rename from omnipod/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/driver/communication/message/response/podinfo/PodInfoResponseTest.java diff --git a/omnipod/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/driver/definition/AlertSetTest.java similarity index 100% rename from omnipod/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/driver/definition/AlertSetTest.java diff --git a/omnipod/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/driver/definition/schedule/BasalScheduleTest.java similarity index 100% rename from omnipod/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/driver/definition/schedule/BasalScheduleTest.java diff --git a/omnipod/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/driver/util/TimeUtilTest.java similarity index 100% rename from omnipod/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/driver/util/TimeUtilTest.java diff --git a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java similarity index 100% rename from omnipod/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/manager/AapsPodStateManagerTest.java diff --git a/settings.gradle b/settings.gradle index 163be2365a..32af4b9e30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ include ':database' -include ':app', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic', ':omnipod' +include ':app', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic', ':omnipod-eros' From 4456aaa0159195b1eb10a31b97a8b674b5a304e1 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Tue, 9 Feb 2021 19:44:26 +0100 Subject: [PATCH 02/20] 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() { From c4ef0dc997e8618687bf3fb3b45b163f5ad48470 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Tue, 9 Feb 2021 21:02:17 +0100 Subject: [PATCH 03/20] Fix base package for Omnipod Eros pump plugin --- crowdin.yml | 4 ++-- omnipod-eros/src/main/AndroidManifest.xml | 4 ++-- .../plugins/pump/omnipod/eros/OmnipodPumpPlugin.java | 2 +- .../pump/omnipod/eros/definition/OmnipodCommandType.java | 2 +- .../pump/omnipod/eros/definition/OmnipodStorageKeys.java | 2 +- .../pump/omnipod/eros/definition/PodHistoryEntryType.java | 2 +- .../plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java | 2 +- .../eros/rileylink/service/RileyLinkOmnipodService.java | 2 +- .../plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt | 4 ++-- .../plugins/pump/omnipod/eros/ui/PodHistoryActivity.java | 2 +- .../plugins/pump/omnipod/eros/ui/PodManagementActivity.kt | 4 ++-- .../eros/ui/wizard/activation/PodActivationWizardActivity.kt | 2 +- .../ui/wizard/activation/fragment/AttachPodInfoFragment.kt | 2 +- .../eros/ui/wizard/activation/fragment/FillPodInfoFragment.kt | 2 +- .../wizard/activation/fragment/InitializePodActionFragment.kt | 2 +- .../wizard/activation/fragment/InsertCannulaActionFragment.kt | 2 +- .../ui/wizard/activation/fragment/PodActivatedInfoFragment.kt | 2 +- .../activation/fragment/PodActivationActionFragmentBase.kt | 2 +- .../ui/wizard/common/activity/OmnipodWizardActivityBase.kt | 2 +- .../eros/ui/wizard/common/fragment/ActionFragmentBase.kt | 2 +- .../eros/ui/wizard/common/fragment/InfoFragmentBase.kt | 2 +- .../eros/ui/wizard/common/fragment/WizardFragmentBase.kt | 4 ++-- .../ui/wizard/deactivation/PodDeactivationWizardActivity.kt | 2 +- .../deactivation/fragment/DeactivatePodActionFragment.kt | 2 +- .../wizard/deactivation/fragment/DeactivatePodInfoFragment.kt | 2 +- .../deactivation/fragment/PodDeactivatedInfoFragment.kt | 2 +- .../wizard/deactivation/fragment/PodDiscardedInfoFragment.kt | 2 +- .../plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java | 2 +- 28 files changed, 33 insertions(+), 33 deletions(-) diff --git a/crowdin.yml b/crowdin.yml index d12e37292f..d1d40577c8 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -19,7 +19,7 @@ files: translation: /dana/src/main/res/values-%android_code%/strings.xml - source: /medtronic/src/main/res/values/strings.xml translation: /medtronic/src/main/res/values-%android_code%/strings.xml - - source: /omnipod/src/main/res/values/strings.xml - translation: /omnipod/src/main/res/values-%android_code%/strings.xml + - source: /omnipod-eros/src/main/res/values/strings.xml + translation: /omnipod-eros/src/main/res/values-%android_code%/strings.xml - source: /rileylink/src/main/res/values/strings.xml translation: /rileylink/src/main/res/values-%android_code%/strings.xml diff --git a/omnipod-eros/src/main/AndroidManifest.xml b/omnipod-eros/src/main/AndroidManifest.xml index 011cd8a01f..af03a825f1 100644 --- a/omnipod-eros/src/main/AndroidManifest.xml +++ b/omnipod-eros/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="info.nightscout.androidaps.plugins.pump.omnipod.eros"> diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java index 835dd527b0..3bcd724874 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java @@ -66,7 +66,7 @@ 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.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.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; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java index c1a5ff660a..c47306d057 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodCommandType.java @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.definition; -import info.nightscout.androidaps.plugins.pump.omnipod.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; /** * Created by andy on 4.8.2019 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java index f1aeebcbcc..861acff0ff 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodStorageKeys.java @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.definition; -import info.nightscout.androidaps.plugins.pump.omnipod.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; public class OmnipodStorageKeys { public static class Preferences { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java index d89e287fdd..e4a61ec8c1 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup; -import info.nightscout.androidaps.plugins.pump.omnipod.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; /** * Created by andy on 24.11.2019 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java index 3cbc4d847f..d4a76b8bae 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodManager.java @@ -41,7 +41,7 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific 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.eros.R; 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; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java index 5f6ced399a..128c465c03 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java @@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.Rile 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.eros.OmnipodPumpPlugin; -import info.nightscout.androidaps.plugins.pump.omnipod.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; 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; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt index f199a2dd8e..6404185aff 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt @@ -23,8 +23,8 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin 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.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.eros.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodOverviewBinding 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java index ed4c7db40a..0cd1cb817b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodHistoryActivity.java @@ -33,7 +33,7 @@ import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair; 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.eros.R; 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; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt index 1296bfa447..d542458d86 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt @@ -14,8 +14,8 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley 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.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.eros.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodPodManagementBinding 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt index bbbf41ab04..723f990c60 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/PodActivationWizardActivity.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activatio import android.os.Bundle import androidx.annotation.IdRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index afade782d2..13c091f04f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -7,7 +7,7 @@ import androidx.annotation.IdRes 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.eros.R 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/eros/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 index 12dfb1e2f5..d6f3316deb 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activatio import androidx.annotation.IdRes import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R 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/eros/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 index 0d3ed954c0..23914c1e96 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -5,7 +5,7 @@ import androidx.annotation.IdRes 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.eros.R 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index 0ab6eabdc8..ec56cedab2 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -5,7 +5,7 @@ import androidx.annotation.IdRes 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.eros.R 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index d7d6cf9139..4b1227ffce 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activatio import androidx.annotation.IdRes import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R 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/eros/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 index be3f3b6159..f94ffd38a2 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -4,7 +4,7 @@ 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.eros.R 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index fbfaf84f7b..31ecd34464 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -4,7 +4,7 @@ import androidx.appcompat.app.AlertDialog import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import info.nightscout.androidaps.activities.NoSplashAppCompatActivity -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R abstract class OmnipodWizardActivityBase : NoSplashAppCompatActivity() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index 7a2f4794b7..d1bd2f9f0b 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -6,7 +6,7 @@ import android.view.View 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.eros.R import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.viewmodel.ActionViewModelBase import info.nightscout.androidaps.utils.extensions.toVisibility diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index 73a52d8e9f..664e373539 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -5,7 +5,7 @@ import android.view.View import android.widget.TextView import androidx.annotation.LayoutRes import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R abstract class InfoFragmentBase : WizardFragmentBase() { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index 587c8e988d..50b3519179 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -10,8 +10,8 @@ import androidx.annotation.LayoutRes import androidx.annotation.StringRes 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.eros.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodWizardBaseFragmentBinding import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.common.activity.OmnipodWizardActivityBase import kotlin.math.roundToInt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt index f39cdfa409..895a7c4c8e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/PodDeactivationWizardActivity.kt @@ -1,7 +1,7 @@ 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.eros.R 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/eros/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 index 3e10d7d9b6..dab6389965 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -9,7 +9,7 @@ import androidx.appcompat.app.AlertDialog 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.eros.R 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 diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index c41e4db357..f90e682e25 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivat import androidx.annotation.IdRes import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R 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/eros/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 index 7c167f2c67..ebc8a16a8e 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivat import androidx.annotation.IdRes import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R 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/eros/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 index b6dc74d7b2..e74bf8a528 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivat import androidx.annotation.IdRes import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.omnipod.R +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R 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/eros/util/AapsOmnipodUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java index 23fff2b0fb..51b9acb54c 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java @@ -16,7 +16,7 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; -import info.nightscout.androidaps.plugins.pump.omnipod.R; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; 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; From 9489cbf9a72872fca56840387f9398ee6e0ba1d0 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Tue, 9 Feb 2021 21:05:40 +0100 Subject: [PATCH 04/20] Rename OmnipodPumpPlugin to OmnipodErosPumpPlugin --- .../dependencyInjection/PluginsModule.kt | 4 ++-- .../plugins/general/actions/ActionsFragment.kt | 4 ++-- .../general/overview/StatusLightHandler.kt | 4 ++-- .../androidaps/setupwizard/SWDefinition.kt | 12 ++++++------ ...umpPlugin.java => OmnipodErosPumpPlugin.java} | 9 ++++----- .../service/RileyLinkOmnipodService.java | 4 ++-- .../omnipod/eros/ui/OmnipodOverviewFragment.kt | 16 ++++++++-------- .../omnipod/eros/ui/PodManagementActivity.kt | 6 +++--- ...nTest.java => OmnipodErosPumpPluginTest.java} | 4 ++-- 9 files changed, 31 insertions(+), 32 deletions(-) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/{OmnipodPumpPlugin.java => OmnipodErosPumpPlugin.java} (99%) rename omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/{OmnipodPumpPluginTest.java => OmnipodErosPumpPluginTest.java} (97%) 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 287ac11e99..02506911ec 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.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin @@ -160,7 +160,7 @@ abstract class PluginsModule { @PumpDriver @IntoMap @IntKey(155) - abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase + abstract fun bindOmnipodPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase @Binds @NotNSClient 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 84a34e1ccd..13f7b5bd27 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.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.skins.SkinProvider import info.nightscout.androidaps.utils.FabricPrivacy @@ -301,7 +301,7 @@ class ActionsFragment : DaggerFragment() { val activeBgSource = activePlugin.activeBgSource historyBrowser?.visibility = (profile != null).toVisibility() fill?.visibility = (pump.pumpDescription.isRefillingCapable && pump.isInitialized && !pump.isSuspended).toVisibility() - pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable || (pump is OmnipodPumpPlugin && pump.isUseRileyLinkBatteryLevel && pump.isBatteryChangeLoggingEnabled)).toVisibility() + pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable || (pump is OmnipodErosPumpPlugin && pump.isUseRileyLinkBatteryLevel && pump.isBatteryChangeLoggingEnabled)).toVisibility() tempTarget?.visibility = (profile != null && config.APS).toVisibility() tddStats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility() 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 b3a5fe952f..82362908b7 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,7 +9,7 @@ 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.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.WarnColors @@ -52,7 +52,7 @@ class StatusLightHandler @Inject constructor( } if (!config.NSCLIENT) { - if (pump.model() == PumpType.Insulet_Omnipod && pump is OmnipodPumpPlugin) { // instance of check is needed because at startup, pump can still be VirtualPumpPlugin and that will cause a crash because of the class cast below + if (pump.model() == PumpType.Insulet_Omnipod && pump is OmnipodErosPumpPlugin) { // instance of check is needed because at startup, pump can still be VirtualPumpPlugin and that will cause a crash because of the class cast below handleOmnipodBatteryLevel(careportal_battery_level, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%", pump.isUseRileyLinkBatteryLevel) } else if (pump.model() != PumpType.AccuChekCombo) { handleLevel(careportal_battery_level, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%") 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 fa8fc38b79..0cc0a8c9e6 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.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.setupwizard.elements.* import info.nightscout.androidaps.setupwizard.events.EventSWUpdate import info.nightscout.androidaps.utils.AndroidPermission @@ -267,22 +267,22 @@ class SWDefinition @Inject constructor( .label(R.string.setupwizard_pump_waiting_for_riley_link_connection) .visibility { val activePump = activePlugin.activePump - activePump is OmnipodPumpPlugin && !activePump.isRileyLinkReady + activePump is OmnipodErosPumpPlugin && !activePump.isRileyLinkReady }) .add( // Omnipod only SWEventListener(injector, EventRileyLinkDeviceStatusChange::class.java) .label(R.string.setupwizard_pump_riley_link_status) - .visibility { activePlugin.activePump is OmnipodPumpPlugin }) + .visibility { activePlugin.activePump is OmnipodErosPumpPlugin }) .add(SWButton(injector) .text(R.string.readstatus) .action { commandQueue.readStatus("Clicked connect to pump", null) } .visibility { // Hide for Omnipod, because as we don't require a Pod to be paired in the setup wizard, // Getting the status might not be possible - activePlugin.activePump !is OmnipodPumpPlugin + activePlugin.activePump !is OmnipodErosPumpPlugin }) .add(SWEventListener(injector, EventPumpStatusChanged::class.java) - .visibility { activePlugin.activePump !is OmnipodPumpPlugin }) + .visibility { activePlugin.activePump !is OmnipodErosPumpPlugin }) .validator { isPumpInitialized() } private fun isPumpInitialized(): Boolean { @@ -290,7 +290,7 @@ class SWDefinition @Inject constructor( // For Omnipod, consider the pump initialized when a RL has been configured successfully // Users will be prompted to activate a Pod after completing the setup wizard. - return activePump.isInitialized || (activePump is OmnipodPumpPlugin && activePump.isRileyLinkReady) + return activePump.isInitialized || (activePump is OmnipodErosPumpPlugin && activePump.isRileyLinkReady) } private val screenAps = SWScreen(injector, R.string.configbuilder_aps) diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java similarity index 99% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java index 3bcd724874..6a5364dbca 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPlugin.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java @@ -66,7 +66,6 @@ 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.eros.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; @@ -116,7 +115,7 @@ import static info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.defini * @author Andy Rozman (andy.rozman@gmail.com) */ @Singleton -public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface, RileyLinkPumpDevice { +public class OmnipodErosPumpPlugin extends PumpPluginBase implements PumpInterface, RileyLinkPumpDevice { private static final long RILEY_LINK_CONNECT_TIMEOUT_MILLIS = 3 * 60 * 1_000L; // 3 minutes private static final long STATUS_CHECK_INTERVAL_MILLIS = 60 * 1_000L; // 1 minute public static final int STARTUP_STATUS_REQUEST_TRIES = 2; @@ -159,7 +158,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface, private final Runnable statusChecker; @Inject - public OmnipodPumpPlugin( + public OmnipodErosPumpPlugin( HasAndroidInjector injector, AAPSLogger aapsLogger, AapsSchedulers aapsSchedulers, @@ -248,10 +247,10 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface, aapsOmnipodManager.createSuspendedFakeTbrIfNotExists(); } - if (OmnipodPumpPlugin.this.hasTimeDateOrTimeZoneChanged) { + if (OmnipodErosPumpPlugin.this.hasTimeDateOrTimeZoneChanged) { getCommandQueue().customCommand(new CommandHandleTimeChange(false), null); } - if (!OmnipodPumpPlugin.this.verifyPodAlertConfiguration()) { + if (!OmnipodErosPumpPlugin.this.verifyPodAlertConfiguration()) { getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java index 128c465c03..9f6417ffdd 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java @@ -18,7 +18,7 @@ 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.eros.OmnipodPumpPlugin; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin; import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodManager; @@ -34,7 +34,7 @@ public class RileyLinkOmnipodService extends RileyLinkService { private static final String REGEX_MAC = "([\\da-fA-F]{1,2}(?:\\:|$)){6}"; - @Inject OmnipodPumpPlugin omnipodPumpPlugin; + @Inject OmnipodErosPumpPlugin omnipodErosPumpPlugin; @Inject AapsOmnipodUtil aapsOmnipodUtil; @Inject PodStateManager podStateManager; @Inject DatabaseHelperInterface databaseHelper; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt index 6404185aff..cc627f1a7a 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodOverviewFragment.kt @@ -22,7 +22,7 @@ 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.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.eros.R import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodOverviewBinding import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress @@ -70,7 +70,7 @@ class OmnipodOverviewFragment : DaggerFragment() { @Inject lateinit var rxBus: RxBusWrapper @Inject lateinit var commandQueue: CommandQueueProvider @Inject lateinit var activePlugin: ActivePluginProvider - @Inject lateinit var omnipodPumpPlugin: OmnipodPumpPlugin + @Inject lateinit var omnipodErosPumpPlugin: OmnipodErosPumpPlugin @Inject lateinit var podStateManager: PodStateManager @Inject lateinit var sp: SP @Inject lateinit var omnipodUtil: AapsOmnipodUtil @@ -106,7 +106,7 @@ class OmnipodOverviewFragment : DaggerFragment() { super.onViewCreated(view, savedInstanceState) binding.buttonPodManagement.setOnClickListener { - if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) { + if (omnipodErosPumpPlugin.rileyLinkService?.verifyConfiguration() == true) { activity?.let { activity -> context?.let { context -> protectionCheck.queryProtection( @@ -232,8 +232,8 @@ class OmnipodOverviewFragment : DaggerFragment() { updatePodStatus() val errors = ArrayList() - if (omnipodPumpPlugin.rileyLinkService != null) { - val rileyLinkErrorDescription = omnipodPumpPlugin.rileyLinkService.errorDescription + if (omnipodErosPumpPlugin.rileyLinkService != null) { + val rileyLinkErrorDescription = omnipodErosPumpPlugin.rileyLinkService.errorDescription if (StringUtils.isNotEmpty(rileyLinkErrorDescription)) { errors.add(rileyLinkErrorDescription) } @@ -288,7 +288,7 @@ class OmnipodOverviewFragment : DaggerFragment() { // base basal rate binding.baseBasalRate.text = if (podStateManager.isPodActivationCompleted) { - resourceHelper.gs(R.string.pump_basebasalrate, omnipodPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(TimeUtil.toDuration(DateTime.now())))) + resourceHelper.gs(R.string.pump_basebasalrate, omnipodErosPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(TimeUtil.toDuration(DateTime.now())))) } else { PLACEHOLDER } @@ -336,7 +336,7 @@ class OmnipodOverviewFragment : DaggerFragment() { if (podStateManager.isPodInitialized && podStateManager.lastSuccessfulCommunication != null) { binding.lastConnection.text = readableDuration(podStateManager.lastSuccessfulCommunication) val lastConnectionColor = - if (omnipodPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().millis)) { + if (omnipodErosPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().millis)) { Color.RED } else { Color.WHITE @@ -397,7 +397,7 @@ class OmnipodOverviewFragment : DaggerFragment() { private fun updateLastBolus() { if (podStateManager.isPodActivationCompleted && podStateManager.hasLastBolus()) { - var text = resourceHelper.gs(R.string.omnipod_overview_last_bolus_value, omnipodPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime)) + var text = resourceHelper.gs(R.string.omnipod_overview_last_bolus_value, omnipodErosPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime)) val textColor: Int if (podStateManager.isLastBolusCertain) { diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt index d542458d86..d7b05ebac7 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/PodManagementActivity.kt @@ -13,7 +13,7 @@ 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.eros.OmnipodPumpPlugin +import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.eros.R import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodPodManagementBinding import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress @@ -49,7 +49,7 @@ class PodManagementActivity : NoSplashAppCompatActivity() { @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData @Inject lateinit var aapsOmnipodManager: AapsOmnipodManager @Inject lateinit var context: Context - @Inject lateinit var omnipodPumpPlugin: OmnipodPumpPlugin + @Inject lateinit var omnipodErosPumpPlugin: OmnipodErosPumpPlugin @Inject lateinit var serviceTaskExecutor: ServiceTaskExecutor @Inject lateinit var aapsSchedulers: AapsSchedulers @@ -78,7 +78,7 @@ class PodManagementActivity : NoSplashAppCompatActivity() { } binding.buttonRileylinkStats.setOnClickListener { - if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) { + if (omnipodErosPumpPlugin.rileyLinkService?.verifyConfiguration() == true) { startActivity(Intent(context, RileyLinkStatusActivity::class.java)) } else { displayNotConfiguredDialog() diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPluginTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java similarity index 97% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPluginTest.java rename to omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java index 82c2008017..795f36fc25 100644 --- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodPumpPluginTest.java +++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; @RunWith(PowerMockRunner.class) -public class OmnipodPumpPluginTest { +public class OmnipodErosPumpPluginTest { @Mock HasAndroidInjector injector; AAPSLogger aapsLogger = new AAPSLoggerTest(); @@ -58,7 +58,7 @@ public class OmnipodPumpPluginTest { // mock all the things PowerMockito.mockStatic(Looper.class); - OmnipodPumpPlugin plugin = new OmnipodPumpPlugin(injector, aapsLogger, new TestAapsSchedulers(), rxBusWrapper, null, + OmnipodErosPumpPlugin plugin = new OmnipodErosPumpPlugin(injector, aapsLogger, new TestAapsSchedulers(), rxBusWrapper, null, resourceHelper, activePluginProvider, null, null, aapsOmnipodManager, commandQueueProvider, null, null, null, null, rileyLinkUtil, null, null, null, null From 43409eb86424e07fce1c6ca7b6ece48ca74f51a5 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Tue, 9 Feb 2021 21:21:30 +0100 Subject: [PATCH 05/20] Add empty Omnipod Dash module --- app/build.gradle | 1 + omnipod-dash/.gitignore | 1 + omnipod-dash/build.gradle | 38 +++++++++++++++++++ omnipod-dash/consumer-rules.pro | 0 omnipod-dash/proguard-rules.pro | 21 ++++++++++ omnipod-dash/src/main/AndroidManifest.xml | 5 +++ .../omnipod/dash/OmnipodDashPumpPlugin.java | 5 +++ settings.gradle | 3 +- 8 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 omnipod-dash/.gitignore create mode 100644 omnipod-dash/build.gradle create mode 100644 omnipod-dash/consumer-rules.pro create mode 100644 omnipod-dash/proguard-rules.pro create mode 100644 omnipod-dash/src/main/AndroidManifest.xml create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java diff --git a/app/build.gradle b/app/build.gradle index c9c7c5fa18..899215e146 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -242,6 +242,7 @@ dependencies { implementation project(':rileylink') implementation project(':medtronic') implementation project(':omnipod-eros') + implementation project(':omnipod-dash') implementation fileTree(include: ['*.jar'], dir: 'libs') diff --git a/omnipod-dash/.gitignore b/omnipod-dash/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/omnipod-dash/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle new file mode 100644 index 0000000000..c673b3a28f --- /dev/null +++ b/omnipod-dash/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'com.android.library' +} + +android { + compileSdkVersion 28 + buildToolsVersion "30.0.2" + + defaultConfig { + minSdkVersion 24 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.3.0' + testImplementation 'junit:junit:4.+' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/omnipod-dash/consumer-rules.pro b/omnipod-dash/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/omnipod-dash/proguard-rules.pro b/omnipod-dash/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/omnipod-dash/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/omnipod-dash/src/main/AndroidManifest.xml b/omnipod-dash/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..e99b57bee2 --- /dev/null +++ b/omnipod-dash/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java new file mode 100644 index 0000000000..e18c717b74 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash; + +public class OmnipodDashPumpPlugin { + // TODO +} diff --git a/settings.gradle b/settings.gradle index 32af4b9e30..2090bffc04 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ -include ':database' -include ':app', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic', ':omnipod-eros' +include ':app', ':database', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic', ':omnipod-eros', ':omnipod-dash' From fc4065b71cce271f77d12bc28a9ffa28f30211be Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 00:17:14 +0100 Subject: [PATCH 06/20] Add GetVersionResponse and SetUniqueIdResponse; add some definitions --- omnipod-dash/build.gradle | 2 +- .../dash/driver/pod/OmnipodDashManager.java | 4 + .../dash/driver/pod/command/Command.java | 7 + .../dash/driver/pod/command/CommandBase.java | 10 ++ .../dash/driver/pod/command/CommandType.java | 26 +++ .../driver/pod/definition/OmnipodEvent.java | 26 +++ .../dash/driver/pod/definition/PodStatus.java | 36 ++++ .../pod/response/ActivationResponseBase.java | 14 ++ .../dash/driver/pod/response/Response.java | 7 + .../driver/pod/response/ResponseBase.java | 22 +++ .../driver/pod/response/ResponseType.java | 76 +++++++++ .../pod/response/SetUniqueIdResponse.java | 155 ++++++++++++++++++ .../driver/pod/response/VersionResponse.java | 128 +++++++++++++++ .../pod/response/SetUniqueIdResponseTest.java | 44 +++++ .../pod/response/VersionResponseTest.java | 41 +++++ 15 files changed, 597 insertions(+), 1 deletion(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/OmnipodDashManager.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/Command.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandType.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle index c673b3a28f..959e970c17 100644 --- a/omnipod-dash/build.gradle +++ b/omnipod-dash/build.gradle @@ -29,7 +29,7 @@ android { } dependencies { - + implementation 'commons-codec:commons-codec:1.15' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' testImplementation 'junit:junit:4.+' diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/OmnipodDashManager.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/OmnipodDashManager.java new file mode 100644 index 0000000000..76af4418c5 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/OmnipodDashManager.java @@ -0,0 +1,4 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod; + +public class OmnipodDashManager { +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/Command.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/Command.java new file mode 100644 index 0000000000..b05534135e --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/Command.java @@ -0,0 +1,7 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +public interface Command { + CommandType getCommandType(); + + byte[] getEncoded(); +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java new file mode 100644 index 0000000000..038086c02d --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java @@ -0,0 +1,10 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +abstract class CommandBase implements Command { + CommandBase(CommandType commandType) { + } + + @Override public CommandType getCommandType() { + return null; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandType.java new file mode 100644 index 0000000000..3df9df23b0 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandType.java @@ -0,0 +1,26 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +public enum CommandType { + SET_UNIQUE_ID((byte) 0x03), + GET_VERSION((byte) 0x07), + GET_STATUS((byte) 0x0e), + SILENCE_ALERTS((byte) 0x11), + PROGRAM_BASAL((byte) 0x13), + PROGRAM_TEMP_BASAL((byte) 0x16), + BOLUS((byte) 0x17), + PROGRAM_ALERTS((byte) 0x19), + DELIVERY_INTERLOCK((byte) 0x1a), + DEACTIVATE((byte) 0x1c), + PROGRAM_BEEPS((byte) 0x1e), + STOP_DELIVERY((byte) 0x1f); + + byte value; + + CommandType(byte value) { + this.value = value; + } + + public byte getValue() { + return value; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java new file mode 100644 index 0000000000..a6f78b06e4 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java @@ -0,0 +1,26 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public class OmnipodEvent { + public enum OmnipodEventType { + CONNECTED, + ALREADY_CONNECTED, + FAILED_TO_CONNECT, + DISCONNECTED, + COMMAND_SENT, + GOT_POD_VERSION, + SET_UNIQUE_ID, + PRIMED_PUMP, + FINISHED_ACTIVATION_1, + PROGRAMMED_BASAL, + PROGRAMMED_ALERTS, + SET_BEEPS, + INSERTED_CANNULA, + FINISHED_ACTIVATION_2, + PROGRAMMED_TEMP_BASAL, + STARTED_BOLUS, + STOPPED_DELIVERY, + SILENCED_ALERTS, + DEACTIVATED, + COMMAND_SENDING, + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java new file mode 100644 index 0000000000..88fb98b546 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java @@ -0,0 +1,36 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public enum PodStatus { + UNINITIALIZED((byte) 0x00), + MFG_TEST((byte) 0x01), + FILLED((byte) 0x02), + UID_SET((byte) 0x03), + ENGAGING_CLUTCH_DRIVE((byte) 0x04), + CLUTCH_DRIVE_ENGAGED((byte) 0x05), + BASAL_PROGRAM_RUNNING((byte) 0x06), + PRIMING((byte) 0x07), + RUNNING_ABOVE_MIN_VOLUME((byte) 0x08), + RUNNING_BELOW_MIN_VOLUME((byte) 0x09), + UNUSED_10((byte) 0x0a), + UNUSED_11((byte) 0x0b), + UNUSED_12((byte) 0x0c), + ALARM((byte) 0x0d), + LUMP_OF_COAL((byte) 0x0e), + DEACTIVATED((byte) 0x0f), + UNKNOWN((byte) 0xff); + + private byte value; + + PodStatus(byte value) { + this.value = value; + } + + public static PodStatus byValue(byte value) { + for (PodStatus status : values()) { + if (status.value == value) { + return status; + } + } + return UNKNOWN; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java new file mode 100644 index 0000000000..f36851f7d8 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java @@ -0,0 +1,14 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +abstract class ActivationResponseBase extends ResponseBase { + final ResponseType.ActivationResponseType activationResponseType; + + ActivationResponseBase(ResponseType.ActivationResponseType activationResponseType, byte[] encoded) { + super(ResponseType.ACTIVATION_RESPONSE, encoded); + this.activationResponseType = activationResponseType; + } + + public ResponseType.ActivationResponseType getActivationResponseType() { + return activationResponseType; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java new file mode 100644 index 0000000000..e4edf3f4ba --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java @@ -0,0 +1,7 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +public interface Response { + ResponseType getResponseType(); + + byte[] getEncoded(); +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java new file mode 100644 index 0000000000..bb43dcf4dc --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java @@ -0,0 +1,22 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import java.util.Arrays; + +abstract class ResponseBase implements Response { + final ResponseType responseType; + final byte[] encoded; + + ResponseBase(ResponseType responseType, byte[] encoded) { + this.responseType = responseType; + this.encoded = Arrays.copyOf(encoded, encoded.length); + } + + @Override public ResponseType getResponseType() { + return responseType; + } + + @Override + public byte[] getEncoded() { + return encoded; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java new file mode 100644 index 0000000000..1dff970efe --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java @@ -0,0 +1,76 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +public enum ResponseType { + ACTIVATION_RESPONSE((byte) 0x01), + DEFAULT_STATUS_RESPONSE((byte) 0x1d), + ADDITIONAL_STATUS_RESPONSE((byte) 0x02), + NAK_RESPONSE((byte) 0x06), + UNKNOWN((byte) 0xff); + + private byte value; + + ResponseType(byte value) { + this.value = value; + } + + public byte getValue() { + return value; + } + + public static ResponseType byValue(byte value) { + for (ResponseType type : values()) { + if (type.value == value) { + return type; + } + } + return UNKNOWN; + } + + enum AdditionalStatusResponseType { + STATUS_RESPONSE_PAGE_1((byte) 0x01), + STATUS_RESPONSE_PAGE_2((byte) 0x02), + STATUS_RESPONSE_PAGE_3((byte) 0x03), + STATUS_RESPONSE_PAGE_5((byte) 0x05), + STATUS_RESPONSE_PAGE_6((byte) 0x06), + STATUS_RESPONSE_PAGE_70((byte) 0x46), + STATUS_RESPONSE_PAGE_80((byte) 0x50), + STATUS_RESPONSE_PAGE_81((byte) 0x51), + UNKNOWN((byte) 0xff); + + private byte value; + + AdditionalStatusResponseType(byte value) { + this.value = value; + } + + public static AdditionalStatusResponseType byValue(byte value) { + for (AdditionalStatusResponseType type : values()) { + if (type.value == value) { + return type; + } + } + return UNKNOWN; + } + } + + enum ActivationResponseType { + GET_VERSION_RESPONSE((byte) 0x15), + SET_UNIQUE_ID_RESPONSE((byte) 0x1b), + UNKNOWN((byte) 0xff); + + private byte length; + + ActivationResponseType(byte length) { + this.length = length; + } + + public static ActivationResponseType byLength(byte length) { + for (ActivationResponseType type : values()) { + if (type.length == length) { + return type; + } + } + return UNKNOWN; + } + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java new file mode 100644 index 0000000000..798643df00 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java @@ -0,0 +1,155 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import java.nio.ByteBuffer; +import java.util.Arrays; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +public final class SetUniqueIdResponse extends ActivationResponseBase { + private byte messageType; + private short messageLength; + private short pulseVolumeInTenThousandthMicroLiter; + private short pumpRate; + private short primePumpRate; + private short numberOfEngagingClutchDrivePulses; + private short numberOfPrimePulses; + private short podExpirationTimeInHours; + private short firmwareVersionMajor; + private short firmwareVersionMinor; + private short firmwareVersionInterim; + private short bleVersionMajor; + private short bleVersionMinor; + private short bleVersionInterim; + private short productId; + private PodStatus podStatus; + private long lotNumber; + private long podSequenceNumber; + private long uniqueIdReceivedInCommand; + + public SetUniqueIdResponse(byte[] encoded) { + super(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, encoded); + + this.messageType = encoded[0]; + this.messageLength = (short) (encoded[1] & 0xff); + this.pulseVolumeInTenThousandthMicroLiter = ByteBuffer.wrap(new byte[]{encoded[2], encoded[3]}).getShort(); + this.pumpRate = (short) (encoded[4] & 0xff); + this.primePumpRate = (short) (encoded[5] & 0xff); + this.numberOfEngagingClutchDrivePulses = (short) (encoded[6] & 0xff); + this.numberOfPrimePulses = (short) (encoded[7] & 0xff); + this.podExpirationTimeInHours = (short) (encoded[8] & 0xff); + this.firmwareVersionMajor = (short) (encoded[9] & 0xff); + this.firmwareVersionMinor = (short) (encoded[10] & 0xff); + this.firmwareVersionInterim = (short) (encoded[11] & 0xff); + this.bleVersionMajor = (short) (encoded[12] & 0xff); + this.bleVersionMinor = (short) (encoded[13] & 0xff); + this.bleVersionInterim = (short) (encoded[14] & 0xff); + this.productId = (short) (encoded[15] & 0xff); + this.podStatus = PodStatus.byValue(encoded[16]); + this.lotNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[17], encoded[18], encoded[19], encoded[20]}).getLong(); + this.podSequenceNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[21], encoded[22], encoded[23], encoded[24]}).getLong(); + this.uniqueIdReceivedInCommand = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[25], encoded[26], encoded[27], encoded[28]}).getLong(); + } + + public byte getMessageType() { + return messageType; + } + + public short getMessageLength() { + return messageLength; + } + + public short getPulseVolumeInTenThousandthMicroLiter() { + return pulseVolumeInTenThousandthMicroLiter; + } + + public short getDeliveryRate() { + return pumpRate; + } + + public short getPrimeRate() { + return primePumpRate; + } + + public short getNumberOfEngagingClutchDrivePulses() { + return numberOfEngagingClutchDrivePulses; + } + + public short getNumberOfPrimePulses() { + return numberOfPrimePulses; + } + + public short getPodExpirationTimeInHours() { + return podExpirationTimeInHours; + } + + public short getFirmwareVersionMajor() { + return firmwareVersionMajor; + } + + public short getFirmwareVersionMinor() { + return firmwareVersionMinor; + } + + public short getFirmwareVersionInterim() { + return firmwareVersionInterim; + } + + public short getBleVersionMajor() { + return bleVersionMajor; + } + + public short getBleVersionMinor() { + return bleVersionMinor; + } + + public short getBleVersionInterim() { + return bleVersionInterim; + } + + public short getProductId() { + return productId; + } + + public PodStatus getPodStatus() { + return podStatus; + } + + public long getLotNumber() { + return lotNumber; + } + + public long getPodSequenceNumber() { + return podSequenceNumber; + } + + public long getUniqueIdReceivedInCommand() { + return uniqueIdReceivedInCommand; + } + + @Override public String toString() { + return "SetUniqueIdResponse{" + + "messageType=" + messageType + + ", messageLength=" + messageLength + + ", pulseVolume=" + pulseVolumeInTenThousandthMicroLiter + + ", pumpRate=" + pumpRate + + ", primePumpRate=" + primePumpRate + + ", numberOfEngagingClutchDrivePulses=" + numberOfEngagingClutchDrivePulses + + ", numberOfPrimePulses=" + numberOfPrimePulses + + ", podExpirationTimeInHours=" + podExpirationTimeInHours + + ", softwareVersionMajor=" + firmwareVersionMajor + + ", softwareVersionMinor=" + firmwareVersionMinor + + ", softwareVersionInterim=" + firmwareVersionInterim + + ", bleVersionMajor=" + bleVersionMajor + + ", bleVersionMinor=" + bleVersionMinor + + ", bleVersionInterim=" + bleVersionInterim + + ", productId=" + productId + + ", podStatus=" + podStatus + + ", lotNumber=" + lotNumber + + ", podSequenceNumber=" + podSequenceNumber + + ", uniqueIdReceivedInCommand=" + uniqueIdReceivedInCommand + + ", activationResponseType=" + activationResponseType + + ", responseType=" + responseType + + ", encoded=" + Arrays.toString(encoded) + + '}'; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java new file mode 100644 index 0000000000..8f3c2e2be8 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java @@ -0,0 +1,128 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import java.nio.ByteBuffer; +import java.util.Arrays; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +public final class VersionResponse extends ActivationResponseBase { + + private final byte messageType; + private final short messageLength; + private final short firmwareVersionMajor; + private final short firmwareVersionMinor; + private final short firmwareVersionInterim; + private final short bleVersionMajor; + private final short bleVersionMinor; + private final short bleVersionInterim; + private final short productId; + private final PodStatus podStatus; + private final long lotNumber; + private final long podSequenceNumber; + private final byte rssi; + private final byte receiverLowerGain; + private final long uniqueIdReceivedInCommand; + + public VersionResponse(byte[] encoded) { + super(ResponseType.ActivationResponseType.GET_VERSION_RESPONSE, encoded); + + messageType = encoded[0]; + messageLength = (short) (encoded[1] & 0xff); + firmwareVersionMajor = (short) (encoded[2] & 0xff); + firmwareVersionMinor = (short) (encoded[3] & 0xff); + firmwareVersionInterim = (short) (encoded[4] & 0xff); + bleVersionMajor = (short) (encoded[5] & 0xff); + bleVersionMinor = (short) (encoded[6] & 0xff); + bleVersionInterim = (short) (encoded[7] & 0xff); + productId = (short) (encoded[8] & 0xff); + podStatus = PodStatus.byValue((byte) (encoded[9] & 0xf)); + lotNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[10], encoded[11], encoded[12], encoded[13]}).getLong(); + podSequenceNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[14], encoded[15], encoded[16], encoded[17]}).getLong(); + rssi = (byte) (encoded[18] & 0x3f); + receiverLowerGain = (byte) ((encoded[18] >> 6) & 0x03); + uniqueIdReceivedInCommand = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[19], encoded[20], encoded[21], encoded[22]}).getLong(); + } + + public byte getMessageType() { + return messageType; + } + + public short getMessageLength() { + return messageLength; + } + + public short getFirmwareVersionMajor() { + return firmwareVersionMajor; + } + + public short getFirmwareVersionMinor() { + return firmwareVersionMinor; + } + + public short getFirmwareVersionInterim() { + return firmwareVersionInterim; + } + + public short getBleVersionMajor() { + return bleVersionMajor; + } + + public short getBleVersionMinor() { + return bleVersionMinor; + } + + public short getBleVersionInterim() { + return bleVersionInterim; + } + + public short getProductId() { + return productId; + } + + public PodStatus getPodStatus() { + return podStatus; + } + + public long getLotNumber() { + return lotNumber; + } + + public long getPodSequenceNumber() { + return podSequenceNumber; + } + + public byte getRssi() { + return rssi; + } + + public byte getReceiverLowerGain() { + return receiverLowerGain; + } + + public long getUniqueIdReceivedInCommand() { + return uniqueIdReceivedInCommand; + } + + @Override public String toString() { + return "VersionResponse{" + + "messageType=" + messageType + + ", messageLength=" + messageLength + + ", firmwareVersionMajor=" + firmwareVersionMajor + + ", firmwareVersionMinor=" + firmwareVersionMinor + + ", firmwareVersionInterim=" + firmwareVersionInterim + + ", bleVersionMajor=" + bleVersionMajor + + ", bleVersionMinor=" + bleVersionMinor + + ", bleVersionInterim=" + bleVersionInterim + + ", productId=" + productId + + ", podStatus=" + podStatus + + ", lotNumber=" + lotNumber + + ", podSequenceNumber=" + podSequenceNumber + + ", rssi=" + rssi + + ", receiverLowerGain=" + receiverLowerGain + + ", uniqueIdReceivedInCommand=" + uniqueIdReceivedInCommand + + ", activationResponseType=" + activationResponseType + + ", responseType=" + responseType + + ", encoded=" + Arrays.toString(encoded) + + '}'; + } +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java new file mode 100644 index 0000000000..1de262db9d --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java @@ -0,0 +1,44 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + +public class SetUniqueIdResponseTest { + @Test + public void testValidResponse() throws DecoderException { + byte[] encoded = Hex.decodeHex("011B13881008340A50040A00010300040308146CC1000954D402420001"); + SetUniqueIdResponse response = new SetUniqueIdResponse(encoded); + + assertArrayEquals(encoded, response.getEncoded()); + assertNotSame(encoded, response.getEncoded()); + assertEquals(ResponseType.ACTIVATION_RESPONSE, response.getResponseType()); + assertEquals(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, response.getActivationResponseType()); + + assertEquals(ResponseType.ACTIVATION_RESPONSE.getValue(), response.getMessageType()); + assertEquals(27, response.getMessageLength()); + assertEquals(5000, response.getPulseVolumeInTenThousandthMicroLiter()); + assertEquals(16, response.getDeliveryRate()); + assertEquals(8, response.getPrimeRate()); + assertEquals(52, response.getNumberOfEngagingClutchDrivePulses()); + assertEquals(10, response.getNumberOfPrimePulses()); + assertEquals(80, response.getPodExpirationTimeInHours()); + assertEquals(4, response.getFirmwareVersionMajor()); + assertEquals(10, response.getFirmwareVersionMinor()); + assertEquals(0, response.getFirmwareVersionInterim()); + assertEquals(1, response.getBleVersionMajor()); + assertEquals(3, response.getBleVersionMinor()); + assertEquals(0, response.getBleVersionInterim()); + assertEquals(4, response.getProductId()); + assertEquals(PodStatus.UID_SET, response.getPodStatus()); + assertEquals(135556289L, response.getLotNumber()); + assertEquals(611540L, response.getPodSequenceNumber()); + assertEquals(37879809L, response.getUniqueIdReceivedInCommand()); + } +} \ No newline at end of file diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java new file mode 100644 index 0000000000..c88142a715 --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java @@ -0,0 +1,41 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + +public class VersionResponseTest { + + @Test + public void testValidResponse() throws DecoderException { + byte[] encoded = Hex.decodeHex("0115040A00010300040208146CC1000954D400FFFFFFFF"); + VersionResponse response = new VersionResponse(encoded); + + assertArrayEquals(encoded, response.getEncoded()); + assertNotSame(encoded, response.getEncoded()); + assertEquals(ResponseType.ACTIVATION_RESPONSE, response.getResponseType()); + assertEquals(ResponseType.ActivationResponseType.GET_VERSION_RESPONSE, response.getActivationResponseType()); + + assertEquals(ResponseType.ACTIVATION_RESPONSE.getValue(), response.getMessageType()); + assertEquals(21, response.getMessageLength()); + assertEquals(4, response.getFirmwareVersionMajor()); + assertEquals(10, response.getFirmwareVersionMinor()); + assertEquals(0, response.getFirmwareVersionInterim()); + assertEquals(1, response.getBleVersionMajor()); + assertEquals(3, response.getBleVersionMinor()); + assertEquals(0, response.getBleVersionInterim()); + assertEquals(4, response.getProductId()); + assertEquals(PodStatus.FILLED, response.getPodStatus()); + assertEquals(135556289, response.getLotNumber()); + assertEquals(611540, response.getPodSequenceNumber()); + assertEquals(0L, response.getRssi()); + assertEquals(0L, response.getReceiverLowerGain()); + assertEquals(4294967295L, response.getUniqueIdReceivedInCommand()); + } +} \ No newline at end of file From f1d095d9c821fd2aed592887dd6f4150b5d42708 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 01:22:53 +0100 Subject: [PATCH 07/20] Add GetVersionCommand --- .../dash/driver/pod/command/CommandBase.java | 64 ++++++++++++++++++- .../driver/pod/command/GetVersionCommand.java | 31 +++++++++ .../omnipod/dash/driver/pod/util/CrcUtil.java | 32 ++++++++++ .../pod/command/GetVersionCommandTest.java | 17 +++++ 4 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/CrcUtil.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java index 038086c02d..9e4c38c24e 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java @@ -1,10 +1,70 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.CrcUtil; + abstract class CommandBase implements Command { - CommandBase(CommandType commandType) { + final CommandType commandType; + final short sequenceNumber; + + CommandBase(CommandType commandType, short sequenceNumber) { + this.commandType = commandType; + this.sequenceNumber = sequenceNumber; } @Override public CommandType getCommandType() { - return null; + return commandType; + } + + public short getSequenceNumber() { + return sequenceNumber; + } + + static byte[] formatCommand(byte[] command) { + List temp = new ArrayList<>(); + + byte[] prefix = "S0.0=".getBytes(StandardCharsets.UTF_8); + for (byte b : prefix) { + temp.add(b); + } + + byte[] length = ByteBuffer.allocate(2).putShort((short) command.length).array(); + for (int i = 0; i < 2; i++) { + temp.add(length[i]); + } + + // Append command + for (byte b : command) { + temp.add(b); + } + + byte[] suffix = ",G0.0".getBytes(StandardCharsets.UTF_8); + for (byte b : suffix) { + temp.add(b); + } + + byte[] out = new byte[((short) temp.size())]; + for (int i2 = 0; i2 < temp.size(); i2++) { + out[i2] = temp.get(i2); + } + return out; + } + + static byte[] appendCrc(byte[] command) { + return ByteBuffer.allocate(command.length + 2) // + .put(command) // + .putShort(CrcUtil.createCrc(command)) // + .array(); + } + + static byte[] encodeHeader(int address, short sequenceNumber, short length, boolean unknown) { + return ByteBuffer.allocate(6) // + .putInt(address) // + .putShort((short) (((sequenceNumber & 15) << 10) | length | (((unknown ? 1 : 0) & 1) << 15))) // + .array(); } } diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java new file mode 100644 index 0000000000..782e4c9b58 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java @@ -0,0 +1,31 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import java.nio.ByteBuffer; + +public class GetVersionCommand extends CommandBase { + private static final int DEFAULT_ADDRESS = -1; + private static final short LENGTH = 6; + private static final byte BODY_LENGTH = 4; + + private final int address; + private final boolean unknown; + + public GetVersionCommand(short sequenceNumber, boolean unknown) { + this(sequenceNumber, DEFAULT_ADDRESS, unknown); + } + + public GetVersionCommand(short sequenceNumber, int address, boolean unknown) { + super(CommandType.GET_VERSION, sequenceNumber); + this.address = address; + this.unknown = unknown; + } + + @Override public byte[] getEncoded() { + return appendCrc(ByteBuffer.allocate(12) // + .put(encodeHeader(address, sequenceNumber, LENGTH, unknown)) // + .put(commandType.getValue()) // + .put(BODY_LENGTH) // + .putInt(address) // + .array()); + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/CrcUtil.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/CrcUtil.java new file mode 100644 index 0000000000..2597c619ff --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/CrcUtil.java @@ -0,0 +1,32 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util; + +public class CrcUtil { + + private static final short[] crc16table = {0, -32763, -32753, 10, -32741, 30, 20, -32751, -32717, 54, 60, -32711, 40, -32723, -32729, 34, -32669, 102, 108, -32663, 120, -32643, -32649, 114, 80, -32683, -32673, 90, -32693, 78, 68, -32703, -32573, 198, 204, -32567, 216, -32547, -32553, 210, 240, -32523, -32513, 250, -32533, 238, 228, -32543, 160, -32603, -32593, 170, -32581, 190, 180, -32591, -32621, 150, 156, -32615, 136, -32627, -32633, 130, -32381, 390, 396, -32375, 408, -32355, -32361, 402, 432, -32331, -32321, 442, -32341, 430, 420, -32351, 480, -32283, -32273, 490, -32261, 510, 500, -32271, -32301, 470, 476, -32295, 456, -32307, -32313, 450, 320, -32443, -32433, 330, -32421, 350, 340, -32431, -32397, 374, 380, -32391, 360, -32403, -32409, 354, -32477, 294, 300, -32471, 312, -32451, -32457, 306, 272, -32491, -32481, 282, -32501, 270, 260, -32511, -31997, 774, 780, -31991, 792, -31971, -31977, 786, 816, -31947, -31937, 826, -31957, 814, 804, -31967, 864, -31899, -31889, 874, -31877, 894, 884, -31887, -31917, 854, 860, -31911, 840, -31923, -31929, 834, 960, -31803, -31793, 970, -31781, 990, 980, -31791, -31757, 1014, 1020, -31751, 1000, -31763, -31769, 994, -31837, 934, 940, -31831, 952, -31811, -31817, 946, 912, -31851, -31841, 922, -31861, 910, 900, -31871, 640, -32123, -32113, 650, -32101, 670, 660, -32111, -32077, 694, 700, -32071, 680, -32083, -32089, 674, -32029, 742, 748, -32023, 760, -32003, -32009, 754, 720, -32043, -32033, 730, -32053, 718, 708, -32063, -32189, 582, 588, -32183, 600, -32163, -32169, 594, 624, -32139, -32129, 634, -32149, 622, 612, -32159, 544, -32219, -32209, 554, -32197, 574, 564, -32207, -32237, 534, 540, -32231, 520, -32243, -32249, 514}; + + public static int createCrc(short[] sArr) { + int i = 0; + for (short s = 0; s < sArr.length; s = (short) (s + 1)) { + byte b = (byte) sArr[s]; + short s2 = b; + if (b < 0) { + s2 = (short) (((byte) (b & Byte.MAX_VALUE)) + 128); + } + i += s2; + } + return i; + } + + public static short createCrc(byte[] bArr) { + short s = 0; + for (byte b : bArr) { + byte b2 = (byte) (b ^ (s & 255)); + short s2 = b2; + if (b2 < 0) { + s2 = (short) (((byte) (b2 & Byte.MAX_VALUE)) + 128); + } + s = (short) (((short) (((short) (s >> 8)) & 255)) ^ crc16table[s2]); + } + return s; + } +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java new file mode 100644 index 0000000000..5750932ffa --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java @@ -0,0 +1,17 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import static org.junit.Assert.assertArrayEquals; + +public class GetVersionCommandTest { + @Test + public void testEncoding() throws DecoderException { + byte[] encoded = new GetVersionCommand((short) 0, false) // + .getEncoded(); + + assertArrayEquals(Hex.decodeHex("FFFFFFFF00060704FFFFFFFF82B2"), encoded); + } +} \ No newline at end of file From af35253f0bf1256b34c566ca65bfdce25ed61573 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 15:16:28 +0100 Subject: [PATCH 08/20] Add SetUniqueIdCommand and DeactivateCommand; add captures for ProgramAlertsCommand --- .../dash/driver/pod/command/CommandBase.java | 20 +++- .../driver/pod/command/DeactivateCommand.java | 21 ++++ .../driver/pod/command/GetVersionCommand.java | 13 +-- .../pod/command/SetUniqueIdCommand.java | 50 +++++++++ .../pod/command/DeactivateCommandTest.java | 17 +++ .../pod/command/ProgramAlertsCommandTest.java | 102 ++++++++++++++++++ .../pod/command/SetUniqueIdCommandTest.java | 19 ++++ 7 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java index 9e4c38c24e..b9c92f8b4c 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java @@ -8,22 +8,36 @@ import java.util.List; import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.CrcUtil; abstract class CommandBase implements Command { - final CommandType commandType; - final short sequenceNumber; + static final short HEADER_LENGTH = 6; - CommandBase(CommandType commandType, short sequenceNumber) { + final CommandType commandType; + final int address; + final short sequenceNumber; + final boolean unknown; + + CommandBase(CommandType commandType, int address, short sequenceNumber, boolean unknown) { this.commandType = commandType; + this.address = address; this.sequenceNumber = sequenceNumber; + this.unknown = unknown; } @Override public CommandType getCommandType() { return commandType; } + public int getAddress() { + return address; + } + public short getSequenceNumber() { return sequenceNumber; } + public boolean isUnknown() { + return unknown; + } + static byte[] formatCommand(byte[] command) { List temp = new ArrayList<>(); diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java new file mode 100644 index 0000000000..d7678f8cb7 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java @@ -0,0 +1,21 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import java.nio.ByteBuffer; + +public class DeactivateCommand extends CommandBase { + private static final short LENGTH = 6; + private static final byte BODY_LENGTH = 4; + + DeactivateCommand(int address, short sequenceNumber, boolean unknown) { + super(CommandType.DEACTIVATE, address, sequenceNumber, unknown); + } + + @Override public byte[] getEncoded() { + return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) // + .put(encodeHeader(address, sequenceNumber, LENGTH, unknown)) // + .put(commandType.getValue()) // + .put(BODY_LENGTH) // + .putInt(1229869870) // FIXME ?? was: byte array of int 777211465 converted to little endian + .array()); + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java index 782e4c9b58..9914c59889 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java @@ -7,21 +7,16 @@ public class GetVersionCommand extends CommandBase { private static final short LENGTH = 6; private static final byte BODY_LENGTH = 4; - private final int address; - private final boolean unknown; - public GetVersionCommand(short sequenceNumber, boolean unknown) { - this(sequenceNumber, DEFAULT_ADDRESS, unknown); + this(DEFAULT_ADDRESS, sequenceNumber, unknown); } - public GetVersionCommand(short sequenceNumber, int address, boolean unknown) { - super(CommandType.GET_VERSION, sequenceNumber); - this.address = address; - this.unknown = unknown; + public GetVersionCommand(int address, short sequenceNumber, boolean unknown) { + super(CommandType.GET_VERSION, address, sequenceNumber, unknown); } @Override public byte[] getEncoded() { - return appendCrc(ByteBuffer.allocate(12) // + return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) // .put(encodeHeader(address, sequenceNumber, LENGTH, unknown)) // .put(commandType.getValue()) // .put(BODY_LENGTH) // diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java new file mode 100644 index 0000000000..3e4e8186c2 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java @@ -0,0 +1,50 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import java.nio.ByteBuffer; +import java.util.Calendar; +import java.util.Date; + +public class SetUniqueIdCommand extends CommandBase { + private static final int DEFAULT_ADDRESS = -1; + private static final short LENGTH = 21; + private static final byte BODY_LENGTH = 19; + + private final int lotNumber; + private final int podSequenceNumber; + private final Date initializationTime; + + SetUniqueIdCommand(int address, short sequenceNumber, int lotNumber, int podSequenceNumber, Date initializationTime, boolean unknown) { + super(CommandType.SET_UNIQUE_ID, address, sequenceNumber, unknown); + this.lotNumber = lotNumber; + this.podSequenceNumber = podSequenceNumber; + this.initializationTime = initializationTime; + } + + @Override public byte[] getEncoded() { + return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) // + .put(encodeHeader(DEFAULT_ADDRESS, sequenceNumber, LENGTH, unknown)) // + .put(commandType.getValue()) // + .put(BODY_LENGTH) // + .putInt(address) // + .put((byte) 0x14) // FIXME ?? + .put((byte) 0x04) // FIXME ?? + .put(encodeInitializationTime(initializationTime)) // + .putInt(lotNumber) // + .putInt(podSequenceNumber) // + .array()); + + } + + private static byte[] encodeInitializationTime(Date date) { + Calendar instance = Calendar.getInstance(); + instance.setTime(date); + + return new byte[]{ // + (byte) (instance.get(Calendar.MONTH) + 1), // + (byte) instance.get(Calendar.DATE), // + (byte) (instance.get(Calendar.YEAR) % 100), // + (byte) instance.get(Calendar.HOUR_OF_DAY), // + (byte) instance.get(Calendar.MINUTE) // + }; + } +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java new file mode 100644 index 0000000000..b0b4b5380b --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java @@ -0,0 +1,17 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import static org.junit.Assert.assertArrayEquals; + +public class DeactivateCommandTest { + @Test + public void testEncoding() throws DecoderException { + byte[] encoded = new DeactivateCommand(37879809, (short) 5, false) // + .getEncoded(); + + assertArrayEquals(Hex.decodeHex("0242000114061C04494E532E001C"), encoded); + } +} \ No newline at end of file diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java new file mode 100644 index 0000000000..ad642d6c4e --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java @@ -0,0 +1,102 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +public class ProgramAlertsCommandTest { + // TODO + + // Address for all captures below: 37879811 + + /* + Pod expiration alerts + + V/PodComm: *** encode() CALLED ON ProgramAlertsCommandEncoder + *** encode() CALLED ON HeaderEncoder + V/PodComm: *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:8C:12 FROM HeaderEncoder{lengthSequenceNumberAndFlags=-29678, f6666a=[], encoded=[2, 66, 0, 3, -116, 18], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} + *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:8C:12:19:10:49:4E:53:2E:79:A4:10:D1:05:02:28:00:12:75:06:02:80:F5 FROM ProgramAlertsCommandEncoder{parameters=ProgramAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=7, enabled=true, durationInMinutes=420, autoOff=false, timeTrigger=false, offsetInMinutes=4305, beepType=2, beepRepetition=5}, AlertConfigurationEncoder{slot=2, enabled=true, durationInMinutes=0, autoOff=false, timeTrigger=false, offsetInMinutes=4725, beepType=2, beepRepetition=6}]}, f6666a=[], encoded=[2, 66, 0, 3, -116, 18, 25, 16, 73, 78, 83, 46, 121, -92, 16, -47, 5, 2, 40, 0, 18, 117, 6, 2, -128, -11], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=-29678, f6666a=[], encoded=[2, 66, 0, 3, -116, 18], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=16} + + I/PodComm: pod command: 024200038C121910494E532E79A410D1050228001275060280F5 + V/PodComm: flags: seqNum=3 ack=false mctf=true + Program Alert: + length:16, number of alerts:2 + ------------------------------------- + alert index: 7 (lump of coal/pod expiration) + enabled: true + duration: 420 minutes + set alarm: false + V/PodComm: type: time - trigger after 4305 minutes (71.75 hrs) + beep type: 2 + beep repetition: 5 + ------------------------------------- + alert index: 2 (imminent pod expiration) + enabled: true + duration: 0 minutes + set alarm: false + type: time - trigger after 4725 minutes (78.75 hrs) + beep type: 2 + beep repetition: 6 + + */ + + /* + Low reservoir + + V/PodComm: *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:20:0C FROM HeaderEncoder{lengthSequenceNumberAndFlags=8204, f6666a=[], encoded=[2, 66, 0, 3, 32, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} + V/PodComm: *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:20:0C:19:0A:49:4E:53:2E:4C:00:00:C8:01:02:01:49 FROM ProgramAlertsCommandEncoder{parameters=ProgamAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=4, enabled=true, durationInMinutes=0, autoOff=false, timeTrigger=true, offsetInMinutes=200, beepType=2, beepRepetition=1}]}, f6666a=[], encoded=[2, 66, 0, 3, 32, 12, 25, 10, 73, 78, 83, 46, 76, 0, 0, -56, 1, 2, 1, 73], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=8204, f6666a=[], encoded=[2, 66, 0, 3, 32, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=10} + + V/PodComm: flags: seqNum=8 ack=false mctf=false + Program Alert: + length:10, number of alerts:1 + ------------------------------------- + alert index: 4 (low reservoir) + enabled: true + duration: 0 minutes + set alarm: false + type: volume - trigger at 200 micro liter + beep type: 2 + beep repetition: 1 + */ + + /* + User Pod expiration + + V/PodComm: *** encode() CALLED ON ProgramAlertsCommandEncoder + *** encode() CALLED ON HeaderEncoder + V/PodComm: *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:3C:0C FROM HeaderEncoder{lengthSequenceNumberAndFlags=15372, f6666a=[], encoded=[2, 66, 0, 3, 60, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} + V/PodComm: *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:3C:0C:19:0A:49:4E:53:2E:38:00:0F:EF:03:02:03:E2 FROM ProgramAlertsCommandEncoder{parameters=ProgramAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=3, enabled=true, durationInMinutes=0, autoOff=false, timeTrigger=false, offsetInMinutes=4079, beepType=2, beepRepetition=3}]}, f6666a=[], encoded=[2, 66, 0, 3, 60, 12, 25, 10, 73, 78, 83, 46, 56, 0, 15, -17, 3, 2, 3, -30], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=15372, f6666a=[], encoded=[2, 66, 0, 3, 60, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=10} + + I/PodComm: pod command: 024200033C0C190A494E532E38000FEF030203E2 + V/PodComm: flags: seqNum=15 ack=false mctf=false + Program Alert: + length:10, number of alerts:1 + ------------------------------------- + alert index: 3 (user pod expiration) + enabled: true + duration: 0 minutes + set alarm: false + type: time - trigger after 4079 minutes (67.98 hrs) + beep type: 2 + beep repetition: 3 + */ + + + /* + Lump of coal + + V/PodComm: *** encode() CALLED ON ProgramAlertsCommandEncoder + *** encode() CALLED ON HeaderEncoder + *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:28:0C FROM HeaderEncoder{lengthSequenceNumberAndFlags=10252, f6666a=[], encoded=[2, 66, 0, 3, 40, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} + D/MainActivity: Pod Activation 1: got Pod Event + V/PodComm: *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:28:0C:19:0A:49:4E:53:2E:78:37:00:05:08:02:03:56 FROM ProgramAlertsCommandEncoder{parameters=ProgramAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=7, enabled=true, durationInMinutes=55, autoOff=false, timeTrigger=false, offsetInMinutes=5, beepType=2, beepRepetition=8}]}, f6666a=[], encoded=[2, 66, 0, 3, 40, 12, 25, 10, 73, 78, 83, 46, 120, 55, 0, 5, 8, 2, 3, 86], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=10252, f6666a=[], encoded=[2, 66, 0, 3, 40, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=10} + + V/PodComm: flags: seqNum=10 ack=false mctf=false + Program Alert: + length:10, number of alerts:1 + ------------------------------------- + V/PodComm: alert index: 7 (lump of coal/pod expiration) + enabled: true + duration: 55 minutes + set alarm: false + type: time - trigger after 5 minutes (0.08 hrs) + beep type: 2 + beep repetition: 8 + */ +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java new file mode 100644 index 0000000000..055f215e5d --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java @@ -0,0 +1,19 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import java.util.Date; + +import static org.junit.Assert.assertArrayEquals; + +public class SetUniqueIdCommandTest { + @Test + public void testEncoding() throws DecoderException { + byte[] encoded = new SetUniqueIdCommand(37879811, (short) 6, 135556289, 681767, new Date(2021, 1, 10, 14, 41), false) // + .getEncoded(); + + assertArrayEquals(Hex.decodeHex("FFFFFFFF18150313024200031404020A150E2908146CC1000A67278344"), encoded); + } +} \ No newline at end of file From eb46c973a320cf8541d77d8156268d7e23288dde Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 18:00:34 +0100 Subject: [PATCH 09/20] Add ProgramAlertsCommand --- .../dash/driver/pod/command/CommandBase.java | 2 +- .../driver/pod/command/DeactivateCommand.java | 9 ++ .../driver/pod/command/GetVersionCommand.java | 9 ++ .../pod/command/ProgramAlertsCommand.java | 46 +++++++ .../pod/command/SetUniqueIdCommand.java | 12 ++ .../pod/definition/AlertConfiguration.java | 62 +++++++++ .../dash/driver/pod/definition/AlertSlot.java | 28 ++++ .../pod/definition/AlertTriggerType.java | 6 + .../pod/definition/BeepRepetitionType.java | 20 +++ .../dash/driver/pod/definition/BeepType.java | 17 +++ .../pod/command/ProgramAlertsCommandTest.java | 130 ++++++------------ 11 files changed, 254 insertions(+), 87 deletions(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java index b9c92f8b4c..e871c07827 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/CommandBase.java @@ -78,7 +78,7 @@ abstract class CommandBase implements Command { static byte[] encodeHeader(int address, short sequenceNumber, short length, boolean unknown) { return ByteBuffer.allocate(6) // .putInt(address) // - .putShort((short) (((sequenceNumber & 15) << 10) | length | (((unknown ? 1 : 0) & 1) << 15))) // + .putShort((short) (((sequenceNumber & 0x0f) << 10) | length | ((unknown ? 1 : 0) << 15))) // .array(); } } diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java index d7678f8cb7..57f32dcdb1 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java @@ -18,4 +18,13 @@ public class DeactivateCommand extends CommandBase { .putInt(1229869870) // FIXME ?? was: byte array of int 777211465 converted to little endian .array()); } + + @Override public String toString() { + return "DeactivateCommand{" + + "commandType=" + commandType + + ", address=" + address + + ", sequenceNumber=" + sequenceNumber + + ", unknown=" + unknown + + '}'; + } } diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java index 9914c59889..b1e2296f48 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java @@ -23,4 +23,13 @@ public class GetVersionCommand extends CommandBase { .putInt(address) // .array()); } + + @Override public String toString() { + return "GetVersionCommand{" + + "commandType=" + commandType + + ", address=" + address + + ", sequenceNumber=" + sequenceNumber + + ", unknown=" + unknown + + '}'; + } } diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java new file mode 100644 index 0000000000..8950e8a7e1 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java @@ -0,0 +1,46 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration; + +public class ProgramAlertsCommand extends CommandBase { + private final List alertConfigurations; + + ProgramAlertsCommand(int address, short sequenceNumber, boolean unknown, List alertConfigurations) { + super(CommandType.PROGRAM_ALERTS, address, sequenceNumber, unknown); + this.alertConfigurations = new ArrayList<>(alertConfigurations); + } + + @Override public byte[] getEncoded() { + ByteBuffer byteBuffer = ByteBuffer.allocate(getLength() + HEADER_LENGTH) // + .put(encodeHeader(address, sequenceNumber, getLength(), unknown)) // + .put(commandType.getValue()) // + .put(getBodyLength()) // + .putInt(1229869870); // FIXME ?? was: byte array of int 777211465 converted to little endian + for (AlertConfiguration configuration : alertConfigurations) { + byteBuffer.put(configuration.getEncoded()); + } + return appendCrc(byteBuffer.array()); + } + + private short getLength() { + return (short) (alertConfigurations.size() * 6 + 6); + } + + private byte getBodyLength() { + return (byte) (alertConfigurations.size() * 6 + 4); + } + + @Override public String toString() { + return "ProgramAlertsCommand{" + + "alertConfigurations=" + alertConfigurations + + ", commandType=" + commandType + + ", address=" + address + + ", sequenceNumber=" + sequenceNumber + + ", unknown=" + unknown + + '}'; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java index 3e4e8186c2..00fca3ec36 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java @@ -47,4 +47,16 @@ public class SetUniqueIdCommand extends CommandBase { (byte) instance.get(Calendar.MINUTE) // }; } + + @Override public String toString() { + return "SetUniqueIdCommand{" + + "lotNumber=" + lotNumber + + ", podSequenceNumber=" + podSequenceNumber + + ", initializationTime=" + initializationTime + + ", commandType=" + commandType + + ", address=" + address + + ", sequenceNumber=" + sequenceNumber + + ", unknown=" + unknown + + '}'; + } } diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java new file mode 100644 index 0000000000..4dc12b4e07 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java @@ -0,0 +1,62 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +import java.nio.ByteBuffer; + +public class AlertConfiguration { + private AlertSlot slot; + private boolean enabled; + private short durationInMinutes; + private boolean autoOff; + private AlertTriggerType triggerType; + private short offsetInMinutesOrThresholdInMicroLiters; + private BeepType beepType; + private BeepRepetitionType beepRepetition; + + public AlertConfiguration(AlertSlot slot, boolean enabled, short durationInMinutes, boolean autoOff, AlertTriggerType triggerType, short offsetInMinutesOrThresholdInMicroLiters, BeepType beepType, BeepRepetitionType beepRepetition) { + this.slot = slot; + this.enabled = enabled; + this.durationInMinutes = durationInMinutes; + this.autoOff = autoOff; + this.triggerType = triggerType; + this.offsetInMinutesOrThresholdInMicroLiters = offsetInMinutesOrThresholdInMicroLiters; + this.beepType = beepType; + this.beepRepetition = beepRepetition; + } + + /* renamed from: d */ + public byte[] getEncoded() { + byte firstByte = (byte) (slot.getValue() << 4); + if (enabled) { + firstByte |= 1 << 3; + } + if (triggerType == AlertTriggerType.RESERVOIR_VOLUME_TRIGGER) { + firstByte |= 1 << 2; + } + if (autoOff) { + firstByte |= 1 << 1; + } + firstByte |= ((durationInMinutes >> 8) & 0x01); + + return ByteBuffer.allocate(6) // + .put(firstByte) + .put((byte) durationInMinutes) // + .putShort(offsetInMinutesOrThresholdInMicroLiters) // + .put(beepRepetition.getValue()) // + .put(beepType.getValue()) // + .array(); + } + + @Override public String toString() { + return "AlertConfiguration{" + + "slot=" + slot + + ", enabled=" + enabled + + ", durationInMinutes=" + durationInMinutes + + ", autoOff=" + autoOff + + ", triggerType=" + triggerType + + ", offsetInMinutesOrThresholdInMicroLiters=" + offsetInMinutesOrThresholdInMicroLiters + + ", beepType=" + beepType + + ", beepRepetition=" + beepRepetition + + '}'; + } + +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java new file mode 100644 index 0000000000..0eb6450c32 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java @@ -0,0 +1,28 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public enum AlertSlot { + EXPIRATION_IMMINENT((byte) 0x02), + LOW_RESERVOIR((byte) 0x04), + USER_POD_EXPIRATION((byte) 0x03), + LUMP_OF_COAL_AND_EXPIRATION((byte) 0x07), + UNKNOWN((byte) 255); + + private byte value; + + AlertSlot(byte value) { + this.value = value; + } + + public static AlertSlot byValue(byte value) { + for (AlertSlot slot : values()) { + if (slot.value == value) { + return slot; + } + } + return UNKNOWN; + } + + public byte getValue() { + return value; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java new file mode 100644 index 0000000000..fda5bf010f --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java @@ -0,0 +1,6 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public enum AlertTriggerType { + TIME_TRIGGER, + RESERVOIR_VOLUME_TRIGGER +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java new file mode 100644 index 0000000000..2b290f96b5 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java @@ -0,0 +1,20 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +// FIXME names +public enum BeepRepetitionType { + XXX((byte) 0x01), // Used in low reservoir alert + XXX2((byte) 0x03), // Used in user pod expiration alert + XXX3((byte) 0x05), // Used in pod expiration alert + XXX4((byte) 0x06), // Used in imminent pod expiration alert + XXX5((byte) 0x08); // Used in lump of coal alert + + private byte value; + + BeepRepetitionType(byte value) { + this.value = value; + } + + public byte getValue() { + return value; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java new file mode 100644 index 0000000000..f0104ff3e6 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java @@ -0,0 +1,17 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +// FIXME names +public enum BeepType { + SILENT((byte) 0x00), + XXX((byte) 0x02); //// Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert + + private byte value; + + BeepType(byte value) { + this.value = value; + } + + public byte getValue() { + return value; + } +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java index ad642d6c4e..280bb7d7a2 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java @@ -1,102 +1,60 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertSlot; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTriggerType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepRepetitionType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType; + +import static org.junit.Assert.assertArrayEquals; + public class ProgramAlertsCommandTest { - // TODO + @Test + public void testExpirationAlerts() throws DecoderException { + List configurations = new ArrayList<>(); + configurations.add(new AlertConfiguration(AlertSlot.LUMP_OF_COAL_AND_EXPIRATION, true, (short) 420, false, AlertTriggerType.TIME_TRIGGER, (short) 4305, BeepType.XXX, BeepRepetitionType.XXX3)); + configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION_IMMINENT, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4725, BeepType.XXX, BeepRepetitionType.XXX4)); - // Address for all captures below: 37879811 + byte[] encoded = new ProgramAlertsCommand(37879811, (short) 3, true, configurations).getEncoded(); - /* - Pod expiration alerts + assertArrayEquals(Hex.decodeHex("024200038C121910494E532E79A410D1050228001275060280F5"), encoded); + } - V/PodComm: *** encode() CALLED ON ProgramAlertsCommandEncoder - *** encode() CALLED ON HeaderEncoder - V/PodComm: *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:8C:12 FROM HeaderEncoder{lengthSequenceNumberAndFlags=-29678, f6666a=[], encoded=[2, 66, 0, 3, -116, 18], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} - *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:8C:12:19:10:49:4E:53:2E:79:A4:10:D1:05:02:28:00:12:75:06:02:80:F5 FROM ProgramAlertsCommandEncoder{parameters=ProgramAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=7, enabled=true, durationInMinutes=420, autoOff=false, timeTrigger=false, offsetInMinutes=4305, beepType=2, beepRepetition=5}, AlertConfigurationEncoder{slot=2, enabled=true, durationInMinutes=0, autoOff=false, timeTrigger=false, offsetInMinutes=4725, beepType=2, beepRepetition=6}]}, f6666a=[], encoded=[2, 66, 0, 3, -116, 18, 25, 16, 73, 78, 83, 46, 121, -92, 16, -47, 5, 2, 40, 0, 18, 117, 6, 2, -128, -11], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=-29678, f6666a=[], encoded=[2, 66, 0, 3, -116, 18], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=16} + @Test + public void testLowReservoirAlert() throws DecoderException { + List configurations = new ArrayList<>(); + configurations.add(new AlertConfiguration(AlertSlot.LOW_RESERVOIR, true, (short) 0, false, AlertTriggerType.RESERVOIR_VOLUME_TRIGGER, (short) 200, BeepType.XXX, BeepRepetitionType.XXX)); - I/PodComm: pod command: 024200038C121910494E532E79A410D1050228001275060280F5 - V/PodComm: flags: seqNum=3 ack=false mctf=true - Program Alert: - length:16, number of alerts:2 - ------------------------------------- - alert index: 7 (lump of coal/pod expiration) - enabled: true - duration: 420 minutes - set alarm: false - V/PodComm: type: time - trigger after 4305 minutes (71.75 hrs) - beep type: 2 - beep repetition: 5 - ------------------------------------- - alert index: 2 (imminent pod expiration) - enabled: true - duration: 0 minutes - set alarm: false - type: time - trigger after 4725 minutes (78.75 hrs) - beep type: 2 - beep repetition: 6 + byte[] encoded = new ProgramAlertsCommand(37879811, (short) 8, false, configurations).getEncoded(); - */ + assertArrayEquals(Hex.decodeHex("02420003200C190A494E532E4C0000C801020149"), encoded); + } - /* - Low reservoir + @Test + public void testUserExpirationAlert() throws DecoderException { + List configurations = new ArrayList<>(); + configurations.add(new AlertConfiguration(AlertSlot.USER_POD_EXPIRATION, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4079, BeepType.XXX, BeepRepetitionType.XXX2)); - V/PodComm: *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:20:0C FROM HeaderEncoder{lengthSequenceNumberAndFlags=8204, f6666a=[], encoded=[2, 66, 0, 3, 32, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} - V/PodComm: *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:20:0C:19:0A:49:4E:53:2E:4C:00:00:C8:01:02:01:49 FROM ProgramAlertsCommandEncoder{parameters=ProgamAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=4, enabled=true, durationInMinutes=0, autoOff=false, timeTrigger=true, offsetInMinutes=200, beepType=2, beepRepetition=1}]}, f6666a=[], encoded=[2, 66, 0, 3, 32, 12, 25, 10, 73, 78, 83, 46, 76, 0, 0, -56, 1, 2, 1, 73], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=8204, f6666a=[], encoded=[2, 66, 0, 3, 32, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=10} + byte[] encoded = new ProgramAlertsCommand(37879811, (short) 15, false, configurations).getEncoded(); - V/PodComm: flags: seqNum=8 ack=false mctf=false - Program Alert: - length:10, number of alerts:1 - ------------------------------------- - alert index: 4 (low reservoir) - enabled: true - duration: 0 minutes - set alarm: false - type: volume - trigger at 200 micro liter - beep type: 2 - beep repetition: 1 - */ - - /* - User Pod expiration - - V/PodComm: *** encode() CALLED ON ProgramAlertsCommandEncoder - *** encode() CALLED ON HeaderEncoder - V/PodComm: *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:3C:0C FROM HeaderEncoder{lengthSequenceNumberAndFlags=15372, f6666a=[], encoded=[2, 66, 0, 3, 60, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} - V/PodComm: *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:3C:0C:19:0A:49:4E:53:2E:38:00:0F:EF:03:02:03:E2 FROM ProgramAlertsCommandEncoder{parameters=ProgramAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=3, enabled=true, durationInMinutes=0, autoOff=false, timeTrigger=false, offsetInMinutes=4079, beepType=2, beepRepetition=3}]}, f6666a=[], encoded=[2, 66, 0, 3, 60, 12, 25, 10, 73, 78, 83, 46, 56, 0, 15, -17, 3, 2, 3, -30], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=15372, f6666a=[], encoded=[2, 66, 0, 3, 60, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=10} - - I/PodComm: pod command: 024200033C0C190A494E532E38000FEF030203E2 - V/PodComm: flags: seqNum=15 ack=false mctf=false - Program Alert: - length:10, number of alerts:1 - ------------------------------------- - alert index: 3 (user pod expiration) - enabled: true - duration: 0 minutes - set alarm: false - type: time - trigger after 4079 minutes (67.98 hrs) - beep type: 2 - beep repetition: 3 - */ + assertArrayEquals(Hex.decodeHex("024200033C0C190A494E532E38000FEF030203E2"), encoded); + } - /* - Lump of coal + @Test + public void testLumpOfCoalAlert() throws DecoderException { + List configurations = new ArrayList<>(); + configurations.add(new AlertConfiguration(AlertSlot.LUMP_OF_COAL_AND_EXPIRATION, true, (short) 55, false, AlertTriggerType.TIME_TRIGGER, (short) 5, BeepType.XXX, BeepRepetitionType.XXX5)); - V/PodComm: *** encode() CALLED ON ProgramAlertsCommandEncoder - *** encode() CALLED ON HeaderEncoder - *** encode() RESULT FOR HeaderEncoder: 02:42:00:03:28:0C FROM HeaderEncoder{lengthSequenceNumberAndFlags=10252, f6666a=[], encoded=[2, 66, 0, 3, 40, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0} - D/MainActivity: Pod Activation 1: got Pod Event - V/PodComm: *** encode() RESULT FOR ProgramAlertsCommandEncoder: 02:42:00:03:28:0C:19:0A:49:4E:53:2E:78:37:00:05:08:02:03:56 FROM ProgramAlertsCommandEncoder{parameters=ProgramAlertsCommandParameters{configurations=[AlertConfigurationEncoder{slot=7, enabled=true, durationInMinutes=55, autoOff=false, timeTrigger=false, offsetInMinutes=5, beepType=2, beepRepetition=8}]}, f6666a=[], encoded=[2, 66, 0, 3, 40, 12, 25, 10, 73, 78, 83, 46, 120, 55, 0, 5, 8, 2, 3, 86], headerEncoder=HeaderEncoder{lengthSequenceNumberAndFlags=10252, f6666a=[], encoded=[2, 66, 0, 3, 40, 12], headerEncoder=null, commandId=0, f6671f=0, commandBodyLength=0}, commandId=25, f6671f=0, commandBodyLength=10} + byte[] encoded = new ProgramAlertsCommand(37879811, (short) 10, false, configurations).getEncoded(); - V/PodComm: flags: seqNum=10 ack=false mctf=false - Program Alert: - length:10, number of alerts:1 - ------------------------------------- - V/PodComm: alert index: 7 (lump of coal/pod expiration) - enabled: true - duration: 55 minutes - set alarm: false - type: time - trigger after 5 minutes (0.08 hrs) - beep type: 2 - beep repetition: 8 - */ + assertArrayEquals(Hex.decodeHex("02420003280C190A494E532E7837000508020356"), encoded); + } } From e77f08cd2303fa47afb42004a962cf4cd5e93337 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 19:36:45 +0100 Subject: [PATCH 10/20] Add DefaultStatusResponse --- .../pod/command/SetUniqueIdCommand.java | 1 - .../driver/pod/definition/DeliveryStatus.java | 26 ++++ .../pod/response/DefaultStatusResponse.java | 136 ++++++++++++++++++ .../response/DefaultStatusResponseTest.java | 41 ++++++ 4 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java index 00fca3ec36..c4849e1fd6 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java @@ -32,7 +32,6 @@ public class SetUniqueIdCommand extends CommandBase { .putInt(lotNumber) // .putInt(podSequenceNumber) // .array()); - } private static byte[] encodeInitializationTime(Date date) { diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java new file mode 100644 index 0000000000..7dc9618fb5 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java @@ -0,0 +1,26 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public enum DeliveryStatus { + SUSPENDED((byte) 0x00), + BASAL_ACTIVE((byte) 0x01), + TEMP_BASAL_ACTIVE((byte) 0x02), + PRIMING((byte) 0x04), + BOLUS_AND_BASAL_ACTIVE((byte) 0x05), + BOLUS_AND_TEMP_BASAL_ACTIVE((byte) 0x06), + UNKNOWN((byte) 0xff); + + private byte value; + + DeliveryStatus(byte value) { + this.value = value; + } + + public static DeliveryStatus byValue(byte value) { + for (DeliveryStatus status : values()) { + if (status.value == value) { + return status; + } + } + return UNKNOWN; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java new file mode 100644 index 0000000000..69828cfa02 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java @@ -0,0 +1,136 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import java.util.Arrays; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +public class DefaultStatusResponse extends ResponseBase { + private final byte messageType; + private final DeliveryStatus deliveryStatus; + private final PodStatus podStatus; + private final short totalPulsesDelivered; + private final short sequenceNumberOfLastProgrammingCommand; + private final short bolusPulsesRemaining; + private final boolean occlusionAlertActive; + private final boolean alert1Active; + private final boolean alert2Active; + private final boolean alert3Active; + private final boolean alert4Active; + private final boolean alert5Active; + private final boolean alert6Active; + private final boolean alert7Active; + private final short minutesSinceActivation; + private final short reservoirPulsesRemaining; + + public DefaultStatusResponse(byte[] encoded) { + super(ResponseType.DEFAULT_STATUS_RESPONSE, encoded); + + this.messageType = encoded[0]; + this.deliveryStatus = DeliveryStatus.byValue((byte) ((encoded[1] >> 4) & 0x0f)); + this.podStatus = PodStatus.byValue((byte) (encoded[1] & 0x0f)); + this.totalPulsesDelivered = (short) (((encoded[2] & 0x0f) << 12) | ((encoded[3] & 0xff) << 1) | ((encoded[4] & 0xff) >>> 7)); + this.sequenceNumberOfLastProgrammingCommand = (byte) ((encoded[4] >>> 3) & 0x0f); + this.bolusPulsesRemaining = (short) (((encoded[4] & 0x07) << 10) | (encoded[5] & 0xff)); + + short activeAlerts = (short) (((encoded[6] & 0xff) << 1) | (encoded[7] >>> 7)); + this.occlusionAlertActive = (activeAlerts & 1) == 1; + this.alert1Active = ((activeAlerts >> 1) & 1) == 1; + this.alert2Active = ((activeAlerts >> 2) & 1) == 1; + this.alert3Active = ((activeAlerts >> 3) & 1) == 1; + this.alert4Active = ((activeAlerts >> 4) & 1) == 1; + this.alert5Active = ((activeAlerts >> 5) & 1) == 1; + this.alert6Active = ((activeAlerts >> 6) & 1) == 1; + this.alert7Active = ((activeAlerts >> 7) & 1) == 1; + + this.minutesSinceActivation = (short) (((encoded[7] & 0x7f) << 6) | (((encoded[8] & 0xff) >>> 2) & 0x3f)); + this.reservoirPulsesRemaining = (short) (((encoded[8] << 8) | encoded[9]) & 0x3ff); + } + + public byte getMessageType() { + return messageType; + } + + public DeliveryStatus getDeliveryStatus() { + return deliveryStatus; + } + + public PodStatus getPodStatus() { + return podStatus; + } + + public short getTotalPulsesDelivered() { + return totalPulsesDelivered; + } + + public short getSequenceNumberOfLastProgrammingCommand() { + return sequenceNumberOfLastProgrammingCommand; + } + + public short getBolusPulsesRemaining() { + return bolusPulsesRemaining; + } + + public boolean isOcclusionAlertActive() { + return occlusionAlertActive; + } + + public boolean isAlert1Active() { + return alert1Active; + } + + public boolean isAlert2Active() { + return alert2Active; + } + + public boolean isAlert3Active() { + return alert3Active; + } + + public boolean isAlert4Active() { + return alert4Active; + } + + public boolean isAlert5Active() { + return alert5Active; + } + + public boolean isAlert6Active() { + return alert6Active; + } + + public boolean isAlert7Active() { + return alert7Active; + } + + public short getMinutesSinceActivation() { + return minutesSinceActivation; + } + + public short getReservoirPulsesRemaining() { + return reservoirPulsesRemaining; + } + + @Override public String toString() { + return "DefaultStatusResponse{" + + "messageType=" + messageType + + ", deliveryStatus=" + deliveryStatus + + ", podStatus=" + podStatus + + ", totalPulsesDelivered=" + totalPulsesDelivered + + ", sequenceNumberOfLastProgrammingCommand=" + sequenceNumberOfLastProgrammingCommand + + ", bolusPulsesRemaining=" + bolusPulsesRemaining + + ", occlusionAlertActive=" + occlusionAlertActive + + ", alert1Active=" + alert1Active + + ", alert2Active=" + alert2Active + + ", alert3Active=" + alert3Active + + ", alert4Active=" + alert4Active + + ", alert5Active=" + alert5Active + + ", alert6Active=" + alert6Active + + ", alert7Active=" + alert7Active + + ", minutesSinceActivation=" + minutesSinceActivation + + ", reservoirPulsesRemaining=" + reservoirPulsesRemaining + + ", responseType=" + responseType + + ", encoded=" + Arrays.toString(encoded) + + '}'; + } +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java new file mode 100644 index 0000000000..2e3ddbd7c1 --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java @@ -0,0 +1,41 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; + +public class DefaultStatusResponseTest { + @Test + public void testValidResponse() throws DecoderException { + byte[] encoded = Hex.decodeHex("1D1800A02800000463FF"); + DefaultStatusResponse response = new DefaultStatusResponse(encoded); + + assertArrayEquals(encoded, response.getEncoded()); + assertNotSame(encoded, response.getEncoded()); + assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE, response.getResponseType()); + assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE.getValue(), response.getMessageType()); + assertEquals(DeliveryStatus.BASAL_ACTIVE, response.getDeliveryStatus()); + assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.getPodStatus()); + assertEquals((short) 320, response.getTotalPulsesDelivered()); + assertEquals((short) 5, response.getSequenceNumberOfLastProgrammingCommand()); + assertEquals((short) 0, response.getBolusPulsesRemaining()); + assertFalse(response.isOcclusionAlertActive()); + assertFalse(response.isAlert1Active()); + assertFalse(response.isAlert2Active()); + assertFalse(response.isAlert3Active()); + assertFalse(response.isAlert4Active()); + assertFalse(response.isAlert5Active()); + assertFalse(response.isAlert6Active()); + assertFalse(response.isAlert7Active()); + assertEquals((short) 280, response.getMinutesSinceActivation()); + assertEquals((short) 1023, response.getReservoirPulsesRemaining()); + } +} \ No newline at end of file From d4ec8464ea110f72cc18ad8bed02582732fc9a94 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 21:53:26 +0100 Subject: [PATCH 11/20] Add AlarmStatusResponse (Status response page 2) --- omnipod-dash/src/main/AndroidManifest.xml | 3 +- .../dash/driver/pod/definition/AlarmType.java | 174 +++++++++++++ .../AdditionalStatusResponseBase.java | 14 + .../pod/response/AlarmStatusResponse.java | 240 ++++++++++++++++++ .../pod/response/DefaultStatusResponse.java | 32 +-- .../driver/pod/response/ResponseType.java | 6 +- .../pod/response/SetUniqueIdResponse.java | 38 +-- .../pod/response/AlarmStatusResponseTest.java | 56 ++++ 8 files changed, 525 insertions(+), 38 deletions(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java diff --git a/omnipod-dash/src/main/AndroidManifest.xml b/omnipod-dash/src/main/AndroidManifest.xml index e99b57bee2..e93d85a757 100644 --- a/omnipod-dash/src/main/AndroidManifest.xml +++ b/omnipod-dash/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java new file mode 100644 index 0000000000..7fcf8a8ece --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java @@ -0,0 +1,174 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public enum AlarmType { + NONE((byte) 0x00), + ALARM_PW_FLASH_ERASE((byte) 0x01), + ALARM_PW_FLASH_WRITE((byte) 0x02), + ALARM_BASAL_CKSUM((byte) 0x03), + ALARM_BASAL_PPULSE((byte) 0x04), + ALARM_BASAL_STEP((byte) 0x05), + ALARM_AUTO_WAKEUP_TIMEOUT((byte) 0x06), + ALARM_WIRE_OVERDRIVEN((byte) 0x07), + ALARM_BEEP_REP_INVALID_INDEX((byte) 0x08), + ALARM_INVALID_REP_PATTERN((byte) 0x09), + ALARM_TEMP_BASAL_STEP((byte) 0x0a), + ALARM_TEMP_BASAL_CKSUM((byte) 0x0b), + ALARM_BOLUS_OVERFLOW((byte) 0x0c), + ALARM_COP_RESET((byte) 0x0d), + ALARM_ILOP_RESET((byte) 0x0e), + ALARM_ILAD_RESET((byte) 0x0f), + ALARM_SAWCOP_RESET((byte) 0x10), + ALARM_BOLUS_STEP((byte) 0x11), + ALARM_LVD_RESET((byte) 0x12), + ALARM_INVALID_RF_MSG_LENGTH((byte) 0x13), + ALARM_OCCLUDED((byte) 0x14), + ALARM_BOLUSPROG_CHKSUM((byte) 0x15), + ALARM_BOLUS_LOG((byte) 0x16), + ALARM_CRITICAL_VAR((byte) 0x17), + ALARM_EMPTY_RESERVOIR((byte) 0x18), + ALARM_LOADERR((byte) 0x19), + ALARM_PSA_FAILURE((byte) 0x1a), + ALARM_TICKCNT_NOT_CLEARED((byte) 0x1b), + ALARM_PUMP_EXPIRED((byte) 0x1c), + ALARM_COMD_BIT_NOT_SET((byte) 0x1d), + ALARM_INVALID_COMD_SET((byte) 0x1e), + ALARM_ALERTS_ARRAY_CKSM((byte) 0x1f), + ALARM_UNIT_TEST((byte) 0x20), + ALARM_TICK_TIME_ERROR((byte) 0x21), + ALARM_CRITICAL_HAZARD((byte) 0x22), + ALARM_PIEZO_FREQ((byte) 0x23), + ALARM_TICKCNT_ERROR_RTC((byte) 0x24), + ALARM_TICK_FAILURE((byte) 0x25), + ALARM_INVALID((byte) 0x26), + ALARM_LUMP_ALERT_PROGRAM((byte) 0x27), + ALARM_INVALID_PASS_CODE((byte) 0x28), + ALARM_ALERT0((byte) 0x29), + ALARM_ALERT1((byte) 0x2a), + ALARM_ALERT2((byte) 0x2b), + ALARM_ALERT3((byte) 0x2c), + ALARM_ALERT4((byte) 0x2d), + ALARM_ALERT5((byte) 0x2e), + ALARM_ALERT6((byte) 0x2f), + ALARM_ALERT7((byte) 0x30), + ALARM_ILLEGAL_PUMP_STATE((byte) 0x31), + ALARM_COP_TEST_FAILURE((byte) 0x32), + ALARM_MCTF((byte) 0x33), + ALARM_ILLEGAL_RESET((byte) 0x34), + ALARM_VETO_NOT_SET((byte) 0x35), + ALARM_ILLEGAL_PIN_RESET((byte) 0x36), + ALARM_INVALID_BEEP_PATTERN((byte) 0x37), + ALARM_WIRE_STATE_MACHINE((byte) 0x38), + ALARM_VETO_TEST_DEFAULT((byte) 0x39), + ALARM_ALERT_INVALID_INDEX((byte) 0x3a), + ALARM_SAWCOP_TEST_FAIL((byte) 0x3b), + ALARM_MCUCOP_TEST_FAIL((byte) 0x3c), + ALARM_STEP_SENSOR_SHORTED((byte) 0x3d), + ALARM_FLASH_FAILURE((byte) 0x3e), + ALARM_SPARE63((byte) 0x3f), + ALARM_SS_OPEN_CNT_EXCEEDED((byte) 0x40), + ALARM_SS_EXCESSIVE_SUMMED((byte) 0x41), + ALARM_SS_MIN_PULSE_TRANSITION((byte) 0x42), + ALARM_SS_DEFAULT((byte) 0x43), + ALARM_OPEN_WIRE1((byte) 0x44), + ALARM_OPEN_WIRE2((byte) 0x45), + ALARM_LOADERR_FAILURE((byte) 0x46), + ALARM_SAW_VETO_FAILURE((byte) 0x47), + ALARM_BAD_RFM_CLOCK((byte) 0x48), + ALARM_BAD_TICK_HIGH((byte) 0x49), + ALARM_BAD_TICK_PERIOD((byte) 0x4a), + ALARM_BAD_TRIM_VALUE((byte) 0x4b), + ALARM_BAD_BUS_CLOCK((byte) 0x4c), + ALARM_BAD_CAL_MODE((byte) 0x4d), + ALARM_SAW_TRIM_ERROR((byte) 0x4e), + ALARM_RFM_CRYSTAL_ERROR((byte) 0x4f), + ALARM_CALST_TIMEOUT((byte) 0x50), + ALARM_TICKCNT_ERROR((byte) 0x51), + ALARM_BAD_RFM_XTAL_START((byte) 0x52), + ALARM_BAD_RX_SENSENSITIVITY((byte) 0x53), + ALARM_BAD_TX_PKT_SIZE((byte) 0x54), + ALARM_TICK_LOW_PHASE_EXCEEDED((byte) 0x55), + ALARM_TICK_HIGH_PHASE_EXCEEDED((byte) 0x56), + ALARM_OCCL_CRITVAR_FAIL((byte) 0x57), + ALARM_OCCL_PARAM((byte) 0x58), + ALARM_PROG_OCCL_FAIL((byte) 0x59), + ALARM_PW_TO_HIGH_FOR_OCCL_DET((byte) 0x5a), + ALARM_OCCL_CSUM((byte) 0x5b), + ALARM_PRIME_OPEN_CNT_TO_LOW((byte) 0x5c), + ALARM_BAD_RF_CDTHR((byte) 0x5d), + ALARM_FLASH_NOT_SECURE((byte) 0x5e), + ALARM_WIRE_TEST_OPEN_GROUND((byte) 0x5f), + ALARM_OCCL_STARTUP1((byte) 0x60), + ALARM_OCCL_STARTUP2((byte) 0x61), + ALARM_OCCL_EXCESS_TIMEOUTS1((byte) 0x62), + ALARM_SPARE99((byte) 0x63), + ALARM_SPARE100((byte) 0x64), + ALARM_SPARE101((byte) 0x65), + ALARM_OCCL_EXCESS_TIMEOUTS2((byte) 0x66), + ALARM_OCCL_EXCESS_TIMEOUTS3((byte) 0x67), + ALARM_OCCL_NOISY_PULSE_WIDTHS((byte) 0x68), + ALARM_OCCL_AT_BOLUS_END((byte) 0x69), + ALARM_OCCL_ABOVE_THRESHOLD((byte) 0x6a), + ALARM_BASAL_UNDERINFUSION((byte) 0x80), + ALARM_BASAL_OVERINFUSION((byte) 0x81), + ALARM_TEMP_UNDERINFUSION((byte) 0x82), + ALARM_TEMP_OVERINFUSION((byte) 0x83), + ALARM_BOLUS_UNDERINFUSION((byte) 0x84), + ALARM_BOLUS_OVERINFUSION((byte) 0x85), + ALARM_BASAL_OVERINFUSION_PULSE((byte) 0x86), + ALARM_TEMP_OVERINFUSION_PULSE((byte) 0x87), + ALARM_BOLUS_OVERINFUSION_PULSE((byte) 0x88), + ALARM_IMMBOLUS_UNDERINFUSION_PULSE((byte) 0x89), + ALARM_EXTBOLUS_OVERINFUSION_PULSE((byte) 0x8a), + ALARM_PROGRAM_CSUM((byte) 0x8b), + ALARM_UNUSED_140((byte) 0x8c), + ALARM_UNRECOGNIZED_PULSE((byte) 0x8d), + ALARM_SYNC_WITHOUT_TEMP_ACTIVE((byte) 0x8e), + ALARM_INTERLOCK_LOAD((byte) 0x8f), + ALARM_ILLEGAL_CHAN_PARAM((byte) 0x90), + ALARM_BASAL_PULSE_CHAN_INACTIVE((byte) 0x91), + ALARM_TEMP_PULSE_CHAN_INACTIVE((byte) 0x92), + ALARM_BOLUS_PULSE_CHAN_INACTIVE((byte) 0x93), + ALARM_INT_SEMAPHORE_NOT_SET((byte) 0x94), + ALARM_ILLEGAL_INTERLOCK_CHAN((byte) 0x95), + ALARM_TERMINATE_BOLUS((byte) 0x96), + ALARM_OPEN_TRANSITIONS_COUNT((byte) 0x97), + ALARM_BLE_TO((byte) 0xa0), + ALARM_BLE_INITIATED((byte) 0xa1), + ALARM_BLE_UNK_ALARM((byte) 0xa2), + ALARM_UNUSED_163((byte) 0xa3), + ALARM_UNUSED_164((byte) 0xa4), + ALARM_UNUSED_165((byte) 0xa5), + ALARM_BLE_IAAS((byte) 0xa6), + ALARM_UNUSED_167((byte) 0xa7), + ALARM_CRC_FAILURE((byte) 0xa8), + ALARM_BLE_WD_PING_TIMEOUT((byte) 0xa9), + ALARM_BLE_EXCESSIVE_RESETS((byte) 0xaa), + ALARM_BLE_NAK_ERROR((byte) 0xab), + ALARM_BLE_REQ_HIGH_TIMEOUT((byte) 0xac), + ALARM_BLE_UNKNOWN_RESP((byte) 0xad), + ALARM_BLE_UNUSED_174((byte) 0xae), + ALARM_BLE_REQ_STUCK_HIGH((byte) 0xaf), + ALARM_BLE_STATE_MACHINE_1((byte) 0xb1), + ALARM_BLE_STATE_MACHINE_2((byte) 0xb2), + ALARM_BLE_UNUSED_179((byte) 0xb3), + ALARM_BLE_ARB_LOST((byte) 0xb4), + ALARM_BLE_ER48_DUAL_NACK((byte) 0xc0), + ALARM_BLE_QN_EXCEED_MAX_RETRY((byte) 0xc1), + ALARM_BLE_QN_CRIT_VAR_FAIL((byte) 0xc2), + UNKNOWN((byte) 0xff); + + private byte value; + + AlarmType(byte value) { + this.value = value; + } + + public static AlarmType byValue(byte value) { + for (AlarmType type : values()) { + if (type.value == value) { + return type; + } + } + return UNKNOWN; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java new file mode 100644 index 0000000000..efb356681e --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java @@ -0,0 +1,14 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +public class AdditionalStatusResponseBase extends ResponseBase { + final ResponseType.AdditionalStatusResponseType statusResponseType; + + AdditionalStatusResponseBase(ResponseType.AdditionalStatusResponseType statusResponseType, byte[] encoded) { + super(ResponseType.ADDITIONAL_STATUS_RESPONSE, encoded); + this.statusResponseType = statusResponseType; + } + + public ResponseType.AdditionalStatusResponseType getStatusResponseType() { + return statusResponseType; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java new file mode 100644 index 0000000000..bb7ce23766 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java @@ -0,0 +1,240 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import java.nio.ByteBuffer; +import java.util.Arrays; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +public class AlarmStatusResponse extends AdditionalStatusResponseBase { + private final byte messageType; + private final short messageLength; + private final byte additionalStatusResponseType; + private final PodStatus podStatus; + private final DeliveryStatus deliveryStatus; + private final short bolusPulsesRemaining; + private final short sequenceNumberOfLastProgrammingCommand; + private final short totalPulsesDelivered; + private final AlarmType alarmType; + private final short alarmTime; + private final short reservoirPulsesRemaining; + private final short minutesSinceActivation; + private final boolean alert0Active; + private final boolean alert1Active; + private final boolean alert2Active; + private final boolean alert3Active; + private final boolean alert4Active; + private final boolean alert5Active; + private final boolean alert6Active; + private final boolean alert7Active; + private final boolean occlusionAlarm; + private final boolean pulseInfoInvalid; + private final PodStatus podStatusWhenAlarmOccurred; + private final boolean immediateBolusWhenAlarmOccurred; + private final byte occlusionType; + private final boolean occurredWhenFetchingImmediateBolusActiveInformation; + private final short rssi; + private final short receiverLowerGain; + private final PodStatus podStatusWhenAlarmOccurred2; + private final short returnAddressOfPodAlarmHandlerCaller; + + public AlarmStatusResponse(byte[] encoded) { + super(ResponseType.AdditionalStatusResponseType.ALARM_STATUS, encoded); + messageType = encoded[0]; + messageLength = (short) (encoded[1] & 0xff); + additionalStatusResponseType = encoded[2]; + podStatus = PodStatus.byValue((byte) (encoded[3] & 0x0f)); + deliveryStatus = DeliveryStatus.byValue((byte) (encoded[4] & 0x0f)); + bolusPulsesRemaining = (short) (ByteBuffer.wrap(new byte[]{encoded[5], encoded[6]}).getShort() & 2047); + sequenceNumberOfLastProgrammingCommand = (short) (encoded[7] & 0x0f); + totalPulsesDelivered = ByteBuffer.wrap(new byte[]{encoded[8], encoded[9]}).getShort(); + alarmType = AlarmType.byValue(encoded[10]); + alarmTime = ByteBuffer.wrap(new byte[]{encoded[11], encoded[12]}).getShort(); + reservoirPulsesRemaining = ByteBuffer.wrap(new byte[]{encoded[13], encoded[14]}).getShort(); + minutesSinceActivation = ByteBuffer.wrap(new byte[]{encoded[15], encoded[16]}).getShort(); + + byte activeAlerts = encoded[17]; + alert0Active = (activeAlerts & 1) == 1; + alert1Active = ((activeAlerts >>> 1) & 1) == 1; + alert2Active = ((activeAlerts >>> 2) & 1) == 1; + alert3Active = ((activeAlerts >>> 3) & 1) == 1; + alert4Active = ((activeAlerts >>> 4) & 1) == 1; + alert5Active = ((activeAlerts >>> 5) & 1) == 1; + alert6Active = ((activeAlerts >>> 6) & 1) == 1; + alert7Active = ((activeAlerts >>> 7) & 1) == 1; + + byte alarmFlags = encoded[18]; + occlusionAlarm = (alarmFlags & 1) == 1; + pulseInfoInvalid = ((alarmFlags >> 1) & 1) == 1; + + byte byte19 = encoded[19]; + byte byte20 = encoded[20]; + podStatusWhenAlarmOccurred = PodStatus.byValue((byte) (byte19 & 0x0f)); + immediateBolusWhenAlarmOccurred = ((byte19 >> 4) & 1) == 1; + occlusionType = (byte) ((byte19 >> 5) & 3); + occurredWhenFetchingImmediateBolusActiveInformation = ((byte19 >> 7) & 1) == 1; + rssi = (short) (byte20 & 0x3f); + receiverLowerGain = (short) ((byte20 >> 6) & 0x03); + podStatusWhenAlarmOccurred2 = PodStatus.byValue((byte) (encoded[21] & 0x0f)); + returnAddressOfPodAlarmHandlerCaller = ByteBuffer.wrap(new byte[]{encoded[22], encoded[23]}).getShort(); + } + + public byte getMessageType() { + return messageType; + } + + public short getMessageLength() { + return messageLength; + } + + public byte getAdditionalStatusResponseType() { + return additionalStatusResponseType; + } + + public PodStatus getPodStatus() { + return podStatus; + } + + public DeliveryStatus getDeliveryStatus() { + return deliveryStatus; + } + + public short getBolusPulsesRemaining() { + return bolusPulsesRemaining; + } + + public short getSequenceNumberOfLastProgrammingCommand() { + return sequenceNumberOfLastProgrammingCommand; + } + + public short getTotalPulsesDelivered() { + return totalPulsesDelivered; + } + + public AlarmType getAlarmType() { + return alarmType; + } + + public short getAlarmTime() { + return alarmTime; + } + + public short getReservoirPulsesRemaining() { + return reservoirPulsesRemaining; + } + + public short getMinutesSinceActivation() { + return minutesSinceActivation; + } + + public boolean isAlert0Active() { + return alert0Active; + } + + public boolean isAlert1Active() { + return alert1Active; + } + + public boolean isAlert2Active() { + return alert2Active; + } + + public boolean isAlert3Active() { + return alert3Active; + } + + public boolean isAlert4Active() { + return alert4Active; + } + + public boolean isAlert5Active() { + return alert5Active; + } + + public boolean isAlert6Active() { + return alert6Active; + } + + public boolean isAlert7Active() { + return alert7Active; + } + + public boolean isOcclusionAlarm() { + return occlusionAlarm; + } + + public boolean isPulseInfoInvalid() { + return pulseInfoInvalid; + } + + public PodStatus getPodStatusWhenAlarmOccurred() { + return podStatusWhenAlarmOccurred; + } + + public boolean isImmediateBolusWhenAlarmOccurred() { + return immediateBolusWhenAlarmOccurred; + } + + public byte getOcclusionType() { + return occlusionType; + } + + public boolean isOccurredWhenFetchingImmediateBolusActiveInformation() { + return occurredWhenFetchingImmediateBolusActiveInformation; + } + + public short getRssi() { + return rssi; + } + + public short getReceiverLowerGain() { + return receiverLowerGain; + } + + public PodStatus getPodStatusWhenAlarmOccurred2() { + return podStatusWhenAlarmOccurred2; + } + + public short getReturnAddressOfPodAlarmHandlerCaller() { + return returnAddressOfPodAlarmHandlerCaller; + } + + @Override public String toString() { + return "AlarmStatusResponse{" + + "messageType=" + messageType + + ", messageLength=" + messageLength + + ", additionalStatusResponseType=" + additionalStatusResponseType + + ", podStatus=" + podStatus + + ", deliveryStatus=" + deliveryStatus + + ", bolusPulsesRemaining=" + bolusPulsesRemaining + + ", sequenceNumberOfLastProgrammingCommand=" + sequenceNumberOfLastProgrammingCommand + + ", totalPulsesDelivered=" + totalPulsesDelivered + + ", alarmType=" + alarmType + + ", alarmTime=" + alarmTime + + ", reservoirPulsesRemaining=" + reservoirPulsesRemaining + + ", minutesSinceActivation=" + minutesSinceActivation + + ", alert0Active=" + alert0Active + + ", alert1Active=" + alert1Active + + ", alert2Active=" + alert2Active + + ", alert3Active=" + alert3Active + + ", alert4Active=" + alert4Active + + ", alert5Active=" + alert5Active + + ", alert6Active=" + alert6Active + + ", alert7Active=" + alert7Active + + ", occlusionAlarm=" + occlusionAlarm + + ", pulseInfoInvalid=" + pulseInfoInvalid + + ", podStatusWhenAlarmOccurred=" + podStatusWhenAlarmOccurred + + ", immediateBolusWhenAlarmOccurred=" + immediateBolusWhenAlarmOccurred + + ", occlusionType=" + occlusionType + + ", occurredWhenFetchingImmediateBolusActiveInformation=" + occurredWhenFetchingImmediateBolusActiveInformation + + ", rssi=" + rssi + + ", receiverLowerGain=" + receiverLowerGain + + ", podStatusWhenAlarmOccurred2=" + podStatusWhenAlarmOccurred2 + + ", returnAddressOfPodAlarmHandlerCaller=" + returnAddressOfPodAlarmHandlerCaller + + ", statusResponseType=" + statusResponseType + + ", responseType=" + responseType + + ", encoded=" + Arrays.toString(encoded) + + '}'; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java index 69828cfa02..bc448f18fb 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java @@ -26,25 +26,25 @@ public class DefaultStatusResponse extends ResponseBase { public DefaultStatusResponse(byte[] encoded) { super(ResponseType.DEFAULT_STATUS_RESPONSE, encoded); - this.messageType = encoded[0]; - this.deliveryStatus = DeliveryStatus.byValue((byte) ((encoded[1] >> 4) & 0x0f)); - this.podStatus = PodStatus.byValue((byte) (encoded[1] & 0x0f)); - this.totalPulsesDelivered = (short) (((encoded[2] & 0x0f) << 12) | ((encoded[3] & 0xff) << 1) | ((encoded[4] & 0xff) >>> 7)); - this.sequenceNumberOfLastProgrammingCommand = (byte) ((encoded[4] >>> 3) & 0x0f); - this.bolusPulsesRemaining = (short) (((encoded[4] & 0x07) << 10) | (encoded[5] & 0xff)); + messageType = encoded[0]; + deliveryStatus = DeliveryStatus.byValue((byte) ((encoded[1] >> 4) & 0x0f)); + podStatus = PodStatus.byValue((byte) (encoded[1] & 0x0f)); + totalPulsesDelivered = (short) (((encoded[2] & 0x0f) << 12) | ((encoded[3] & 0xff) << 1) | ((encoded[4] & 0xff) >>> 7)); + sequenceNumberOfLastProgrammingCommand = (byte) ((encoded[4] >>> 3) & 0x0f); + bolusPulsesRemaining = (short) ((((encoded[4] & 0x07) << 10) | (encoded[5] & 0xff)) & 2047); short activeAlerts = (short) (((encoded[6] & 0xff) << 1) | (encoded[7] >>> 7)); - this.occlusionAlertActive = (activeAlerts & 1) == 1; - this.alert1Active = ((activeAlerts >> 1) & 1) == 1; - this.alert2Active = ((activeAlerts >> 2) & 1) == 1; - this.alert3Active = ((activeAlerts >> 3) & 1) == 1; - this.alert4Active = ((activeAlerts >> 4) & 1) == 1; - this.alert5Active = ((activeAlerts >> 5) & 1) == 1; - this.alert6Active = ((activeAlerts >> 6) & 1) == 1; - this.alert7Active = ((activeAlerts >> 7) & 1) == 1; + occlusionAlertActive = (activeAlerts & 1) == 1; + alert1Active = ((activeAlerts >> 1) & 1) == 1; + alert2Active = ((activeAlerts >> 2) & 1) == 1; + alert3Active = ((activeAlerts >> 3) & 1) == 1; + alert4Active = ((activeAlerts >> 4) & 1) == 1; + alert5Active = ((activeAlerts >> 5) & 1) == 1; + alert6Active = ((activeAlerts >> 6) & 1) == 1; + alert7Active = ((activeAlerts >> 7) & 1) == 1; - this.minutesSinceActivation = (short) (((encoded[7] & 0x7f) << 6) | (((encoded[8] & 0xff) >>> 2) & 0x3f)); - this.reservoirPulsesRemaining = (short) (((encoded[8] << 8) | encoded[9]) & 0x3ff); + minutesSinceActivation = (short) (((encoded[7] & 0x7f) << 6) | (((encoded[8] & 0xff) >>> 2) & 0x3f)); + reservoirPulsesRemaining = (short) (((encoded[8] << 8) | encoded[9]) & 0x3ff); } public byte getMessageType() { diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java index 1dff970efe..384ae11c0e 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java @@ -28,7 +28,7 @@ public enum ResponseType { enum AdditionalStatusResponseType { STATUS_RESPONSE_PAGE_1((byte) 0x01), - STATUS_RESPONSE_PAGE_2((byte) 0x02), + ALARM_STATUS((byte) 0x02), STATUS_RESPONSE_PAGE_3((byte) 0x03), STATUS_RESPONSE_PAGE_5((byte) 0x05), STATUS_RESPONSE_PAGE_6((byte) 0x06), @@ -51,6 +51,10 @@ public enum ResponseType { } return UNKNOWN; } + + public byte getValue() { + return value; + } } enum ActivationResponseType { diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java index 798643df00..2c0703258a 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java @@ -29,25 +29,25 @@ public final class SetUniqueIdResponse extends ActivationResponseBase { public SetUniqueIdResponse(byte[] encoded) { super(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, encoded); - this.messageType = encoded[0]; - this.messageLength = (short) (encoded[1] & 0xff); - this.pulseVolumeInTenThousandthMicroLiter = ByteBuffer.wrap(new byte[]{encoded[2], encoded[3]}).getShort(); - this.pumpRate = (short) (encoded[4] & 0xff); - this.primePumpRate = (short) (encoded[5] & 0xff); - this.numberOfEngagingClutchDrivePulses = (short) (encoded[6] & 0xff); - this.numberOfPrimePulses = (short) (encoded[7] & 0xff); - this.podExpirationTimeInHours = (short) (encoded[8] & 0xff); - this.firmwareVersionMajor = (short) (encoded[9] & 0xff); - this.firmwareVersionMinor = (short) (encoded[10] & 0xff); - this.firmwareVersionInterim = (short) (encoded[11] & 0xff); - this.bleVersionMajor = (short) (encoded[12] & 0xff); - this.bleVersionMinor = (short) (encoded[13] & 0xff); - this.bleVersionInterim = (short) (encoded[14] & 0xff); - this.productId = (short) (encoded[15] & 0xff); - this.podStatus = PodStatus.byValue(encoded[16]); - this.lotNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[17], encoded[18], encoded[19], encoded[20]}).getLong(); - this.podSequenceNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[21], encoded[22], encoded[23], encoded[24]}).getLong(); - this.uniqueIdReceivedInCommand = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[25], encoded[26], encoded[27], encoded[28]}).getLong(); + messageType = encoded[0]; + messageLength = (short) (encoded[1] & 0xff); + pulseVolumeInTenThousandthMicroLiter = ByteBuffer.wrap(new byte[]{encoded[2], encoded[3]}).getShort(); + pumpRate = (short) (encoded[4] & 0xff); + primePumpRate = (short) (encoded[5] & 0xff); + numberOfEngagingClutchDrivePulses = (short) (encoded[6] & 0xff); + numberOfPrimePulses = (short) (encoded[7] & 0xff); + podExpirationTimeInHours = (short) (encoded[8] & 0xff); + firmwareVersionMajor = (short) (encoded[9] & 0xff); + firmwareVersionMinor = (short) (encoded[10] & 0xff); + firmwareVersionInterim = (short) (encoded[11] & 0xff); + bleVersionMajor = (short) (encoded[12] & 0xff); + bleVersionMinor = (short) (encoded[13] & 0xff); + bleVersionInterim = (short) (encoded[14] & 0xff); + productId = (short) (encoded[15] & 0xff); + podStatus = PodStatus.byValue(encoded[16]); + lotNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[17], encoded[18], encoded[19], encoded[20]}).getLong(); + podSequenceNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[21], encoded[22], encoded[23], encoded[24]}).getLong(); + uniqueIdReceivedInCommand = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[25], encoded[26], encoded[27], encoded[28]}).getLong(); } public byte getMessageType() { diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java new file mode 100644 index 0000000000..892f22cdb2 --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java @@ -0,0 +1,56 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; + +public class AlarmStatusResponseTest { + @Test + public void testValidResponse() throws DecoderException { + byte[] encoded = Hex.decodeHex("021602080100000501BD00000003FF01950000000000670A"); + AlarmStatusResponse response = new AlarmStatusResponse(encoded); + + assertArrayEquals(encoded, response.getEncoded()); + assertNotSame(encoded, response.getEncoded()); + assertEquals(ResponseType.ADDITIONAL_STATUS_RESPONSE, response.getResponseType()); + assertEquals(ResponseType.ADDITIONAL_STATUS_RESPONSE.getValue(), response.getMessageType()); + assertEquals(ResponseType.AdditionalStatusResponseType.ALARM_STATUS, response.getStatusResponseType()); + assertEquals(ResponseType.AdditionalStatusResponseType.ALARM_STATUS.getValue(), response.getAdditionalStatusResponseType()); + assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.getPodStatus()); + assertEquals(DeliveryStatus.BASAL_ACTIVE, response.getDeliveryStatus()); + assertEquals((short) 0, response.getBolusPulsesRemaining()); + assertEquals((short) 5, response.getSequenceNumberOfLastProgrammingCommand()); + assertEquals((short) 445, response.getTotalPulsesDelivered()); + assertEquals(AlarmType.NONE, response.getAlarmType()); + assertEquals((short) 0, response.getAlarmTime()); + assertEquals((short) 1023, response.getReservoirPulsesRemaining()); + assertEquals((short) 405, response.getMinutesSinceActivation()); + assertFalse(response.isAlert0Active()); + assertFalse(response.isAlert1Active()); + assertFalse(response.isAlert2Active()); + assertFalse(response.isAlert3Active()); + assertFalse(response.isAlert4Active()); + assertFalse(response.isAlert5Active()); + assertFalse(response.isAlert6Active()); + assertFalse(response.isAlert7Active()); + assertFalse(response.isOcclusionAlarm()); + assertFalse(response.isPulseInfoInvalid()); + assertEquals(PodStatus.UNINITIALIZED, response.getPodStatusWhenAlarmOccurred()); + assertFalse(response.isImmediateBolusWhenAlarmOccurred()); + assertEquals((byte) 0x00, response.getOcclusionType()); + assertFalse(response.isOccurredWhenFetchingImmediateBolusActiveInformation()); + assertEquals(0, response.getRssi()); + assertEquals(0, response.getReceiverLowerGain()); + assertEquals(PodStatus.UNINITIALIZED, response.getPodStatusWhenAlarmOccurred2()); + assertEquals((short) 26378, response.getReturnAddressOfPodAlarmHandlerCaller()); + } +} \ No newline at end of file From 1afc0ae2a90822948a26b7bb2d628e51ff2c6d32 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 21:58:14 +0100 Subject: [PATCH 12/20] Remove comment --- .../omnipod/dash/driver/pod/definition/AlertConfiguration.java | 1 - 1 file changed, 1 deletion(-) diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java index 4dc12b4e07..f620df086d 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java @@ -23,7 +23,6 @@ public class AlertConfiguration { this.beepRepetition = beepRepetition; } - /* renamed from: d */ public byte[] getEncoded() { byte firstByte = (byte) (slot.getValue() << 4); if (enabled) { From 43c3b429129c6e93a0c39a691cc172bf6d1a02dc Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 22:35:44 +0100 Subject: [PATCH 13/20] Add SilenceAlertsCommand (untested) --- .../pod/command/SilenceAlertsCommand.java | 61 +++++++++++++++++++ .../dash/driver/pod/definition/AlertSlot.java | 10 ++- .../pod/command/ProgramAlertsCommandTest.java | 6 +- .../pod/command/SilenceAlertsCommandTest.java | 5 ++ 4 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java new file mode 100644 index 0000000000..bb2609846f --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java @@ -0,0 +1,61 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import java.nio.ByteBuffer; +import java.util.BitSet; + +public class SilenceAlertsCommand extends CommandBase { + private static final short LENGTH = (short) 7; + private static final byte BODY_LENGTH = (byte) 5; + + private final SilenceAlertCommandParameters parameters; + + public SilenceAlertsCommand(int address, short sequenceNumber, boolean unknown, SilenceAlertCommandParameters parameters) { + super(CommandType.SILENCE_ALERTS, address, sequenceNumber, unknown); + this.parameters = parameters; + } + + @Override public byte[] getEncoded() { + return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) // + .put(encodeHeader(address, sequenceNumber, LENGTH, unknown)) // + .put(commandType.getValue()) // + .put(BODY_LENGTH) // + .putInt(1229869870) // FIXME ?? was: byte array of int 777211465 converted to little endian + .put(parameters.getEncoded()) // + .array()); + } + + public static final class SilenceAlertCommandParameters { + private final boolean silenceAutoOffAlert; + private final boolean silenceMultiCommandAlert; + private final boolean silenceExpirationImminentAlert; + private final boolean silenceUserSetExpirationAlert; + private final boolean silenceLowReservoirAlert; + private final boolean silenceSuspendInProgressAlert; + private final boolean silenceSuspendEndedAlert; + private final boolean silencePodExpirationAlert; + + public SilenceAlertCommandParameters(boolean silenceAutoOffAlert, boolean silenceMultiCommandAlert, boolean silenceExpirationImminentAlert, boolean silenceUserSetExpirationAlert, boolean silenceLowReservoirAlert, boolean silenceSuspendInProgressAlert, boolean silenceSuspendEndedAlert, boolean silencePodExpirationAlert) { + this.silenceAutoOffAlert = silenceAutoOffAlert; + this.silenceMultiCommandAlert = silenceMultiCommandAlert; + this.silenceExpirationImminentAlert = silenceExpirationImminentAlert; + this.silenceUserSetExpirationAlert = silenceUserSetExpirationAlert; + this.silenceLowReservoirAlert = silenceLowReservoirAlert; + this.silenceSuspendInProgressAlert = silenceSuspendInProgressAlert; + this.silenceSuspendEndedAlert = silenceSuspendEndedAlert; + this.silencePodExpirationAlert = silencePodExpirationAlert; + } + + public byte[] getEncoded() { + BitSet bitSet = new BitSet(8); + bitSet.set(0, this.silenceAutoOffAlert); + bitSet.set(1, this.silenceMultiCommandAlert); + bitSet.set(2, this.silenceExpirationImminentAlert); + bitSet.set(3, this.silenceUserSetExpirationAlert); + bitSet.set(4, this.silenceLowReservoirAlert); + bitSet.set(5, this.silenceSuspendInProgressAlert); + bitSet.set(6, this.silenceSuspendEndedAlert); + bitSet.set(7, this.silencePodExpirationAlert); + return bitSet.toByteArray(); + } + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java index 0eb6450c32..9e8b23cb74 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java @@ -1,11 +1,15 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; public enum AlertSlot { + AUTO_OFF((byte) 0x00), + MULTI_COMMAND((byte) 0x01), EXPIRATION_IMMINENT((byte) 0x02), + USER_SET_EXPIRATION((byte) 0x03), LOW_RESERVOIR((byte) 0x04), - USER_POD_EXPIRATION((byte) 0x03), - LUMP_OF_COAL_AND_EXPIRATION((byte) 0x07), - UNKNOWN((byte) 255); + SUSPEND_IN_PROGRESS((byte) 0x05), + SUSPEND_ENDED((byte) 0x06), + EXPIRATION((byte) 0x07), + UNKNOWN((byte) 0xff); private byte value; diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java index 280bb7d7a2..a849ca74e0 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java @@ -19,7 +19,7 @@ public class ProgramAlertsCommandTest { @Test public void testExpirationAlerts() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.LUMP_OF_COAL_AND_EXPIRATION, true, (short) 420, false, AlertTriggerType.TIME_TRIGGER, (short) 4305, BeepType.XXX, BeepRepetitionType.XXX3)); + configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 420, false, AlertTriggerType.TIME_TRIGGER, (short) 4305, BeepType.XXX, BeepRepetitionType.XXX3)); configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION_IMMINENT, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4725, BeepType.XXX, BeepRepetitionType.XXX4)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 3, true, configurations).getEncoded(); @@ -40,7 +40,7 @@ public class ProgramAlertsCommandTest { @Test public void testUserExpirationAlert() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.USER_POD_EXPIRATION, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4079, BeepType.XXX, BeepRepetitionType.XXX2)); + configurations.add(new AlertConfiguration(AlertSlot.USER_SET_EXPIRATION, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4079, BeepType.XXX, BeepRepetitionType.XXX2)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 15, false, configurations).getEncoded(); @@ -51,7 +51,7 @@ public class ProgramAlertsCommandTest { @Test public void testLumpOfCoalAlert() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.LUMP_OF_COAL_AND_EXPIRATION, true, (short) 55, false, AlertTriggerType.TIME_TRIGGER, (short) 5, BeepType.XXX, BeepRepetitionType.XXX5)); + configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 55, false, AlertTriggerType.TIME_TRIGGER, (short) 5, BeepType.XXX, BeepRepetitionType.XXX5)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 10, false, configurations).getEncoded(); diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java new file mode 100644 index 0000000000..a107d38e6e --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +// TODO capture silence alerts command +public class SilenceAlertsCommandTest { +} \ No newline at end of file From 93e4e924fa1ff16ee1c792f5e2296b414539570f Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 22:55:42 +0100 Subject: [PATCH 14/20] Add NakResponse (untested) --- .../driver/pod/definition/NakErrorType.java | 49 +++++++++++++ .../dash/driver/pod/response/NakResponse.java | 71 +++++++++++++++++++ .../driver/pod/response/NakResponseTest.java | 5 ++ 3 files changed, 125 insertions(+) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java new file mode 100644 index 0000000000..d6482386ee --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java @@ -0,0 +1,49 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; + +public enum NakErrorType { + FLASH_WRITE((byte) 0x01), + FLASH_ERASE((byte) 0x02), + FLASH_OPERATION((byte) 0x03), + FLASH_ADDR((byte) 0x04), + POD_STATE((byte) 0x05), + CRITICAL_VARIABLE((byte) 0x06), + ILLEGAL_PARAM((byte) 0x07), + BOLUS_CRITICAL_VAR((byte) 0x08), + INT_ILLEGAL_PARAM((byte) 0x09), + ILLEGAL_CHECKSUM((byte) 0x0a), + INVALID_MSG_LEN((byte) 0x0b), + PUMP_STATE((byte) 0x0c), + ILLEGAL_COMMAND((byte) 0x0d), + ILLEGAL_FILL_STATE((byte) 0x0e), + MAX_READWRITE_SIZE((byte) 0x0f), + ILLEGAL_READ_ADDRESS((byte) 0x10), + ILLEGAL_READ_MEM_TYPE((byte) 0x11), + INIT_POD((byte) 0x12), + ILLEGAL_CMD_STATE((byte) 0x13), + ILLEGAL_SECURITY_CODE((byte) 0x14), + POD_IN_ALARM((byte) 0x15), + COMD_NOT_SET((byte) 0x16), + ILLEGAL_RX_SENS_VALUE((byte) 0x17), + ILLEGAL_TX_PKT_SIZE((byte) 0x18), + OCCL_PARAMS_ALREADY_SET((byte) 0x19), + OCCL_PARAM((byte) 0x1a), + ILLEGAL_CDTHR_VALUE((byte) 0x1b), + IGNORE_COMMAND((byte) 0x1c), + INVALID_CRC((byte) 0x1d), + UNKNOWN((byte) 0xff); + + private byte value; + + NakErrorType(byte value) { + this.value = value; + } + + public static NakErrorType byValue(byte value) { + for (NakErrorType type : values()) { + if (type.value == value) { + return type; + } + } + return UNKNOWN; + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java new file mode 100644 index 0000000000..8b55189ebe --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java @@ -0,0 +1,71 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +import java.util.Arrays; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +public class NakResponse extends ResponseBase { + private final byte messageType; + private final short messageLength; + private final NakErrorType nakErrorType; + private final AlarmType alarmType; + private final PodStatus podStatus; + private final short securityNakSyncCount; + + public NakResponse(byte[] encoded) { + super(ResponseType.NAK_RESPONSE, encoded); + this.messageType = encoded[0]; + this.messageLength = encoded[1]; + this.nakErrorType = NakErrorType.byValue(encoded[2]); + byte byte3 = encoded[3]; + byte byte4 = encoded[4]; + if (nakErrorType == NakErrorType.ILLEGAL_SECURITY_CODE) { + this.securityNakSyncCount = (short) ((byte3 << 8) | byte4); + this.alarmType = null; + this.podStatus = null; + } else { + this.securityNakSyncCount = 0; + this.alarmType = AlarmType.byValue(byte3); + this.podStatus = PodStatus.byValue(byte4); + } + } + + public byte getMessageType() { + return messageType; + } + + public short getMessageLength() { + return messageLength; + } + + public NakErrorType getNakErrorType() { + return nakErrorType; + } + + public AlarmType getAlarmType() { + return alarmType; + } + + public PodStatus getPodStatus() { + return podStatus; + } + + public short getSecurityNakSyncCount() { + return securityNakSyncCount; + } + + @Override public String toString() { + return "NakResponse{" + + "messageType=" + messageType + + ", messageLength=" + messageLength + + ", nakErrorType=" + nakErrorType + + ", alarmType=" + alarmType + + ", podStatus=" + podStatus + + ", securityNakSyncCount=" + securityNakSyncCount + + ", responseType=" + responseType + + ", encoded=" + Arrays.toString(encoded) + + '}'; + } +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java new file mode 100644 index 0000000000..393cb41e4e --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; + +// TODO capture NAK response +public class NakResponseTest { +} \ No newline at end of file From e7e6f523050969c86c9826990e215483946dddef Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Wed, 10 Feb 2021 23:52:48 +0100 Subject: [PATCH 15/20] Add StopDeliveryCommand, add test for NakResponse --- .../pod/command/StopDeliveryCommand.java | 55 +++++++++++++++++++ .../dash/driver/pod/definition/BeepType.java | 4 +- .../pod/command/ProgramAlertsCommandTest.java | 10 ++-- .../pod/command/StopDeliveryCommandTest.java | 29 ++++++++++ .../driver/pod/response/NakResponseTest.java | 27 ++++++++- 5 files changed, 117 insertions(+), 8 deletions(-) create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java create mode 100644 omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java new file mode 100644 index 0000000000..99cc1da256 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java @@ -0,0 +1,55 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import java.nio.ByteBuffer; +import java.util.BitSet; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType; + +public class StopDeliveryCommand extends CommandBase { + private static final short LENGTH = 7; + private static final byte BODY_LENGTH = 5; + + private final DeliveryType deliveryType; + private final BeepType beepType; + + public StopDeliveryCommand(int address, short sequenceNumber, boolean unknown, DeliveryType deliveryType, BeepType beepType) { + super(CommandType.STOP_DELIVERY, address, sequenceNumber, unknown); + this.deliveryType = deliveryType; + this.beepType = beepType; + } + + @Override public byte[] getEncoded() { + return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) // + .put(encodeHeader(address, sequenceNumber, LENGTH, unknown)) // + .put(commandType.getValue()) // + .put(BODY_LENGTH) // + .putInt(1229869870) // FIXME ?? was: byte array of int 777211465 converted to little endian + .put((byte) ((beepType.getValue() << 4) | deliveryType.getEncoded())) // + .array()); + } + + public enum DeliveryType { + BASAL(true, false, false), + TEMP_BASAL(false, true, false), + BOLUS(false, false, true), + ALL(true, true, true); + + private final boolean basal; + private final boolean tempBasal; + private final boolean bolus; + + DeliveryType(boolean basal, boolean tempBasal, boolean bolus) { + this.basal = basal; + this.tempBasal = tempBasal; + this.bolus = bolus; + } + + public byte getEncoded() { + BitSet bitSet = new BitSet(8); + bitSet.set(0, this.basal); + bitSet.set(1, this.tempBasal); + bitSet.set(2, this.bolus); + return bitSet.toByteArray()[0]; + } + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java index f0104ff3e6..ee750df520 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition; -// FIXME names public enum BeepType { SILENT((byte) 0x00), - XXX((byte) 0x02); //// Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert + FOUR_TIMES_BIP_BEEP((byte) 0x02), // Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert + LONG_SINGLE_BEEP((byte) 0x06); // Used in stop delivery command private byte value; diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java index a849ca74e0..f054efc0eb 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java @@ -19,8 +19,8 @@ public class ProgramAlertsCommandTest { @Test public void testExpirationAlerts() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 420, false, AlertTriggerType.TIME_TRIGGER, (short) 4305, BeepType.XXX, BeepRepetitionType.XXX3)); - configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION_IMMINENT, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4725, BeepType.XXX, BeepRepetitionType.XXX4)); + configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 420, false, AlertTriggerType.TIME_TRIGGER, (short) 4305, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX3)); + configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION_IMMINENT, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4725, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX4)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 3, true, configurations).getEncoded(); @@ -30,7 +30,7 @@ public class ProgramAlertsCommandTest { @Test public void testLowReservoirAlert() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.LOW_RESERVOIR, true, (short) 0, false, AlertTriggerType.RESERVOIR_VOLUME_TRIGGER, (short) 200, BeepType.XXX, BeepRepetitionType.XXX)); + configurations.add(new AlertConfiguration(AlertSlot.LOW_RESERVOIR, true, (short) 0, false, AlertTriggerType.RESERVOIR_VOLUME_TRIGGER, (short) 200, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 8, false, configurations).getEncoded(); @@ -40,7 +40,7 @@ public class ProgramAlertsCommandTest { @Test public void testUserExpirationAlert() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.USER_SET_EXPIRATION, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4079, BeepType.XXX, BeepRepetitionType.XXX2)); + configurations.add(new AlertConfiguration(AlertSlot.USER_SET_EXPIRATION, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4079, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX2)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 15, false, configurations).getEncoded(); @@ -51,7 +51,7 @@ public class ProgramAlertsCommandTest { @Test public void testLumpOfCoalAlert() throws DecoderException { List configurations = new ArrayList<>(); - configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 55, false, AlertTriggerType.TIME_TRIGGER, (short) 5, BeepType.XXX, BeepRepetitionType.XXX5)); + configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 55, false, AlertTriggerType.TIME_TRIGGER, (short) 5, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX5)); byte[] encoded = new ProgramAlertsCommand(37879811, (short) 10, false, configurations).getEncoded(); diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java new file mode 100644 index 0000000000..35fa7e63a3 --- /dev/null +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java @@ -0,0 +1,29 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType; + +import static org.junit.Assert.assertArrayEquals; + +public class StopDeliveryCommandTest { + @Test + public void testStopTempBasal() throws DecoderException { + byte[] encoded = new StopDeliveryCommand(37879811, (short) 0, false, StopDeliveryCommand.DeliveryType.TEMP_BASAL, BeepType.LONG_SINGLE_BEEP) // + .getEncoded(); + + assertArrayEquals(Hex.decodeHex("0242000300071F05494E532E6201B1"), encoded); + } + + @Test + public void testSuspendDelivery() throws DecoderException { + byte[] encoded = new StopDeliveryCommand(37879811, (short) 2, false, StopDeliveryCommand.DeliveryType.ALL, BeepType.SILENT) // + .getEncoded(); + + assertArrayEquals(Hex.decodeHex("0242000308071F05494E532E078287"), encoded); + } + + // TODO test cancel bolus +} \ No newline at end of file diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java index 393cb41e4e..8f43916574 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java @@ -1,5 +1,30 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response; -// TODO capture NAK response +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType; +import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + public class NakResponseTest { + @Test + public void testValidResponse() throws DecoderException { + byte[] encoded = Hex.decodeHex("0603070009"); + + NakResponse response = new NakResponse(encoded); + assertArrayEquals(encoded, response.getEncoded()); + assertNotSame(encoded, response.getEncoded()); + assertEquals(ResponseType.NAK_RESPONSE, response.getResponseType()); + assertEquals(ResponseType.NAK_RESPONSE.getValue(), response.getMessageType()); + assertEquals(NakErrorType.ILLEGAL_PARAM, response.getNakErrorType()); + assertEquals(AlarmType.NONE, response.getAlarmType()); + assertEquals(PodStatus.RUNNING_BELOW_MIN_VOLUME, response.getPodStatus()); + assertEquals((byte) 0x00, response.getSecurityNakSyncCount()); + } } \ No newline at end of file From fa051630193a888f843a9a245bed63a85ef83980 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 11 Feb 2021 00:10:14 +0100 Subject: [PATCH 16/20] Add test for SilenceAlertsCommand --- .../pod/command/SilenceAlertsCommandTest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java index a107d38e6e..57d9ad20fb 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java @@ -1,5 +1,19 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command; -// TODO capture silence alerts command +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import static org.junit.Assert.assertArrayEquals; + public class SilenceAlertsCommandTest { + @Test + public void testSilenceLowReservoirAlert() throws DecoderException { + byte[] encoded = new SilenceAlertsCommand(37879811, (short) 1, false, new SilenceAlertsCommand.SilenceAlertCommandParameters(false, false, false, false, true, false, false, false)) // + .getEncoded(); + + assertArrayEquals(Hex.decodeHex("0242000304071105494E532E1081CE"), encoded); + } + + // TODO capture more silence alerts commands } \ No newline at end of file From c05dcbd8db7d718c551aa497ba90d7243cad02e6 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 11 Feb 2021 00:51:20 +0100 Subject: [PATCH 17/20] Minor Eros stuff --- .../androidaps/dependencyInjection/AppComponent.kt | 4 ++-- omnipod-eros/src/main/AndroidManifest.xml | 8 ++++---- .../dagger/{OmnipodModule.kt => OmnipodErosModule.kt} | 2 +- omnipod-eros/src/main/res/layout/omnipod_overview.xml | 2 +- .../src/main/res/layout/omnipod_pod_management.xml | 9 +++++---- 5 files changed, 13 insertions(+), 12 deletions(-) rename omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/{OmnipodModule.kt => OmnipodErosModule.kt} (98%) 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 e45e5ae42d..61cb5334b0 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.eros.dagger.OmnipodModule +import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule import javax.inject.Singleton @Singleton @@ -32,7 +32,7 @@ import javax.inject.Singleton WizardModule::class, RileyLinkModule::class, MedtronicModule::class, - OmnipodModule::class, + OmnipodErosModule::class, APSModule::class, PreferencesModule::class, OverviewModule::class, diff --git a/omnipod-eros/src/main/AndroidManifest.xml b/omnipod-eros/src/main/AndroidManifest.xml index af03a825f1..22e068b8cc 100644 --- a/omnipod-eros/src/main/AndroidManifest.xml +++ b/omnipod-eros/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ android:enabled="true" android:exported="true" /> - - - - + + + + \ No newline at end of file diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt similarity index 98% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodModule.kt rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt index fd9c3def50..bea8298395 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodModule.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt @@ -14,7 +14,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivati @Module @Suppress("unused") -abstract class OmnipodModule { +abstract class OmnipodErosModule { // Activities @ContributesAndroidInjector diff --git a/omnipod-eros/src/main/res/layout/omnipod_overview.xml b/omnipod-eros/src/main/res/layout/omnipod_overview.xml index 42c7a84ac9..f627579beb 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=".eros.ui.OmnipodOverviewFragment"> + tools:context=".ui.OmnipodOverviewFragment"> + android:orientation="vertical" + tools:context=".ui.PodManagementActivity"> + android:visibility="gone" /> @@ -155,7 +156,7 @@ android:drawableTop="@drawable/ic_pod_management_rl_stats" android:text="@string/omnipod_pod_management_button_riley_link_stats" android:textAllCaps="false" - android:visibility="gone"/> + android:visibility="gone" /> From 9aca29feb6ff80c82bbf6907c6e2876bf081829a Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 11 Feb 2021 10:52:47 +0100 Subject: [PATCH 18/20] Add omnipod-dash module to crowdin --- crowdin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crowdin.yml b/crowdin.yml index d1d40577c8..d4bddbb642 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -19,6 +19,8 @@ files: translation: /dana/src/main/res/values-%android_code%/strings.xml - source: /medtronic/src/main/res/values/strings.xml translation: /medtronic/src/main/res/values-%android_code%/strings.xml + - source: /omnipod-dash/src/main/res/values/strings.xml + translation: /omnipod-dash/src/main/res/values-%android_code%/strings.xml - source: /omnipod-eros/src/main/res/values/strings.xml translation: /omnipod-eros/src/main/res/values-%android_code%/strings.xml - source: /rileylink/src/main/res/values/strings.xml From b2c56ba48e647bfb2ca1ebd3ba7d98da21c9ec66 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 11 Feb 2021 11:01:18 +0100 Subject: [PATCH 19/20] Update Omnipod Eros and Omnipod Dash build.gradle --- omnipod-dash/build.gradle | 23 +++++++++++++++++++---- omnipod-eros/build.gradle | 10 ---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle index 959e970c17..9521d7b4c2 100644 --- a/omnipod-dash/build.gradle +++ b/omnipod-dash/build.gradle @@ -1,10 +1,9 @@ -plugins { - id 'com.android.library' -} +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' android { compileSdkVersion 28 - buildToolsVersion "30.0.2" defaultConfig { minSdkVersion 24 @@ -16,11 +15,22 @@ android { consumerProguardFiles "consumer-rules.pro" } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + debug { + testCoverageEnabled(project.hasProperty('coverage')) + } + firebaseDisable { + System.setProperty("disableFirebase", "true") + ext.enableCrashlytics = false + } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -29,6 +39,11 @@ android { } dependencies { + annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" + annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" + kapt "com.google.dagger:dagger-android-processor:$dagger_version" + kapt "com.google.dagger:dagger-compiler:$dagger_version" + implementation 'commons-codec:commons-codec:1.15' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle index 41548fa975..beb8c490bc 100644 --- a/omnipod-eros/build.gradle +++ b/omnipod-eros/build.gradle @@ -41,20 +41,10 @@ android { } } -allprojects { - repositories { - flatDir { - dirs 'libs' - } - } -} - dependencies { implementation project(':core') implementation project(':rileylink') - implementation fileTree(dir: 'libs', include: ['*.jar']) - annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" From 1a866e970fa9b119e0bc3786353a9e737cf1edf9 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 11 Feb 2021 11:24:31 +0100 Subject: [PATCH 20/20] Variable version in Omnipod Eros and Omnipod Dash build.gradle --- app/build.gradle | 2 +- build.gradle | 4 +++- core/core_dependencies.gradle | 2 +- omnipod-dash/build.gradle | 11 +++++------ omnipod-eros/build.gradle | 2 +- wear/build.gradle | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ae8f2060f7..2f474c8590 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -254,7 +254,7 @@ dependencies { testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" - testImplementation 'joda-time:joda-time:2.10.9' + testImplementation "joda-time:joda-time:$jodatime_version" testImplementation('com.google.truth:truth:1.1.2') { exclude group: "com.google.guava", module: "guava" exclude group: "com.google.code.findbugs", module: "jsr305" diff --git a/build.gradle b/build.gradle index 4e22ae1ea0..1070011ebb 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,13 @@ buildscript { fragmentktx_version = '1.3.0-rc01' ormLiteVersion = '4.46' nav_version = '2.3.2' - appcompat_verison = '1.2.0' + appcompat_version = '1.2.0' material_version = '1.2.1' constraintlayout_version = '2.0.4' preferencektx_version = '1.1.1' commonslang3_version = '3.11' + commonscodec_version = '1.15' + jodatime_version = '2.10.9' work_version = '2.5.0' junit_version = '4.13.1' diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle index f6864b8332..4d05f7312f 100644 --- a/core/core_dependencies.gradle +++ b/core/core_dependencies.gradle @@ -8,7 +8,7 @@ dependencies { api "androidx.core:core-ktx:$coreVersion" api 'androidx.legacy:legacy-support-v13:1.0.0' api 'androidx.legacy:legacy-support-v4:1.0.0' - api "androidx.appcompat:appcompat:$appcompat_verison" + api "androidx.appcompat:appcompat:$appcompat_version" api "androidx.preference:preference-ktx:$preferencektx_version" api 'androidx.biometric:biometric:1.0.1' api "androidx.activity:activity-ktx:${activityVersion}" diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle index 9521d7b4c2..66ca373984 100644 --- a/omnipod-dash/build.gradle +++ b/omnipod-dash/build.gradle @@ -44,10 +44,9 @@ dependencies { kapt "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" - implementation 'commons-codec:commons-codec:1.15' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.3.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation "commons-codec:commons-codec:$commonscodec_version" + implementation "androidx.appcompat:appcompat:$appcompat_version" + implementation "com.google.android.material:material:$material_version" + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" } \ No newline at end of file diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle index beb8c490bc..5f95aa675c 100644 --- a/omnipod-eros/build.gradle +++ b/omnipod-eros/build.gradle @@ -54,7 +54,7 @@ dependencies { testImplementation "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" - testImplementation 'joda-time:joda-time:2.10.9' + testImplementation "joda-time:joda-time:$jodatime_version" androidTestImplementation "androidx.test.ext:junit:$androidx_junit" androidTestImplementation "androidx.test:rules:$androidx_rules" } diff --git a/wear/build.gradle b/wear/build.gradle index a5a93a3530..653c44eb30 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -114,7 +114,7 @@ dependencies { //implementation files("libs/hellocharts-library-1.5.5.jar") //compile "com.ustwo.android:clockwise-wearable:1.0.2" - implementation "androidx.appcompat:appcompat:$appcompat_verison" + implementation "androidx.appcompat:appcompat:$appcompat_version" implementation 'androidx.legacy:legacy-support-v13:1.0.0' compileOnly "com.google.android.wearable:wearable:${wearableVersion}" @@ -143,7 +143,7 @@ dependencies { testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" - testImplementation 'joda-time:joda-time:2.10.9' + testImplementation "joda-time:joda-time:$jodatime_version" testImplementation('com.google.truth:truth:1.1.2') { exclude group: "com.google.guava", module: "guava" }