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 d431be7a6c..e1df8f6c34 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt @@ -15,6 +15,7 @@ import info.nightscout.androidaps.danars.di.InsightModule import info.nightscout.androidaps.database.DatabaseModule import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule +import info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger.OmnipodDashModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule import javax.inject.Singleton @@ -36,6 +37,7 @@ import javax.inject.Singleton WizardModule::class, RileyLinkModule::class, MedtronicModule::class, + OmnipodDashModule::class, OmnipodErosModule::class, APSModule::class, PreferencesModule::class, 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 e106245afb..3d10603408 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt @@ -42,6 +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.dash.OmnipodDashPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin @@ -162,6 +163,12 @@ abstract class PluginsModule { @IntKey(155) abstract fun bindOmnipodErosPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase + @Binds + @PumpDriver + @IntoMap + @IntKey(156) + abstract fun bindOmnipodDashPumpPlugin(plugin: OmnipodDashPumpPlugin): PluginBase + @Binds @NotNSClient @IntoMap diff --git a/omnipod-dash/src/main/AndroidManifest.xml b/omnipod-dash/src/main/AndroidManifest.xml index 25a6e46f21..180d3b98ce 100644 --- a/omnipod-dash/src/main/AndroidManifest.xml +++ b/omnipod-dash/src/main/AndroidManifest.xml @@ -6,4 +6,10 @@ + + + + + + \ 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 index 5831caabde..628445b62b 100644 --- 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 @@ -2,6 +2,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash; import androidx.annotation.Nullable; +import com.google.gson.JsonObject; + import org.jetbrains.annotations.NotNull; import org.json.JSONObject; @@ -56,7 +58,7 @@ public class OmnipodDashPumpPlugin extends PumpPluginBase implements PumpInterfa } @Override public boolean isInitialized() { - return false; + return true; } @Override public boolean isSuspended() { @@ -64,7 +66,8 @@ public class OmnipodDashPumpPlugin extends PumpPluginBase implements PumpInterfa } @Override public boolean isBusy() { - return false; + // prevents the queue from executing + return true; } @Override public boolean isConnected() { @@ -100,15 +103,18 @@ public class OmnipodDashPumpPlugin extends PumpPluginBase implements PumpInterfa } @NotNull @Override public PumpEnactResult setNewBasalProfile(@NotNull Profile profile) { - return null; + // TODO + return new PumpEnactResult(getInjector()).success(true).enacted(true); } @Override public boolean isThisProfileSet(@NotNull Profile profile) { - return false; + // TODO + return true; } @Override public long lastDataTime() { - return 0; + // TODO + return System.currentTimeMillis(); } @Override public double getBaseBasalRate() { @@ -152,7 +158,7 @@ public class OmnipodDashPumpPlugin extends PumpPluginBase implements PumpInterfa } @NotNull @Override public JSONObject getJSONStatus(@NotNull Profile profile, @NotNull String profileName, @NotNull String version) { - return null; + return new JSONObject(); } @NotNull @Override public ManufacturerType manufacturer() { diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt index 285349495a..9a3e241e52 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt @@ -1,8 +1,33 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ActivityScope +import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodWizardModule +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.DashPodManagementActivity +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOverviewFragment +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity @Module @Suppress("unused") abstract class OmnipodDashModule { + // ACTIVITIES + + @ContributesAndroidInjector + abstract fun contributesDashPodManagementActivity(): DashPodManagementActivity + + @ActivityScope + @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodDashWizardViewModelsModule::class]) + abstract fun contributesDashActivationWizardActivity(): DashPodActivationWizardActivity + + @ActivityScope + @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodDashWizardViewModelsModule::class]) + abstract fun contributesDashDeactivationWizardActivity(): DashPodDeactivationWizardActivity + + // FRAGMENTS + + @ContributesAndroidInjector + abstract fun contributesOmnipodDashOverviewFragment(): OmnipodDashOverviewFragment + } diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt new file mode 100644 index 0000000000..1b1aaf6f13 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt @@ -0,0 +1,89 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger + +import androidx.lifecycle.ViewModel +import dagger.Binds +import dagger.Module +import dagger.multibindings.IntoMap +import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier +import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ViewModelKey +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.PodActivatedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.StartPodActivationViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDeactivatedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDiscardedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.StartPodDeactivationViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action.DashInitializePodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action.DashInsertCannulaViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info.DashAttachPodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info.DashPodActivatedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info.DashStartPodActivationViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.action.DashDeactivatePodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info.DashPodDeactivatedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info.DashPodDiscardedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info.DashStartPodDeactivationViewModel + +@Module +@Suppress("unused") +abstract class OmnipodDashWizardViewModelsModule { + // #### VIEW MODELS ############################################################################ + + // POD ACTIVATION + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(StartPodActivationViewModel::class) + internal abstract fun startPodActivationViewModel(viewModel: DashStartPodActivationViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(InitializePodViewModel::class) + internal abstract fun initializePodViewModel(viewModel: DashInitializePodViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(AttachPodViewModel::class) + internal abstract fun attachPodViewModel(viewModel: DashAttachPodViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(InsertCannulaViewModel::class) + internal abstract fun insertCannulaViewModel(viewModel: DashInsertCannulaViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(PodActivatedViewModel::class) + internal abstract fun podActivatedViewModel(viewModel: DashPodActivatedViewModel): ViewModel + + // POD DEACTIVATION + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(StartPodDeactivationViewModel::class) + internal abstract fun startPodDeactivationViewModel(viewModel: DashStartPodDeactivationViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(DeactivatePodViewModel::class) + internal abstract fun deactivatePodViewModel(viewModel: DashDeactivatePodViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(PodDeactivatedViewModel::class) + internal abstract fun podDeactivatedViewModel(viewModel: DashPodDeactivatedViewModel): ViewModel + + @Binds + @IntoMap + @OmnipodPluginQualifier + @ViewModelKey(PodDiscardedViewModel::class) + internal abstract fun podDiscardedViewModel(viewModel: DashPodDiscardedViewModel): ViewModel +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt new file mode 100644 index 0000000000..ac96ad394b --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt @@ -0,0 +1,113 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import dagger.android.HasAndroidInjector +import info.nightscout.androidaps.activities.ErrorHelperActivity +import info.nightscout.androidaps.activities.NoSplashAppCompatActivity +import info.nightscout.androidaps.interfaces.CommandQueueProvider +import info.nightscout.androidaps.plugins.bus.RxBusWrapper +import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import info.nightscout.androidaps.plugins.pump.omnipod.dash.databinding.OmnipodDashPodManagementBinding +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity +import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity +import info.nightscout.androidaps.queue.Callback +import info.nightscout.androidaps.queue.events.EventQueueChanged +import info.nightscout.androidaps.utils.FabricPrivacy +import info.nightscout.androidaps.utils.alertDialogs.OKDialog +import info.nightscout.androidaps.utils.rx.AapsSchedulers +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign +import javax.inject.Inject + +/** + * Created by andy on 30/08/2019 + */ +class DashPodManagementActivity : NoSplashAppCompatActivity() { + + @Inject lateinit var rxBus: RxBusWrapper + @Inject lateinit var fabricPrivacy: FabricPrivacy + @Inject lateinit var commandQueue: CommandQueueProvider + @Inject lateinit var injector: HasAndroidInjector + @Inject lateinit var context: Context + @Inject lateinit var aapsSchedulers: AapsSchedulers + + private var disposables: CompositeDisposable = CompositeDisposable() + + private lateinit var binding: OmnipodDashPodManagementBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = OmnipodDashPodManagementBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.buttonActivatePod.setOnClickListener { + /* TODO determine type + val type: PodActivationWizardActivity.Type = if (podStateManager.isPodInitialized + and podStateManager.activationProgress.isAtLeast(ActivationProgress.PRIMING_COMPLETED)) { + PodActivationWizardActivity.Type.SHORT + } else { + PodActivationWizardActivity.Type.LONG + } + */ + + val intent = Intent(this, DashPodActivationWizardActivity::class.java) + intent.putExtra(PodActivationWizardActivity.KEY_TYPE, PodActivationWizardActivity.Type.LONG) + startActivity(intent) + } + + binding.buttonDeactivatePod.setOnClickListener { + startActivity(Intent(this, DashPodDeactivationWizardActivity::class.java)) + } + + binding.buttonDiscardPod.setOnClickListener { + OKDialog.showConfirmation(this, + resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread { + // TODO discard Pod + }) + } + + binding.buttonPlayTestBeep.setOnClickListener { + // TODO + binding.buttonPlayTestBeep.isEnabled = false + binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_playing_test_beep) + + commandQueue.customCommand(CommandPlayTestBeep(), object : Callback() { + override fun run() { + if (!result.success) { + displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep), result.comment), false) + } + } + }) + } + } + + override fun onResume() { + super.onResume() + disposables += rxBus + .toObservable(EventQueueChanged::class.java) + .observeOn(aapsSchedulers.main) + .subscribe({ refreshButtons() }, fabricPrivacy::logException) + + refreshButtons() + } + + override fun onPause() { + super.onPause() + disposables.clear() + } + + private fun refreshButtons() { + // TODO update button state from Pod state + } + + private fun displayErrorDialog(title: String, message: String, @Suppress("SameParameterValue") withSound: Boolean) { + context.let { + ErrorHelperActivity.runAlarm(it, message, title, if (withSound) R.raw.boluserror else 0) + } + } +} diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt index cb01eafe10..295afbf47b 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt @@ -1,5 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -31,4 +32,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() { _bluetoothStatusBinding = OmnipodDashOverviewBluetoothStatusBinding.bind(it.root) _binding = it }.root + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + buttonBinding.buttonPodManagement.setOnClickListener { + startActivity(Intent(context, DashPodManagementActivity::class.java)) + } + } } \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt new file mode 100644 index 0000000000..6f87bfd8f6 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation + +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity + +class DashPodActivationWizardActivity : PodActivationWizardActivity() \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt new file mode 100644 index 0000000000..b6a3b8de7e --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt @@ -0,0 +1,31 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action + +import androidx.annotation.StringRes +import dagger.android.HasAndroidInjector +import info.nightscout.androidaps.data.PumpEnactResult +import info.nightscout.androidaps.logging.AAPSLogger +import info.nightscout.androidaps.logging.LTag +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashInitializePodViewModel @Inject constructor(private val aapsLogger: AAPSLogger, private val injector: HasAndroidInjector) : InitializePodViewModel() { + + override fun isPodInAlarm(): Boolean = false // TODO + + override fun isPodActivationTimeExceeded(): Boolean = false // TODO + + override fun isPodDeactivatable(): Boolean = true // TODO + + override fun doExecuteAction(): PumpEnactResult { + // TODO FIRST STEP OF ACTIVATION + aapsLogger.debug(LTag.PUMP, "started activation part 1") + return PumpEnactResult(injector).success(false).comment("not implemented") + } + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_initialize_pod_title + + @StringRes + override fun getTextId() = R.string.omnipod_dash_pod_activation_wizard_initialize_pod_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt new file mode 100644 index 0000000000..0f353b17e8 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt @@ -0,0 +1,26 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action + +import androidx.annotation.StringRes +import dagger.android.HasAndroidInjector +import info.nightscout.androidaps.data.PumpEnactResult +import info.nightscout.androidaps.interfaces.ProfileFunction +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashInsertCannulaViewModel @Inject constructor(private val injector: HasAndroidInjector, private val profileFunction: ProfileFunction) : InsertCannulaViewModel() { + + override fun isPodInAlarm(): Boolean = false // TODO + + override fun isPodActivationTimeExceeded(): Boolean = false // TODO + + override fun isPodDeactivatable(): Boolean = true // TODO + + override fun doExecuteAction(): PumpEnactResult = PumpEnactResult(injector) // TODO + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title + + @StringRes + override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_insert_cannula_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt new file mode 100644 index 0000000000..dfad36eb91 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt @@ -0,0 +1,15 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info + +import androidx.annotation.StringRes +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashAttachPodViewModel @Inject constructor() : AttachPodViewModel() { + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_attach_pod_title + + @StringRes + override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_attach_pod_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt new file mode 100644 index 0000000000..88721268a9 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt @@ -0,0 +1,15 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info + +import androidx.annotation.StringRes +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.PodActivatedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashPodActivatedViewModel @Inject constructor() : PodActivatedViewModel() { + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_pod_activated_title + + @StringRes + override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_pod_activated_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt new file mode 100644 index 0000000000..0e7538b621 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt @@ -0,0 +1,15 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info + +import androidx.annotation.StringRes +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.StartPodActivationViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashStartPodActivationViewModel @Inject constructor() : StartPodActivationViewModel() { + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_start_pod_activation_title + + @StringRes + override fun getTextId(): Int = R.string.omnipod_dash_pod_activation_wizard_start_pod_activation_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt new file mode 100644 index 0000000000..0a45f38be8 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt @@ -0,0 +1,5 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation + +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.PodDeactivationWizardActivity + +class DashPodDeactivationWizardActivity : PodDeactivationWizardActivity() \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt new file mode 100644 index 0000000000..093b93fe51 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt @@ -0,0 +1,23 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.action + +import androidx.annotation.StringRes +import dagger.android.HasAndroidInjector +import info.nightscout.androidaps.data.PumpEnactResult +import info.nightscout.androidaps.plugins.pump.omnipod.common.R +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel +import javax.inject.Inject + +class DashDeactivatePodViewModel @Inject constructor(private val injector: HasAndroidInjector) : DeactivatePodViewModel() { + + override fun doExecuteAction(): PumpEnactResult = PumpEnactResult(injector) // TODO + + override fun discardPod() { + // TODO + } + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_title + + @StringRes + override fun getTextId(): Int = R.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt new file mode 100644 index 0000000000..3496076606 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt @@ -0,0 +1,16 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info + +import androidx.annotation.StringRes +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDeactivatedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashPodDeactivatedViewModel @Inject constructor() : PodDeactivatedViewModel() { + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_title + + @StringRes + override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_text + +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt new file mode 100644 index 0000000000..27fb8fd625 --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt @@ -0,0 +1,15 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info + +import androidx.annotation.StringRes +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDiscardedViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashPodDiscardedViewModel @Inject constructor() : PodDiscardedViewModel() { + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_pod_discarded_title + + @StringRes + override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_discarded_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt new file mode 100644 index 0000000000..099ce1f53c --- /dev/null +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt @@ -0,0 +1,15 @@ +package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info + +import androidx.annotation.StringRes +import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.StartPodDeactivationViewModel +import info.nightscout.androidaps.plugins.pump.omnipod.dash.R +import javax.inject.Inject + +class DashStartPodDeactivationViewModel @Inject constructor() : StartPodDeactivationViewModel() { + + @StringRes + override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title + + @StringRes + override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text +} \ No newline at end of file diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml index ae28ff9884..16d1031ed9 100644 --- a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml +++ b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml @@ -37,47 +37,45 @@ android:paddingStart="5dp" android:paddingEnd="5dp" android:textSize="14sp" /> + - + + - - - - - - - + android:layout_weight="1.5" + android:gravity="end" + android:paddingStart="5dp" + android:paddingEnd="5dp" + android:text="@string/omnipod_dash_bluetooth_status" + android:textSize="14sp" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/omnipod-dash/src/main/res/values/strings.xml b/omnipod-dash/src/main/res/values/strings.xml index 5ea562af03..c1353658eb 100644 --- a/omnipod-dash/src/main/res/values/strings.xml +++ b/omnipod-dash/src/main/res/values/strings.xml @@ -11,4 +11,8 @@ Bluetooth Status Bluetooth Address + + + Fill a new Pod with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 85U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press Next.\n\nNote: do not remove the Pod\'s needle cap at this time. + Trying to pair with the new Pod and prime it.\n\nWhen the initialization process has successfully been completed, you can press Next. \ No newline at end of file diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java index 2ebdd9a1cd..81e1f40997 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java @@ -82,7 +82,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.Al import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType; 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.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosActiveAlertsChanged; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosFaultEventChanged; @@ -122,7 +122,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements PumpInterfa public static final int STARTUP_STATUS_REQUEST_TRIES = 2; public static final double RESERVOIR_OVER_50_UNITS_DEFAULT = 75.0; - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final RileyLinkServiceData rileyLinkServiceData; private final AapsOmnipodErosManager aapsOmnipodErosManager; private final AapsOmnipodUtil aapsOmnipodUtil; @@ -167,7 +167,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements PumpInterfa ResourceHelper resourceHelper, ActivePluginProvider activePlugin, SP sp, - PodStateManager podStateManager, + ErosPodStateManager podStateManager, AapsOmnipodErosManager aapsOmnipodErosManager, CommandQueueProvider commandQueue, FabricPrivacy fabricPrivacy, diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt index 453f1f7f86..341779fbec 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt @@ -6,7 +6,7 @@ import dagger.android.ContributesAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ActivityScope import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodWizardModule 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.driver.manager.ErosPodStateManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService @@ -23,36 +23,36 @@ abstract class OmnipodErosModule { // ACTIVITIES @ContributesAndroidInjector - abstract fun contributesPodManagementActivity(): ErosPodManagementActivity - @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): ErosPodHistoryActivity + abstract fun contributesErosPodManagementActivity(): ErosPodManagementActivity + @ContributesAndroidInjector abstract fun contributesErosPodHistoryActivity(): ErosPodHistoryActivity @ActivityScope @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodErosWizardViewModelsModule::class]) - abstract fun contributesActivationWizardActivity(): ErosPodActivationWizardActivity + abstract fun contributesErosActivationWizardActivity(): ErosPodActivationWizardActivity @ActivityScope @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodErosWizardViewModelsModule::class]) - abstract fun contributesDeactivationWizardActivity(): ErosPodDeactivationWizardActivity + abstract fun contributesErosDeactivationWizardActivity(): ErosPodDeactivationWizardActivity // FRAGMENTS @ContributesAndroidInjector - abstract fun contributesOmnipodFragment(): OmnipodErosOverviewFragment + abstract fun contributesOmnipodErosOverviewFragment(): OmnipodErosOverviewFragment // SERVICES @ContributesAndroidInjector - abstract fun omnipodCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager + abstract fun contributesOmnipodRileyLinkCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService // DATA - @ContributesAndroidInjector abstract fun rlHistoryItemOmnipod(): RLHistoryItemOmnipod + @ContributesAndroidInjector abstract fun contributesRlHistoryItemOmnipod(): RLHistoryItemOmnipod companion object { @Provides - fun podStateManagerProvider(aapsErosPodStateManager: AapsErosPodStateManager): PodStateManager = aapsErosPodStateManager + fun erosPodStateManagerProvider(aapsErosPodStateManager: AapsErosPodStateManager): ErosPodStateManager = aapsErosPodStateManager } } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java index 6252d6db56..24dc417c72 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java @@ -6,14 +6,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class AcknowledgeAlertsAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final AlertSet alerts; - public AcknowledgeAlertsAction(PodStateManager podStateManager, AlertSet alerts) { + public AcknowledgeAlertsAction(ErosPodStateManager podStateManager, AlertSet alerts) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); } @@ -26,7 +26,7 @@ public class AcknowledgeAlertsAction implements OmnipodAction { this.alerts = alerts; } - public AcknowledgeAlertsAction(PodStateManager podStateManager, AlertSlot alertSlot) { + public AcknowledgeAlertsAction(ErosPodStateManager podStateManager, AlertSlot alertSlot) { this(podStateManager, new AlertSet(Collections.singletonList(alertSlot))); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java index 2d615177de..5f1314c59d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java @@ -14,14 +14,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.Pa 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class AssignAddressAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final AAPSLogger aapsLogger; - public AssignAddressAction(PodStateManager podStateManager, AAPSLogger aapsLogger) { + public AssignAddressAction(ErosPodStateManager podStateManager, AAPSLogger aapsLogger) { if (podStateManager == null) { throw new IllegalArgumentException("podStateManager can not be null"); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java index 465a68a9ca..7ed57a6db6 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java @@ -9,17 +9,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class BolusAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final double units; private final Duration timeBetweenPulses; private final boolean acknowledgementBeep; private final boolean completionBeep; - public BolusAction(PodStateManager podStateManager, double units, Duration timeBetweenPulses, + public BolusAction(ErosPodStateManager podStateManager, double units, Duration timeBetweenPulses, boolean acknowledgementBeep, boolean completionBeep) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); @@ -34,7 +34,7 @@ public class BolusAction implements OmnipodAction { this.completionBeep = completionBeep; } - public BolusAction(PodStateManager podStateManager, double units, boolean acknowledgementBeep, boolean completionBeep) { + public BolusAction(ErosPodStateManager podStateManager, double units, boolean acknowledgementBeep, boolean completionBeep) { this(podStateManager, units, Duration.standardSeconds(2), acknowledgementBeep, completionBeep); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java index 5140edf673..5fc280207f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java @@ -14,15 +14,15 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class CancelDeliveryAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final EnumSet deliveryTypes; private final boolean acknowledgementBeep; - public CancelDeliveryAction(PodStateManager podStateManager, EnumSet deliveryTypes, + public CancelDeliveryAction(ErosPodStateManager podStateManager, EnumSet deliveryTypes, boolean acknowledgementBeep) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java index 39265c03a7..ad10e1284d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java @@ -5,14 +5,14 @@ import java.util.List; 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class ConfigureAlertsAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final List alertConfigurations; - public ConfigureAlertsAction(PodStateManager podStateManager, List alertConfigurations) { + public ConfigureAlertsAction(ErosPodStateManager podStateManager, List alertConfigurations) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); } @@ -31,7 +31,7 @@ public class ConfigureAlertsAction implements OmnipodAction { return statusResponse; } - public static void updateConfiguredAlerts(PodStateManager podStateManager, List alertConfigurations) { + public static void updateConfiguredAlerts(ErosPodStateManager podStateManager, List alertConfigurations) { for (AlertConfiguration alertConfiguration : alertConfigurations) { if (alertConfiguration.isActive()) { podStateManager.putConfiguredAlert(alertConfiguration.getAlertSlot(), alertConfiguration.getAlertType()); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java index b8b8914256..c1dd3e2a55 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java @@ -5,11 +5,11 @@ import org.joda.time.Duration; 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class ConfigureBeepAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final BeepConfigType beepType; private final boolean basalCompletionBeep; private final Duration basalIntervalBeep; @@ -18,7 +18,7 @@ public class ConfigureBeepAction implements OmnipodAction { private final boolean bolusCompletionBeep; private final Duration bolusIntervalBeep; - public ConfigureBeepAction(PodStateManager podState, BeepConfigType beepType, boolean basalCompletionBeep, Duration basalIntervalBeep, boolean tempBasalCompletionBeep, Duration tempBasalIntervalBeep, boolean bolusCompletionBeep, Duration bolusIntervalBeep) { + public ConfigureBeepAction(ErosPodStateManager podState, BeepConfigType beepType, boolean basalCompletionBeep, Duration basalIntervalBeep, boolean tempBasalCompletionBeep, Duration tempBasalIntervalBeep, boolean bolusCompletionBeep, Duration bolusIntervalBeep) { if (podState == null || beepType == null) { throw new IllegalArgumentException("Required parameter(s) missing"); } @@ -33,7 +33,7 @@ public class ConfigureBeepAction implements OmnipodAction { this.podStateManager = podState; } - public ConfigureBeepAction(PodStateManager podState, BeepConfigType beepType) { + public ConfigureBeepAction(ErosPodStateManager podState, BeepConfigType beepType) { this(podState, beepType, false, Duration.ZERO, false, Duration.ZERO, false, Duration.ZERO); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java index 2170a43e20..ec70547c6d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java @@ -6,14 +6,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class DeactivatePodAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final boolean acknowledgementBeep; - public DeactivatePodAction(PodStateManager podStateManager, boolean acknowledgementBeep) { + public DeactivatePodAction(ErosPodStateManager podStateManager, boolean acknowledgementBeep) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java index 399309b4f7..efbfc3157d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java @@ -3,14 +3,14 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communicatio 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class GetPodInfoAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final PodInfoType podInfoType; - public GetPodInfoAction(PodStateManager podStateManager, PodInfoType podInfoType) { + public GetPodInfoAction(ErosPodStateManager podStateManager, PodInfoType podInfoType) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); } 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 index 9cb087e328..b68928e2b2 100644 --- 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 @@ -3,13 +3,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communicatio 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class GetStatusAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; - public GetStatusAction(PodStateManager podState) { + public GetStatusAction(ErosPodStateManager podState) { if (podState == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java index 994d3a8d07..15c76ae683 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java @@ -11,17 +11,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.Al 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class InsertCannulaAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final BasalSchedule initialBasalSchedule; private final Duration expirationReminderTimeBeforeShutdown; private final Integer lowReservoirAlertUnits; - public InsertCannulaAction(PodStateManager podStateManager, BasalSchedule initialBasalSchedule, + public InsertCannulaAction(ErosPodStateManager podStateManager, BasalSchedule initialBasalSchedule, Duration expirationReminderTimeBeforeShutdown, Integer lowReservoirAlertUnits) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java index 582df47447..df02efe473 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java @@ -3,15 +3,15 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communicatio 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class PrimeAction implements OmnipodAction { private final PrimeService service; - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; - public PrimeAction(PrimeService primeService, PodStateManager podStateManager) { + public PrimeAction(PrimeService primeService, ErosPodStateManager podStateManager) { if (primeService == null) { throw new IllegalArgumentException("Prime service cannot be null"); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java index a96d2c0853..ff1f98407f 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java @@ -9,17 +9,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class SetBasalScheduleAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final BasalSchedule basalSchedule; private final boolean confidenceReminder; private final Duration scheduleOffset; private final boolean acknowledgementBeep; - public SetBasalScheduleAction(PodStateManager podStateManager, BasalSchedule basalSchedule, + public SetBasalScheduleAction(ErosPodStateManager podStateManager, BasalSchedule basalSchedule, boolean confidenceReminder, Duration scheduleOffset, boolean acknowledgementBeep) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java index e26a2d803b..b643c174e3 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java @@ -10,17 +10,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class SetTempBasalAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final double rate; private final Duration duration; private final boolean acknowledgementBeep; private final boolean completionBeep; - public SetTempBasalAction(PodStateManager podStateManager, double rate, Duration duration, + public SetTempBasalAction(ErosPodStateManager podStateManager, double rate, Duration duration, boolean acknowledgementBeep, boolean completionBeep) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager cannot be null"); diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java index 5188210bca..cd4614c6ac 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java @@ -16,14 +16,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.Ill 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; public class SetupPodAction implements OmnipodAction { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final AAPSLogger aapsLogger; - public SetupPodAction(PodStateManager podStateManager, AAPSLogger aapsLogger) { + public SetupPodAction(ErosPodStateManager podStateManager, AAPSLogger aapsLogger) { if (podStateManager == null) { throw new IllegalArgumentException("Pod state manager can not be null"); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index 3e208d87ba..a2cd03d4de 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -11,14 +11,14 @@ import java.util.Map; 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.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.AlertConfigurationUtil; public final class ExpirationReminderBuilder { private final Map alerts = new HashMap<>(); private final DateTime endOfServiceTime; - public ExpirationReminderBuilder(PodStateManager podStateManager) { + public ExpirationReminderBuilder(ErosPodStateManager podStateManager) { this.endOfServiceTime = podStateManager.getActivatedAt().plus(OmnipodConstants.SERVICE_DURATION); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 index e5973ca1e9..640869dc00 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/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 @@ -11,26 +11,26 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication 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.manager.ErosPodStateManager; 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 { - public StatusResponse executeDisableTab5Sub16And17FaultConfigCommand(OmnipodRileyLinkCommunicationManager communicationService, PodStateManager podStateManager) { + public StatusResponse executeDisableTab5Sub16And17FaultConfigCommand(OmnipodRileyLinkCommunicationManager communicationService, ErosPodStateManager podStateManager) { FaultConfigCommand faultConfigCommand = new FaultConfigCommand(podStateManager.getCurrentNonce(), (byte) 0x00, (byte) 0x00); OmnipodMessage faultConfigMessage = new OmnipodMessage(podStateManager.getAddress(), Collections.singletonList(faultConfigCommand), podStateManager.getMessageNumber()); return communicationService.exchangeMessages(StatusResponse.class, podStateManager, faultConfigMessage); } - public StatusResponse executeFinishSetupReminderAlertCommand(OmnipodRileyLinkCommunicationManager communicationService, PodStateManager podStateManager) { + public StatusResponse executeFinishSetupReminderAlertCommand(OmnipodRileyLinkCommunicationManager communicationService, ErosPodStateManager podStateManager) { AlertConfiguration finishSetupReminderAlertConfiguration = AlertConfigurationUtil.createFinishSetupReminderAlertConfiguration(); return communicationService.executeAction(new ConfigureAlertsAction(podStateManager, Collections.singletonList(finishSetupReminderAlertConfiguration))); } - public StatusResponse executePrimeBolusCommand(OmnipodRileyLinkCommunicationManager communicationService, PodStateManager podStateManager) { + public StatusResponse executePrimeBolusCommand(OmnipodRileyLinkCommunicationManager communicationService, ErosPodStateManager podStateManager) { return communicationService.executeAction(new BolusAction(podStateManager, OmnipodConstants.POD_PRIME_BOLUS_UNITS, Duration.standardSeconds(1), false, true)); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java similarity index 99% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java index adc56510bb..e066f5e1a9 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java @@ -38,13 +38,13 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.sc import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil; // TODO add nullchecks on some setters -public abstract class PodStateManager { +public abstract class ErosPodStateManager { private final AAPSLogger aapsLogger; private final Gson gsonInstance; private PodState podState; - protected PodStateManager(AAPSLogger aapsLogger) { + protected ErosPodStateManager(AAPSLogger aapsLogger) { this.aapsLogger = aapsLogger; this.gsonInstance = createGson(); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java index d76b183cf6..6649eced0d 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java @@ -63,7 +63,7 @@ public class OmnipodManager { private static final int ACTION_VERIFICATION_TRIES = 1; private final OmnipodRileyLinkCommunicationManager communicationService; - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private ActiveBolusData activeBolusData; private SingleSubject bolusCommandExecutionSubject; @@ -76,7 +76,7 @@ public class OmnipodManager { public OmnipodManager(AAPSLogger aapsLogger, AapsSchedulers aapsSchedulers, OmnipodRileyLinkCommunicationManager communicationService, - PodStateManager podStateManager) { + ErosPodStateManager podStateManager) { if (communicationService == null) { throw new IllegalArgumentException("Communication service cannot be null"); } diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java index 99e58b3550..4a170d5c35 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java @@ -8,7 +8,7 @@ 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.eros.definition.OmnipodErosStorageKeys; -import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosActiveAlertsChanged; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosFaultEventChanged; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosTbrChanged; @@ -16,7 +16,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodEr import info.nightscout.androidaps.utils.sharedPreferences.SP; @Singleton -public class AapsErosPodStateManager extends PodStateManager { +public class AapsErosPodStateManager extends ErosPodStateManager { private final SP sp; private final RxBusWrapper rxBus; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java index 0acab0537b..068dd53793 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java @@ -80,7 +80,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.Ril 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; @@ -94,7 +94,7 @@ import io.reactivex.subjects.SingleSubject; @Singleton public class AapsOmnipodErosManager { - private final PodStateManager podStateManager; + private final ErosPodStateManager podStateManager; private final AapsOmnipodUtil aapsOmnipodUtil; private final AAPSLogger aapsLogger; private final AapsSchedulers aapsSchedulers; @@ -127,7 +127,7 @@ public class AapsOmnipodErosManager { @Inject public AapsOmnipodErosManager(OmnipodRileyLinkCommunicationManager communicationService, - PodStateManager podStateManager, + ErosPodStateManager podStateManager, AapsOmnipodUtil aapsOmnipodUtil, AAPSLogger aapsLogger, AapsSchedulers aapsSchedulers, diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java index 2e405af2ee..bd8ae128ee 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java @@ -43,7 +43,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.Pod 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; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager; /** * Created by andy on 6/29/18. @@ -86,11 +86,11 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication return super.sendAndListen(msg, timeout_ms, repeatCount, retryCount, extendPreamble_ms); } - public T sendCommand(Class responseClass, PodStateManager podStateManager, MessageBlock command) { + public T sendCommand(Class responseClass, ErosPodStateManager podStateManager, MessageBlock command) { return sendCommand(responseClass, podStateManager, command, true); } - public T sendCommand(Class responseClass, PodStateManager podStateManager, MessageBlock command, boolean automaticallyResyncNone) { + public T sendCommand(Class responseClass, ErosPodStateManager podStateManager, MessageBlock command, boolean automaticallyResyncNone) { OmnipodMessage message = new OmnipodMessage(podStateManager.getAddress(), Collections.singletonList(command), podStateManager.getMessageNumber()); return exchangeMessages(responseClass, podStateManager, message, automaticallyResyncNone); } @@ -100,19 +100,19 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication return action.execute(this); } - public T exchangeMessages(Class responseClass, PodStateManager podStateManager, OmnipodMessage message) { + public T exchangeMessages(Class responseClass, ErosPodStateManager podStateManager, OmnipodMessage message) { return exchangeMessages(responseClass, podStateManager, message, true); } - public T exchangeMessages(Class responseClass, PodStateManager podStateManager, OmnipodMessage message, boolean automaticallyResyncNonce) { + public T exchangeMessages(Class responseClass, ErosPodStateManager podStateManager, OmnipodMessage message, boolean automaticallyResyncNonce) { return exchangeMessages(responseClass, podStateManager, message, null, null, automaticallyResyncNonce); } - public synchronized T exchangeMessages(Class responseClass, PodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) { + public synchronized T exchangeMessages(Class responseClass, ErosPodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) { return exchangeMessages(responseClass, podStateManager, message, addressOverride, ackAddressOverride, true); } - public synchronized T exchangeMessages(Class responseClass, PodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride, boolean automaticallyResyncNonce) { + public synchronized T exchangeMessages(Class responseClass, ErosPodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride, boolean automaticallyResyncNonce) { aapsLogger.debug(LTag.PUMPBTCOMM, "Exchanging OmnipodMessage: responseClass={}, podStateManager={}, message={}, addressOverride={}, ackAddressOverride={}, automaticallyResyncNonce={}", // responseClass.getSimpleName(), podStateManager, message, addressOverride, ackAddressOverride, automaticallyResyncNonce); @@ -192,7 +192,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication } - private MessageBlock transportMessages(PodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) { + private MessageBlock transportMessages(ErosPodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) { int packetAddress = podStateManager.getAddress(); if (addressOverride != null) { packetAddress = addressOverride; @@ -298,7 +298,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication return messageBlock; } - private OmnipodPacket createAckPacket(PodStateManager podStateManager, Integer packetAddress, Integer messageAddress) { + private OmnipodPacket createAckPacket(ErosPodStateManager podStateManager, Integer packetAddress, Integer messageAddress) { if (packetAddress == null) { packetAddress = podStateManager.getAddress(); } @@ -308,7 +308,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication return new OmnipodPacket(packetAddress, PacketType.ACK, podStateManager.getPacketNumber(), ByteUtil.getBytesFromInt(messageAddress)); } - private void ackUntilQuiet(PodStateManager podStateManager, Integer packetAddress, Integer messageAddress) { + private void ackUntilQuiet(ErosPodStateManager podStateManager, Integer packetAddress, Integer messageAddress) { OmnipodPacket ack = createAckPacket(podStateManager, packetAddress, messageAddress); boolean quiet = false; while (!quiet) try { @@ -326,15 +326,15 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication podStateManager.increasePacketNumber(); } - private OmnipodPacket exchangePackets(PodStateManager podStateManager, OmnipodPacket packet) { + private OmnipodPacket exchangePackets(ErosPodStateManager podStateManager, OmnipodPacket packet) { return exchangePackets(podStateManager, packet, 0, 333, 9000, 127); } - private OmnipodPacket exchangePackets(PodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int preambleExtensionMilliseconds) { + private OmnipodPacket exchangePackets(ErosPodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int preambleExtensionMilliseconds) { return exchangePackets(podStateManager, packet, repeatCount, 333, 9000, preambleExtensionMilliseconds); } - private OmnipodPacket exchangePackets(PodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int responseTimeoutMilliseconds, int exchangeTimeoutMilliseconds, int preambleExtensionMilliseconds) { + private OmnipodPacket exchangePackets(ErosPodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int responseTimeoutMilliseconds, int exchangeTimeoutMilliseconds, int preambleExtensionMilliseconds) { long timeoutTime = System.currentTimeMillis() + exchangeTimeoutMilliseconds; podStateManager.increasePacketNumber(); 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 89524f0129..31ca482106 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 @@ -20,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService; 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.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; @@ -36,7 +36,7 @@ public class RileyLinkOmnipodService extends RileyLinkService { @Inject OmnipodErosPumpPlugin omnipodErosPumpPlugin; @Inject AapsOmnipodUtil aapsOmnipodUtil; - @Inject PodStateManager podStateManager; + @Inject ErosPodStateManager podStateManager; @Inject DatabaseHelperInterface databaseHelper; @Inject AapsOmnipodErosManager aapsOmnipodErosManager; @Inject OmnipodRileyLinkCommunicationManager omnipodRileyLinkCommunicationManager; diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt index 95c3e7e586..4ddf876f02 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt @@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugi import info.nightscout.androidaps.plugins.pump.omnipod.eros.R import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodErosPodManagementBinding 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.driver.manager.ErosPodStateManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog @@ -44,7 +44,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() { @Inject lateinit var rxBus: RxBusWrapper @Inject lateinit var fabricPrivacy: FabricPrivacy @Inject lateinit var commandQueue: CommandQueueProvider - @Inject lateinit var podStateManager: PodStateManager + @Inject lateinit var podStateManager: ErosPodStateManager @Inject lateinit var injector: HasAndroidInjector @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData @Inject lateinit var aapsOmnipodManager: AapsOmnipodErosManager diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt index 356f3d0444..1b232a6527 100644 --- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt +++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt @@ -35,7 +35,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodE 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.manager.ErosPodStateManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager @@ -74,7 +74,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { @Inject lateinit var commandQueue: CommandQueueProvider @Inject lateinit var activePlugin: ActivePluginProvider @Inject lateinit var omnipodErosPumpPlugin: OmnipodErosPumpPlugin - @Inject lateinit var podStateManager: PodStateManager + @Inject lateinit var podStateManager: ErosPodStateManager @Inject lateinit var sp: SP @Inject lateinit var omnipodUtil: AapsOmnipodUtil @Inject lateinit var omnipodAlertUtil: OmnipodAlertUtil 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 ad99d1746b..2ac8d0cdf2 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 @@ -20,7 +20,7 @@ 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; -import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager; +import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.utils.resources.ResourceHelper; /** @@ -56,7 +56,7 @@ public class AapsOmnipodUtil { return this.gsonInstance; } - public List getTranslatedActiveAlerts(PodStateManager podStateManager) { + public List getTranslatedActiveAlerts(ErosPodStateManager podStateManager) { List translatedAlerts = new ArrayList<>(); AlertSet activeAlerts = podStateManager.getActiveAlerts();