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

Feat/improve debug decoding (#3554)

Browse Source
This commit is contained in:
Dane Evans
2025-10-30 14:10:06 +11:00
committed by GitHub
parent 213cb78491
commit c482bd0aaf
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt
View File

@@ -35,6 +35,7 @@ import kotlinx.coroutines.launch
import org.meshtastic.core.data.repository.MeshLogRepository
import org.meshtastic.core.data.repository.NodeRepository
import org.meshtastic.core.database.entity.MeshLog
import org.meshtastic.core.model.getTracerouteResponse
import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
import org.meshtastic.proto.AdminProtos
import org.meshtastic.proto.MeshProtos
@@ -366,6 +367,7 @@ constructor(
* @return A human-readable string representation of the decoded payload, or an error message if decoding fails, or
* null if the log does not contain a decodable packet.
*/
@Suppress("detekt:CyclomaticComplexMethod") // large switch that detekt doesn't parse well.
private fun decodePayloadFromMeshLog(log: MeshLog): String? {
var result: String? = null
val packet = log.meshPacket
@@ -389,6 +391,8 @@ constructor(
PortNum.PAXCOUNTER_APP_VALUE -> PaxcountProtos.Paxcount.parseFrom(payload).toString()
PortNum.STORE_FORWARD_APP_VALUE ->
StoreAndForwardProtos.StoreAndForward.parseFrom(payload).toString()
PortNum.NEIGHBORINFO_APP_VALUE -> decodeNeighborInfo(payload)
PortNum.TRACEROUTE_APP_VALUE -> decodeTraceroute(packet, payload)
else -> payload.joinToString(" ") { HEX_FORMAT.format(it) }
}
} catch (e: InvalidProtocolBufferException) {
@@ -397,4 +401,34 @@ constructor(
}
return result
}
private fun formatNodeWithShortName(nodeNum: Int): String {
val user = nodeRepository.nodeDBbyNum.value[nodeNum]?.user
val shortName = user?.shortName?.takeIf { it.isNotEmpty() } ?: ""
val nodeId = "!%08x".format(nodeNum)
return if (shortName.isNotEmpty()) "$nodeId ($shortName)" else nodeId
}
private fun decodeNeighborInfo(payload: ByteArray): String {
val info = MeshProtos.NeighborInfo.parseFrom(payload)
return buildString {
appendLine("NeighborInfo:")
appendLine(" node_id: ${formatNodeWithShortName(info.nodeId)}")
appendLine(" last_sent_by_id: ${formatNodeWithShortName(info.lastSentById)}")
appendLine(" node_broadcast_interval_secs: ${info.nodeBroadcastIntervalSecs}")
if (info.neighborsCount > 0) {
appendLine(" neighbors:")
info.neighborsList.forEach { n ->
appendLine(" - node_id: ${formatNodeWithShortName(n.nodeId)} snr: ${n.snr}")
}
}
}
}
private fun decodeTraceroute(packet: MeshProtos.MeshPacket, payload: ByteArray): String {
val getUsername: (Int) -> String = { nodeNum -> formatNodeWithShortName(nodeNum) }
return packet.getTracerouteResponse(getUsername)
?: runCatching { MeshProtos.RouteDiscovery.parseFrom(payload).toString() }.getOrNull()
?: payload.joinToString(" ") { HEX_FORMAT.format(it) }
}
}