Merge branch 'andy_tandem_dev' into andy_tandem

Author: andy-rozman-beyondnow

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt

@@ -143,7 +143,10 @@ open class Notification {
         const val AAPS_DIR_NOT_SELECTED = 92
         const val EQUIL_ALARM = 93
         const val EQUIL_ALARM_INSULIN = 94
+
         const val TANDEM_BASAL_PROFILE_ERROR = 95
+        const val TANDEM_SITE_REMINDER = 96
+        const val TANDEM_PUMP_SETTINGS_UPDATED = 97
 
 
         const val USER_MESSAGE = 1000

gradle/libs.versions.toml

@@ -184,5 +184,6 @@ androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name =
 # Tandem
 com-jakewharton-timber = { group = "com.jakewharton.timber", name = "timber", version="5.0.1" }
 com-github-weliem-blessed-android = { group = "com.github.weliem", name = "blessed-android", version="2.4.0" }
-
+io-github-vanpra-compose-dialogs-datetime = { group = "io.github.vanpra.compose-material-dialogs", name = "datetime", version="0.9.0" }
+com-github-jwoglom-pumpx2-android = { group = "com.github.jwoglom.pumpX2", name = "pumpx2-android", version="v1.6.9" }
 

pump/common/src/main/kotlin/app/aaps/pump/common/PumpPluginAbstract.kt

@@ -450,6 +450,7 @@ abstract class PumpPluginAbstract protected constructor(
                             commandQueue.readStatus("Scheduled Status Refresh", null)
                         }
                     }
+                    doCustomScheduledActions()
                 }
             } while (serviceRunning)
         }.start()
@@ -488,7 +489,14 @@ abstract class PumpPluginAbstract protected constructor(
         }
     }
 
