From 46fa08dc3311a9b2c7a5d192ea915f5196ba599d Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 23 Feb 2023 13:05:24 -0600 Subject: [PATCH] Air quality specific prefs (#2303) --- src/mesh/NodeDB.cpp | 1 + src/modules/Telemetry/AirQualityTelemetry.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 9702fb5f2..ebf214316 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -246,6 +246,7 @@ void NodeDB::initModuleConfigIntervals() { moduleConfig.telemetry.device_update_interval = default_broadcast_interval_secs; moduleConfig.telemetry.environment_update_interval = default_broadcast_interval_secs; + moduleConfig.telemetry.air_quality_interval = default_broadcast_interval_secs; } void NodeDB::installDefaultChannels() diff --git a/src/modules/Telemetry/AirQualityTelemetry.cpp b/src/modules/Telemetry/AirQualityTelemetry.cpp index 966e2d0ff..c300e1f96 100644 --- a/src/modules/Telemetry/AirQualityTelemetry.cpp +++ b/src/modules/Telemetry/AirQualityTelemetry.cpp @@ -16,9 +16,9 @@ int32_t AirQualityTelemetryModule::runOnce() without having to configure it from the PythonAPI or WebUI. */ - // moduleConfig.telemetry.environment_measurement_enabled = 1; + // moduleConfig.telemetry.air_quality_enabled = 1; - if (!(moduleConfig.telemetry.environment_measurement_enabled)) { + if (!(moduleConfig.telemetry.air_quality_enabled)) { // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it return disable(); } @@ -27,7 +27,7 @@ int32_t AirQualityTelemetryModule::runOnce() // This is the first time the OSThread library has called this function, so do some setup firstTime = 0; - if (moduleConfig.telemetry.environment_measurement_enabled) { + if (moduleConfig.telemetry.air_quality_enabled) { LOG_INFO("Air quality Telemetry: Initializing\n"); if (!aqi.begin_I2C()) { LOG_WARN("Could not establish i2c connection to AQI sensor\n"); @@ -38,12 +38,12 @@ int32_t AirQualityTelemetryModule::runOnce() return result; } else { // if we somehow got to a second run of this module with measurement disabled, then just wait forever - if (!moduleConfig.telemetry.environment_measurement_enabled) + if (!moduleConfig.telemetry.air_quality_enabled) return result; uint32_t now = millis(); if (((lastSentToMesh == 0) || - ((now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.environment_update_interval))) && + ((now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.air_quality_interval))) && airTime->isTxAllowedAirUtil()) { sendTelemetry(); lastSentToMesh = now;