mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
feat: calculate default values for LoRa channel_num and frequency (#664)
This commit is contained in:
parent
f27ae8feba
commit
527d94d32a
7 changed files with 141 additions and 29 deletions
|
|
@ -43,9 +43,7 @@ data class Channel(
|
|||
val name: String
|
||||
get() = settings.name.ifEmpty {
|
||||
// We have a new style 'empty' channel name. Use the same logic from the device to convert that to a human readable name
|
||||
if (loraConfig.bandwidth != 0)
|
||||
"Unset"
|
||||
else when (loraConfig.modemPreset) {
|
||||
if (loraConfig.usePreset) when (loraConfig.modemPreset) {
|
||||
ModemPreset.SHORT_FAST -> "ShortFast"
|
||||
ModemPreset.SHORT_SLOW -> "ShortSlow"
|
||||
ModemPreset.MEDIUM_FAST -> "MediumFast"
|
||||
|
|
@ -55,7 +53,7 @@ data class Channel(
|
|||
ModemPreset.LONG_MODERATE -> "LongMod"
|
||||
ModemPreset.VERY_LONG_SLOW -> "VLongSlow"
|
||||
else -> "Invalid"
|
||||
}
|
||||
} else "Custom"
|
||||
}
|
||||
|
||||
val psk: ByteString
|
||||
|
|
@ -90,6 +88,26 @@ data class Channel(
|
|||
return "#${name}-${suffix}"
|
||||
}
|
||||
|
||||
/**
|
||||
* hash a string into an integer using the djb2 algorithm by Dan Bernstein
|
||||
* http://www.cse.yorku.ca/~oz/hash.html
|
||||
*/
|
||||
val hash: UInt // using UInt instead of Long to match RadioInterface.cpp results
|
||||
get() {
|
||||
var hash: UInt = 5381u
|
||||
for (c in name) {
|
||||
hash += (hash shl 5) + c.code.toUInt()
|
||||
print("$c ${c.code} $hash ")
|
||||
}
|
||||
return hash
|
||||
}
|
||||
|
||||
val channelNum: Int
|
||||
get() = if (loraConfig.channelNum != 0) loraConfig.channelNum
|
||||
else (hash % RegionInfo.numChannels(loraConfig).toUInt()).toInt() + 1
|
||||
|
||||
val radioFreq: Float get() = RegionInfo.radioFreq(loraConfig, channelNum)
|
||||
|
||||
override fun equals(other: Any?): Boolean = (other is Channel)
|
||||
&& psk.toByteArray() contentEquals other.psk.toByteArray()
|
||||
&& name == other.name
|
||||
|
|
|
|||
|
|
@ -1,27 +1,85 @@
|
|||
package com.geeksville.mesh.model
|
||||
|
||||
import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig
|
||||
import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig.ModemPreset
|
||||
import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig.RegionCode
|
||||
import com.geeksville.mesh.R
|
||||
|
||||
fun LoRaConfig.bandwidth() = if (usePreset) {
|
||||
val wideLora = region == RegionCode.LORA_24
|
||||
ChannelOption.bandwidth(modemPreset) * if (wideLora) 3.25f else 1f
|
||||
} else when (bandwidth) {
|
||||
31 -> .03125f
|
||||
62 -> .0625f
|
||||
200 -> .203125f
|
||||
400 -> .40625f
|
||||
800 -> .8125f
|
||||
1600 -> 1.6250f
|
||||
else -> bandwidth / 1000f
|
||||
}
|
||||
|
||||
enum class RegionInfo(
|
||||
val regionCode: RegionCode,
|
||||
val freqStart: Float,
|
||||
val freqEnd: Float,
|
||||
) {
|
||||
US(RegionCode.US, 902.0f, 928.0f),
|
||||
EU_433(RegionCode.EU_433, 433.0f, 434.0f),
|
||||
EU_868(RegionCode.EU_868, 869.4f, 869.65f),
|
||||
CN(RegionCode.CN, 470.0f, 510.0f),
|
||||
JP(RegionCode.JP, 920.8f, 927.8f),
|
||||
ANZ(RegionCode.ANZ, 915.0f, 928.0f),
|
||||
RU(RegionCode.RU, 868.7f, 869.2f),
|
||||
KR(RegionCode.KR, 920.0f, 923.0f),
|
||||
TW(RegionCode.TW, 920.0f, 925.0f),
|
||||
IN(RegionCode.IN, 865.0f, 867.0f),
|
||||
NZ_865(RegionCode.NZ_865, 864.0f, 868.0f),
|
||||
TH(RegionCode.TH, 920.0f, 925.0f),
|
||||
UA_433(RegionCode.UA_433, 433.0f, 434.7f),
|
||||
UA_868(RegionCode.UA_868, 868.0f, 868.6f),
|
||||
LORA_24(RegionCode.LORA_24, 2400.0f, 2483.5f),
|
||||
UNSET(RegionCode.UNSET, 902.0f, 928.0f);
|
||||
|
||||
companion object {
|
||||
fun numChannels(loraConfig: LoRaConfig): Int {
|
||||
for (option in values()) {
|
||||
if (option.regionCode == loraConfig.region)
|
||||
return ((option.freqEnd - option.freqStart) / loraConfig.bandwidth()).toInt()
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
fun radioFreq(loraConfig: LoRaConfig, channelNum: Int): Float = with(loraConfig) {
|
||||
if (overrideFrequency != 0f) return overrideFrequency + frequencyOffset
|
||||
for (option in values()) {
|
||||
if (option.regionCode == region)
|
||||
return (option.freqStart + bandwidth() / 2) + (channelNum - 1) * bandwidth()
|
||||
}
|
||||
return 0f
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum class ChannelOption(
|
||||
val modemPreset: ModemPreset,
|
||||
val configRes: Int,
|
||||
val bandwidth: Float,
|
||||
) {
|
||||
SHORT_FAST(ModemPreset.SHORT_FAST, R.string.modem_config_short),
|
||||
SHORT_SLOW(ModemPreset.SHORT_SLOW, R.string.modem_config_slow_short),
|
||||
MEDIUM_FAST(ModemPreset.MEDIUM_FAST, R.string.modem_config_medium),
|
||||
MEDIUM_SLOW(ModemPreset.MEDIUM_SLOW, R.string.modem_config_slow_medium),
|
||||
LONG_FAST(ModemPreset.LONG_FAST, R.string.modem_config_long),
|
||||
LONG_MODERATE(ModemPreset.LONG_MODERATE, R.string.modem_config_mod_long),
|
||||
LONG_SLOW(ModemPreset.LONG_SLOW, R.string.modem_config_slow_long),
|
||||
VERY_LONG_SLOW(ModemPreset.VERY_LONG_SLOW, R.string.modem_config_very_long);
|
||||
LONG_SLOW(ModemPreset.LONG_SLOW, R.string.modem_config_slow_long, .125f),
|
||||
VERY_LONG_SLOW(ModemPreset.VERY_LONG_SLOW, R.string.modem_config_very_long, .0625f),
|
||||
MEDIUM_SLOW(ModemPreset.MEDIUM_SLOW, R.string.modem_config_slow_medium, .250f),
|
||||
MEDIUM_FAST(ModemPreset.MEDIUM_FAST, R.string.modem_config_medium, .250f),
|
||||
SHORT_SLOW(ModemPreset.SHORT_SLOW, R.string.modem_config_slow_short, .250f),
|
||||
SHORT_FAST(ModemPreset.SHORT_FAST, R.string.modem_config_short, .250f),
|
||||
LONG_MODERATE(ModemPreset.LONG_MODERATE, R.string.modem_config_mod_long, .125f),
|
||||
LONG_FAST(ModemPreset.LONG_FAST, R.string.modem_config_long, .250f);
|
||||
|
||||
companion object {
|
||||
fun fromConfig(modemPreset: ModemPreset?): ChannelOption? {
|
||||
fun bandwidth(modemPreset: ModemPreset?): Float {
|
||||
for (option in values()) {
|
||||
if (option.modemPreset == modemPreset) return option
|
||||
if (option.modemPreset == modemPreset) return option.bandwidth
|
||||
}
|
||||
return null
|
||||
return 0f
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue