Skip to content

Fix analogWidth for ESP32S2 in esp32-hal-adc.c #5711

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
Oct 1, 2021
Merged

Fix analogWidth for ESP32S2 in esp32-hal-adc.c #5711

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
668dd43
fix analogWidth for ESP32S2
caternuson Sep 27, 2021
50a9e92
update logic
caternuson Sep 28, 2021
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
4 changes: 4 additions & 0 deletions cores/esp32/esp32-hal-adc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ static uint8_t __analogVRefPin = 0;
#endif

static uint8_t __analogAttenuation = 3;//11db
#if CONFIG_IDF_TARGET_ESP32
static uint8_t __analogWidth = 3;//12 bits
#elif CONFIG_IDF_TARGET_ESP32S2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be listed first and have an #else with the existing 12bit analog value. With the proposed change this will fail to compile on the ESP32-C3.

static uint8_t __analogWidth = 4; // 13 bits
#endif
static uint8_t __analogClockDiv = 1;
static adc_attenuation_t __pin_attenuation[SOC_GPIO_PIN_COUNT];

Expand Down