jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

esp32: Fix machine_touchpad compiling on IDFv5.3.

Browse source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Daniël van de Giessen 2024-12-03 11:08:13 +01:00 committed by Damien George
parent 5564f3042c
commit 5fb846df67
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ports/esp32/machine_touchpad.c
View file

@ -31,9 +31,17 @@
#if SOC_TOUCH_SENSOR_SUPPORTED #if SOC_TOUCH_SENSOR_SUPPORTED
#if SOC_TOUCH_VERSION_1 // ESP32 only #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
#if SOC_TOUCH_VERSION_1
#define SOC_TOUCH_SENSOR_VERSION (1)
#elif SOC_TOUCH_VERSION_2
#define SOC_TOUCH_SENSOR_VERSION (2)
#endif
#endif
#if SOC_TOUCH_SENSOR_VERSION == 1 // ESP32 only
#include "driver/touch_pad.h" #include "driver/touch_pad.h"
#elif SOC_TOUCH_VERSION_2 // All other SoCs with touch, to date #elif SOC_TOUCH_SENSOR_VERSION == 2 // All other SoCs with touch, to date
#include "driver/touch_sensor.h" #include "driver/touch_sensor.h"
#else #else
#error "Unknown touch hardware version" #error "Unknown touch hardware version"
@ -98,13 +106,13 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER); touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
initialized = 1; initialized = 1;
} }
#if SOC_TOUCH_VERSION_1 #if SOC_TOUCH_SENSOR_VERSION == 1
esp_err_t err = touch_pad_config(self->touchpad_id, 0); esp_err_t err = touch_pad_config(self->touchpad_id, 0);
#elif SOC_TOUCH_VERSION_2 #elif SOC_TOUCH_SENSOR_VERSION == 2
esp_err_t err = touch_pad_config(self->touchpad_id); esp_err_t err = touch_pad_config(self->touchpad_id);
#endif #endif
if (err == ESP_OK) { if (err == ESP_OK) {
#if SOC_TOUCH_VERSION_2 #if SOC_TOUCH_SENSOR_VERSION == 2
touch_pad_fsm_start(); touch_pad_fsm_start();
#endif #endif
@ -115,10 +123,10 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
static mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) { static mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) {
mtp_obj_t *self = self_in; mtp_obj_t *self = self_in;
#if SOC_TOUCH_VERSION_1 #if SOC_TOUCH_SENSOR_VERSION == 1
uint16_t value = mp_obj_get_int(value_in); uint16_t value = mp_obj_get_int(value_in);
esp_err_t err = touch_pad_config(self->touchpad_id, value); esp_err_t err = touch_pad_config(self->touchpad_id, value);
#elif SOC_TOUCH_VERSION_2 #elif SOC_TOUCH_SENSOR_VERSION == 2
esp_err_t err = touch_pad_config(self->touchpad_id); esp_err_t err = touch_pad_config(self->touchpad_id);
#endif #endif
if (err == ESP_OK) { if (err == ESP_OK) {
@ -130,10 +138,10 @@ MP_DEFINE_CONST_FUN_OBJ_2(mtp_config_obj, mtp_config);
static mp_obj_t mtp_read(mp_obj_t self_in) { static mp_obj_t mtp_read(mp_obj_t self_in) {
mtp_obj_t *self = self_in; mtp_obj_t *self = self_in;
#if SOC_TOUCH_VERSION_1 #if SOC_TOUCH_SENSOR_VERSION == 1
uint16_t value; uint16_t value;
esp_err_t err = touch_pad_read(self->touchpad_id, &value); esp_err_t err = touch_pad_read(self->touchpad_id, &value);
#elif SOC_TOUCH_VERSION_2 #elif SOC_TOUCH_SENSOR_VERSION == 2
uint32_t value; uint32_t value;
esp_err_t err = touch_pad_read_raw_data(self->touchpad_id, &value); esp_err_t err = touch_pad_read_raw_data(self->touchpad_id, &value);
#endif #endif