mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-03 05:33:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into osmdroid-phase3

Browse Source
This commit is contained in:
PWRxPSYCHO
2022-10-27 09:21:24 -04:00
committed by GitHub
parent 25ea4bddb8 2cc839eafd
commit 68dfc71812
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/geeksville/mesh/model/Channel.kt
View File

@@ -29,8 +29,13 @@ data class Channel(
// The default channel that devices ship with
val default = Channel(
channelSettings { psk = ByteString.copyFrom(defaultPSK) },
// reference: NodeDB::installDefaultConfig
loRaConfig { txEnabled = true; modemPreset = ModemPreset.LONG_FAST; hopLimit = 3 }
// references: NodeDB::installDefaultConfig / Channels::initDefaultChannel
loRaConfig {
usePreset = true
modemPreset = ModemPreset.LONG_FAST
hopLimit = 3
txEnabled = true
}
)
}

2
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -465,7 +465,7 @@ class UIViewModel @Inject constructor(
// Filter out of our results any packet that doesn't report SNR. This
// is primarily ADMIN_APP.
if (proto.rxSnr > 0.0f) {
if (proto.rxSnr != 0.0f) {
val rxDateTime = dateFormat.format(packet.received_date)
val rxFrom = proto.from.toUInt()
val senderName = nodesById[proto.from]?.user?.longName ?: ""