From cc9cda40691cfd095b8fe0322df422f2ee99ee06 Mon Sep 17 00:00:00 2001 From: Hu Rui Date: Fri, 15 May 2026 17:49:26 +0800 Subject: [PATCH] fix(touch): fix some typo in reg and ll --- .../esp32h4/include/hal/touch_sensor_ll.h | 1 - .../esp32s31/include/hal/touch_sensor_ll.h | 1 - .../soc/esp32h4/register/soc/touch_reg.h | 52 +++++++++---------- .../soc/esp32s31/register/soc/touch_reg.h | 52 +++++++++---------- 4 files changed, 52 insertions(+), 54 deletions(-) diff --git a/components/esp_hal_touch_sens/esp32h4/include/hal/touch_sensor_ll.h b/components/esp_hal_touch_sens/esp32h4/include/hal/touch_sensor_ll.h index 7e44a1d460a..62607551a87 100644 --- a/components/esp_hal_touch_sens/esp32h4/include/hal/touch_sensor_ll.h +++ b/components/esp_hal_touch_sens/esp32h4/include/hal/touch_sensor_ll.h @@ -19,7 +19,6 @@ #include "hal/touch_sensor_periph.h" #include "hal/touch_sens_types.h" #include "hal/config.h" -#include "soc/lp_analog_peri_struct.h" #include "soc/lp_clkrst_struct.h" #include "soc/lpperi_struct.h" #include "soc/touch_aon_struct.h" diff --git a/components/esp_hal_touch_sens/esp32s31/include/hal/touch_sensor_ll.h b/components/esp_hal_touch_sens/esp32s31/include/hal/touch_sensor_ll.h index dcdd0062c4b..f88dd1e6086 100644 --- a/components/esp_hal_touch_sens/esp32s31/include/hal/touch_sensor_ll.h +++ b/components/esp_hal_touch_sens/esp32s31/include/hal/touch_sensor_ll.h @@ -19,7 +19,6 @@ #include "hal/touch_sensor_periph.h" #include "hal/touch_sens_types.h" #include "hal/config.h" -#include "soc/lp_analog_peri_struct.h" #include "soc/lp_peri_clkrst_struct.h" #include "soc/touch_aon_struct.h" #include "soc/touch_struct.h" diff --git a/components/soc/esp32h4/register/soc/touch_reg.h b/components/soc/esp32h4/register/soc/touch_reg.h index a00758a73b4..fa046f8337b 100644 --- a/components/soc/esp32h4/register/soc/touch_reg.h +++ b/components/soc/esp32h4/register/soc/touch_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 OR MIT */ @@ -13,7 +13,7 @@ extern "C" { /** TOUCH_INT_RAW_REG register * need_des */ -#define TOUCH_INT_RAW_REG (DR_REG_TOUCH_BASE + 0x0) +#define TOUCH_INT_RAW_REG (DR_REG_TOUCH_SENS_BASE + 0x0) /** TOUCH_SCAN_DONE_INT_RAW : R/WTC/SS; bitpos: [0]; default: 0; * need_des */ @@ -67,7 +67,7 @@ extern "C" { /** TOUCH_INT_ST_REG register * need_des */ -#define TOUCH_INT_ST_REG (DR_REG_TOUCH_BASE + 0x4) +#define TOUCH_INT_ST_REG (DR_REG_TOUCH_SENS_BASE + 0x4) /** TOUCH_SCAN_DONE_INT_ST : RO; bitpos: [0]; default: 0; * need_des */ @@ -121,7 +121,7 @@ extern "C" { /** TOUCH_INT_ENA_REG register * need_des */ -#define TOUCH_INT_ENA_REG (DR_REG_TOUCH_BASE + 0x8) +#define TOUCH_INT_ENA_REG (DR_REG_TOUCH_SENS_BASE + 0x8) /** TOUCH_SCAN_DONE_INT_ENA : R/W; bitpos: [0]; default: 0; * need_des */ @@ -175,7 +175,7 @@ extern "C" { /** TOUCH_INT_CLR_REG register * need_des */ -#define TOUCH_INT_CLR_REG (DR_REG_TOUCH_BASE + 0xc) +#define TOUCH_INT_CLR_REG (DR_REG_TOUCH_SENS_BASE + 0xc) /** TOUCH_SCAN_DONE_INT_CLR : WT; bitpos: [0]; default: 0; * need_des */ @@ -229,7 +229,7 @@ extern "C" { /** TOUCH_CHN_STATUS_REG register * need_des */ -#define TOUCH_CHN_STATUS_REG (DR_REG_TOUCH_BASE + 0x10) +#define TOUCH_CHN_STATUS_REG (DR_REG_TOUCH_SENS_BASE + 0x10) /** TOUCH_PAD_ACTIVE : RO; bitpos: [14:0]; default: 0; * need_des */ @@ -255,7 +255,7 @@ extern "C" { /** TOUCH_STATUS_0_REG register * need_des */ -#define TOUCH_STATUS_0_REG (DR_REG_TOUCH_BASE + 0x14) +#define TOUCH_STATUS_0_REG (DR_REG_TOUCH_SENS_BASE + 0x14) /** TOUCH_PAD0_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -281,7 +281,7 @@ extern "C" { /** TOUCH_STATUS_1_REG register * need_des */ -#define TOUCH_STATUS_1_REG (DR_REG_TOUCH_BASE + 0x18) +#define TOUCH_STATUS_1_REG (DR_REG_TOUCH_SENS_BASE + 0x18) /** TOUCH_PAD1_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -307,7 +307,7 @@ extern "C" { /** TOUCH_STATUS_2_REG register * need_des */ -#define TOUCH_STATUS_2_REG (DR_REG_TOUCH_BASE + 0x1c) +#define TOUCH_STATUS_2_REG (DR_REG_TOUCH_SENS_BASE + 0x1c) /** TOUCH_PAD2_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -333,7 +333,7 @@ extern "C" { /** TOUCH_STATUS_3_REG register * need_des */ -#define TOUCH_STATUS_3_REG (DR_REG_TOUCH_BASE + 0x20) +#define TOUCH_STATUS_3_REG (DR_REG_TOUCH_SENS_BASE + 0x20) /** TOUCH_PAD3_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -359,7 +359,7 @@ extern "C" { /** TOUCH_STATUS_4_REG register * need_des */ -#define TOUCH_STATUS_4_REG (DR_REG_TOUCH_BASE + 0x24) +#define TOUCH_STATUS_4_REG (DR_REG_TOUCH_SENS_BASE + 0x24) /** TOUCH_PAD4_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -385,7 +385,7 @@ extern "C" { /** TOUCH_STATUS_5_REG register * need_des */ -#define TOUCH_STATUS_5_REG (DR_REG_TOUCH_BASE + 0x28) +#define TOUCH_STATUS_5_REG (DR_REG_TOUCH_SENS_BASE + 0x28) /** TOUCH_PAD5_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -411,7 +411,7 @@ extern "C" { /** TOUCH_STATUS_6_REG register * need_des */ -#define TOUCH_STATUS_6_REG (DR_REG_TOUCH_BASE + 0x2c) +#define TOUCH_STATUS_6_REG (DR_REG_TOUCH_SENS_BASE + 0x2c) /** TOUCH_PAD6_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -437,7 +437,7 @@ extern "C" { /** TOUCH_STATUS_7_REG register * need_des */ -#define TOUCH_STATUS_7_REG (DR_REG_TOUCH_BASE + 0x30) +#define TOUCH_STATUS_7_REG (DR_REG_TOUCH_SENS_BASE + 0x30) /** TOUCH_PAD7_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -463,7 +463,7 @@ extern "C" { /** TOUCH_STATUS_8_REG register * need_des */ -#define TOUCH_STATUS_8_REG (DR_REG_TOUCH_BASE + 0x34) +#define TOUCH_STATUS_8_REG (DR_REG_TOUCH_SENS_BASE + 0x34) /** TOUCH_PAD8_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -489,7 +489,7 @@ extern "C" { /** TOUCH_STATUS_9_REG register * need_des */ -#define TOUCH_STATUS_9_REG (DR_REG_TOUCH_BASE + 0x38) +#define TOUCH_STATUS_9_REG (DR_REG_TOUCH_SENS_BASE + 0x38) /** TOUCH_PAD9_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -515,7 +515,7 @@ extern "C" { /** TOUCH_STATUS_10_REG register * need_des */ -#define TOUCH_STATUS_10_REG (DR_REG_TOUCH_BASE + 0x3c) +#define TOUCH_STATUS_10_REG (DR_REG_TOUCH_SENS_BASE + 0x3c) /** TOUCH_PAD10_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -541,7 +541,7 @@ extern "C" { /** TOUCH_STATUS_11_REG register * need_des */ -#define TOUCH_STATUS_11_REG (DR_REG_TOUCH_BASE + 0x40) +#define TOUCH_STATUS_11_REG (DR_REG_TOUCH_SENS_BASE + 0x40) /** TOUCH_PAD11_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -567,7 +567,7 @@ extern "C" { /** TOUCH_STATUS_12_REG register * need_des */ -#define TOUCH_STATUS_12_REG (DR_REG_TOUCH_BASE + 0x44) +#define TOUCH_STATUS_12_REG (DR_REG_TOUCH_SENS_BASE + 0x44) /** TOUCH_PAD12_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -593,7 +593,7 @@ extern "C" { /** TOUCH_STATUS_13_REG register * need_des */ -#define TOUCH_STATUS_13_REG (DR_REG_TOUCH_BASE + 0x48) +#define TOUCH_STATUS_13_REG (DR_REG_TOUCH_SENS_BASE + 0x48) /** TOUCH_PAD13_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -619,7 +619,7 @@ extern "C" { /** TOUCH_STATUS_14_REG register * need_des */ -#define TOUCH_STATUS_14_REG (DR_REG_TOUCH_BASE + 0x4c) +#define TOUCH_STATUS_14_REG (DR_REG_TOUCH_SENS_BASE + 0x4c) /** TOUCH_PAD14_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -645,7 +645,7 @@ extern "C" { /** TOUCH_STATUS_15_REG register * need_des */ -#define TOUCH_STATUS_15_REG (DR_REG_TOUCH_BASE + 0x50) +#define TOUCH_STATUS_15_REG (DR_REG_TOUCH_SENS_BASE + 0x50) /** TOUCH_SLP_DATA : RO; bitpos: [15:0]; default: 65535; * need_des */ @@ -671,7 +671,7 @@ extern "C" { /** TOUCH_STATUS_16_REG register * need_des */ -#define TOUCH_STATUS_16_REG (DR_REG_TOUCH_BASE + 0x54) +#define TOUCH_STATUS_16_REG (DR_REG_TOUCH_SENS_BASE + 0x54) /** TOUCH_APPROACH_PAD2_CNT : RO; bitpos: [7:0]; default: 0; * need_des */ @@ -704,7 +704,7 @@ extern "C" { /** TOUCH_STATUS_17_REG register * need_des */ -#define TOUCH_STATUS_17_REG (DR_REG_TOUCH_BASE + 0x58) +#define TOUCH_STATUS_17_REG (DR_REG_TOUCH_SENS_BASE + 0x58) /** TOUCH_DCAP_LPF : RO; bitpos: [6:0]; default: 0; * Reserved */ @@ -751,7 +751,7 @@ extern "C" { /** TOUCH_CHN_TMP_STATUS_REG register * need_des */ -#define TOUCH_CHN_TMP_STATUS_REG (DR_REG_TOUCH_BASE + 0x5c) +#define TOUCH_CHN_TMP_STATUS_REG (DR_REG_TOUCH_SENS_BASE + 0x5c) /** TOUCH_PAD_INACTIVE_STATUS : RO; bitpos: [14:0]; default: 0; * need_des */ @@ -770,7 +770,7 @@ extern "C" { /** TOUCH_DATE_REG register * need_des */ -#define TOUCH_DATE_REG (DR_REG_TOUCH_BASE + 0x100) +#define TOUCH_DATE_REG (DR_REG_TOUCH_SENS_BASE + 0x100) /** TOUCH_CLK_EN : R/W; bitpos: [31]; default: 0; * need_des */ diff --git a/components/soc/esp32s31/register/soc/touch_reg.h b/components/soc/esp32s31/register/soc/touch_reg.h index a00758a73b4..fa046f8337b 100644 --- a/components/soc/esp32s31/register/soc/touch_reg.h +++ b/components/soc/esp32s31/register/soc/touch_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 OR MIT */ @@ -13,7 +13,7 @@ extern "C" { /** TOUCH_INT_RAW_REG register * need_des */ -#define TOUCH_INT_RAW_REG (DR_REG_TOUCH_BASE + 0x0) +#define TOUCH_INT_RAW_REG (DR_REG_TOUCH_SENS_BASE + 0x0) /** TOUCH_SCAN_DONE_INT_RAW : R/WTC/SS; bitpos: [0]; default: 0; * need_des */ @@ -67,7 +67,7 @@ extern "C" { /** TOUCH_INT_ST_REG register * need_des */ -#define TOUCH_INT_ST_REG (DR_REG_TOUCH_BASE + 0x4) +#define TOUCH_INT_ST_REG (DR_REG_TOUCH_SENS_BASE + 0x4) /** TOUCH_SCAN_DONE_INT_ST : RO; bitpos: [0]; default: 0; * need_des */ @@ -121,7 +121,7 @@ extern "C" { /** TOUCH_INT_ENA_REG register * need_des */ -#define TOUCH_INT_ENA_REG (DR_REG_TOUCH_BASE + 0x8) +#define TOUCH_INT_ENA_REG (DR_REG_TOUCH_SENS_BASE + 0x8) /** TOUCH_SCAN_DONE_INT_ENA : R/W; bitpos: [0]; default: 0; * need_des */ @@ -175,7 +175,7 @@ extern "C" { /** TOUCH_INT_CLR_REG register * need_des */ -#define TOUCH_INT_CLR_REG (DR_REG_TOUCH_BASE + 0xc) +#define TOUCH_INT_CLR_REG (DR_REG_TOUCH_SENS_BASE + 0xc) /** TOUCH_SCAN_DONE_INT_CLR : WT; bitpos: [0]; default: 0; * need_des */ @@ -229,7 +229,7 @@ extern "C" { /** TOUCH_CHN_STATUS_REG register * need_des */ -#define TOUCH_CHN_STATUS_REG (DR_REG_TOUCH_BASE + 0x10) +#define TOUCH_CHN_STATUS_REG (DR_REG_TOUCH_SENS_BASE + 0x10) /** TOUCH_PAD_ACTIVE : RO; bitpos: [14:0]; default: 0; * need_des */ @@ -255,7 +255,7 @@ extern "C" { /** TOUCH_STATUS_0_REG register * need_des */ -#define TOUCH_STATUS_0_REG (DR_REG_TOUCH_BASE + 0x14) +#define TOUCH_STATUS_0_REG (DR_REG_TOUCH_SENS_BASE + 0x14) /** TOUCH_PAD0_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -281,7 +281,7 @@ extern "C" { /** TOUCH_STATUS_1_REG register * need_des */ -#define TOUCH_STATUS_1_REG (DR_REG_TOUCH_BASE + 0x18) +#define TOUCH_STATUS_1_REG (DR_REG_TOUCH_SENS_BASE + 0x18) /** TOUCH_PAD1_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -307,7 +307,7 @@ extern "C" { /** TOUCH_STATUS_2_REG register * need_des */ -#define TOUCH_STATUS_2_REG (DR_REG_TOUCH_BASE + 0x1c) +#define TOUCH_STATUS_2_REG (DR_REG_TOUCH_SENS_BASE + 0x1c) /** TOUCH_PAD2_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -333,7 +333,7 @@ extern "C" { /** TOUCH_STATUS_3_REG register * need_des */ -#define TOUCH_STATUS_3_REG (DR_REG_TOUCH_BASE + 0x20) +#define TOUCH_STATUS_3_REG (DR_REG_TOUCH_SENS_BASE + 0x20) /** TOUCH_PAD3_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -359,7 +359,7 @@ extern "C" { /** TOUCH_STATUS_4_REG register * need_des */ -#define TOUCH_STATUS_4_REG (DR_REG_TOUCH_BASE + 0x24) +#define TOUCH_STATUS_4_REG (DR_REG_TOUCH_SENS_BASE + 0x24) /** TOUCH_PAD4_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -385,7 +385,7 @@ extern "C" { /** TOUCH_STATUS_5_REG register * need_des */ -#define TOUCH_STATUS_5_REG (DR_REG_TOUCH_BASE + 0x28) +#define TOUCH_STATUS_5_REG (DR_REG_TOUCH_SENS_BASE + 0x28) /** TOUCH_PAD5_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -411,7 +411,7 @@ extern "C" { /** TOUCH_STATUS_6_REG register * need_des */ -#define TOUCH_STATUS_6_REG (DR_REG_TOUCH_BASE + 0x2c) +#define TOUCH_STATUS_6_REG (DR_REG_TOUCH_SENS_BASE + 0x2c) /** TOUCH_PAD6_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -437,7 +437,7 @@ extern "C" { /** TOUCH_STATUS_7_REG register * need_des */ -#define TOUCH_STATUS_7_REG (DR_REG_TOUCH_BASE + 0x30) +#define TOUCH_STATUS_7_REG (DR_REG_TOUCH_SENS_BASE + 0x30) /** TOUCH_PAD7_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -463,7 +463,7 @@ extern "C" { /** TOUCH_STATUS_8_REG register * need_des */ -#define TOUCH_STATUS_8_REG (DR_REG_TOUCH_BASE + 0x34) +#define TOUCH_STATUS_8_REG (DR_REG_TOUCH_SENS_BASE + 0x34) /** TOUCH_PAD8_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -489,7 +489,7 @@ extern "C" { /** TOUCH_STATUS_9_REG register * need_des */ -#define TOUCH_STATUS_9_REG (DR_REG_TOUCH_BASE + 0x38) +#define TOUCH_STATUS_9_REG (DR_REG_TOUCH_SENS_BASE + 0x38) /** TOUCH_PAD9_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -515,7 +515,7 @@ extern "C" { /** TOUCH_STATUS_10_REG register * need_des */ -#define TOUCH_STATUS_10_REG (DR_REG_TOUCH_BASE + 0x3c) +#define TOUCH_STATUS_10_REG (DR_REG_TOUCH_SENS_BASE + 0x3c) /** TOUCH_PAD10_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -541,7 +541,7 @@ extern "C" { /** TOUCH_STATUS_11_REG register * need_des */ -#define TOUCH_STATUS_11_REG (DR_REG_TOUCH_BASE + 0x40) +#define TOUCH_STATUS_11_REG (DR_REG_TOUCH_SENS_BASE + 0x40) /** TOUCH_PAD11_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -567,7 +567,7 @@ extern "C" { /** TOUCH_STATUS_12_REG register * need_des */ -#define TOUCH_STATUS_12_REG (DR_REG_TOUCH_BASE + 0x44) +#define TOUCH_STATUS_12_REG (DR_REG_TOUCH_SENS_BASE + 0x44) /** TOUCH_PAD12_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -593,7 +593,7 @@ extern "C" { /** TOUCH_STATUS_13_REG register * need_des */ -#define TOUCH_STATUS_13_REG (DR_REG_TOUCH_BASE + 0x48) +#define TOUCH_STATUS_13_REG (DR_REG_TOUCH_SENS_BASE + 0x48) /** TOUCH_PAD13_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -619,7 +619,7 @@ extern "C" { /** TOUCH_STATUS_14_REG register * need_des */ -#define TOUCH_STATUS_14_REG (DR_REG_TOUCH_BASE + 0x4c) +#define TOUCH_STATUS_14_REG (DR_REG_TOUCH_SENS_BASE + 0x4c) /** TOUCH_PAD14_DATA : RO; bitpos: [15:0]; default: 0; * need_des */ @@ -645,7 +645,7 @@ extern "C" { /** TOUCH_STATUS_15_REG register * need_des */ -#define TOUCH_STATUS_15_REG (DR_REG_TOUCH_BASE + 0x50) +#define TOUCH_STATUS_15_REG (DR_REG_TOUCH_SENS_BASE + 0x50) /** TOUCH_SLP_DATA : RO; bitpos: [15:0]; default: 65535; * need_des */ @@ -671,7 +671,7 @@ extern "C" { /** TOUCH_STATUS_16_REG register * need_des */ -#define TOUCH_STATUS_16_REG (DR_REG_TOUCH_BASE + 0x54) +#define TOUCH_STATUS_16_REG (DR_REG_TOUCH_SENS_BASE + 0x54) /** TOUCH_APPROACH_PAD2_CNT : RO; bitpos: [7:0]; default: 0; * need_des */ @@ -704,7 +704,7 @@ extern "C" { /** TOUCH_STATUS_17_REG register * need_des */ -#define TOUCH_STATUS_17_REG (DR_REG_TOUCH_BASE + 0x58) +#define TOUCH_STATUS_17_REG (DR_REG_TOUCH_SENS_BASE + 0x58) /** TOUCH_DCAP_LPF : RO; bitpos: [6:0]; default: 0; * Reserved */ @@ -751,7 +751,7 @@ extern "C" { /** TOUCH_CHN_TMP_STATUS_REG register * need_des */ -#define TOUCH_CHN_TMP_STATUS_REG (DR_REG_TOUCH_BASE + 0x5c) +#define TOUCH_CHN_TMP_STATUS_REG (DR_REG_TOUCH_SENS_BASE + 0x5c) /** TOUCH_PAD_INACTIVE_STATUS : RO; bitpos: [14:0]; default: 0; * need_des */ @@ -770,7 +770,7 @@ extern "C" { /** TOUCH_DATE_REG register * need_des */ -#define TOUCH_DATE_REG (DR_REG_TOUCH_BASE + 0x100) +#define TOUCH_DATE_REG (DR_REG_TOUCH_SENS_BASE + 0x100) /** TOUCH_CLK_EN : R/W; bitpos: [31]; default: 0; * need_des */