tim/karoo-headwind
1
0
Fork 0
Code Issues Actions Releases 12 Activity

Fix throttle setting label on K2 (#120)

Browse Source
This commit is contained in:
timklge 2025-05-05 15:31:03 +02:00 committed by GitHub
parent a0a1ad6f7b
commit cff4b07d7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/de/timklge/karooheadwind/HeadwindSettings.kt
View File

@ -70,8 +70,8 @@ enum class RefreshRate(val id: String, val k2Ms: Long, val k3Ms: Long) {
SLOW("slow", 5_000L, 3_000L), SLOW("slow", 5_000L, 3_000L),
MINIMUM("minimum", 10_000L, 10_000L); MINIMUM("minimum", 10_000L, 10_000L);
fun getDescription(karooSystemService: KarooSystemService): String { fun getDescription(isOnK2: Boolean): String {
return if (karooSystemService.hardwareType == HardwareType.K2) { return if (isOnK2) {
when (this) { when (this) {
FAST -> "Fast (1s)" FAST -> "Fast (1s)"
STANDARD -> "Standard (2s)" STANDARD -> "Standard (2s)"

9
app/src/main/kotlin/de/timklge/karooheadwind/screens/SettingsScreen.kt
View File

@ -84,6 +84,7 @@ fun SettingsScreen(onFinish: () -> Unit) {
var selectedWeatherProvider by remember { mutableStateOf(WeatherDataProvider.OPEN_METEO) } var selectedWeatherProvider by remember { mutableStateOf(WeatherDataProvider.OPEN_METEO) }
var openWeatherMapApiKey by remember { mutableStateOf("") } var openWeatherMapApiKey by remember { mutableStateOf("") }
var isK2 by remember { mutableStateOf(false) }
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
ctx.streamSettings(karooSystem).collect { settings -> ctx.streamSettings(karooSystem).collect { settings ->
@ -102,6 +103,7 @@ fun SettingsScreen(onFinish: () -> Unit) {
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
karooSystem.connect { connected -> karooSystem.connect { connected ->
karooConnected = connected karooConnected = connected
isK2 = karooSystem.hardwareType == io.hammerhead.karooext.models.HardwareType.K2
} }
} }
@ -151,8 +153,8 @@ fun SettingsScreen(onFinish: () -> Unit) {
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp) .fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)
) { ) {
val refreshRateDropdownOptions = RefreshRate.entries.toList().map { unit -> DropdownOption(unit.id, unit.getDescription(karooSystem)) } val refreshRateDropdownOptions = remember(isK2) { RefreshRate.entries.toList().map { unit -> DropdownOption(unit.id, unit.getDescription(isK2)) } }
val refreshRateSelection by remember(refreshRateSetting) { val refreshRateSelection by remember(refreshRateSetting, isK2) {
mutableStateOf(refreshRateDropdownOptions.find { option -> option.id == refreshRateSetting.id }!!) mutableStateOf(refreshRateDropdownOptions.find { option -> option.id == refreshRateSetting.id }!!)
} }
Dropdown( Dropdown(
@ -160,8 +162,7 @@ fun SettingsScreen(onFinish: () -> Unit) {
options = refreshRateDropdownOptions, options = refreshRateDropdownOptions,
selected = refreshRateSelection selected = refreshRateSelection
) { selectedOption -> ) { selectedOption ->
refreshRateSetting = refreshRateSetting = RefreshRate.entries.find { unit -> unit.id == selectedOption.id }!!
RefreshRate.entries.find { unit -> unit.id == selectedOption.id }!!
} }
val windDirectionIndicatorSettingDropdownOptions = val windDirectionIndicatorSettingDropdownOptions =