3 Commits

2 changed files with 3 additions and 6 deletions

View File

@@ -1 +1 @@
2.3.0 2.3.1

View File

@@ -20,7 +20,6 @@ static uint8_t _interrupt_gpio = GPIO_NUM_MAX;
static const uint8_t _gpio_matrix[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; static const uint8_t _gpio_matrix[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
static bool _is_prev_gpio_isr_service = false; static bool _is_prev_gpio_isr_service = false;
static zh_pcf8574_stats_t _stats = {0}; static zh_pcf8574_stats_t _stats = {0};
static uint8_t _expander_counter = 0;
static zh_vector_t _vector = {0}; static zh_vector_t _vector = {0};
@@ -75,7 +74,6 @@ esp_err_t zh_pcf8574_init(const zh_pcf8574_init_config_t *config, zh_pcf8574_han
} }
} }
handle->is_initialized = true; handle->is_initialized = true;
++_expander_counter;
ZH_LOGI("PCF8574 initialization completed successfully."); ZH_LOGI("PCF8574 initialization completed successfully.");
return ESP_OK; return ESP_OK;
} }
@@ -101,7 +99,7 @@ esp_err_t zh_pcf8574_deinit(zh_pcf8574_handle_t *handle)
gpio_isr_handler_remove((gpio_num_t)_interrupt_gpio); gpio_isr_handler_remove((gpio_num_t)_interrupt_gpio);
gpio_reset_pin((gpio_num_t)_interrupt_gpio); gpio_reset_pin((gpio_num_t)_interrupt_gpio);
zh_vector_free(&_vector); zh_vector_free(&_vector);
if (_is_prev_gpio_isr_service == true) if (_is_prev_gpio_isr_service == false)
{ {
gpio_uninstall_isr_service(); gpio_uninstall_isr_service();
} }
@@ -110,7 +108,6 @@ esp_err_t zh_pcf8574_deinit(zh_pcf8574_handle_t *handle)
} }
i2c_master_bus_rm_device(handle->dev_handle); i2c_master_bus_rm_device(handle->dev_handle);
handle->is_initialized = false; handle->is_initialized = false;
--_expander_counter;
ZH_LOGI("PCF8574 deinitialization completed successfully."); ZH_LOGI("PCF8574 deinitialization completed successfully.");
return ESP_OK; return ESP_OK;
} }
@@ -205,7 +202,7 @@ static esp_err_t _zh_pcf8574_validate_config(const zh_pcf8574_init_config_t *con
ZH_ERROR_CHECK(config != NULL, ESP_ERR_INVALID_ARG, NULL, "Initial config is NULL."); ZH_ERROR_CHECK(config != NULL, ESP_ERR_INVALID_ARG, NULL, "Initial config is NULL.");
ZH_ERROR_CHECK((config->i2c_address >= 0x20 && config->i2c_address <= 0x27) || (config->i2c_address >= 0x38 && config->i2c_address <= 0x3F), ESP_ERR_INVALID_ARG, NULL, "Invalid I2C address."); ZH_ERROR_CHECK((config->i2c_address >= 0x20 && config->i2c_address <= 0x27) || (config->i2c_address >= 0x38 && config->i2c_address <= 0x3F), ESP_ERR_INVALID_ARG, NULL, "Invalid I2C address.");
ZH_ERROR_CHECK(config->task_priority >= 10 && config->stack_size >= 2048, ESP_ERR_INVALID_ARG, NULL, "Invalid task settings."); ZH_ERROR_CHECK(config->task_priority >= 10 && config->stack_size >= 2048, ESP_ERR_INVALID_ARG, NULL, "Invalid task settings.");
ZH_ERROR_CHECK(config->interrupt_gpio >= GPIO_NUM_0 && config->interrupt_gpio <= GPIO_NUM_MAX, ESP_ERR_INVALID_ARG, NULL, "Invalid GPIO number."); ZH_ERROR_CHECK(config->interrupt_gpio <= GPIO_NUM_MAX, ESP_ERR_INVALID_ARG, NULL, "Invalid GPIO number.");
ZH_ERROR_CHECK(config->i2c_handle != NULL, ESP_ERR_INVALID_ARG, NULL, "Invalid I2C handle."); ZH_ERROR_CHECK(config->i2c_handle != NULL, ESP_ERR_INVALID_ARG, NULL, "Invalid I2C handle.");
return ESP_OK; return ESP_OK;
} }