Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt

@@ -498,25 +498,25 @@ class MedtrumPump @Inject constructor(
 
     fun alarmStateToString(alarmState: AlarmState): String {
         val stringId = when (alarmState) {
-            AlarmState.NONE               -> R.string.alarm_none
+            AlarmState.NONE                 -> R.string.alarm_none
-            AlarmState.PUMP_LOW_BATTERY   -> R.string.alarm_pump_low_battery
+            AlarmState.PUMP_LOW_BATTERY     -> R.string.alarm_pump_low_battery
-            AlarmState.PUMP_LOW_RESERVOIR -> R.string.alarm_pump_low_reservoir
+            AlarmState.PUMP_LOW_RESERVOIR   -> R.string.alarm_pump_low_reservoir
-            AlarmState.PUMP_EXPIRES_SOON  -> R.string.alarm_pump_expires_soon
+            AlarmState.PUMP_EXPIRES_SOON    -> R.string.alarm_pump_expires_soon
-            AlarmState.LOW_BG_SUSPENDED   -> R.string.alarm_low_bg_suspended
+            AlarmState.LOW_BG_SUSPENDED     -> R.string.alarm_low_bg_suspended
-            AlarmState.LOW_BG_SUSPENDED2  -> R.string.alarm_low_bg_suspended2
+            AlarmState.LOW_BG_SUSPENDED2    -> R.string.alarm_low_bg_suspended2
             AlarmState.AUTO_SUSPENDED       -> R.string.alarm_auto_suspended
             AlarmState.HOURLY_MAX_SUSPENDED -> R.string.alarm_hourly_max_suspended
             AlarmState.DAILY_MAX_SUSPENDED  -> R.string.alarm_daily_max_suspended
             AlarmState.SUSPENDED            -> R.string.alarm_suspended
-            AlarmState.PAUSED             -> R.string.alarm_paused
+            AlarmState.PAUSED               -> R.string.alarm_paused
-            AlarmState.OCCLUSION          -> R.string.alarm_occlusion
+            AlarmState.OCCLUSION            -> R.string.alarm_occlusion
-            AlarmState.EXPIRED            -> R.string.alarm_expired
+            AlarmState.EXPIRED              -> R.string.alarm_expired
-            AlarmState.RESERVOIR_EMPTY    -> R.string.alarm_reservoir_empty
+            AlarmState.RESERVOIR_EMPTY      -> R.string.alarm_reservoir_empty
-            AlarmState.PATCH_FAULT        -> R.string.alarm_patch_fault
+            AlarmState.PATCH_FAULT          -> R.string.alarm_patch_fault
-            AlarmState.PATCH_FAULT2       -> R.string.alarm_patch_fault2
+            AlarmState.PATCH_FAULT2         -> R.string.alarm_patch_fault2
-            AlarmState.BASE_FAULT         -> R.string.alarm_base_fault
+            AlarmState.BASE_FAULT           -> R.string.alarm_base_fault
-            AlarmState.BATTERY_OUT        -> R.string.alarm_battery_out
+            AlarmState.BATTERY_OUT          -> R.string.alarm_battery_out
-            AlarmState.NO_CALIBRATION     -> R.string.alarm_no_calibration
+            AlarmState.NO_CALIBRATION       -> R.string.alarm_no_calibration
         }
         return rh.gs(stringId)
     }

pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SynchronizePacket.kt

@@ -49,14 +49,12 @@ class SynchronizePacket(injector: HasAndroidInjector) : MedtrumPacket(injector)
                 aapsLogger.debug(LTag.PUMPCOMM, "SynchronizePacket: fieldMask: $fieldMask")
             }
 
