caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

get correct serial number in password reset

Browse source
This commit is contained in:
jbr7rr 2023-07-16 10:59:34 +02:00
parent f66afc8c02
commit c0819cda06
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
View file

@ -356,7 +356,8 @@ import kotlin.math.abs
} }
override fun serialNumber(): String { override fun serialNumber(): String {
return medtrumPump.pumpSN.toString(radix = 16) // Load from SP here, because this value will be get before pump is initialized
return medtrumPump.pumpSNFromSP.toString(radix = 16)
} }
override val pumpDescription: PumpDescription override val pumpDescription: PumpDescription

15
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt
View file

@ -206,6 +206,15 @@ class MedtrumPump @Inject constructor(
val pumpSN: Long val pumpSN: Long
get() = _pumpSN get() = _pumpSN
val pumpSNFromSP: Long
get() =
try {
sp.getString(R.string.key_sn_input, "0").toLong(radix = 16)
} catch (e: NumberFormatException) {
aapsLogger.debug(LTag.PUMP, "pumpSNFromSP: Invalid input!")
0L
}
var needCheckTimeUpdate = false var needCheckTimeUpdate = false
var lastTimeReceivedFromPump = 0L // Time in ms! var lastTimeReceivedFromPump = 0L // Time in ms!
var suspendTime = 0L // Time in ms! var suspendTime = 0L // Time in ms!
@ -288,12 +297,8 @@ class MedtrumPump @Inject constructor(
desiredAlarmSetting = AlarmSetting.values().firstOrNull { it.code == alarmSettingCode } ?: AlarmSetting.LIGHT_VIBRATE_AND_BEEP desiredAlarmSetting = AlarmSetting.values().firstOrNull { it.code == alarmSettingCode } ?: AlarmSetting.LIGHT_VIBRATE_AND_BEEP
desiredHourlyMaxInsulin = sp.getInt(info.nightscout.pump.medtrum.R.string.key_hourly_max_insulin, 40) desiredHourlyMaxInsulin = sp.getInt(info.nightscout.pump.medtrum.R.string.key_hourly_max_insulin, 40)
desiredDailyMaxInsulin = sp.getInt(info.nightscout.pump.medtrum.R.string.key_daily_max_insulin, 180) desiredDailyMaxInsulin = sp.getInt(info.nightscout.pump.medtrum.R.string.key_daily_max_insulin, 180)
_pumpSN = pumpSNFromSP
try {
_pumpSN = sp.getString(info.nightscout.pump.medtrum.R.string.key_sn_input, " ").toLong(radix = 16)
} catch (e: NumberFormatException) {
aapsLogger.debug(LTag.PUMP, "changePump: Invalid input!")
}
} }
fun buildMedtrumProfileArray(nsProfile: Profile): ByteArray? { fun buildMedtrumProfileArray(nsProfile: Profile): ByteArray? {