diff --git a/.skills/compose-ui/strings-index.txt b/.skills/compose-ui/strings-index.txt index 86f866cd9..f566b506c 100644 --- a/.skills/compose-ui/strings-index.txt +++ b/.skills/compose-ui/strings-index.txt @@ -803,6 +803,7 @@ label_long_slow label_long_turbo label_medium_fast label_medium_slow +label_medium_turbo label_narrow_fast label_narrow_slow label_short_fast diff --git a/core/model/src/commonMain/kotlin/org/meshtastic/core/model/Channel.kt b/core/model/src/commonMain/kotlin/org/meshtastic/core/model/Channel.kt index cb058cedb..b68025b0b 100644 --- a/core/model/src/commonMain/kotlin/org/meshtastic/core/model/Channel.kt +++ b/core/model/src/commonMain/kotlin/org/meshtastic/core/model/Channel.kt @@ -82,6 +82,7 @@ data class Channel(val settings: ChannelSettings = default.settings, val loraCon ModemPreset.SHORT_SLOW -> "ShortSlow" ModemPreset.MEDIUM_FAST -> "MediumFast" ModemPreset.MEDIUM_SLOW -> "MediumSlow" + ModemPreset.MEDIUM_TURBO -> "MediumTurbo" ModemPreset.LONG_FAST -> "LongFast" ModemPreset.LONG_SLOW -> "LongSlow" ModemPreset.LONG_MODERATE -> "LongMod" diff --git a/core/model/src/commonMain/kotlin/org/meshtastic/core/model/ChannelOption.kt b/core/model/src/commonMain/kotlin/org/meshtastic/core/model/ChannelOption.kt index d80199ecb..2ca454695 100644 --- a/core/model/src/commonMain/kotlin/org/meshtastic/core/model/ChannelOption.kt +++ b/core/model/src/commonMain/kotlin/org/meshtastic/core/model/ChannelOption.kt @@ -320,6 +320,7 @@ enum class ChannelOption(val modemPreset: ModemPreset, val bandwidth: Float, val LONG_SLOW(ModemPreset.LONG_SLOW, 0.125f, snrLimit = -20f), // SF12 MEDIUM_FAST(ModemPreset.MEDIUM_FAST, 0.250f, snrLimit = -12.5f), // SF9 MEDIUM_SLOW(ModemPreset.MEDIUM_SLOW, 0.250f, snrLimit = -15f), // SF10 + MEDIUM_TURBO(ModemPreset.MEDIUM_TURBO, 0.500f, snrLimit = -12.5f), // SF9 SHORT_FAST(ModemPreset.SHORT_FAST, 0.250f, snrLimit = -7.5f), // SF7 SHORT_SLOW(ModemPreset.SHORT_SLOW, 0.250f, snrLimit = -10f), // SF8 SHORT_TURBO(ModemPreset.SHORT_TURBO, 0.500f, snrLimit = -7.5f), // SF7 diff --git a/core/resources/src/commonMain/composeResources/values/strings.xml b/core/resources/src/commonMain/composeResources/values/strings.xml index bf5f6194c..fe5007258 100644 --- a/core/resources/src/commonMain/composeResources/values/strings.xml +++ b/core/resources/src/commonMain/composeResources/values/strings.xml @@ -827,6 +827,7 @@ Long Range - Turbo Medium Range - Fast Medium Range - Slow + Medium Range - Turbo Narrow - Fast Narrow - Slow Short Range - Fast diff --git a/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/util/ModelExtensions.kt b/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/util/ModelExtensions.kt index c1250f15f..cb3c971a5 100644 --- a/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/util/ModelExtensions.kt +++ b/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/util/ModelExtensions.kt @@ -28,6 +28,7 @@ import org.meshtastic.core.resources.label_long_slow import org.meshtastic.core.resources.label_long_turbo import org.meshtastic.core.resources.label_medium_fast import org.meshtastic.core.resources.label_medium_slow +import org.meshtastic.core.resources.label_medium_turbo import org.meshtastic.core.resources.label_narrow_fast import org.meshtastic.core.resources.label_narrow_slow import org.meshtastic.core.resources.label_short_fast @@ -49,6 +50,7 @@ val ChannelOption.labelRes: StringResource ChannelOption.LONG_SLOW -> Res.string.label_long_slow ChannelOption.MEDIUM_FAST -> Res.string.label_medium_fast ChannelOption.MEDIUM_SLOW -> Res.string.label_medium_slow + ChannelOption.MEDIUM_TURBO -> Res.string.label_medium_turbo ChannelOption.SHORT_FAST -> Res.string.label_short_fast ChannelOption.SHORT_SLOW -> Res.string.label_short_slow ChannelOption.SHORT_TURBO -> Res.string.label_short_turbo diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 128373f4c..57cefc28d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -98,7 +98,7 @@ mqttastic = "0.4.0" jmdns = "3.6.3" qrcode-kotlin = "4.5.0" takpacket-sdk = "0.7.0" -meshtastic-protobufs = "2.7.26.95-g1ae3be3-SNAPSHOT" +meshtastic-protobufs = "2.7.26.97-g9d589c1-SNAPSHOT" # Gradle Plugins develocity = "4.5.0"