fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

esp32: Use hardware version for touchpad macro defines.

Browse Source 
ESP32 has hardware V1 and S2/S3 has V2, and future chips
may have different versions.

This should still compile to the same binary before and after.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
This commit is contained in:
Angus Gratton 2024-11-06 16:48:56 +11:00 committed by Damien George
parent 03bc561edb
commit eb0027b82f
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ports/esp32/machine_touchpad.c
View File

@ -29,12 +29,14 @@
#include "modmachine.h" #include "modmachine.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #if SOC_TOUCH_SENSOR_SUPPORTED
#if CONFIG_IDF_TARGET_ESP32 #if SOC_TOUCH_VERSION_1 // ESP32 only
#include "driver/touch_pad.h" #include "driver/touch_pad.h"
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #elif SOC_TOUCH_VERSION_2 // All other SoCs with touch, to date
#include "driver/touch_sensor.h" #include "driver/touch_sensor.h"
#else
#error "Unknown touch hardware version"
#endif #endif
typedef struct _mtp_obj_t { typedef struct _mtp_obj_t {
@ -70,6 +72,8 @@ static const mtp_obj_t touchpad_obj[] = {
{{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM12}, {{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM12},
{{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM13}, {{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM13},
{{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM14}, {{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM14},
#else
#error "Please add GPIO mapping for this SoC"
#endif #endif
}; };
@ -92,14 +96,14 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
if (!initialized) { if (!initialized) {
touch_pad_init(); touch_pad_init();
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER); touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #if TOUCH_HW_VER == 2
touch_pad_fsm_start(); touch_pad_fsm_start();
#endif #endif
initialized = 1; initialized = 1;
} }
#if CONFIG_IDF_TARGET_ESP32 #if SOC_TOUCH_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 CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #elif SOC_TOUCH_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) {
@ -110,10 +114,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 CONFIG_IDF_TARGET_ESP32 #if SOC_TOUCH_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 CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #elif SOC_TOUCH_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) {
@ -125,10 +129,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 CONFIG_IDF_TARGET_ESP32 #if SOC_TOUCH_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 CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #elif SOC_TOUCH_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
@ -155,4 +159,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
locals_dict, &mtp_locals_dict locals_dict, &mtp_locals_dict
); );
#endif #endif // SOC_TOUCH_SENSOR_SUPPORTED