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

fix(ui): Prevent NaN values in environment metrics (#4316)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2026-01-26 06:52:13 -06:00 • committed by GitHub
parent 847152acd7
commit 50a04a98b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/model/src/main/kotlin/org/meshtastic/core/model/util/UnitConversions.kt
View file

@ -26,6 +26,8 @@ object UnitConversions {
/** Formats temperature as a string with the unit suffix. */
fun Float.toTempString(isFahrenheit: Boolean): String {
if (this.isNaN()) return "--"
val temp = if (isFahrenheit) celsiusToFahrenheit(this) else this
val unit = if (isFahrenheit) "F" else "C"

6
core/model/src/test/kotlin/org/meshtastic/core/model/util/UnitConversionsTest.kt
View file

@ -77,6 +77,12 @@ class UnitConversionsTest {
assertEquals("-40°F", (-40.0f).toTempString(true))
}
@Test
fun `toTempString handles NaN`() {
assertEquals("--", Float.NaN.toTempString(false))
assertEquals("--", Float.NaN.toTempString(true))
}
@Test
fun `celsiusToFahrenheit converts correctly`() {
mapOf(

18
feature/node/src/main/kotlin/org/meshtastic/feature/node/component/EnvironmentMetrics.kt
View file

@ -145,15 +145,17 @@ internal fun EnvironmentMetrics(
}
if (hasTemperature() && hasRelativeHumidity()) {
val dewPoint = UnitConversions.calculateDewPoint(temperature, relativeHumidity)
add(
DrawableMetricInfo(
Res.string.dew_point,
dewPoint.toTempString(isFahrenheit),
org.meshtastic.feature.node.R.drawable.ic_outlined_dew_point_24,
),
)
if (!dewPoint.isNaN()) {
add(
DrawableMetricInfo(
Res.string.dew_point,
dewPoint.toTempString(isFahrenheit),
org.meshtastic.feature.node.R.drawable.ic_outlined_dew_point_24,
),
)
}
}
if (hasSoilTemperature()) {
if (hasSoilTemperature() && !soilTemperature.isNaN()) {
add(
DrawableMetricInfo(
Res.string.soil_temperature,