From f9d1b5fbe1b14c90f08e43c132d6ee5a7f117549 Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Sun, 21 Jul 2024 09:10:48 +0300 Subject: [PATCH] WIP --- zh_aht.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zh_aht.c b/zh_aht.c index e4baca4..1f47a70 100644 --- a/zh_aht.c +++ b/zh_aht.c @@ -52,7 +52,7 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config) 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); - esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + 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); @@ -68,7 +68,7 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config) 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); + 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); @@ -85,12 +85,12 @@ esp_err_t zh_aht_init(const zh_aht_init_config_t *config) bool is_first_check = false; INIT_SENSOR:; #ifdef CONFIG_IDF_TARGET_ESP8266 - i2c_cmd_handle_t i2c_cmd_handle = i2c_cmd_link_create(); + 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); - esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + 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, &check_command, sizeof(check_command), 1000 / portTICK_PERIOD_MS); @@ -111,14 +111,14 @@ 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_t i2c_cmd_handle = i2c_cmd_link_create(); + 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); - esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + 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); @@ -158,7 +158,7 @@ esp_err_t zh_aht_read(float *humidity, float *temperature) 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); - esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + 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); @@ -178,7 +178,7 @@ esp_err_t zh_aht_read(float *humidity, float *temperature) 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); - esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + 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); @@ -223,7 +223,7 @@ esp_err_t zh_aht_reset(void) 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); - esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); + 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);