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

Fix frequency calculation for amateur radio regions

Browse source 
The frequency calculation for amateur radio regions was incorrectly including `regionInfo.spacing`. This change removes the spacing component from the calculation when the region description contains "Amateur", aligning the behavior with the firmware.
This commit is contained in:
James Rich 2026-01-23 11:06:34 -06:00
parent 0724924f8c
commit 0d9c1a6c02
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,14 +99,16 @@ internal fun LoRaConfig.radioFreq(channelNum: Int): Float {
return if (regionInfo != null) {
val bw = bandwidth(regionInfo)
val channelSpacing = regionInfo.spacing + bw
// Match firmware: float freq = myRegion->freqStart + myRegion->spacing + (bw / 2000) + (channel_num *
// 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);
// Note: firmware channel_num is 0-indexed in the calculation, but the app uses 1-indexed for some reason?
// Let's re-verify the firmware logic.
// Firmware: channel_num = hash(channelName) % numChannels;
// freq = myRegion->freqStart + myRegion->spacing + (bw / 2000) + (channel_num * channelSpacing);
// The app's channelNum function returns 1..numChannels if channelNum is 0.
(regionInfo.freqStart + regionInfo.spacing + bw / 2) + (channelNum - 1) * channelSpacing
if (regionInfo.description.contains("Amateur")) {
(regionInfo.freqStart + bw / 2) + (channelNum - 1) * channelSpacing
} else {
(regionInfo.freqStart + regionInfo.spacing + bw / 2) + (channelNum - 1) * channelSpacing
}
} else {
0f
}