Merge pull request #79 from 0pen-dash/avereha/suspend-beep
suspend sound alert. other fixes
This commit is contained in:
Andrei Vereha
GitHub
commit
d3acab4a32
|
|
@ -147,13 +147,12 @@ class OmnipodDashPumpPlugin @Inject constructor(
|
|||
} else {
|
||||
rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED))
|
||||
if (podStateManager.isSuspended) {
|
||||
val notification =
|
||||
Notification(
|
||||
Notification.OMNIPOD_POD_SUSPENDED,
|
||||
"Insulin delivery suspended",
|
||||
Notification.NORMAL
|
||||
)
|
||||
rxBus.send(EventNewNotification(notification))
|
||||
showNotification(
|
||||
Notification.OMNIPOD_POD_SUSPENDED,
|
||||
"Insulin delivery suspended",
|
||||
Notification.NORMAL,
|
||||
R.raw.boluserror
|
||||
)
|
||||
} else {
|
||||
rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
|
||||
if (!podStateManager.sameTimeZone) {
|
||||
|
|
@ -328,6 +327,15 @@ class OmnipodDashPumpPlugin @Inject constructor(
|
|||
Notification.URGENT,
|
||||
R.raw.boluserror
|
||||
)
|
||||
if (!podStateManager.alarmSynced) {
|
||||
pumpSync.insertAnnouncement(
|
||||
error = podStateManager.alarmType?.toString() ?: "Unknown pod failure",
|
||||
pumpId = Random.Default.nextLong(),
|
||||
pumpType = PumpType.OMNIPOD_DASH,
|
||||
pumpSerial = serialNumber()
|
||||
)
|
||||
podStateManager.alarmSynced = true
|
||||
}
|
||||
}
|
||||
Completable.complete()
|
||||
}
|
||||
|
|
@ -1068,7 +1076,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
|
|||
private fun deactivatePod(): PumpEnactResult {
|
||||
val ret = executeProgrammingCommand(
|
||||
historyEntry = history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
|
||||
command = omnipodManager.deactivatePod().ignoreElements()
|
||||
command = omnipodManager.deactivatePod().ignoreElements(),
|
||||
checkNoActiveCommand = false,
|
||||
).doOnComplete {
|
||||
rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
|
||||
}.toPumpEnactResult()
|
||||
|
|
@ -1381,6 +1390,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
|
|||
sp.getBoolean(R.string.key_omnipod_common_notification_uncertain_tbr_sound_enabled, true)
|
||||
Notification.OMNIPOD_UNCERTAIN_SMB ->
|
||||
sp.getBoolean(R.string.key_omnipod_common_notification_uncertain_smb_sound_enabled, true)
|
||||
Notification.OMNIPOD_POD_SUSPENDED ->
|
||||
sp.getBoolean(R.string.key_omnipod_common_notification_delivery_suspended_sound_enabled, true)
|
||||
else -> true
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
|
||||
|
||||
open class FailedToConnectException : Exception {
|
||||
constructor(message: String? = null) : super("Failed to connect: ${message ?: ""}")
|
||||
}
|
||||
open class FailedToConnectException(message: String? = null) : Exception("Failed to connect: ${message ?: ""}")
|
||||
|
|
|
|||
|
|
@ -2,6 +2,5 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan
|
|||
|
||||
import android.os.ParcelUuid
|
||||
|
||||
class DiscoveredInvalidPodException : Exception {
|
||||
constructor(message: String, serviceUUIds: List<ParcelUuid?>) : super("$message service UUIDs: $serviceUUIds")
|
||||
}
|
||||
class DiscoveredInvalidPodException(message: String, serviceUUIds: List<ParcelUuid?>) :
|
||||
Exception("$message service UUIDs: $serviceUUIds")
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ enum class BeepRepetitionType(
|
|||
XXX(0x01.toByte()), // Used in lump of coal alert, LOW_RESERVOIR
|
||||
XXX2(0x03.toByte()), // Used in USER_SET_EXPIRATION
|
||||
XXX3(0x05.toByte()), // published system expiration alert
|
||||
XXX4(0x06.toByte()), // Used in imminent pod expiration alert
|
||||
XXX4(0x06.toByte()), // Used in imminent pod expiration alert, suspend in progress
|
||||
XXX5(0x08.toByte()); // Lump of coal alert
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@ enum class BeepType(val value: Byte) {
|
|||
|
||||
SILENT(0x00.toByte()),
|
||||
FOUR_TIMES_BIP_BEEP(0x02.toByte()), // Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert
|
||||
XXX(0x04.toByte()), // Used during suspend
|
||||
LONG_SINGLE_BEEP(0x06.toByte()); // Used in stop delivery command
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ import java.time.Duration
|
|||
|
||||
class PodConstants {
|
||||
companion object {
|
||||
val MAX_POD_LIFETIME = Duration.ofMinutes(80)
|
||||
val MAX_POD_LIFETIME = Duration.ofHours(80)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ interface OmnipodDashPodStateManager {
|
|||
val time: ZonedDateTime?
|
||||
val timeDrift: java.time.Duration?
|
||||
val expiry: ZonedDateTime?
|
||||
var alarmSynced: Boolean
|
||||
|
||||
val messageSequenceNumber: Short
|
||||
val sequenceNumberOfLastProgrammingCommand: Short?
|
||||
|
|
|
|||
|
|
@ -124,7 +124,19 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
|
|||
override val sameTimeZone: Boolean
|
||||
get() {
|
||||
val now = System.currentTimeMillis()
|
||||
return TimeZone.getDefault().getOffset(now) == timeZone.getOffset(now)
|
||||
val currentTimezone = TimeZone.getDefault()
|
||||
val currentOffset = currentTimezone.getOffset(now)
|
||||
val podOffset = timeZone.getOffset(now)
|
||||
logger.debug(
|
||||
LTag.PUMPCOMM,
|
||||
"sameTimeZone currentTimezone=${currentTimezone.getDisplayName(
|
||||
true,
|
||||
TimeZone.SHORT
|
||||
)} " +
|
||||
"currentOffset=$currentOffset " +
|
||||
"podOffset=$podOffset"
|
||||
)
|
||||
return currentOffset == podOffset
|
||||
}
|
||||
|
||||
override val bluetoothVersion: SoftwareVersion?
|
||||
|
|
@ -233,6 +245,13 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
|
|||
return null
|
||||
}
|
||||
|
||||
override var alarmSynced: Boolean
|
||||
get() = podState.alarmSynced
|
||||
set(value) {
|
||||
podState.alarmSynced = value
|
||||
store()
|
||||
}
|
||||
|
||||
override var bluetoothConnectionState: OmnipodDashPodStateManager.BluetoothConnectionState
|
||||
@Synchronized
|
||||
get() = podState.bluetoothConnectionState
|
||||
|
|
@ -498,8 +517,10 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
|
|||
podState.lastStatusResponseReceived = 0
|
||||
}
|
||||
|
||||
CommandSendingFailure, NoActiveCommand ->
|
||||
CommandSendingFailure, NoActiveCommand -> {
|
||||
podState.activeCommand = null
|
||||
podState.lastStatusResponseReceived = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -576,7 +597,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
|
|||
override fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) {
|
||||
logger.info(
|
||||
LTag.PUMP,
|
||||
"Received AlarmStatusReponse: $response"
|
||||
"Received AlarmStatusResponse: $response"
|
||||
)
|
||||
podState.deliveryStatus = response.deliveryStatus
|
||||
podState.podStatus = response.podStatus
|
||||
|
|
@ -660,6 +681,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
|
|||
var eapAkaSequenceNumber: Long = 1
|
||||
var bolusPulsesRemaining: Short = 0
|
||||
var timeZone: String = "" // TimeZone ID (e.g. "Europe/Amsterdam")
|
||||
var alarmSynced: Boolean = false
|
||||
|
||||
var bleVersion: SoftwareVersion? = null
|
||||
var firmwareVersion: SoftwareVersion? = null
|
||||
|
|
|
|||
|
|
@ -21,4 +21,6 @@
|
|||
|
||||
<string name="key_omnipod_common_preferences_category_confirmation_beeps" translatable="false">omnipod_common_preferences_category_confirmation</string>
|
||||
<string name="key_common_preferences_category_other_settings" translatable="false">common_preferences_category_other</string>
|
||||
<string name="key_omnipod_common_notification_delivery_suspended_sound_enabled">AAPS.Omnipod.notification_delivery_suspended_sound_enabled</string>
|
||||
<string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Sound when delivery suspended notification enabled</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -93,6 +93,11 @@
|
|||
android:key="@string/key_omnipod_common_notification_uncertain_bolus_sound_enabled"
|
||||
android:title="@string/omnipod_common_preferences_notification_uncertain_bolus_sound_enabled" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/key_omnipod_common_notification_delivery_suspended_sound_enabled"
|
||||
android:title="@string/omnipod_common_preferences_notification_delivery_suspended_sound_enabled" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
|
|
|
|||
Loading…
Reference in a new issue