caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Medtrum: Skip record if it fails

Browse source
This commit is contained in:
jbr7rr 2023-10-28 09:46:00 +02:00
parent 4b8c48b424
commit e026b59208
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,6 +139,7 @@ open class Notification {
const val PUMP_TIMEZONE_UPDATE_FAILED = 85 const val PUMP_TIMEZONE_UPDATE_FAILED = 85
const val BLUETOOTH_NOT_SUPPORTED = 86 const val BLUETOOTH_NOT_SUPPORTED = 86
const val PUMP_WARNING = 87 const val PUMP_WARNING = 87
const val PUMP_SYNC_ERROR = 88
const val USER_MESSAGE = 1000 const val USER_MESSAGE = 1000

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

@ -559,10 +559,29 @@ class MedtrumService : DaggerService(), BLECommCallback {
private fun syncRecords(): Boolean { private fun syncRecords(): Boolean {
aapsLogger.debug(LTag.PUMP, "syncRecords: called!, syncedSequenceNumber: ${medtrumPump.syncedSequenceNumber}, currentSequenceNumber: ${medtrumPump.currentSequenceNumber}") aapsLogger.debug(LTag.PUMP, "syncRecords: called!, syncedSequenceNumber: ${medtrumPump.syncedSequenceNumber}, currentSequenceNumber: ${medtrumPump.currentSequenceNumber}")
var result = true var result = true
var failureCount = 0
if (medtrumPump.syncedSequenceNumber < medtrumPump.currentSequenceNumber) { if (medtrumPump.syncedSequenceNumber < medtrumPump.currentSequenceNumber) {
for (sequence in (medtrumPump.syncedSequenceNumber + 1)..medtrumPump.currentSequenceNumber) { for (sequence in (medtrumPump.syncedSequenceNumber + 1)..medtrumPump.currentSequenceNumber) {
result = sendPacketAndGetResponse(GetRecordPacket(injector, sequence), COMMAND_SYNC_TIMEOUT_SEC) val packet = GetRecordPacket(injector, sequence)
if (!result) break result = sendPacketAndGetResponse(packet, COMMAND_SYNC_TIMEOUT_SEC)
if (!result && packet.failed) {
// Record may be broken for unkown reasons, try the next packet if that fails abort
failureCount++
if (failureCount == 1) {
// Show notification to alert user of failure
uiInteraction.addNotificationWithSound(
Notification.PUMP_SYNC_ERROR,
rh.gs(R.string.pump_sync_error),
Notification.URGENT,
app.aaps.core.ui.R.raw.alarm
)
} else if (failureCount >= 2) {
break
}
} else if (!result) {
// Communication timeout, try again
break
}
} }
} }
return result return result

1
pump/medtrum/src/main/res/values/strings.xml
View file

@ -38,6 +38,7 @@
<string name="pump_is_suspended_day_max">Pump is suspended due to daily max insulin exceeded</string> <string name="pump_is_suspended_day_max">Pump is suspended due to daily max insulin exceeded</string>
<string name="patch_not_active">Patch not activated</string> <string name="patch_not_active">Patch not activated</string>
<string name="pump_setting_failed">Setting user settings to pump failed!</string> <string name="pump_setting_failed">Setting user settings to pump failed!</string>
<string name="pump_sync_error">Error while syncing history from pump, a record has been skipped. Check treatment tab to check if bolus is synced correctly. Snooze and if error keep coming back change patch or pumpbase.</string>
<!-- overview fragment --> <!-- overview fragment -->
<string name="ble_status_label">BLE Status</string> <string name="ble_status_label">BLE Status</string>