2 Commits

2 changed files with 11 additions and 12 deletions

View File

@@ -1 +1 @@
2.4.1 2.5.0

View File

@@ -214,14 +214,17 @@ static esp_err_t _zh_pcf8574_validate_config(const zh_pcf8574_init_config_t *con
static esp_err_t _zh_pcf8574_gpio_init(const zh_pcf8574_init_config_t *config, zh_pcf8574_handle_t *handle) // -V2008 static esp_err_t _zh_pcf8574_gpio_init(const zh_pcf8574_init_config_t *config, zh_pcf8574_handle_t *handle) // -V2008
{ {
uint8_t reg_temp = 0;
if (_interrupt_gpio != GPIO_NUM_MAX) if (_interrupt_gpio != GPIO_NUM_MAX)
{ {
_zh_pcf8574_read_register(handle, &reg_temp);
esp_err_t err = zh_vector_push_back(&_vector, handle); esp_err_t err = zh_vector_push_back(&_vector, handle);
ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "Failed add item to vector.") ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "Failed add item to vector.")
return ESP_OK; return ESP_OK;
} }
esp_err_t err = zh_vector_init(&_vector, sizeof(zh_pcf8574_handle_t)); esp_err_t err = zh_vector_init(&_vector, sizeof(zh_pcf8574_handle_t));
ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "Failed create vector.") ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "Failed create vector.")
_zh_pcf8574_read_register(handle, &reg_temp);
err = zh_vector_push_back(&_vector, handle); err = zh_vector_push_back(&_vector, handle);
ZH_ERROR_CHECK(err == ESP_OK, err, zh_vector_free(&_vector), "Failed add item to vector.") ZH_ERROR_CHECK(err == ESP_OK, err, zh_vector_free(&_vector), "Failed add item to vector.")
gpio_config_t interrupt_gpio_config = { gpio_config_t interrupt_gpio_config = {
@@ -305,7 +308,6 @@ static void IRAM_ATTR _zh_pcf8574_isr_processing_task(void *pvParameter)
} }
zh_pcf8574_event_on_isr_t event = {0}; zh_pcf8574_event_on_isr_t event = {0};
event.i2c_address = handle->i2c_address; event.i2c_address = handle->i2c_address;
event.gpio_number = 0xFF;
uint8_t old_reg = handle->gpio_status; uint8_t old_reg = handle->gpio_status;
uint8_t new_reg = 0; uint8_t new_reg = 0;
esp_err_t err = _zh_pcf8574_read_register(handle, &new_reg); esp_err_t err = _zh_pcf8574_read_register(handle, &new_reg);
@@ -322,11 +324,6 @@ static void IRAM_ATTR _zh_pcf8574_isr_processing_task(void *pvParameter)
{ {
event.gpio_number = j; event.gpio_number = j;
event.gpio_level = new_reg & _gpio_matrix[j]; event.gpio_level = new_reg & _gpio_matrix[j];
}
}
}
if (event.gpio_number != 0xFF)
{
err = esp_event_post(ZH_PCF8574, 0, &event, sizeof(event), 1000 / portTICK_PERIOD_MS); err = esp_event_post(ZH_PCF8574, 0, &event, sizeof(event), 1000 / portTICK_PERIOD_MS);
if (err != ESP_OK) if (err != ESP_OK)
{ {
@@ -336,6 +333,8 @@ static void IRAM_ATTR _zh_pcf8574_isr_processing_task(void *pvParameter)
} }
} }
} }
}
}
_stats.min_stack_size = (uint32_t)uxTaskGetStackHighWaterMark(NULL); _stats.min_stack_size = (uint32_t)uxTaskGetStackHighWaterMark(NULL);
} }
vTaskDelete(NULL); vTaskDelete(NULL);