From 5797e3246176465a9c06bf29f2815aa5aace3dd4 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Sun, 16 Jan 2022 15:16:03 -0800 Subject: [PATCH] add support for other 2 sensors --- src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp b/src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp index 5ef642c75..7ed2cad09 100644 --- a/src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp +++ b/src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp @@ -71,10 +71,11 @@ int32_t EnvironmentalMeasurementPlugin::runOnce() // therefore, we should only enable the sensor loop if measurement is also enabled switch (radioConfig.preferences.environmental_measurement_plugin_sensor_type) { case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11: + case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT12: dht = new DHT(radioConfig.preferences.environmental_measurement_plugin_sensor_pin, DHT11); this->dht->begin(); this->dht->read(); - DEBUG_MSG("EnvironmentalMeasurement: Opened DHT11 on pin: %d\n", + DEBUG_MSG("EnvironmentalMeasurement: Opened DHT11/DHT12 on pin: %d\n", radioConfig.preferences.environmental_measurement_plugin_sensor_pin); return (DHT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS); case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DS18B20: @@ -86,11 +87,12 @@ int32_t EnvironmentalMeasurementPlugin::runOnce() DEBUG_MSG("EnvironmentalMeasurement: Opened DS18B20 on pin: %d\n", radioConfig.preferences.environmental_measurement_plugin_sensor_pin); return (DS18B20_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS); + case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT21: case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT22: dht = new DHT(radioConfig.preferences.environmental_measurement_plugin_sensor_pin, DHT22); this->dht->begin(); this->dht->read(); - DEBUG_MSG("EnvironmentalMeasurement: Opened DHT22 on pin: %d\n", + DEBUG_MSG("EnvironmentalMeasurement: Opened DHT21/DHT22 on pin: %d\n", radioConfig.preferences.environmental_measurement_plugin_sensor_pin); return (DHT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS); default: @@ -136,9 +138,11 @@ int32_t EnvironmentalMeasurementPlugin::runOnce() switch (radioConfig.preferences.environmental_measurement_plugin_sensor_type) { case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11: + case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT12: return (DHT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS); case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DS18B20: return (DS18B20_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS); + case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT21: case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT22: return (DHT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS); default: @@ -254,6 +258,7 @@ bool EnvironmentalMeasurementPlugin::sendOurEnvironmentalMeasurement(NodeNum des switch (radioConfig.preferences.environmental_measurement_plugin_sensor_type) { case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11: + case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT12: if (!this->dht->read(true)) { sensor_read_error_count++; DEBUG_MSG("EnvironmentalMeasurement: FAILED TO READ DATA\n"); @@ -273,6 +278,7 @@ bool EnvironmentalMeasurementPlugin::sendOurEnvironmentalMeasurement(NodeNum des DEBUG_MSG("EnvironmentalMeasurement: FAILED TO READ DATA\n"); return false; } + case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT21: case RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT22: if (!this->dht->read(true)) { sensor_read_error_count++;