feat!: removed esp8266 support

This commit is contained in:
aZholtikov committed 2026-04-04 13:48:58 +03:00
1 parent 2e4d50e6b1
commit 6ed641a5c7
5 files changed
+11 -118

No files matched your search

+6 -25
View File
@@ -1,13 +1,12 @@
# ESP32 ESP-IDF and ESP8266 RTOS SDK component for AHT10/AHT15/AHT20/AHT21/AHT25/AHT30 humidity & temperature sensor
# ESP32 ESP-IDF component for AHT family humidity & temperature sensor
## Tested on
1. ESP8266 RTOS_SDK v3.4
2. ESP32 ESP-IDF v5.2
1. ESP32 ESP-IDF v5.2
## Features
1. Autodetect sensor type.
1. Support of AHT10/AHT15/AHT20/AHT21/AHT25/AHT30.
## Using
@@ -35,35 +34,19 @@ Reading the sensor:
void app_main(void)
{
esp_log_level_set("zh_aht", ESP_LOG_NONE);
#ifdef CONFIG_IDF_TARGET_ESP8266
i2c_config_t i2c_config = {
.mode = I2C_MODE_MASTER,
.sda_io_num = GPIO_NUM_4, // In accordance with used chip.
.sda_pullup_en = GPIO_PULLUP_ENABLE,
.scl_io_num = GPIO_NUM_5, // In accordance with used chip.
.scl_pullup_en = GPIO_PULLUP_ENABLE,
};
i2c_driver_install(I2C_PORT, i2c_config.mode);
i2c_param_config(I2C_PORT, &i2c_config);
#else
esp_log_level_set("zh_aht", ESP_LOG_ERROR);
i2c_master_bus_config_t i2c_bus_config = {
.clk_source = I2C_CLK_SRC_DEFAULT,
.i2c_port = I2C_PORT,
.scl_io_num = GPIO_NUM_22, // In accordance with used chip.
.sda_io_num = GPIO_NUM_21, // In accordance with used chip.
.scl_io_num = GPIO_NUM_22,
.sda_io_num = GPIO_NUM_21,
.glitch_ignore_cnt = 7,
.flags.enable_internal_pullup = true,
};
i2c_master_bus_handle_t i2c_bus_handle;
i2c_new_master_bus(&i2c_bus_config, &i2c_bus_handle);
#endif
zh_aht_init_config_t aht_init_config = ZH_AHT_INIT_CONFIG_DEFAULT();
#ifdef CONFIG_IDF_TARGET_ESP8266
aht_init_config.i2c_port = I2C_PORT;
#else
aht_init_config.i2c_handle = i2c_bus_handle;
#endif
zh_aht_init(&aht_init_config);
float humidity = 0.0;
float temperature = 0.0;
@@ -76,5 +59,3 @@ void app_main(void)
}
}
```
Any [feedback](mailto:github@azholtikov.ru) will be gladly accepted.
View File
Whitespace-only changes.
+2 -9
View File
@@ -6,20 +6,16 @@
#include "esp_err.h"
#include "esp_log.h"
#ifdef CONFIG_IDF_TARGET_ESP8266
#include "driver/i2c.h"
#else
#include "driver/i2c_master.h"
#endif
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
// #include "freertos/task.h"
/**
* @brief AHT sensor initial default values.
*/
#define ZH_AHT_INIT_CONFIG_DEFAULT() \
{ \
.i2c_port = 0}
}
#ifdef __cplusplus
extern "C"
@@ -31,10 +27,7 @@ extern "C"
*/
typedef struct
{
bool i2c_port; /*!< I2C port. */
#ifndef CONFIG_IDF_TARGET_ESP8266
i2c_master_bus_handle_t i2c_handle; /*!< Unique I2C bus handle. */
#endif
} zh_aht_init_config_t;
/**
+1 -1
View File
@@ -1 +1 @@
1.0.0
2.0.0
+2 -83
View File
@@ -13,9 +13,7 @@
static zh_aht_init_config_t _init_config = {0};
static bool _is_initialized = false;
#ifndef CONFIG_IDF_TARGET_ESP8266
static i2c_master_dev_handle_t _aht_handle = {0};
#endif
static const char *TAG = "zh_aht";
@@ -30,7 +28,6 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
return ESP_ERR_INVALID_ARG;
}
_init_config = *config;
#ifndef CONFIG_IDF_TARGET_ESP8266
i2c_device_config_t aht_config = {
.dev_addr_length = I2C_ADDR_BIT_LEN_7,
.device_address = I2C_ADDRESS,
@@ -42,59 +39,28 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
ESP_LOGE(TAG, "AHT initialization fail. Sensor not connected or not responded.");
return ESP_ERR_NOT_FOUND;
}
#endif
esp_err_t err = ESP_OK;
uint8_t status_read_command = I2C_STATUS_READ_COMMAND;
uint8_t sensor_data = 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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, status_read_command, true);
i2c_master_stop(i2c_cmd_handle);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
err = i2c_master_transmit(_aht_handle, &status_read_command, sizeof(status_read_command), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
ESP_LOGE(TAG, "AHT initialization fail. I2C driver error at line %d.", __LINE__);
return ESP_ERR_INVALID_RESPONSE;
}
#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, 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);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
err = i2c_master_receive(_aht_handle, &sensor_data, sizeof(sensor_data), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
ESP_LOGE(TAG, "AHT initialization fail. I2C driver error at line %d.", __LINE__);
return ESP_ERR_INVALID_RESPONSE;
}
if ((sensor_data & 0x08) == 0) // If sensor is not calibrated.
if ((sensor_data & 0x08) == 0)
{
uint8_t init_command[] = {I2C_INIT_COMMAND};
uint8_t check_command = I2C_INIT_AHT2X_FIRST_BYTE;
bool is_first_check = false;
INIT_SENSOR:;
#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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, check_command, true);
i2c_master_stop(i2c_cmd_handle);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
INIT_SENSOR:
err = i2c_master_transmit(_aht_handle, &check_command, sizeof(check_command), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
if (err == ESP_ERR_INVALID_STATE && is_first_check == false)
@@ -110,19 +76,7 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config)
}
}
init_command[0] = check_command;
#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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, init_command[0], true);
i2c_master_write_byte(i2c_cmd_handle, init_command[1], true);
i2c_master_write_byte(i2c_cmd_handle, init_command[2], true);
i2c_master_stop(i2c_cmd_handle);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
err = i2c_master_transmit(_aht_handle, init_command, sizeof(init_command), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
ESP_LOGE(TAG, "AHT initialization fail. I2C driver error at line %d.", __LINE__);
@@ -150,39 +104,14 @@ esp_err_t zh_aht_read(float *humidity, float *temperature)
esp_err_t err = ESP_OK;
uint8_t sensor_data[I2C_MAX_DATA_SIZE] = {0};
uint8_t data_read_command[] = {I2C_DATA_READ_COMMAND};
#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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, data_read_command[0], true);
i2c_master_write_byte(i2c_cmd_handle, data_read_command[1], true);
i2c_master_write_byte(i2c_cmd_handle, data_read_command[2], true);
i2c_master_stop(i2c_cmd_handle);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
err = i2c_master_transmit(_aht_handle, data_read_command, sizeof(data_read_command), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
ESP_LOGE(TAG, "AHT read fail. I2C driver error at line %d.", __LINE__);
return ESP_ERR_INVALID_RESPONSE;
}
vTaskDelay(MEASUREMENT_TIME / portTICK_PERIOD_MS);
#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, 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);
}
i2c_master_stop(i2c_cmd_handle);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
err = i2c_master_receive(_aht_handle, sensor_data, sizeof(sensor_data), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
ESP_LOGE(TAG, "AHT read fail. I2C driver error at line %d.", __LINE__);
@@ -217,17 +146,7 @@ esp_err_t zh_aht_reset(void)
}
esp_err_t err = ESP_OK;
uint8_t reset_command = I2C_RESET_COMMAND;
#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, I2C_ADDRESS << 1 | I2C_MASTER_WRITE, true);
i2c_master_write_byte(i2c_cmd_handle, reset_command, true);
i2c_master_stop(i2c_cmd_handle);
err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
i2c_cmd_link_delete(i2c_cmd_handle);
#else
err = i2c_master_transmit(_aht_handle, &reset_command, sizeof(reset_command), 1000 / portTICK_PERIOD_MS);
#endif
if (err != ESP_OK)
{
ESP_LOGE(TAG, "AHT reset fail. I2C driver error at line %d.", __LINE__);