-            // Remove bolus fields from fieldMask if fields are present (we sync bolus trough other commands)
+            // Remove extended bolus field from fieldMask if field is present (extended bolus is not supported)
             if (fieldMask and MASK_SUSPEND != 0) {
                 offset += 4 // If field is present, skip 4 bytes
             }
             if (fieldMask and MASK_NORMAL_BOLUS != 0) {
-                aapsLogger.debug(LTag.PUMPCOMM, "SynchronizePacket: Normal bolus present removing from fieldMask")
+                offset += 3 // If field is present, skip 3 bytes
-                fieldMask = fieldMask and MASK_NORMAL_BOLUS.inv()
-                syncData = syncData.copyOfRange(0, offset) + syncData.copyOfRange(offset + 3, syncData.size)
             }
             if (fieldMask and MASK_EXTENDED_BOLUS != 0) {
                 aapsLogger.debug(LTag.PUMPCOMM, "SynchronizePacket: Extended bolus present removing from fieldMask")

pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt

@@ -164,8 +164,19 @@ class MedtrumService : DaggerService(), BLECommCallback {
         if (currentState is IdleState) {
             medtrumPump.connectionState = ConnectionState.CONNECTING
             return bleComm.connect(from, medtrumPump.pumpSN)
+        } else if (currentState is ReadyState) {
+            aapsLogger.error(LTag.PUMPCOMM, "Connect attempt when in ReadyState from: $from")
+            if (isConnected) {
+                aapsLogger.debug(LTag.PUMP, "connect: already connected")
+                return true
+            } else {
+                aapsLogger.debug(LTag.PUMP, "connect: not connected, resetting state and trying to connect")
+                toState(IdleState())
+                medtrumPump.connectionState = ConnectionState.CONNECTING
+                return bleComm.connect(from, medtrumPump.pumpSN)
+            }
         } else {
-            aapsLogger.error(LTag.PUMPCOMM, "Connect attempt when in non Idle state from: $from")
+            aapsLogger.error(LTag.PUMPCOMM, "Connect attempt when in state: $currentState from: $from")
             return false
         }
     }
@@ -287,20 +298,22 @@ class MedtrumService : DaggerService(), BLECommCallback {
     }
 
     fun setBolus(detailedBolusInfo: DetailedBolusInfo, t: EventOverviewBolusProgress.Treatment): Boolean {
-        if (!isConnected) return false
+        if (!isConnected) {
-        if (BolusProgressData.stopPressed) return false
+            aapsLogger.warn(LTag.PUMPCOMM, "Pump not connected, not setting bolus")
+            return false
+        }
+        if (BolusProgressData.stopPressed) {
+            aapsLogger.warn(LTag.PUMPCOMM, "Bolus stop pressed, not setting bolus")
+            return false
+        }
+        if (!medtrumPump.bolusDone) {
+            aapsLogger.warn(LTag.PUMPCOMM, "Bolus already in progress, not setting new one")
+            return false
+        }
+
         val insulin = detailedBolusInfo.insulin
-        val bolusStart = System.currentTimeMillis()
-
-        medtrumPump.bolusDone = false
-        medtrumPump.bolusingTreatment = t
-        medtrumPump.bolusAmountToBeDelivered = insulin
-        medtrumPump.bolusStopped = false
-        medtrumPump.bolusProgressLastTimeStamp = bolusStart
-
         if (insulin > 0) {
-            val result = sendPacketAndGetResponse(SetBolusPacket(injector, insulin))
+            if (!sendPacketAndGetResponse(SetBolusPacket(injector, insulin))) {
-            if (!result) {
                 aapsLogger.error(LTag.PUMPCOMM, "Failed to set bolus")
                 commandQueue.loadEvents(null) // make sure if anything is delivered (which is highly unlikely at this point) we get it
                 t.insulin = 0.0
@@ -312,6 +325,13 @@ class MedtrumService : DaggerService(), BLECommCallback {
             return false
         }
 
+        val bolusStart = System.currentTimeMillis()
+        medtrumPump.bolusDone = false
+        medtrumPump.bolusingTreatment = t
+        medtrumPump.bolusAmountToBeDelivered = insulin
+        medtrumPump.bolusStopped = false
+        medtrumPump.bolusProgressLastTimeStamp = bolusStart
+
         detailedBolusInfo.timestamp = bolusStart // Make sure the timestamp is set to the start of the bolus
         detailedBolusInfoStorage.add(detailedBolusInfo) // will be picked up on reading history
         // Sync the initial bolus
@@ -641,7 +661,7 @@ class MedtrumService : DaggerService(), BLECommCallback {
             result = currentState.waitForResponse(timeout)
             SystemClock.sleep(100)
         } else {
-            aapsLogger.error(LTag.PUMPCOMM, "Send packet attempt when in non Ready state")
+            aapsLogger.error(LTag.PUMPCOMM, "Send packet attempt when in state: $currentState")
         }
         return result
     }

pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt

@@ -103,7 +103,7 @@ class MedtrumOverviewViewModel @Inject constructor(
 
                     ConnectionState.DISCONNECTING -> {
                         _bleStatus.postValue("{fa-bluetooth-b spin}")
-                        _canDoRefresh.postValue(false)
+                        _canDoRefresh.postValue(true)
                     }
                 }
                 updateGUI()