Skip to content

Commit a775317

Browse files
committed
refactor(lp_ana_periph): sync the reg names to TRM
1 parent 96e370f commit a775317

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

components/hal/esp32p4/include/hal/touch_sensor_ll.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,10 +724,10 @@ static inline void touch_ll_filter_set_neg_noise_thresh(int neg_noise_thresh, ui
724724
{
725725
bool always_update = neg_noise_thresh == -1;
726726
bool stop_update = neg_noise_thresh == -2;
727-
LP_ANA_PERI.touch_filter2.touch_bypass_neg_noise_thres = always_update;
728-
LP_ANA_PERI.touch_filter1.touch_neg_noise_disupdate_baseline_en = stop_update;
729-
LP_ANA_PERI.touch_filter1.touch_neg_noise_thres = always_update || stop_update ? 0 : neg_noise_thresh;
730-
LP_ANA_PERI.touch_filter1.touch_neg_noise_limit = always_update || stop_update ? 5 : neg_noise_limit; // 5 is the default value
727+
LP_ANA_PERI.touch_filter2.touch_bypass_nn_thres = always_update;
728+
LP_ANA_PERI.touch_filter1.touch_nn_disupdate_baseline_en = stop_update;
729+
LP_ANA_PERI.touch_filter1.touch_nn_thres = always_update || stop_update ? 0 : neg_noise_thresh;
730+
LP_ANA_PERI.touch_filter1.touch_nn_limit = always_update || stop_update ? 5 : neg_noise_limit; // 5 is the default value
731731
}
732732

733733
/**

components/soc/esp32p4/include/soc/lp_analog_peri_reg.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -619,27 +619,27 @@ extern "C" {
619619
* need_des
620620
*/
621621
#define LP_ANALOG_PERI_TOUCH_FILTER1_REG (DR_REG_LP_ANALOG_PERI_BASE + 0x110)
622-
/** LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN : R/W; bitpos: [0]; default: 0;
622+
/** LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN : R/W; bitpos: [0]; default: 0;
623623
* Reserved
624624
*/
625-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN (BIT(0))
626-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN_M (LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN_V << LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN_S)
627-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN_V 0x00000001U
628-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_DISUPDATE_BASELINE_EN_S 0
625+
#define LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN (BIT(0))
626+
#define LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN_M (LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN_V << LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN_S)
627+
#define LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN_V 0x00000001U
628+
#define LP_ANALOG_PERI_TOUCH_NN_DISUPDATE_BASELINE_EN_S 0
629629
/** LP_ANALOG_PERI_TOUCH_HYSTERESIS : R/W; bitpos: [2:1]; default: 0;
630630
* need_des
631631
*/
632632
#define LP_ANALOG_PERI_TOUCH_HYSTERESIS 0x00000003U
633633
#define LP_ANALOG_PERI_TOUCH_HYSTERESIS_M (LP_ANALOG_PERI_TOUCH_HYSTERESIS_V << LP_ANALOG_PERI_TOUCH_HYSTERESIS_S)
634634
#define LP_ANALOG_PERI_TOUCH_HYSTERESIS_V 0x00000003U
635635
#define LP_ANALOG_PERI_TOUCH_HYSTERESIS_S 1
636-
/** LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES : R/W; bitpos: [4:3]; default: 0;
636+
/** LP_ANALOG_PERI_TOUCH_NN_THRES : R/W; bitpos: [4:3]; default: 0;
637637
* need_des
638638
*/
639-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES 0x00000003U
640-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES_M (LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES_V << LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES_S)
641-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES_V 0x00000003U
642-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_THRES_S 3
639+
#define LP_ANALOG_PERI_TOUCH_NN_THRES 0x00000003U
640+
#define LP_ANALOG_PERI_TOUCH_NN_THRES_M (LP_ANALOG_PERI_TOUCH_NN_THRES_V << LP_ANALOG_PERI_TOUCH_NN_THRES_S)
641+
#define LP_ANALOG_PERI_TOUCH_NN_THRES_V 0x00000003U
642+
#define LP_ANALOG_PERI_TOUCH_NN_THRES_S 3
643643
/** LP_ANALOG_PERI_TOUCH_NOISE_THRES : R/W; bitpos: [6:5]; default: 0;
644644
* need_des
645645
*/
@@ -675,13 +675,13 @@ extern "C" {
675675
#define LP_ANALOG_PERI_TOUCH_FILTER_EN_M (LP_ANALOG_PERI_TOUCH_FILTER_EN_V << LP_ANALOG_PERI_TOUCH_FILTER_EN_S)
676676
#define LP_ANALOG_PERI_TOUCH_FILTER_EN_V 0x00000001U
677677
#define LP_ANALOG_PERI_TOUCH_FILTER_EN_S 16
678-
/** LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT : R/W; bitpos: [20:17]; default: 5;
678+
/** LP_ANALOG_PERI_TOUCH_NN_LIMIT : R/W; bitpos: [20:17]; default: 5;
679679
* need_des
680680
*/
681-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT 0x0000000FU
682-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT_M (LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT_V << LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT_S)
683-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT_V 0x0000000FU
684-
#define LP_ANALOG_PERI_TOUCH_NEG_NOISE_LIMIT_S 17
681+
#define LP_ANALOG_PERI_TOUCH_NN_LIMIT 0x0000000FU
682+
#define LP_ANALOG_PERI_TOUCH_NN_LIMIT_M (LP_ANALOG_PERI_TOUCH_NN_LIMIT_V << LP_ANALOG_PERI_TOUCH_NN_LIMIT_S)
683+
#define LP_ANALOG_PERI_TOUCH_NN_LIMIT_V 0x0000000FU
684+
#define LP_ANALOG_PERI_TOUCH_NN_LIMIT_S 17
685685
/** LP_ANALOG_PERI_TOUCH_APPROACH_LIMIT : R/W; bitpos: [28:21]; default: 80;
686686
* need_des
687687
*/
@@ -715,13 +715,13 @@ extern "C" {
715715
#define LP_ANALOG_PERI_TOUCH_BYPASS_NOISE_THRES_M (LP_ANALOG_PERI_TOUCH_BYPASS_NOISE_THRES_V << LP_ANALOG_PERI_TOUCH_BYPASS_NOISE_THRES_S)
716716
#define LP_ANALOG_PERI_TOUCH_BYPASS_NOISE_THRES_V 0x00000001U
717717
#define LP_ANALOG_PERI_TOUCH_BYPASS_NOISE_THRES_S 30
718-
/** LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES : R/W; bitpos: [31]; default: 0;
718+
/** LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES : R/W; bitpos: [31]; default: 0;
719719
* need_des
720720
*/
721-
#define LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES (BIT(31))
722-
#define LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES_M (LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES_V << LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES_S)
723-
#define LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES_V 0x00000001U
724-
#define LP_ANALOG_PERI_TOUCH_BYPASS_NEG_NOISE_THRES_S 31
721+
#define LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES (BIT(31))
722+
#define LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES_M (LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES_V << LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES_S)
723+
#define LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES_V 0x00000001U
724+
#define LP_ANALOG_PERI_TOUCH_BYPASS_NN_THRES_S 31
725725

726726
/** LP_ANALOG_PERI_TOUCH_FILTER3_REG register
727727
* need_des

components/soc/esp32p4/include/soc/lp_analog_peri_struct.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -510,18 +510,18 @@ typedef union {
510510
*/
511511
typedef union {
512512
struct {
513-
/** touch_neg_noise_disupdate_baseline_en : R/W; bitpos: [0]; default: 0;
513+
/** touch_nn_disupdate_baseline_en : R/W; bitpos: [0]; default: 0;
514514
* Reserved
515515
*/
516-
uint32_t touch_neg_noise_disupdate_baseline_en:1;
516+
uint32_t touch_nn_disupdate_baseline_en:1;
517517
/** touch_hysteresis : R/W; bitpos: [2:1]; default: 0;
518518
* need_des
519519
*/
520520
uint32_t touch_hysteresis:2;
521-
/** touch_neg_noise_thres : R/W; bitpos: [4:3]; default: 0;
521+
/** touch_nn_thres : R/W; bitpos: [4:3]; default: 0;
522522
* need_des
523523
*/
524-
uint32_t touch_neg_noise_thres:2;
524+
uint32_t touch_nn_thres:2;
525525
/** touch_noise_thres : R/W; bitpos: [6:5]; default: 0;
526526
* need_des
527527
*/
@@ -542,10 +542,10 @@ typedef union {
542542
* need_des
543543
*/
544544
uint32_t touch_filter_en:1;
545-
/** touch_neg_noise_limit : R/W; bitpos: [20:17]; default: 5;
545+
/** touch_nn_limit : R/W; bitpos: [20:17]; default: 5;
546546
* need_des
547547
*/
548-
uint32_t touch_neg_noise_limit:4;
548+
uint32_t touch_nn_limit:4;
549549
/** touch_approach_limit : R/W; bitpos: [28:21]; default: 80;
550550
* need_des
551551
*/
@@ -572,10 +572,10 @@ typedef union {
572572
* need_des
573573
*/
574574
uint32_t touch_bypass_noise_thres:1;
575-
/** touch_bypass_neg_noise_thres : R/W; bitpos: [31]; default: 0;
575+
/** touch_bypass_nn_thres : R/W; bitpos: [31]; default: 0;
576576
* need_des
577577
*/
578-
uint32_t touch_bypass_neg_noise_thres:1;
578+
uint32_t touch_bypass_nn_thres:1;
579579
};
580580
uint32_t val;
581581
} lp_analog_peri_touch_filter2_reg_t;

0 commit comments

Comments
 (0)