copy the has_relative_humidity value to telem packet from AHTX0 packet (#5277 )

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Fixed compile error when using GPS_DEBUG (#5275 )
2025-09-19 08:17:26 +00:00 · 2024-11-08 07:59:36 +08:00 · 2024-11-07 16:19:31 -06:00
2 changed files with 3 additions and 1 deletions
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@ -794,7 +794,7 @@ void GPS::writePinEN(bool on)
    // Write and log
    enablePin->set(on);
 #ifdef GPS_DEBUG
-    LOG_DEBUG("Pin EN %s", val == HIGH ? "HI" : "LOW");
+    LOG_DEBUG("Pin EN %s", on == HIGH ? "HI" : "LOW");
 #endif
 }

--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@ -376,12 +376,14 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
            LOG_INFO("AHTX0+BMP280 module detected: using temp from BMP280 and humy from AHTX0");
            aht10Sensor.getMetrics(&m_ahtx);
            m->variant.environment_metrics.relative_humidity = m_ahtx.variant.environment_metrics.relative_humidity;
+            m->variant.environment_metrics.has_relative_humidity = m_ahtx.variant.environment_metrics.has_relative_humidity;
        } else {
            // prefer bmp3xx temp if both sensors are present, fetch only humidity
            meshtastic_Telemetry m_ahtx = meshtastic_Telemetry_init_zero;
            LOG_INFO("AHTX0+BMP3XX module detected: using temp from BMP3XX and humy from AHTX0");
            aht10Sensor.getMetrics(&m_ahtx);
            m->variant.environment_metrics.relative_humidity = m_ahtx.variant.environment_metrics.relative_humidity;
+            m->variant.environment_metrics.has_relative_humidity = m_ahtx.variant.environment_metrics.has_relative_humidity;
        }
    }
    if (max17048Sensor.hasSensor()) {
Author	SHA1	Message	Date
Tavis	aa184e6d8b	copy the has_relative_humidity value to telem packet from AHTX0 packet (#5277 ) Some checks failed CI / setup (stm32) (push) Waiting to run Details CI / check (push) Blocked by required conditions Details CI / build-esp32 (push) Blocked by required conditions Details CI / build-esp32-s3 (push) Blocked by required conditions Details CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / package-raspbian (push) Waiting to run Details CI / package-raspbian-armv7l (push) Waiting to run Details CI / package-native (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Flawfinder Scan / Flawfinder (push) Waiting to run Details Nightly / Trunk Check Upload (push) Has been cancelled Details Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2024-11-08 07:59:36 +08:00
Marco Veneziano	2eea412f1c	Fixed compile error when using GPS_DEBUG (#5275 )	2024-11-07 16:19:31 -06:00