RileyLinkPumpDevice -> kt

medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt

@@ -91,7 +91,8 @@ class MedtronicPumpPlugin @Inject constructor(
     aapsSchedulers: AapsSchedulers,
     pumpSync: PumpSync,
     pumpSyncStorage: info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
-) : PumpPluginAbstract(PluginDescription() //
+) : PumpPluginAbstract(
+    PluginDescription() //
         .mainType(PluginType.PUMP) //
         .fragmentClass(MedtronicFragment::class.java.name) //
         .pluginIcon(R.drawable.ic_veo_128)
@@ -234,18 +235,16 @@ class MedtronicPumpPlugin @Inject constructor(
     // Pump Plugin
     private var isServiceSet: Boolean = false
 
-    override fun getRileyLinkService(): RileyLinkMedtronicService? = rileyLinkMedtronicService
+    override val rileyLinkService: RileyLinkMedtronicService? = rileyLinkMedtronicService
 
-    override fun getPumpInfo(): RileyLinkPumpInfo {
+    override val pumpInfo: RileyLinkPumpInfo
-        val frequency = rh.gs(if (medtronicPumpStatus.pumpFrequency == "medtronic_pump_frequency_us_ca") R.string.medtronic_pump_frequency_us_ca else R.string.medtronic_pump_frequency_worldwide)
+        get() = RileyLinkPumpInfo(
-        val model = if (!medtronicUtil.isModelSet) "???" else "Medtronic " + medtronicPumpStatus.medtronicDeviceType.pumpModel
+            rh.gs(if (medtronicPumpStatus.pumpFrequency == "medtronic_pump_frequency_us_ca") R.string.medtronic_pump_frequency_us_ca else R.string.medtronic_pump_frequency_worldwide),
-        val serialNumber = medtronicPumpStatus.serialNumber
+            if (!medtronicUtil.isModelSet) "???" else "Medtronic " + medtronicPumpStatus.medtronicDeviceType.pumpModel,
-        return RileyLinkPumpInfo(frequency, model, serialNumber)
+            medtronicPumpStatus.serialNumber
-    }
+        )
 
-    override fun getLastConnectionTimeMillis(): Long {
+    override val lastConnectionTimeMillis: Long = medtronicPumpStatus.lastConnection
-        return medtronicPumpStatus.lastConnection
-    }
 
     override fun setLastCommunicationToNow() {
         medtronicPumpStatus.setLastCommunicationToNow()
@@ -326,7 +325,8 @@ class MedtronicPumpPlugin @Inject constructor(
             }
             if (rileyLinkServiceState != RileyLinkServiceState.PumpConnectorReady //
                 && rileyLinkServiceState != RileyLinkServiceState.RileyLinkReady //
-                && rileyLinkServiceState != RileyLinkServiceState.TuneUpDevice) {
+                && rileyLinkServiceState != RileyLinkServiceState.TuneUpDevice
+            ) {
                 aapsLogger.debug(LTag.PUMP, "RileyLink unreachable.")
                 return false
             }
@@ -334,8 +334,10 @@ class MedtronicPumpPlugin @Inject constructor(
         }
 
     private fun refreshAnyStatusThatNeedsToBeRefreshed() {
-        val statusRefresh = workWithStatusRefresh(StatusRefreshAction.GetData, null,
+        val statusRefresh = workWithStatusRefresh(
-            null)!!
+            StatusRefreshAction.GetData, null,
+            null
+        )!!
         if (!doWeHaveAnyStatusNeededRefreshing(statusRefresh)) {
             return
         }
@@ -594,9 +596,13 @@ class MedtronicPumpPlugin @Inject constructor(
             return PumpEnactResult(injector) //
                 .success(false) //
                 .enacted(false) //
-                .comment(rh.gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
+                .comment(
+                    rh.gs(
+                        R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
                         medtronicPumpStatus.reservoirRemainingUnits,
-                               detailedBolusInfo.insulin))
+                        detailedBolusInfo.insulin
+                    )
+                )
         }
         bolusDeliveryType = BolusDeliveryType.DeliveryPrepared
         if (isPumpNotReachable) {
@@ -619,8 +625,10 @@ class MedtronicPumpPlugin @Inject constructor(
             bolusDeliveryType = BolusDeliveryType.Delivering
 
             // LOG.debug("MedtronicPumpPlugin::deliverBolus - Start delivery");
-            val responseTask = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(MedtronicCommandType.SetBolus,
+            val responseTask = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(
-                arrayListOf(detailedBolusInfo.insulin))
+                MedtronicCommandType.SetBolus,
+                arrayListOf(detailedBolusInfo.insulin)
+            )
             val response = responseTask?.result as Boolean?
             setRefreshButtonEnabled(true)
 
@@ -757,8 +765,10 @@ class MedtronicPumpPlugin @Inject constructor(
         }
 
         // now start new TBR
-        val responseTask = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(MedtronicCommandType.SetTemporaryBasal,
+        val responseTask = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(
-            arrayListOf(absoluteRate, durationInMinutes))
+            MedtronicCommandType.SetTemporaryBasal,
+            arrayListOf(absoluteRate, durationInMinutes)
+        )
         val response = responseTask?.result as Boolean?
         aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute - setTBR. Response: " + response)
         return if (response == null || !response) {
@@ -784,13 +794,13 @@ class MedtronicPumpPlugin @Inject constructor(
 
     @Deprecated("Not used, TBRs fixed in history, should be removed.")
     private fun cancelTBRWithTemporaryId() {
-        val tbrs : MutableList<PumpDbEntryTBR> = pumpSyncStorage.getTBRs()
+        val tbrs: MutableList<PumpDbEntryTBR> = pumpSyncStorage.getTBRs()
-        if (tbrs.size > 0 && medtronicPumpStatus.runningTBRWithTemp!=null) {
+        if (tbrs.size > 0 && medtronicPumpStatus.runningTBRWithTemp != null) {
             aapsLogger.info(LTag.PUMP, logPrefix + "cancelTBRWithTemporaryId - TBR items: ${tbrs.size}")
 
-            var item : PumpDbEntryTBR? = null
+            var item: PumpDbEntryTBR? = null
 
-            if (tbrs.size==1) {
+            if (tbrs.size == 1) {
                 item = tbrs[0]
             } else {
                 for (tbr in tbrs) {
@@ -801,7 +811,7 @@ class MedtronicPumpPlugin @Inject constructor(
                 }
             }
 
-            if (item!=null) {
+            if (item != null) {
 
                 aapsLogger.debug(LTag.PUMP, "DD: cancelTBRWithTemporaryId: tempIdEntry=${item}")
 
@@ -814,18 +824,20 @@ class MedtronicPumpPlugin @Inject constructor(
                         "duration=${differenceS} s, " +
                         "isAbsolute=${!item.isAbsolute}, temporaryId=${item.temporaryId}, " +
                         "pumpId=NO, pumpType=${medtronicPumpStatus.pumpType}, " +
-                    "pumpSerial=${medtronicPumpStatus.serialNumber}]")
+                        "pumpSerial=${medtronicPumpStatus.serialNumber}]"
+                )
 
                 val result = pumpSync.syncTemporaryBasalWithTempId(
                     timestamp = item.date,
                     rate = item.rate,
-                    duration= differenceS * 1000L,
+                    duration = differenceS * 1000L,
                     isAbsolute = item.isAbsolute,
                     temporaryId = item.temporaryId,
                     type = item.tbrType,
                     pumpId = null,
                     pumpType = medtronicPumpStatus.pumpType,
-                    pumpSerial = medtronicPumpStatus.serialNumber)
+                    pumpSerial = medtronicPumpStatus.serialNumber
+                )
 
                 aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId - Result: $result")
             }
@@ -834,7 +846,7 @@ class MedtronicPumpPlugin @Inject constructor(
             aapsLogger.info(LTag.PUMP, logPrefix + "cancelTBRWithTemporaryId - TBR items: ${tbrs.size}, runningTBRWithTemp=${medtronicPumpStatus.runningTBRWithTemp}")
         }
 
-        if (medtronicPumpStatus.runningTBRWithTemp!=null) {
+        if (medtronicPumpStatus.runningTBRWithTemp != null) {
             medtronicPumpStatus.runningTBRWithTemp = null
         }
     }
@@ -846,7 +858,10 @@ class MedtronicPumpPlugin @Inject constructor(
         } else {
             var absoluteValue = profile.getBasal() * (percent / 100.0)
             absoluteValue = pumpDescription.pumpType.determineCorrectBasalSize(absoluteValue)
-            aapsLogger.warn(LTag.PUMP, "setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% ($percent). This will start setTempBasalAbsolute, with calculated value ($absoluteValue). Result might not be 100% correct.")
+            aapsLogger.warn(
+                LTag.PUMP,
+                "setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% ($percent). This will start setTempBasalAbsolute, with calculated value ($absoluteValue). Result might not be 100% correct."
+            )
             setTempBasalAbsolute(absoluteValue, durationInMinutes, profile, enforceNew, tbrType)
         }
     }
@@ -870,7 +885,8 @@ class MedtronicPumpPlugin @Inject constructor(
             scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, -1)
         }
         if (medtronicPumpStatus.basalProfileStatus !== BasalProfileStatus.NotInitialized
-            && medtronicHistoryData.hasBasalProfileChanged()) {
+            && medtronicHistoryData.hasBasalProfileChanged()
+        ) {
             medtronicHistoryData.processLastBasalProfileChange(pumpDescription.pumpType, medtronicPumpStatus)
         }
         val previousState = pumpState
@@ -890,7 +906,7 @@ class MedtronicPumpPlugin @Inject constructor(
     private fun readPumpHistoryLogic() {
 
         val debugHistory = false
-        var targetDate: LocalDateTime? = null
+        val targetDate: LocalDateTime?
         if (lastPumpHistoryEntry == null) {  // first read
             if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntry: null")
             val lastPumpHistoryEntryTime = lastPumpEntryTime
@@ -898,13 +914,11 @@ class MedtronicPumpPlugin @Inject constructor(
             timeMinus36h = timeMinus36h.minusHours(36)
             medtronicHistoryData.setIsInInit(true)
             if (lastPumpHistoryEntryTime == 0L) {
-                if (debugHistory) aapsLogger.debug(
+                if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L")
-                    LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
-                    + targetDate)
                 targetDate = timeMinus36h
             } else {
                 // LocalDateTime lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime);
-                if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime + " - targetDate: " + targetDate)
+                if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime)
                 //medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntryTime)
                 var lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime)
                 lastHistoryRecordTime = lastHistoryRecordTime.minusHours(12) // we get last 12 hours of history to
@@ -922,8 +936,10 @@ class MedtronicPumpPlugin @Inject constructor(
 
         //aapsLogger.debug(LTag.PUMP, "HST: Target Date: " + targetDate);
         @Suppress("UNCHECKED_CAST")
-        val responseTask2 = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(MedtronicCommandType.GetHistoryData,
+        val responseTask2 = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(
-            arrayListOf(/*lastPumpHistoryEntry*/ null, targetDate) as? ArrayList<Any>?)
+            MedtronicCommandType.GetHistoryData,
+            arrayListOf(/*lastPumpHistoryEntry*/ null, targetDate) as? ArrayList<Any>?
+        )
         if (debugHistory) aapsLogger.debug(LTag.PUMP, "HST: After task")
         val historyResult = responseTask2?.result as PumpHistoryResult?
         if (debugHistory) aapsLogger.debug(LTag.PUMP, "HST: History Result: " + historyResult.toString())
@@ -981,8 +997,10 @@ class MedtronicPumpPlugin @Inject constructor(
             }
 
             MedtronicStatusRefreshType.PumpTime, MedtronicStatusRefreshType.Configuration, MedtronicStatusRefreshType.BatteryStatus, MedtronicStatusRefreshType.PumpHistory -> {
-                workWithStatusRefresh(StatusRefreshAction.Add, refreshType,
+                workWithStatusRefresh(
-                    getTimeInFutureFromMinutes(refreshType.refreshTime + additionalTimeInMinutes))
+                    StatusRefreshAction.Add, refreshType,
+                    getTimeInFutureFromMinutes(refreshType.refreshTime + additionalTimeInMinutes)
+                )
             }
         }
     }
@@ -993,9 +1011,11 @@ class MedtronicPumpPlugin @Inject constructor(
     }
 
     @Synchronized
-    private fun workWithStatusRefresh(action: StatusRefreshAction,  //
+    private fun workWithStatusRefresh(
+        action: StatusRefreshAction,  //
         statusRefreshType: MedtronicStatusRefreshType?,  //
-                                      time: Long?): Map<MedtronicStatusRefreshType, Long>? {
+        time: Long?
+    ): Map<MedtronicStatusRefreshType, Long>? {
         return when (action) {
             StatusRefreshAction.Add     -> {
                 statusRefreshMap[statusRefreshType!!] = time!!
@@ -1086,14 +1106,16 @@ class MedtronicPumpPlugin @Inject constructor(
                         runningTBR.tbrType,
                         runningTBR.pumpId!!,
                         runningTBR.pumpType,
-                        runningTBR.serialNumber)
+                        runningTBR.serialNumber
+                    )
 
                     val differenceTimeMin = floor(differenceTime / (60.0 * 1000.0))
 
                     aapsLogger.debug(
                         LTag.PUMP, "canceling running TBR - syncTemporaryBasalWithPumpId [date=${runningTBR.date}, " +
                             "pumpId=${runningTBR.pumpId}, rate=${runningTBR.rate} U, duration=${differenceTimeMin.toInt()}, " +
-                        "pumpSerial=${medtronicPumpStatus.serialNumber}] - Result: $result")
+                            "pumpSerial=${medtronicPumpStatus.serialNumber}] - Result: $result"
+                    )
                 }
             }
 
@@ -1145,8 +1167,10 @@ class MedtronicPumpPlugin @Inject constructor(
                 .enacted(false) //
                 .comment(rh.gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid))
         }
-        val responseTask = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(MedtronicCommandType.SetBasalProfileSTD,
+        val responseTask = rileyLinkMedtronicService?.medtronicUIComm?.executeCommand(
-            arrayListOf(basalProfile))
+            MedtronicCommandType.SetBasalProfileSTD,
+            arrayListOf(basalProfile)
+        )
         val response = responseTask?.result as Boolean?
         aapsLogger.info(LTag.PUMP, logPrefix + "Basal Profile was set: " + response)
         return if (response == null || !response) {
@@ -1184,18 +1208,24 @@ class MedtronicPumpPlugin @Inject constructor(
 
     // OPERATIONS not supported by Pump or Plugin
     private var customActions: List<CustomAction>? = null
-    private val customActionWakeUpAndTune = CustomAction(R.string.medtronic_custom_action_wake_and_tune,
+    private val customActionWakeUpAndTune = CustomAction(
-        MedtronicCustomActionType.WakeUpAndTune)
+        R.string.medtronic_custom_action_wake_and_tune,
+        MedtronicCustomActionType.WakeUpAndTune
+    )
     private val customActionClearBolusBlock = CustomAction(
-        R.string.medtronic_custom_action_clear_bolus_block, MedtronicCustomActionType.ClearBolusBlock, false)
+        R.string.medtronic_custom_action_clear_bolus_block, MedtronicCustomActionType.ClearBolusBlock, false
+    )
     private val customActionResetRLConfig = CustomAction(
-        R.string.medtronic_custom_action_reset_rileylink, MedtronicCustomActionType.ResetRileyLinkConfiguration, true)
+        R.string.medtronic_custom_action_reset_rileylink, MedtronicCustomActionType.ResetRileyLinkConfiguration, true
+    )
 
     override fun getCustomActions(): List<CustomAction>? {
         if (customActions == null) {
-            customActions = listOf(customActionWakeUpAndTune,  //
+            customActions = listOf(
+                customActionWakeUpAndTune,  //
                 customActionClearBolusBlock,  //
-                customActionResetRLConfig)
+                customActionResetRLConfig
+            )
         }
         return customActions
     }

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt

@@ -87,7 +87,7 @@ class RileyLinkBLEConfigActivity : DaggerAppCompatActivity() {
             sp.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress)
             sp.putString(RileyLinkConst.Prefs.RileyLinkName, deviceName)
             val rileyLinkPump = activePlugin.activePump as RileyLinkPumpDevice
-            rileyLinkPump.rileyLinkService.verifyConfiguration(true) // force reloading of address to assure that the RL gets reconnected (even if the address didn't change)
+            rileyLinkPump.rileyLinkService?.verifyConfiguration(true) // force reloading of address to assure that the RL gets reconnected (even if the address didn't change)
             rileyLinkPump.triggerPumpConfigurationChangedEvent()
             finish()
         }

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java

@@ -1,18 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
-
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
-
-public interface RileyLinkPumpDevice {
-
-    void setBusy(boolean busy);
-
-    void triggerPumpConfigurationChangedEvent();
-
-    RileyLinkService getRileyLinkService();
-
-    RileyLinkPumpInfo getPumpInfo();
-
-    long getLastConnectionTimeMillis();
-
-    void setLastCommunicationToNow();
-}

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.kt

@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs
+
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
+
+interface RileyLinkPumpDevice {
+
+    fun setBusy(busy: Boolean)
+    fun triggerPumpConfigurationChangedEvent()
+    val rileyLinkService: RileyLinkService?
+    val pumpInfo: RileyLinkPumpInfo
+    val lastConnectionTimeMillis: Long
+    fun setLastCommunicationToNow()
+}

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt

@@ -40,7 +40,7 @@ class RileyLinkBroadcastReceiver : DaggerBroadcastReceiver() {
         createBroadcastIdentifiers()
     }
 
-    private val rileyLinkService: RileyLinkService
+    private val rileyLinkService: RileyLinkService?
         get() = (activePlugin.activePump as RileyLinkPumpDevice).rileyLinkService
 
     private fun createBroadcastIdentifiers() {
@@ -102,13 +102,13 @@ class RileyLinkBroadcastReceiver : DaggerBroadcastReceiver() {
             RileyLinkConst.Intents.RileyLinkReady         -> {
                 aapsLogger.warn(LTag.PUMPBTCOMM, "RileyLinkConst.Intents.RileyLinkReady")
                 // sendIPCNotification(RT2Const.IPC.MSG_note_WakingPump);
-                rileyLinkService.rileyLinkBLE.enableNotifications()
+                rileyLinkService?.rileyLinkBLE?.enableNotifications()
-                rileyLinkService.rfSpy.startReader() // call startReader from outside?
+                rileyLinkService?.rfSpy?.startReader() // call startReader from outside?
-                rileyLinkService.rfSpy.initializeRileyLink()
+                rileyLinkService?.rfSpy?.initializeRileyLink()
-                val bleVersion = rileyLinkService.rfSpy.bleVersionCached
+                val bleVersion = rileyLinkService?.rfSpy?.bleVersionCached
                 val rlVersion = rileyLinkServiceData.firmwareVersion
                 aapsLogger.debug(LTag.PUMPBTCOMM, "RfSpy version (BLE113): $bleVersion")
-                rileyLinkService.rileyLinkServiceData.versionBLE113 = bleVersion
+                rileyLinkService?.rileyLinkServiceData?.versionBLE113 = bleVersion
 
                 aapsLogger.debug(LTag.PUMPBTCOMM, "RfSpy Radio version (CC110): " + rlVersion.name)
                 rileyLinkServiceData.firmwareVersion = rlVersion
@@ -122,12 +122,12 @@ class RileyLinkBroadcastReceiver : DaggerBroadcastReceiver() {
                 val rileylinkBLEAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "")
                 if (rileylinkBLEAddress == "") {
                     aapsLogger.error("No Rileylink BLE Address saved in app")
-                } else rileyLinkService.reconfigureRileyLink(rileylinkBLEAddress)
+                } else rileyLinkService?.reconfigureRileyLink(rileylinkBLEAddress)
                 true
             }
 
             RileyLinkConst.Intents.RileyLinkDisconnect    -> {
-                rileyLinkService.disconnectRileyLink()
+                rileyLinkService?.disconnectRileyLink()
                 true
             }
 
@@ -144,7 +144,7 @@ class RileyLinkBroadcastReceiver : DaggerBroadcastReceiver() {
 
             RileyLinkConst.Intents.BluetoothReconnected -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Bluetooth - Reconnecting")
-                rileyLinkService.bluetoothInit()
+                rileyLinkService?.bluetoothInit()
                 serviceTaskExecutor.startTask(DiscoverGattServicesTask(injector, true))
                 true
             }
@@ -154,7 +154,7 @@ class RileyLinkBroadcastReceiver : DaggerBroadcastReceiver() {
 
     private fun processTuneUpBroadcasts(action: String): Boolean =
         if (broadcastIdentifiers["TuneUp"]?.contains(action) == true) {
-            if (rileyLinkService.rileyLinkTargetDevice.isTuneUpEnabled) serviceTaskExecutor.startTask(WakeAndTuneTask(injector))
+            if (rileyLinkService?.rileyLinkTargetDevice?.isTuneUpEnabled == true) serviceTaskExecutor.startTask(WakeAndTuneTask(injector))
             true
         } else false
 }