From 680550b76ce5f9b329222dafbdfcf68dd597c793 Mon Sep 17 00:00:00 2001
From: GUVWAF <thijs@havinga.eu>
Date: Sat, 11 Feb 2023 10:08:25 +0100
Subject: [PATCH] Add HAS_SENSOR flag To separate DeviceTelemetry and
 EnvironmentTelemetry

---
 arch/portduino/portduino.ini                   | 4 +++-
 src/modules/Modules.cpp                        | 6 +++++-
 src/modules/Telemetry/EnvironmentTelemetry.cpp | 2 --
 src/platform/esp32/architecture.h              | 3 +++
 src/platform/nrf52/architecture.h              | 3 +++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index b6b17d391..100f3538d 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -12,7 +12,9 @@ build_src_filter =
   -<mesh/http/>
   -<mesh/eth/>
   -<modules/esp32>
-  -<modules/Telemetry>
+  -<modules/Telemetry/EnvironmentTelemetry.cpp>
+  -<modules/Telemetry/AirQualityTelemetry.cpp>
+  -<modules/Telemetry/Sensor>
   +<../variants/portduino>
 lib_deps =
   ${env.lib_deps}
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index bc874a9a3..4119cdc77 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -14,9 +14,11 @@
 #include "modules/TraceRouteModule.h"
 #include "modules/WaypointModule.h"
 #if HAS_TELEMETRY
-#include "modules/Telemetry/AirQualityTelemetry.h"
 #include "modules/Telemetry/DeviceTelemetry.h"
+#endif
+#if HAS_SENSOR
 #include "modules/Telemetry/EnvironmentTelemetry.h"
+#include "modules/Telemetry/AirQualityTelemetry.h"
 #endif
 #ifdef ARCH_ESP32
 #include "modules/esp32/AudioModule.h"
@@ -63,6 +65,8 @@ void setupModules()
 #endif
 #if HAS_TELEMETRY
         new DeviceTelemetryModule();
+#endif
+#if HAS_SENSOR
         new EnvironmentTelemetryModule();
         if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I] > 0) {
             new AirQualityTelemetryModule();
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index d9b129e70..bd7ed539a 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -52,7 +52,6 @@ SHT31Sensor sht31Sensor;
 
 int32_t EnvironmentTelemetryModule::runOnce()
 {
-#ifndef ARCH_PORTDUINO
     int32_t result = INT32_MAX;
     /*
         Uncomment the preferences below if you want to use the module
@@ -115,7 +114,6 @@ int32_t EnvironmentTelemetryModule::runOnce()
         }
     }
     return sendToPhoneIntervalMs;
-#endif
 }
 
 bool EnvironmentTelemetryModule::wantUIFrame()
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 09b754d0f..90c016dae 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -27,6 +27,9 @@
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 1
 #endif
+#ifndef HAS_SENSOR
+#define HAS_SENSOR 1
+#endif
 #ifndef HAS_RADIO
 #define HAS_RADIO 1
 #endif
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index 383a0da4e..f21635560 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -23,6 +23,9 @@
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 1
 #endif
+#ifndef HAS_SENSOR
+#define HAS_SENSOR 1
+#endif
 #ifndef HAS_RADIO
 #define HAS_RADIO 1
 #endif