Bugfix in setting Dash basal
This commit is contained in:
Bart Sopers
parent
653deff0b6
commit
76c4d01ee7
|
|
@ -135,7 +135,8 @@ class OmnipodDashManagerImpl @Inject constructor(
|
|||
|
||||
private fun observeProgramBasalCommand(basalProgram: BasalProgram): Observable<PodEvent> {
|
||||
return Observable.defer {
|
||||
logger.debug(LTag.PUMPCOMM, "Programming basal. basalProgram={}", basalProgram)
|
||||
val currentTime = Date()
|
||||
logger.debug(LTag.PUMPCOMM, "Programming basal. currentTime={}, basalProgram={}", currentTime, basalProgram)
|
||||
bleManager.sendCommand(
|
||||
ProgramBasalCommand.Builder()
|
||||
.setUniqueId(podStateManager.uniqueId!!.toInt())
|
||||
|
|
@ -143,7 +144,7 @@ class OmnipodDashManagerImpl @Inject constructor(
|
|||
.setNonce(1229869870) // TODO
|
||||
.setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0))
|
||||
.setBasalProgram(basalProgram)
|
||||
.setCurrentTime(Date())
|
||||
.setCurrentTime(currentTime)
|
||||
.build(),
|
||||
DefaultStatusResponse::class
|
||||
)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ class Session(
|
|||
@Throws(CouldNotParseResponseException::class, UnsupportedOperationException::class)
|
||||
fun sendCommand(cmd: Command, responseType: KClass<out Response>): Response {
|
||||
sessionKeys.msgSequenceNumber++
|
||||
aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command: ${cmd.encoded.toHex()} in packet $cmd")
|
||||
aapsLogger.debug(
|
||||
LTag.PUMPBTCOMM,
|
||||
"Sending command: ${cmd.javaClass.simpleName}: ${cmd.encoded.toHex()} in packet $cmd"
|
||||
)
|
||||
|
||||
val msg = getCmdMessage(cmd)
|
||||
aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command(wrapped): ${msg.payload.toHex()}")
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ object ProgramBasalUtil {
|
|||
|
||||
fun mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot: ShortArray?): List<ShortInsulinProgramElement> {
|
||||
require(pulsesPerSlot!!.size <= NUMBER_OF_BASAL_SLOTS) { "Basal program must contain at most 48 slots" }
|
||||
|
||||
val elements: MutableList<ShortInsulinProgramElement> = ArrayList()
|
||||
var extraAlternatePulse = false
|
||||
var previousPulsesPerSlot: Short = 0
|
||||
|
|
@ -84,7 +85,7 @@ object ProgramBasalUtil {
|
|||
extraAlternatePulse = false
|
||||
}
|
||||
currentTotalNumberOfSlots++
|
||||
} else if (numberOfSlotsInCurrentElement.toInt() == 1 && pulsesPerSlot[currentTotalNumberOfSlots.toInt()].toInt() == previousPulsesPerSlot + 1) {
|
||||
} else if (numberOfSlotsInCurrentElement.toInt() == 1 && !extraAlternatePulse && pulsesPerSlot[currentTotalNumberOfSlots.toInt()].toInt() == previousPulsesPerSlot + 1) {
|
||||
// Second slot of segment with extra alternate pulse
|
||||
var expectAlternatePulseForNextSegment = false
|
||||
currentTotalNumberOfSlots++
|
||||
|
|
@ -94,10 +95,10 @@ object ProgramBasalUtil {
|
|||
// Loop rest alternate pulse segment
|
||||
if (pulsesPerSlot[currentTotalNumberOfSlots.toInt()].toInt() == previousPulsesPerSlot + (if (expectAlternatePulseForNextSegment) 1 else 0)) {
|
||||
// Still in alternate pulse segment
|
||||
currentTotalNumberOfSlots++
|
||||
expectAlternatePulseForNextSegment = !expectAlternatePulseForNextSegment
|
||||
if (numberOfSlotsInCurrentElement < MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT) {
|
||||
numberOfSlotsInCurrentElement++
|
||||
currentTotalNumberOfSlots++
|
||||
} else {
|
||||
// End of alternate pulse segment (no slots left in element)
|
||||
elements.add(
|
||||
|
|
@ -110,6 +111,7 @@ object ProgramBasalUtil {
|
|||
previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
|
||||
numberOfSlotsInCurrentElement = 1
|
||||
extraAlternatePulse = false
|
||||
currentTotalNumberOfSlots++
|
||||
break
|
||||
}
|
||||
} else {
|
||||
|
|
@ -193,6 +195,7 @@ object ProgramBasalUtil {
|
|||
val hourOfDay = instance[Calendar.HOUR_OF_DAY]
|
||||
val minuteOfHour = instance[Calendar.MINUTE]
|
||||
val secondOfMinute = instance[Calendar.SECOND]
|
||||
|
||||
val index = ((hourOfDay * 60 + minuteOfHour) / 30).toByte()
|
||||
val secondOfDay = secondOfMinute + hourOfDay * 3600 + minuteOfHour * 60
|
||||
val secondsRemaining = ((index + 1) * 1800 - secondOfDay).toShort()
|
||||
|
|
|
|||
|
|
@ -17,4 +17,8 @@ class ProgramReminder(
|
|||
or ((atInterval and 0x3f).toInt())
|
||||
).toByte()
|
||||
)
|
||||
|
||||
override fun toString(): String {
|
||||
return "ProgramReminder(atStart=$atStart, atEnd=$atEnd, atInterval=$atInterval)"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -295,7 +295,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
|
|||
// total delivered
|
||||
podInfoBinding.totalDelivered.text =
|
||||
if (podStateManager.isActivationCompleted && podStateManager.pulsesDelivered != null) {
|
||||
resourceHelper.gs(R.string.omnipod_common_overview_total_delivered_value, podStateManager.pulseRate)
|
||||
resourceHelper.gs(
|
||||
R.string.omnipod_common_overview_total_delivered_value,
|
||||
podStateManager.pulsesDelivered!! * 0.05
|
||||
)
|
||||
} else {
|
||||
PLACEHOLDER
|
||||
}
|
||||
|
|
@ -313,7 +316,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
|
|||
|
||||
podInfoBinding.reservoir.text = resourceHelper.gs(
|
||||
R.string.omnipod_common_overview_reservoir_value,
|
||||
(podStateManager.pulsesRemaining!! / 20.0)
|
||||
(podStateManager.pulsesRemaining!! * 0.05)
|
||||
)
|
||||
podInfoBinding.reservoir.setTextColor(
|
||||
if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class ProgramBasalCommandTest {
|
|||
BasalProgram.Segment(0.toShort(), 48.toShort(), 300)
|
||||
)
|
||||
val basalProgram = BasalProgram(segments)
|
||||
val date = Date(2021, 1, 17, 14, 47, 43)
|
||||
val date = Date(121, 1, 17, 14, 47, 43)
|
||||
|
||||
val encoded = ProgramBasalCommand.Builder() //
|
||||
.setUniqueId(37879809) //
|
||||
|
|
@ -27,6 +27,33 @@ class ProgramBasalCommandTest {
|
|||
.build() //
|
||||
.encoded
|
||||
|
||||
Assert.assertArrayEquals(Hex.decodeHex("0242000128241A12494E532E0005E81D1708000CF01EF01EF01E130E40001593004C4B403840005B8D80827C"), encoded)
|
||||
Assert.assertArrayEquals(
|
||||
Hex.decodeHex("0242000128241A12494E532E0005E81D1708000CF01EF01EF01E130E40001593004C4B403840005B8D80827C"),
|
||||
encoded
|
||||
)
|
||||
}
|
||||
|
||||
@Test @Throws(DecoderException::class) fun testProgramBasalCommandWithExtraAlternateSegmentPulse() {
|
||||
val segments = listOf(
|
||||
BasalProgram.Segment(0.toShort(), 48.toShort(), 5)
|
||||
)
|
||||
val basalProgram = BasalProgram(segments)
|
||||
val date = Date(121, 0, 30, 23, 21, 46)
|
||||
|
||||
val encoded = ProgramBasalCommand.Builder() //
|
||||
.setUniqueId(4241) //
|
||||
.setNonce(1229869870) //
|
||||
.setSequenceNumber(12.toShort()) //
|
||||
.setBasalProgram(basalProgram) //
|
||||
.setCurrentTime(date) //
|
||||
.setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0.toByte())) //
|
||||
.build() //
|
||||
.encoded
|
||||
|
||||
Assert.assertArrayEquals(
|
||||
Hex.decodeHex("0000109130241a12494e532e0000c52e0f700000f800f800f800130e0000000707fcad8000f015752a00033b"),
|
||||
encoded
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue