meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove us 433

Browse source
This commit is contained in:
James Rich 2026-01-23 11:29:14 -06:00
parent 0d9c1a6c02
commit 04abfecf70
1 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/model/src/main/kotlin/org/meshtastic/core/model/ChannelOption.kt
View file

@ -101,14 +101,9 @@ internal fun LoRaConfig.radioFreq(channelNum: Int): Float {
val channelSpacing = regionInfo.spacing + bw
// The frequency calculation attempts to match firmware behavior,
// where channel_num is 0-indexed in the calculation, but 1-indexed in the app's channelNum function.
// For amateur radio regions, regionInfo.spacing is not included in the frequency calculation.
// Firmware example: float freq = myRegion->freqStart + myRegion->spacing + (bw / 2000) + (channel_num *
// channelSpacing);
if (regionInfo.description.contains("Amateur")) {
(regionInfo.freqStart + bw / 2) + (channelNum - 1) * channelSpacing
} else {
(regionInfo.freqStart + regionInfo.spacing + bw / 2) + (channelNum - 1) * channelSpacing
}
(regionInfo.freqStart + regionInfo.spacing + bw / 2) + (channelNum - 1) * channelSpacing
} else {
0f
}
@ -344,16 +339,6 @@ enum class RegionInfo(
spacing = 0.015f,
defaultPreset = ModemPreset.NARROW_FAST,
),
/** US 433MHz Amateur Use band */
HAM_US433(
RegionCode.HAM_US433,
"United States 433MHz (Amateur)",
430.0f,
450.0f,
wideLora = false,
defaultPreset = ModemPreset.NARROW_SLOW,
),
;
companion object {