tim/karoo-powerbar
1
0
Fork 0
Code Issues Actions Releases 5 Activity

Fix smoothing options for pedal balance source (#62)

Browse Source
This commit is contained in:
timklge 2025-08-18 18:00:50 +02:00 committed by GitHub
parent 659250fb78
commit f0495768fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt
View File

@ -188,9 +188,9 @@ class Window(
SelectedSource.ROUTE_PROGRESS -> streamRouteProgress(SelectedSource.ROUTE_PROGRESS, ::getRouteProgress) SelectedSource.ROUTE_PROGRESS -> streamRouteProgress(SelectedSource.ROUTE_PROGRESS, ::getRouteProgress)
SelectedSource.REMAINING_ROUTE -> streamRouteProgress(SelectedSource.REMAINING_ROUTE, ::getRemainingRouteProgress) SelectedSource.REMAINING_ROUTE -> streamRouteProgress(SelectedSource.REMAINING_ROUTE, ::getRemainingRouteProgress)
SelectedSource.GRADE -> streamGrade() SelectedSource.GRADE -> streamGrade()
SelectedSource.POWER_BALANCE -> streamBalance(PedalBalanceSmoothing.RAW) SelectedSource.POWER_BALANCE -> streamBalance(PedalBalanceSmoothing.RAW, SelectedSource.POWER_BALANCE)
SelectedSource.POWER_BALANCE_3S -> streamBalance(PedalBalanceSmoothing.SMOOTHED_3S) SelectedSource.POWER_BALANCE_3S -> streamBalance(PedalBalanceSmoothing.SMOOTHED_3S, SelectedSource.POWER_BALANCE_3S)
SelectedSource.POWER_BALANCE_10S -> streamBalance(PedalBalanceSmoothing.SMOOTHED_10S) SelectedSource.POWER_BALANCE_10S -> streamBalance(PedalBalanceSmoothing.SMOOTHED_10S, SelectedSource.POWER_BALANCE_10S)
SelectedSource.FRONT_GEAR -> streamGears(Gears.FRONT) SelectedSource.FRONT_GEAR -> streamGears(Gears.FRONT)
SelectedSource.REAR_GEAR -> streamGears(Gears.REAR) SelectedSource.REAR_GEAR -> streamGears(Gears.REAR)
SelectedSource.NONE -> {} SelectedSource.NONE -> {}
@ -209,7 +209,7 @@ class Window(
} }
} }
private suspend fun streamBalance(smoothing: PedalBalanceSmoothing) { private suspend fun streamBalance(smoothing: PedalBalanceSmoothing, selectedSource: SelectedSource) {
data class StreamData(val powerBalanceLeft: Double?, val power: Double?) data class StreamData(val powerBalanceLeft: Double?, val power: Double?)
karooSystem.streamDataFlow(smoothing.dataTypeId) karooSystem.streamDataFlow(smoothing.dataTypeId)
@ -221,7 +221,7 @@ class Window(
.distinctUntilChanged() .distinctUntilChanged()
.throttle(1_000).collect { streamData -> .throttle(1_000).collect { streamData ->
val powerBalanceLeft = streamData.powerBalanceLeft val powerBalanceLeft = streamData.powerBalanceLeft
val powerbarsWithBalanceSource = powerbars.values.filter { it.source == SelectedSource.POWER_BALANCE } val powerbarsWithBalanceSource = powerbars.values.filter { it.source == selectedSource }
powerbarsWithBalanceSource.forEach { powerbar -> powerbarsWithBalanceSource.forEach { powerbar ->
powerbar.drawMode = ProgressBarDrawMode.CENTER_OUT powerbar.drawMode = ProgressBarDrawMode.CENTER_OUT