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

Merge branch 'osmdroid-phase3' of github.com:ScriptTactics/Meshtastic-Android into osmdroid-phase3

Browse source
This commit is contained in:
PWRxPSYCHO 2022-10-27 09:26:28 -04:00
commit 71ff6002a9
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 ?: ""

2
app/src/main/proto

@ -1 +1 @@
Subproject commit d0559bfa3c31023ed2f2aa3807b6a0a1da9a6feb
Subproject commit a79e3aef8117dad642b1a011ec0438619616740c