jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-29 06:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dht] Clean-up, shorten some log messages (#8949)

Browse Source
This commit is contained in:
Keith Burzinski 2025-05-29 04:37:41 -05:00 committed by GitHub
parent fd72a64053
commit 4031077f6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
esphome/components/dht/dht.cpp
View File

@ -13,20 +13,14 @@ void DHT::setup() {
this->pin_->setup(); this->pin_->setup();
this->pin_->digital_write(true); this->pin_->digital_write(true);
} }
void DHT::dump_config() { void DHT::dump_config() {
ESP_LOGCONFIG(TAG, "DHT:"); ESP_LOGCONFIG(TAG, "DHT:");
LOG_PIN(" Pin: ", this->pin_); LOG_PIN(" Pin: ", this->pin_);
if (this->is_auto_detect_) { ESP_LOGCONFIG(TAG, " %sModel: %s", this->is_auto_detect_ ? "Auto-detected " : "",
ESP_LOGCONFIG(TAG, " Auto-detected model: %s", this->model_ == DHT_MODEL_DHT11 ? "DHT11" : "DHT22"); this->model_ == DHT_MODEL_DHT11 ? "DHT11" : "DHT22 or equivalent");
} else if (this->model_ == DHT_MODEL_DHT11) { ESP_LOGCONFIG(TAG, " Internal pull-up: %s", ONOFF(this->pin_->get_flags() & gpio::FLAG_PULLUP));
ESP_LOGCONFIG(TAG, " Model: DHT11");
} else {
ESP_LOGCONFIG(TAG, " Model: DHT22 (or equivalent)");
}
ESP_LOGCONFIG(TAG, " Internal Pull-up: %s", ONOFF(this->pin_->get_flags() & gpio::FLAG_PULLUP));
LOG_UPDATE_INTERVAL(this); LOG_UPDATE_INTERVAL(this);
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_); LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
LOG_SENSOR(" ", "Humidity", this->humidity_sensor_); LOG_SENSOR(" ", "Humidity", this->humidity_sensor_);
} }
@ -46,7 +40,7 @@ void DHT::update() {
} }
if (success) { if (success) {
ESP_LOGD(TAG, "Got Temperature=%.1f°C Humidity=%.1f%%", temperature, humidity); ESP_LOGD(TAG, "Temperature %.1f°C Humidity %.1f%%", temperature, humidity);
if (this->temperature_sensor_ != nullptr) if (this->temperature_sensor_ != nullptr)
this->temperature_sensor_->publish_state(temperature); this->temperature_sensor_->publish_state(temperature);
@ -54,11 +48,8 @@ void DHT::update() {
this->humidity_sensor_->publish_state(humidity); this->humidity_sensor_->publish_state(humidity);
this->status_clear_warning(); this->status_clear_warning();
} else { } else {
const char *str = ""; ESP_LOGW(TAG, "Invalid readings! Check pin number and pull-up resistor%s.",
if (this->is_auto_detect_) { this->is_auto_detect_ ? " and try manually specifying the model" : "");
str = " and consider manually specifying the DHT model using the model option";
}
ESP_LOGW(TAG, "Invalid readings! Please check your wiring (pull-up resistor, pin number)%s.", str);
if (this->temperature_sensor_ != nullptr) if (this->temperature_sensor_ != nullptr)
this->temperature_sensor_->publish_state(NAN); this->temperature_sensor_->publish_state(NAN);
if (this->humidity_sensor_ != nullptr) if (this->humidity_sensor_ != nullptr)
@ -68,10 +59,12 @@ void DHT::update() {
} }
float DHT::get_setup_priority() const { return setup_priority::DATA; } float DHT::get_setup_priority() const { return setup_priority::DATA; }
void DHT::set_dht_model(DHTModel model) { void DHT::set_dht_model(DHTModel model) {
this->model_ = model; this->model_ = model;
this->is_auto_detect_ = model == DHT_MODEL_AUTO_DETECT; this->is_auto_detect_ = model == DHT_MODEL_AUTO_DETECT;
} }
bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool report_errors) { bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool report_errors) {
*humidity = NAN; *humidity = NAN;
*temperature = NAN; *temperature = NAN;
@ -121,9 +114,9 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
while (!this->pin_->digital_read()) { while (!this->pin_->digital_read()) {
if (micros() - start_time > 90) { if (micros() - start_time > 90) {
if (i < 0) { if (i < 0) {
error_code = 1; error_code = 1; // line didn't clear
} else { } else {
error_code = 2; error_code = 2; // rising edge for bit i timeout
} }
break; break;
} }
@ -139,9 +132,9 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
end_time = micros(); end_time = micros();
if (end_time - start_time > 90) { if (end_time - start_time > 90) {
if (i < 0) { if (i < 0) {
error_code = 3; error_code = 3; // requesting data failed
} else { } else {
error_code = 4; error_code = 4; // falling edge for bit i timeout
} }
break; break;
} }
@ -166,22 +159,9 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
if (!report_errors && error_code != 0) if (!report_errors && error_code != 0)
return false; return false;
switch (error_code) { if (error_code) {
case 1: ESP_LOGW(TAG, ESP_LOG_MSG_COMM_FAIL);
ESP_LOGW(TAG, "Waiting for DHT communication to clear failed!"); return false;
return false;
case 2:
ESP_LOGW(TAG, "Rising edge for bit %d failed!", i);
return false;
case 3:
ESP_LOGW(TAG, "Requesting data from DHT failed!");
return false;
case 4:
ESP_LOGW(TAG, "Falling edge for bit %d failed!", i);
return false;
case 0:
default:
break;
} }
ESP_LOGVV(TAG, ESP_LOGVV(TAG,
@ -206,15 +186,15 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
if (checksum_a == data[4]) { if (checksum_a == data[4]) {
// Data format: 8bit integral RH data + 8bit decimal RH data + 8bit integral T data + 8bit decimal T data + 8bit // Data format: 8bit integral RH data + 8bit decimal RH data + 8bit integral T data + 8bit decimal T data + 8bit
// check sum - some models always have 0 in the decimal part // check sum - some models always have 0 in the decimal part
const uint16_t raw_temperature = uint16_t(data[2]) * 10 + (data[3] & 0x7F); const uint16_t raw_temperature = static_cast<uint16_t>(data[2]) * 10 + (data[3] & 0x7F);
*temperature = raw_temperature / 10.0f; *temperature = static_cast<float>(raw_temperature) / 10.0f;
if ((data[3] & 0x80) != 0) { if ((data[3] & 0x80) != 0) {
// negative // negative
*temperature *= -1; *temperature *= -1;
} }
const uint16_t raw_humidity = uint16_t(data[0]) * 10 + data[1]; const uint16_t raw_humidity = static_cast<uint16_t>(data[0]) * 10 + data[1];
*humidity = raw_humidity / 10.0f; *humidity = static_cast<float>(raw_humidity) / 10.0f;
} else { } else {
// For compatibility with DHT11 models which might only use 2 bytes checksums, only use the data from these two // For compatibility with DHT11 models which might only use 2 bytes checksums, only use the data from these two
// bytes // bytes
@ -222,8 +202,8 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
*humidity = data[0]; *humidity = data[0];
} }
} else { } else {
uint16_t raw_humidity = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF); uint16_t raw_humidity = encode_uint16(data[0], data[1]);
uint16_t raw_temperature = (uint16_t(data[2] & 0xFF) << 8) | (data[3] & 0xFF); uint16_t raw_temperature = encode_uint16(data[2], data[3]);
if (raw_temperature & 0x8000) { if (raw_temperature & 0x8000) {
if (!(raw_temperature & 0x4000)) if (!(raw_temperature & 0x4000))
@ -234,24 +214,23 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
if (raw_temperature == 1 && raw_humidity == 10) { if (raw_temperature == 1 && raw_humidity == 10) {
if (report_errors) { if (report_errors) {
ESP_LOGW(TAG, "Invalid temperature+humidity! Sensor reported 1°C and 1%% Hum"); ESP_LOGW(TAG, "Invalid data");
} }
return false; return false;
} }
*humidity = raw_humidity * 0.1f; *humidity = static_cast<float>(raw_humidity) * 0.1f;
if (*humidity > 100) if (*humidity > 100.0f)
*humidity = NAN; *humidity = NAN;
*temperature = int16_t(raw_temperature) * 0.1f; *temperature = static_cast<int16_t>(raw_temperature) * 0.1f;
} }
if (*temperature == 0.0f && (*humidity == 1.0f || *humidity == 2.0f)) { if (*temperature == 0.0f && (*humidity == 1.0f || *humidity == 2.0f)) {
if (report_errors) { if (report_errors) {
ESP_LOGW(TAG, "DHT reports invalid data. Is the update interval too high or the sensor damaged?"); ESP_LOGW(TAG, "Invalid data");
} }
return false; return false;
} }
return true; return true;
} }