alexey.zholtikov/zh_aht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

WIP

Browse Source
This commit is contained in:
Alexey Zholtikov 2024-07-21 00:07:47 +03:00
parent 0cdf40a823
commit a454e5bb42
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/zh_aht.h
View File

@ -10,11 +10,9 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#define ZH_AHT_INIT_CONFIG_DEFAULT() \
{ \
.sensor_type = ZH_AHT2X, \
.i2c_address = ZH_I2C_ADDRESS_LOW, \
.i2c_port = 0 \
#define ZH_AHT_INIT_CONFIG_DEFAULT() \
{ \
.i2c_port = 0 \
}
#ifdef __cplusplus
@ -24,16 +22,6 @@ extern "C"
typedef struct // Structure for initial initialization of AHT sensor.
{
enum // Sensor type.
{
ZH_AHT1X, // AHT10/AHT15.
ZH_AHT2X // AHT20/AHT21/AHT25/AHT30.
} sensor_type;
enum // Sensor I2C address.
{
ZH_I2C_ADDRESS_HIGH = 0x39, // Address pin connected to VCC. AHT10 only.
ZH_I2C_ADDRESS_LOW = 0x38 // AHT15/AHT20/AHT21/AHT25/AHT30. AHT10 address pin connected to GND.
} i2c_address;
bool i2c_port; // I2C port.
#ifndef CONFIG_IDF_TARGET_ESP8266
i2c_master_bus_handle_t i2c_handle; // Unique I2C bus handle.

2
version.txt
View File

@ -1 +1 @@
1.1.0
1.1.1

19
zh_aht.c
View File

@ -3,6 +3,7 @@
#define I2C_MAX_DATA_SIZE 7 // Sensor maximum data size (in bytes).
#define MEASUREMENT_TIME 80 // Sensor measurement time (in milliseconds).
#define RESET_TIME 20 // Sensor reset time (in milliseconds).
#define I2C_ADDRESS 0x38 // Sensor I2C address.
#define I2C_DATA_READ_COMMAND 0xAC, 0x33, 0x00 // Command for read sensor data (temperature and humidity).
#define I2C_RESET_COMMAND 0xBA // Command for reset sensor.
#define I2C_INIT_COMMAND 0x00, 0x08, 0x00 // Command for initialize sensor. First byte is depend of sensor type.
@ -32,11 +33,11 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
#ifndef CONFIG_IDF_TARGET_ESP8266
i2c_device_config_t aht_config = {
.dev_addr_length = I2C_ADDR_BIT_LEN_7,
.device_address = _init_config.i2c_address,
.device_address = I2C_ADDRESS,
.scl_speed_hz = 100000,
};
i2c_master_bus_add_device(_init_config.i2c_handle, &aht_config, &_aht_handle);
if (i2c_master_probe(_init_config.i2c_handle, _init_config.i2c_address, 1000 / portTICK_PERIOD_MS) != ESP_OK)
if (i2c_master_probe(_init_config.i2c_handle, I2C_ADDRESS, 1000 / portTICK_PERIOD_MS) != ESP_OK)
{
ESP_LOGE(TAG, "AHT initialization fail. Sensor not connected or not responded.");
return ESP_ERR_NOT_FOUND;
@ -48,7 +49,7 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
#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, 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);
@ -64,7 +65,7 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
#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_write_byte(i2c_cmd_handle, I2C_ADDRESS << 1 | I2C_MASTER_READ, true);
i2c_master_read_byte(i2c_cmd_handle, &sensor_data, 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);
@ -91,7 +92,7 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
#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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, command[0], true);
i2c_master_write_byte(i2c_cmd_handle, command[1], true);
i2c_master_write_byte(i2c_cmd_handle, command[2], true);
@ -131,7 +132,7 @@ esp_err_t zh_aht_read(float *humidity, float *temperature)
#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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, command[0], true);
i2c_master_write_byte(i2c_cmd_handle, command[1], true);
i2c_master_write_byte(i2c_cmd_handle, command[2], true);
@ -150,7 +151,7 @@ esp_err_t zh_aht_read(float *humidity, float *temperature)
#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_write_byte(i2c_cmd_handle, I2C_ADDRESS << 1 | I2C_MASTER_READ, true);
for (uint8_t i = 0; i < sizeof(sensor_data); ++i)
{
i2c_master_read_byte(i2c_cmd_handle, &sensor_data[i], i == (sizeof(sensor_data) - 1) ? I2C_MASTER_NACK : I2C_MASTER_ACK);
@ -171,7 +172,7 @@ esp_err_t zh_aht_read(float *humidity, float *temperature)
ESP_LOGE(TAG, "AHT read fail. Timeout exceeded.");
return ESP_ERR_TIMEOUT;
}
if (_init_config.sensor_type != ZH_AHT1X)
if (sensor_data[6] != 0x00 || sensor_data[6] != 0xFF)
{
if (_calc_crc(sensor_data, I2C_MAX_DATA_SIZE - 1) != sensor_data[6])
{
@ -198,7 +199,7 @@ esp_err_t zh_aht_reset(void)
#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, 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);