Skip to content

GPIO refactoring #6259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 16, 2022
Merged

GPIO refactoring #6259

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7571718
GPIO refactoring
P-R-O-C-H-Y Feb 11, 2022
bd363a1
Edited analog channels functions
P-R-O-C-H-Y Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Edited analog channels functions
  • Loading branch information
@P-R-O-C-H-Y
P-R-O-C-H-Y committed Feb 14, 2022
commit bd363a1ca9efd8ffa5e76692dd9b07ac099f3739
11 changes: 6 additions & 5 deletions cores/esp32/esp32-hal-gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,25 @@ int8_t digitalPinToTouchChannel(uint8_t pin)

int8_t digitalPinToAnalogChannel(uint8_t pin)
{
uint8_t channel;
int8_t ret = -1;
uint8_t channel = 0;
if (pin < SOC_GPIO_PIN_COUNT) {
for (uint8_t i = 0; i < SOC_ADC_PERIPH_NUM; i++) {
for (uint8_t j = 0; j < SOC_ADC_MAX_CHANNEL_NUM; j++) {
if (adc_channel_io_map[i][j] == pin) {
ret = channel;
break;
return channel;
}
channel++;
}
}
}
return ret;
return -1;
}

int8_t analogChannelToDigitalPin(uint8_t channel)
{
if (channel >= (SOC_ADC_PERIPH_NUM * SOC_ADC_MAX_CHANNEL_NUM)) {
return -1;
}
uint8_t adc_unit = (channel / SOC_ADC_MAX_CHANNEL_NUM);
uint8_t adc_chan = (channel % SOC_ADC_MAX_CHANNEL_NUM);
return adc_channel_io_map[adc_unit][adc_chan];
Expand Down