Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ana_cmpr_esp32h21' into 'master'

Browse Source 
fix(ana_cmpr): correct swapped POS/NEG interrupt masks on ESP32-H21

See merge request espressif/esp-idf!52940
This commit is contained in:
morris
2026-09-18 14:43:30 +08:00
parent 63fdbf9e28 dabfc7fc4b
commit 34f797defd
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/esp_driver_ana_cmpr/CMakeLists.txt
View File

@@ -1,4 +1,7 @@
idf_build_get_property(target IDF_TARGET)
if(${target} STREQUAL "linux")
return() # This component is not supported by the POSIX/Linux simulator
endif()
set(srcs)
@@ -10,17 +13,11 @@ if(CONFIG_SOC_ANA_CMPR_SUPPORTED)
endif()
endif()
if(${target} STREQUAL "linux")
set(priv_requires "")
set(requires "")
else()
set(priv_requires esp_pm esp_driver_gpio)
set(requires esp_hal_ana_cmpr)
endif()
set(priv_requires esp_pm esp_driver_gpio)
idf_component_register(SRCS ${srcs}
INCLUDE_DIRS "include"
PRIV_REQUIRES "${priv_requires}"
REQUIRES "${requires}"
PRIV_REQUIRES ${priv_requires}
REQUIRES esp_hal_ana_cmpr
LDFRAGMENTS "linker.lf"
)

2
components/esp_hal_ana_cmpr/esp32c5/include/hal/ana_cmpr_ll.h
View File

@@ -37,8 +37,8 @@ extern "C" {
#define ANALOG_CMPR_LL_GET_HW(unit) (&ANALOG_CMPR[unit])
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) 0x02
#define ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan) 0x01
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) 0x02
#define ANALOG_CMPR_LL_ANY_CROSS_INTR_MASK(unit, src_chan) (ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) | ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan))
#define ANALOG_CMPR_LL_ALL_INTR_MASK(unit) 0x07

2
components/esp_hal_ana_cmpr/esp32c61/include/hal/ana_cmpr_ll.h
View File

@@ -37,8 +37,8 @@ extern "C" {
#define ANALOG_CMPR_LL_GET_HW(unit) (&ANALOG_CMPR[unit])
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) 0x02
#define ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan) 0x01
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) 0x02
#define ANALOG_CMPR_LL_ANY_CROSS_INTR_MASK(unit, src_chan) (ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) | ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan))
#define ANALOG_CMPR_LL_ALL_INTR_MASK(unit) 0x07

4
components/esp_hal_ana_cmpr/esp32h21/include/hal/ana_cmpr_ll.h
View File

@@ -36,8 +36,8 @@ extern "C" {
#define ANALOG_CMPR_LL_GET_HW(unit) (&ANALOG_CMPR[unit])
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) 0x01
#define ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan) 0x02
#define ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan) 0x01
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) 0x02
#define ANALOG_CMPR_LL_ANY_CROSS_INTR_MASK(unit, src_chan) (ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) | ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan))
#define ANALOG_CMPR_LL_ALL_INTR_MASK(unit) 0x07

2
components/esp_hal_ana_cmpr/esp32p4/include/hal/ana_cmpr_ll.h
View File

@@ -38,8 +38,8 @@ extern "C" {
#define ANALOG_CMPR_LL_GET_HW(unit) (&ANALOG_CMPR[unit])
#define ANALOG_CMPR_LL_GET_UNIT(hw) ((hw) == (&ANALOG_CMPR[0]) ? 0 : 1)
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) (1UL << ((unit) * 3 + 1))
#define ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan) (1UL << ((unit) * 3 + 0))
#define ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) (1UL << ((unit) * 3 + 1))
#define ANALOG_CMPR_LL_ANY_CROSS_INTR_MASK(unit, src_chan) (ANALOG_CMPR_LL_NEG_CROSS_INTR_MASK(unit, src_chan) | ANALOG_CMPR_LL_POS_CROSS_INTR_MASK(unit, src_chan))
#define ANALOG_CMPR_LL_ALL_INTR_MASK(unit) (0x07 << ((unit) * 3))