+
+    protected open fun doCustomScheduledActions() {
+
+    }
+
+
     protected fun doWeHaveAnyStatusNeededRefereshing(statusRefresh: Map<PumpDataRefreshType?, Long?>?): Boolean {
+        // aapsLogger.error(LTag.PUMP, "Do we have status needed to refresh: $statusRefresh, currentTime=${System.currentTimeMillis()}")
         for ((_, value) in statusRefresh!!) {
             if (value!! > 0 && System.currentTimeMillis() > value) {
                 return true
@@ -540,8 +548,6 @@ abstract class PumpPluginAbstract protected constructor(
     }
 
 
-
-
     // this method needs to be overwriten in your driver and implement PumpDataRefreshCapable
     open fun getRefreshTime(pumpDataRefreshType: PumpDataRefreshType): Int {
         return -1

pump/common/src/main/kotlin/app/aaps/pump/common/defs/BolusData.kt

@@ -4,8 +4,10 @@ import app.aaps.pump.common.driver.connector.commands.data.AdditionalResponseDat
 import com.google.gson.annotations.Expose
 
 class BolusData constructor(
-    @Expose var timestamp: Long,
-    @Expose var amountImmediate : Double,
+    @Expose var timestamp: Long = System.currentTimeMillis(),
+    @Expose var amountImmediateRequested : Double? = null,
+    @Expose var amountImmediateDelivered : Double? = null,
+    @Expose var fullyDelivered: Boolean = false,
     @Expose var carbs : Double = 0.0,
     @Expose var durationMinutes : Int? = null,
     @Expose var amountExtended : Double? = null,

pump/common/src/main/kotlin/app/aaps/pump/common/driver/connector/PumpDummyConnector.kt

@@ -68,7 +68,7 @@ open class PumpDummyConnector(var pumpStatus: PumpStatus,
         //return successfulResponseForSet.cloneWithNewCommandType(PumpCommandType.SetBolus)
 
         return DataCommandResponse(
-            PumpCommandType.SetBolus, true, null, BolusData(amountImmediate = 1.0,
+            PumpCommandType.SetBolus, true, null, BolusData(amountImmediateDelivered = 1.0,
                                                             timestamp = System.currentTimeMillis())
         )
     }
@@ -77,7 +77,7 @@ open class PumpDummyConnector(var pumpStatus: PumpStatus,
         pumpUtil.sleepSeconds(10)
 
         return DataCommandResponse(
-            PumpCommandType.GetBolus, true, null, BolusData(amountImmediate = 1.0,
+            PumpCommandType.GetBolus, true, null, BolusData(amountImmediateDelivered = 1.0,
                                                             timestamp = System.currentTimeMillis())
         )
     }

pump/common/src/main/kotlin/app/aaps/pump/common/driver/connector/commands/parameters/CommandParameters.kt

@@ -72,10 +72,10 @@ open class CommandParameters //    public CommandParameters(YpsoPumpCommandType
     //        }
     //
     //    }
-    override fun equals(o: Any?): Boolean {
-        if (this === o) return true
-        if (o !is CommandParameters) return false
-        val that = o
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is CommandParameters) return false
+        val that = other
         return isSingleCommand == that.isSingleCommand && commandType == that.commandType && commandTypeList == that.commandTypeList
     }
 

pump/common/src/main/kotlin/app/aaps/pump/common/driver/connector/mgr/PumpConnectionManager.kt

@@ -488,7 +488,6 @@ abstract class PumpConnectionManager constructor(
 
         if (responseData.isSuccess) {
             pumpStatus.batteryRemaining = responseData.value!!
-            aapsLogger.error(TAG, "New Battery remaining: ${pumpStatus.batteryRemaining}")
         }
 
         return responseData

pump/common/src/main/res/values/strings.xml

@@ -7,7 +7,10 @@
     <string name="common_resultok">OK</string>
 
     <string name="pump_serial_number">Pump Serial Number</string>
+    <string name="bolus_preparing">Preparing for %1$.2f U bolus</string>
     <string name="bolus_delivered_so_far">%1$.2f U / %2$.2f U delivered</string>
+    <string name="bolus_finished_post_bolus">Bolus finished, performing post-bolus checks</string>
+
 
     <!-- PumpCommon - Overview fragment -->
     <string name="pump_base_basal_rate_with_profile">(%1s) %2$.2f U/h</string>

pump/tandem/build.gradle.kts

@@ -55,11 +55,9 @@ dependencies {
     testImplementation(project(":shared:impl"))
 
 
-    //api(libs.androidx.fragment)
     api(libs.androidx.room)
     api(libs.androidx.room.runtime)
     api(libs.androidx.room.rxjava3)
-    //api(libs.commons.codec)
 
     ksp(libs.androidx.room.compiler)
     ksp(libs.com.google.dagger.compiler)
@@ -80,13 +78,13 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.compose.navigation)
     implementation(libs.androidx.compose.runtime.livedata)
-    //implementation(libs.androidx.compose.material3.pullrefresh)
+    implementation(libs.io.github.vanpra.compose.dialogs.datetime)
 
     // pumpX2
     implementation(libs.com.jakewharton.timber)
     implementation(libs.com.github.weliem.blessed.android)
-    implementation("com.github.jwoglom.pumpX2:pumpx2-android:v1.6.9")
-
+    //implementation("com.github.jwoglom.pumpX2:pumpx2-android:v1.6.9")
+    implementation(libs.com.github.jwoglom.pumpx2.android)
 
 
     // temporarily X2 released under atech-software instead of jwoglom (some problems with linking)

pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/comm/TandemCommunicationManager.kt

@@ -173,9 +173,12 @@ class TandemCommunicationManager(
      * Sends command to the pump, if driver is in preventConnect mode any messages will be ignored,
      * unless we specify forceSend. Force send should be used only for ChangeFillManager
      */
+    @Synchronized
     fun sendCommand(request: Message, forceSend: Boolean = false): Message? {
         var times = 0
 
+        aapsLogger.error(TAG, "sendCommand: ${request.javaClass.simpleName}")  // TODO
+
         operationMode = OperationMode.StandardOperation
 
         if (pumpUtil.preventConnect) {