espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

touch_sensor: add esp_timer error check

Browse Source
This commit is contained in:
laokaiyao
2022-09-09 14:56:46 +08:00
committed by morris
parent b333c1a9f1
commit 434966f7b1
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/driver/esp32/touch_sensor.c
View File

@@ -456,12 +456,11 @@ esp_err_t touch_pad_filter_start(uint32_t filter_period_ms)
ESP_RETURN_ON_FALSE(filter_period_ms >= portTICK_PERIOD_MS, ESP_ERR_INVALID_ARG, TOUCH_TAG, "Touch pad filter period error"); ESP_RETURN_ON_FALSE(filter_period_ms >= portTICK_PERIOD_MS, ESP_ERR_INVALID_ARG, TOUCH_TAG, "Touch pad filter period error");
ESP_RETURN_ON_FALSE(rtc_touch_mux, ESP_ERR_INVALID_STATE, TOUCH_TAG, "Touch pad not initialized"); ESP_RETURN_ON_FALSE(rtc_touch_mux, ESP_ERR_INVALID_STATE, TOUCH_TAG, "Touch pad not initialized");
esp_err_t ret = ESP_OK;
xSemaphoreTake(rtc_touch_mux, portMAX_DELAY); xSemaphoreTake(rtc_touch_mux, portMAX_DELAY);
if (s_touch_pad_filter == NULL) { if (s_touch_pad_filter == NULL) {
s_touch_pad_filter = (touch_pad_filter_t *) calloc(1, sizeof(touch_pad_filter_t)); s_touch_pad_filter = (touch_pad_filter_t *) calloc(1, sizeof(touch_pad_filter_t));
if (s_touch_pad_filter == NULL) { ESP_GOTO_ON_FALSE(s_touch_pad_filter, ESP_ERR_NO_MEM, err_no_mem, TOUCH_TAG, "no memory for filter");
goto err_no_mem;
}
} }
if (s_touch_pad_filter->timer == NULL) { if (s_touch_pad_filter->timer == NULL) {
esp_timer_create_args_t timer_cfg = { esp_timer_create_args_t timer_cfg = {
@@ -471,23 +470,25 @@ esp_err_t touch_pad_filter_start(uint32_t filter_period_ms)
.name = "touch filter timer", .name = "touch filter timer",
.skip_unhandled_events = true, .skip_unhandled_events = true,
}; };
esp_timer_create(&timer_cfg, &(s_touch_pad_filter->timer)); ESP_GOTO_ON_ERROR(esp_timer_create(&timer_cfg, &(s_touch_pad_filter->timer)),
if (s_touch_pad_filter->timer == NULL) { err_timer_create, TOUCH_TAG, "failed to create the filter timer");
free(s_touch_pad_filter);
s_touch_pad_filter = NULL;
goto err_no_mem;
}
s_touch_pad_filter->period = filter_period_ms; s_touch_pad_filter->period = filter_period_ms;
touch_pad_filter_cb(NULL); // Trigger once immediately to get the initial raw value touch_pad_filter_cb(NULL); // Trigger once immediately to get the initial raw value
esp_timer_start_periodic(s_touch_pad_filter->timer, filter_period_ms * 1000); ESP_GOTO_ON_ERROR(esp_timer_start_periodic(s_touch_pad_filter->timer, filter_period_ms * 1000),
err_timer_start, TOUCH_TAG, "failed to start the filter timer");
} }
xSemaphoreGive(rtc_touch_mux); xSemaphoreGive(rtc_touch_mux);
return ret;
return ESP_OK; err_timer_start:
esp_timer_delete(s_touch_pad_filter->timer);
err_timer_create:
free(s_touch_pad_filter);
s_touch_pad_filter = NULL;
err_no_mem: err_no_mem:
xSemaphoreGive(rtc_touch_mux); xSemaphoreGive(rtc_touch_mux);
return ESP_ERR_NO_MEM; return ret;
} }
esp_err_t touch_pad_filter_stop(void) esp_err_t touch_pad_filter_stop(void)