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

refactor: update signalMetrics filter for 0 hop packets

Browse source
This commit is contained in:
andrekir 2024-10-23 17:49:47 -03:00
parent bb345e7437
commit fa24dd43b8
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
View file

@ -37,6 +37,9 @@ class MetricsViewModel @Inject constructor(
) : ViewModel() {
private val destNum = MutableStateFlow(0)
private fun MeshPacket.hasValidSignal(): Boolean =
rxTime > 0 && (rxSnr != 0f && rxRssi != 0) && (hopStart > 0 && hopStart - hopLimit == 0)
@OptIn(ExperimentalCoroutinesApi::class)
val state = destNum.flatMapLatest { destNum ->
combine(
@ -49,7 +52,7 @@ class MetricsViewModel @Inject constructor(
environmentMetrics = telemetry.filter {
it.hasEnvironmentMetrics() && it.environmentMetrics.relativeHumidity >= 0f
},
signalMetrics = meshPackets.filter { it.rxTime > 0 },
signalMetrics = meshPackets.filter { it.hasValidSignal() },
environmentDisplayFahrenheit = config.telemetry.environmentDisplayFahrenheit,
)
}