From 8c3d60d8fdf54ac3900e0e62eac0c720d08dffc7 Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Sat, 22 Jun 2024 16:37:08 +0300 Subject: [PATCH] WIP --- README.md | 5 ++- zh_dht.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 108 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 77d1758..29ca0ac 100644 --- a/README.md +++ b/README.md @@ -77,10 +77,11 @@ void app_main(void) i2c_master_bus_handle_t i2c_bus_handle; i2c_new_master_bus(&i2c_bus_config, &i2c_bus_handle); zh_dht_init_config_t zh_dht_init_config = ZH_DHT_INIT_CONFIG_DEFAULT(); +#endif #ifdef CONFIG_IDF_TARGET_ESP8266 - zh_bh1750_init_config.i2c_port = I2C_PORT; + zh_dht_init_config.i2c_port = I2C_PORT; #else - zh_bh1750_init_config.i2c_handle = i2c_bus_handle; + zh_dht_init_config.i2c_handle = i2c_bus_handle; #endif zh_dht_init(&zh_dht_init_config); float humidity = 0.0; diff --git a/zh_dht.c b/zh_dht.c index 96c8d40..d4c6b14 100644 --- a/zh_dht.c +++ b/zh_dht.c @@ -1,12 +1,14 @@ #include "zh_dht.h" -#define BIT_1_TRANSFER_MAX_DURATION 75 // Signal "1" high time. -#define BIT_0_TRANSFER_MAX_DURATION 30 // Signal "0" high time. -#define DATA_BIT_START_TRANSFER_MAX_DURATION 55 // Signal "0", "1" low time. -#define RESPONSE_MAX_DURATION 85 // Response to low time. Response to high time. -#define MASTER_RELEASE_MAX_DURATION 200 // Bus master has released time. -#define DATA_SIZE 40 // Sensor data size for 1-wire connection. -#define I2C_ADDRESS 100 // Sensor address size for I2C connection. +#define BIT_1_TRANSFER_MAX_DURATION 75 // Signal "1" high time for 1-wire connection. +#define BIT_0_TRANSFER_MAX_DURATION 30 // Signal "0" high time for 1-wire connection. +#define DATA_BIT_START_TRANSFER_MAX_DURATION 55 // Signal "0", "1" low time for 1-wire connection. +#define RESPONSE_MAX_DURATION 85 // Response to low time. Response to high time. For 1-wire connection. +#define MASTER_RELEASE_MAX_DURATION 200 // Bus master has released time for 1-wire connection. +#define ONE_WIRE_DATA_SIZE 40 // Sensor data size for 1-wire connection (in bits). +#define I2C_DATA_SIZE 8 // Sensor data size for I2C connection (in bytes). +#define I2C_ADDRESS 0x5C // Sensor address for I2C connection. +#define I2C_DATA_READ_COMMAND 0x03, 0x00, 0x04 // Command for read sensor data (temperature and humidity) for I2C connection. #ifdef CONFIG_IDF_TARGET_ESP8266 #define esp_delay_us(x) os_delay_us(x) @@ -23,6 +25,7 @@ static i2c_master_dev_handle_t _dht_handle = {0}; static const char *TAG = "zh_dht"; static esp_err_t _read_bit(bool *bit); +static uint16_t _calc_crc(const uint8_t *buf, size_t len); esp_err_t zh_dht_init(const zh_dht_init_config_t *config) { @@ -50,7 +53,20 @@ esp_err_t zh_dht_init(const zh_dht_init_config_t *config) } else { - // I2C. +#ifndef CONFIG_IDF_TARGET_ESP8266 + i2c_device_config_t dht_config = { + .dev_addr_length = I2C_ADDR_BIT_LEN_7, + .device_address = I2C_ADDRESS, + .scl_speed_hz = 100000, + }; + i2c_master_bus_add_device(_init_config.i2c_handle, &dht_config, &_dht_handle); + if (i2c_master_probe(_init_config.i2c_handle, I2C_ADDRESS, 1000 / portTICK_PERIOD_MS) != ESP_OK) + { + ESP_LOGE(TAG, "DHT initialization fail. Sensor not connected or not responded."); + return ESP_ERR_NOT_FOUND; + } + ESP_LOGI(TAG, "DHT initialization success. I2C connection."); +#endif } _is_initialized = true; return ESP_OK; @@ -114,10 +130,10 @@ esp_err_t zh_dht_read(float *humidity, float *temperature) ++time; esp_delay_us(1); } - uint8_t dht_data[DATA_SIZE / 8] = {0}; + uint8_t dht_data[ONE_WIRE_DATA_SIZE / 8] = {0}; uint8_t byte_index = 0; uint8_t bit_index = 7; - for (uint8_t i = 0; i < 40; ++i) + for (uint8_t i = 0; i < ONE_WIRE_DATA_SIZE; ++i) { bool bit = 0; if (_read_bit(&bit) != ESP_OK) @@ -148,6 +164,63 @@ esp_err_t zh_dht_read(float *humidity, float *temperature) *temperature *= -1; } } + else + { + esp_err_t esp_err = ESP_OK; + uint8_t dht_data[I2C_DATA_SIZE] = {0}; + uint8_t read_command[] = {I2C_DATA_READ_COMMAND}; + uint8_t wakeup_command = {0}; +#ifdef CONFIG_IDF_TARGET_ESP8266 + // i2c_cmd_handle_t i2c_cmd_handle = i2c_cmd_link_create(); + // i2c_master_start(i2c_cmd_handle); + // i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true); + // i2c_master_write_byte(i2c_cmd_handle, _command, true); + // i2c_master_stop(i2c_cmd_handle); + // esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + // i2c_cmd_link_delete(i2c_cmd_handle); +#else + esp_err = i2c_master_transmit(_dht_handle, &wakeup_command, sizeof(wakeup_command), 1000 / portTICK_PERIOD_MS); + if (esp_err != ESP_OK) + { + ESP_LOGE(TAG, "DHT read fail. I2C driver error."); + return esp_err; + } + esp_err = i2c_master_transmit(_dht_handle, read_command, sizeof(read_command), 1000 / portTICK_PERIOD_MS); +#endif + if (esp_err != ESP_OK) + { + ESP_LOGE(TAG, "DHT read fail. I2C driver error."); + return esp_err; + } +#ifdef CONFIG_IDF_TARGET_ESP8266 + // i2c_cmd_handle = i2c_cmd_link_create(); + // i2c_master_start(i2c_cmd_handle); + // i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_READ, true); + // i2c_master_read_byte(i2c_cmd_handle, &sensor_data[0], I2C_MASTER_ACK); + // i2c_master_read_byte(i2c_cmd_handle, &sensor_data[1], I2C_MASTER_NACK); + // i2c_master_stop(i2c_cmd_handle); + // esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + // i2c_cmd_link_delete(i2c_cmd_handle); +#else + esp_err = i2c_master_receive(_dht_handle, dht_data, sizeof(dht_data), 1000 / portTICK_PERIOD_MS); +#endif + if (esp_err != ESP_OK) + { + ESP_LOGE(TAG, "DHT read fail. I2C driver error."); + return esp_err; + } + if (_calc_crc(dht_data, I2C_DATA_SIZE - 2) != (dht_data[7] << 8 | dht_data[6])) + { + ESP_LOGE(TAG, "DHT read fail. Invalid CRC."); + return ESP_ERR_INVALID_CRC; + } + *humidity = (dht_data[2] << 8 | dht_data[3]) / 10.0; + *temperature = ((dht_data[4] & 0x7F) << 8 | dht_data[5]) / 10.0; + if ((dht_data[4] & 0x80) != 0) + { + *temperature *= -1; + } + } ESP_LOGI(TAG, "DHT read success."); return ESP_OK; } @@ -176,4 +249,26 @@ static esp_err_t _read_bit(bool *bit) } *bit = (time > BIT_0_TRANSFER_MAX_DURATION) ? 1 : 0; return ESP_OK; +} + +static uint16_t _calc_crc(const uint8_t *buf, size_t len) +{ + uint16_t crc = 0xFFFF; + while (len--) + { + crc ^= (uint16_t)*buf++; + for (unsigned i = 0; i < 8; i++) + { + if (crc & 0x0001) + { + crc >>= 1; + crc ^= 0xA001; + } + else + { + crc >>= 1; + } + } + } + return crc; } \ No newline at end of file