From 3b642ae9f650021c3ce570fec8bd04494f0bf1a1 Mon Sep 17 00:00:00 2001
From: "Justin E. Mann" <Justin-Mann@users.noreply.github.com>
Date: Mon, 5 May 2025 15:52:14 -0600
Subject: [PATCH] ...

---
 src/modules/Telemetry/Sensor/RAK12035Sensor.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp b/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
index b8569853f..29d1538a4 100644
--- a/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
@@ -110,6 +110,14 @@ bool RAK12035Sensor::getMetrics(meshtastic_Telemetry *measurement)
     measurement->variant.environment_metrics.soil_temperature = (float)(temp / 10);
     measurement->variant.environment_metrics.soil_moisture = moisture;
 
+    if (variant.environment_metrics.temperature == 0 || variant.environment_metrics.temperature == null && variant.environment_metrics.relative_humidity == 0 || variant.environment_metrics.relative_humidity == null)
+    {
+        measurement->variant.environment_metrics.has_temperature = true;
+        measurement->variant.environment_metrics.has_relative_humidity = true;
+        measurement->variant.environment_metrics.temperature = measurement->variant.environment_metrics.soil_temperature;
+        measurement->variant.environment_metrics.relative_humidity = measurement->variant.environment_metrics.soil_moisture;
+    }
+
     return true;
 }
 #endif
\ No newline at end of file