Skip to content

Commit a98732d

Browse files
committed
Fix Esp32 A0 definition, and ADC unit numbering (off-by-one)
1 parent 6de9152 commit a98732d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Sming/Arch/Esp32/Core/adc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bool lookupAdc(uint16_t pin, AdcInfo& info)
2020
for(unsigned adc = 0; adc < SOC_ADC_PERIPH_NUM; ++adc) {
2121
for(unsigned ch = 0; ch < SOC_ADC_MAX_CHANNEL_NUM; ++ch) {
2222
if(adc_channel_io_map[adc][ch] == pin) {
23-
info.adc = adc_unit_t(adc + 1);
23+
info.adc = adc_unit_t(adc);
2424
info.channel = adc_channel_t(ch);
2525
return true;
2626
}

Sming/Arch/Esp32/Core/pins_arduino.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#pragma once
1414

15+
#include <soc/adc_channel.h>
16+
1517
#define EXTERNAL_NUM_INTERRUPTS 16
1618
#define NUM_DIGITAL_PINS 40
1719
#define NUM_ANALOG_INPUTS 16
@@ -20,7 +22,7 @@
2022
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
2123
#define digitalPinHasPWM(p) (p < 34)
2224

23-
constexpr uint8_t A0{36};
25+
constexpr uint8_t A0 = ADC1_CHANNEL_0_GPIO_NUM;
2426

2527
#define GPIO_REG_TYPE uint32_t
2628

0 commit comments

Comments
 (0)