From 2c30923e3e70641b61fdc7795ebacd4583ca2371 Mon Sep 17 00:00:00 2001 From: Oliver Seiler Date: Mon, 6 May 2024 11:25:18 +1200 Subject: [PATCH 1/2] add MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR exclusion to RCWL9620 --- src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp | 9 +++++++-- src/modules/Telemetry/Sensor/RCWL9620Sensor.h | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp index 03df57efd..4f5ddf622 100644 --- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp +++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp @@ -1,7 +1,10 @@ +#include "configuration.h" + +#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR + #include "RCWL9620Sensor.h" #include "../mesh/generated/meshtastic/telemetry.pb.h" #include "TelemetrySensor.h" -#include "configuration.h" RCWL9620Sensor::RCWL9620Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_RCWL9620, "RCWL9620") {} @@ -57,4 +60,6 @@ float RCWL9620Sensor::getDistance() } else { return Distance; } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/modules/Telemetry/Sensor/RCWL9620Sensor.h b/src/modules/Telemetry/Sensor/RCWL9620Sensor.h index b78066f5c..7f9486d25 100644 --- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.h +++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.h @@ -1,3 +1,7 @@ +#include "configuration.h" + +#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR + #include "../mesh/generated/meshtastic/telemetry.pb.h" #include "TelemetrySensor.h" #include @@ -20,4 +24,6 @@ class RCWL9620Sensor : public TelemetrySensor RCWL9620Sensor(); virtual int32_t runOnce() override; virtual bool getMetrics(meshtastic_Telemetry *measurement) override; -}; \ No newline at end of file +}; + +#endif \ No newline at end of file From b155a5b6dccf479c1b5edbec8b3221141208588e Mon Sep 17 00:00:00 2001 From: Oliver Seiler Date: Mon, 6 May 2024 12:15:49 +1200 Subject: [PATCH 2/2] rearrange includes --- src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp index 4f5ddf622..49a509d38 100644 --- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp +++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp @@ -2,8 +2,8 @@ #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR -#include "RCWL9620Sensor.h" #include "../mesh/generated/meshtastic/telemetry.pb.h" +#include "RCWL9620Sensor.h" #include "TelemetrySensor.h" RCWL9620Sensor::RCWL9620Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_RCWL9620, "RCWL9620") {}