Skip to content

Commit 0a0bb16

Browse files
authored
Update esp32-hal-adc.c
1 parent f4c26c8 commit 0a0bb16

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cores/esp32/esp32-hal-adc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "soc/rtc_io_reg.h"
2828
#include "esp32/rom/ets_sys.h"
2929
#include "esp_intr_alloc.h"
30+
#include "soc/dac_channel.h"
3031
#define DEFAULT_VREF 1100
3132
static esp_adc_cal_characteristics_t *__analogCharacteristics[2] = {NULL, NULL};
3233
static uint16_t __analogVRef = 0;
@@ -35,6 +36,7 @@ static uint8_t __analogVRefPin = 0;
3536
#include "esp32s2/rom/ets_sys.h"
3637
#include "soc/sens_reg.h"
3738
#include "soc/rtc_io_reg.h"
39+
#include "soc/dac_channel.h"
3840
#elif CONFIG_IDF_TARGET_ESP32S3
3941
#include "esp32s3/rom/ets_sys.h"
4042
#include "soc/sens_reg.h"
@@ -145,10 +147,10 @@ bool __adcAttachPin(uint8_t pin){
145147
}
146148
#endif
147149
}
148-
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
149-
else if(pin == 25){
150+
#if SOC_DAC_SUPPORTED
151+
else if(pin == DAC_CHANNEL_1_GPIO_NUM){
150152
CLEAR_PERI_REG_MASK(RTC_IO_PAD_DAC1_REG, RTC_IO_PDAC1_XPD_DAC | RTC_IO_PDAC1_DAC_XPD_FORCE);//stop dac1
151-
} else if(pin == 26){
153+
} else if(pin == DAC_CHANNEL_2_GPIO_NUM){
152154
CLEAR_PERI_REG_MASK(RTC_IO_PAD_DAC2_REG, RTC_IO_PDAC2_XPD_DAC | RTC_IO_PDAC2_DAC_XPD_FORCE);//stop dac2
153155
}
154156
#endif

0 commit comments

Comments
 (0)