From 75eebb989e2585684de07166b6bc7492e3b4a5c2 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Thu, 27 Jul 2023 03:45:04 -0500 Subject: [PATCH] Fix truncation of environmental metrics when using Celsius (#667) --- app/src/main/java/com/geeksville/mesh/NodeInfo.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt index ddd232f6e..5786ed0c5 100644 --- a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt @@ -175,8 +175,8 @@ data class NodeInfo( if (env != null && env != 0f) String.format(f + unit, env) else "" fun envMetricStr(isFahrenheit: Boolean = false): String = - if (!isFahrenheit) envFormat("%.1f", "°C ", environmentMetrics?.temperature) - else envFormat("%.1f", "°F ", environmentMetrics?.temperature?.times(1.8f)?.plus(32)) + + (if (!isFahrenheit) envFormat("%.1f", "°C ", environmentMetrics?.temperature) + else envFormat("%.1f", "°F ", environmentMetrics?.temperature?.times(1.8f)?.plus(32))) + envFormat("%.0f", "%% ", environmentMetrics?.relativeHumidity) + envFormat("%.1f", "hPa ", environmentMetrics?.barometricPressure) + envFormat("%.0f", "MΩ ", environmentMetrics?.gasResistance) +