pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/esp32s2beta_fix_rtc_peripheral_driver' into 'master'

Browse Source 
Driver: fix touch driver and deep sleep example

See merge request espressif/esp-idf!6476
This commit is contained in:
Angus Gratton
2019-11-22 11:39:41 +08:00
parent ea29c101cd 246242dbd5
commit 0e0994092e
7 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/soc/esp32s2beta/include/soc/sens_reg.h
+2 -2
View File
@@ -1143,7 +1143,7 @@ extern "C" {
#define SENS_TOUCH_PAD14_BASELINE_V 0x3FFFFF
#define SENS_TOUCH_PAD14_BASELINE_S 0
#define SENS_SAR_TOUCH_STATUS15_REG (DR_REG_SENS_BASE + 0x0114)
#define SENS_SAR_TOUCH_SLP_STATUS_REG (DR_REG_SENS_BASE + 0x0114)
/* SENS_TOUCH_SLP_DEBOUNCE : RO ;bitpos:[31:29] ;default: 3'd0 ; */
/*description: */
#define SENS_TOUCH_SLP_DEBOUNCE 0x00000007
@@ -1157,7 +1157,7 @@ extern "C" {
#define SENS_TOUCH_SLP_BASELINE_V 0x3FFFFF
#define SENS_TOUCH_SLP_BASELINE_S 0
#define SENS_SAR_TOUCH_STATUS16_REG (DR_REG_SENS_BASE + 0x0118)
#define SENS_SAR_TOUCH_APPR_STATUS_REG (DR_REG_SENS_BASE + 0x0118)
/* SENS_TOUCH_SLP_APPROACH_CNT : RO ;bitpos:[31:24] ;default: 8'd0 ; */
/*description: */
#define SENS_TOUCH_SLP_APPROACH_CNT 0x000000FF
components/soc/esp32s2beta/include/soc/sens_struct.h
+9 -1
View File
@@ -277,6 +277,14 @@ typedef volatile struct {
};
uint32_t val;
} sar_touch_status[14];
union {
struct {
uint32_t touch_slp_baseline:22;
uint32_t reserved22: 7;
uint32_t touch_slp_debounce: 3;
};
uint32_t val;
} sar_touch_slp_status;
union {
struct {
uint32_t touch_approach_pad2_cnt: 8;
@@ -285,7 +293,7 @@ typedef volatile struct {
uint32_t touch_slp_approach_cnt: 8;
};
uint32_t val;
} sar_touch_status16;
} sar_touch_appr_status;
union {
struct {
uint32_t sw_fstep: 16; /*frequency step for CW generator*/