mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-15 10:17:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix truncation of environmental metrics when using Celsius (#667)

Browse Source
This commit is contained in:
Jonathan Bennett
2023-07-27 03:45:04 -05:00
committed by GitHub
parent 242dc76081
commit 75eebb989e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/NodeInfo.kt
View File

@@ -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) +