Skip to content

feat(equil): add multi-version pump support #4396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hhfcvmars wants to merge 1 commit into
base: dev
Choose a base branch
from
+19 −1
Open

feat(equil): add multi-version pump support #4396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pump/equil/src/main/kotlin/app/aaps/pump/equil/EquilConst.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ object EquilConst {
const val EQUIL_BLE_WRITE_TIME_OUT: Long = 20
const val EQUIL_BLE_NEXT_CMD: Long = 150
const val EQUIL_SUPPORT_LEVEL = 5.3f
const val EQUIL_SUPPORT_LEVEL_PUMP_V1_0 = 5.3f // 1.0 PUMP
const val EQUIL_SUPPORT_LEVEL_PUMP_V1_5 = 1.3f // 1.5 PUMP
const val EQUIL_SUPPORT_LEVEL_PUMP_V1_5R = 2.3f // 1.5R PUMP
const val EQUIL_BOLUS_THRESHOLD_STEP = 1600
const val EQUIL_BASAL_THRESHOLD_STEP = 240
const val EQUIL_STEP_MAX = 32000
Expand Down
17 changes: 16 additions & 1 deletion pump/equil/src/main/kotlin/app/aaps/pump/equil/manager/command/CmdDevicesOldGet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,22 @@ class CmdDevicesOldGet(
}
}

fun isSupport(): Boolean = firmwareVersion >= EquilConst.EQUIL_SUPPORT_LEVEL
fun isSupport(serialNumber: String): Boolean {
val firstChar = serialNumber.firstOrNull()?.uppercaseChar()
return when {
// 1.0 pump
firmwareVersion >= EquilConst.EQUIL_SUPPORT_LEVEL_PUMP_V1_0 -> true

// 1.5 pump
firstChar != null && firstChar in '6'..'9' ->
firmwareVersion <= EquilConst.EQUIL_SUPPORT_LEVEL_PUMP_V1_5

// 1.5R pump
firstChar == 'A' -> firmwareVersion < EquilConst.EQUIL_SUPPORT_LEVEL_PUMP_V1_5R

else -> false
}
}

override fun getEventType(): EquilHistoryRecord.EventType? = null
}