From 668dd4365cb5a75652b67bd03d1a8e9731a7faf3 Mon Sep 17 00:00:00 2001
From: caternuson <caternuson@gmail.com>
Date: Mon, 27 Sep 2021 08:36:07 -0700
Subject: [PATCH 1/2] fix analogWidth for ESP32S2

---
 cores/esp32/esp32-hal-adc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cores/esp32/esp32-hal-adc.c b/cores/esp32/esp32-hal-adc.c
index 0530f1d84fb..72d051f3177 100644
--- a/cores/esp32/esp32-hal-adc.c
+++ b/cores/esp32/esp32-hal-adc.c
@@ -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
+static uint8_t __analogWidth = 4;   // 13 bits
+#endif
 static uint8_t __analogClockDiv = 1;
 static adc_attenuation_t __pin_attenuation[SOC_GPIO_PIN_COUNT];
 

From 50a9e926244d81f895729ccdc0ddfb755eab0dd0 Mon Sep 17 00:00:00 2001
From: caternuson <caternuson@gmail.com>
Date: Tue, 28 Sep 2021 16:08:21 -0700
Subject: [PATCH 2/2] update logic

---
 cores/esp32/esp32-hal-adc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cores/esp32/esp32-hal-adc.c b/cores/esp32/esp32-hal-adc.c
index 72d051f3177..9387ec69018 100644
--- a/cores/esp32/esp32-hal-adc.c
+++ b/cores/esp32/esp32-hal-adc.c
@@ -37,7 +37,7 @@ static uint8_t __analogVRefPin = 0;
 #include "soc/rtc_io_reg.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #include "esp32c3/rom/ets_sys.h"
-#else 
+#else
 #error Target CONFIG_IDF_TARGET is not supported
 #endif
 #else // ESP32 Before IDF 4.0
@@ -46,10 +46,10 @@ 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
-static uint8_t __analogWidth = 4;   // 13 bits
+#if CONFIG_IDF_TARGET_ESP32S2
+static uint8_t __analogWidth = 4; // 13 bits
+#else
+static uint8_t __analogWidth = 3; // 12 bits
 #endif
 static uint8_t __analogClockDiv = 1;
 static adc_attenuation_t __pin_attenuation[SOC_GPIO_PIN_COUNT];