summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmfaria <dmfaria@gmail.com>2024-06-14 15:43:26 -0300
committerDamien George <damien@micropython.org>2024-10-09 23:31:21 +1100
commit5aa115a4bc54a637c2357854e3e01ce7995e6ce8 (patch)
tree58fc3b08e58c1a58afd836c7398c32e0f23746bc
parent68e95c73d32b1a3c6ebd283c13882582907f58ef (diff)
esp32/adc: Set ADC to 12bit by default on esp32c6.
Signed-off-by: Andrew Leech <andrew@alelec.net>
-rw-r--r--ports/esp32/adc.c2
-rw-r--r--ports/esp32/machine_adc_block.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
index 91db9ec52..ccf264e5c 100644
--- a/ports/esp32/adc.c
+++ b/ports/esp32/adc.c
@@ -45,7 +45,7 @@ void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits) {
self->width = ADC_WIDTH_BIT_11;
break;
#endif
- #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+ #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
case 12:
self->width = ADC_WIDTH_BIT_12;
break;
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
index 6afdd6f87..78c5b2491 100644
--- a/ports/esp32/machine_adc_block.c
+++ b/ports/esp32/machine_adc_block.c
@@ -32,10 +32,10 @@
#include "driver/adc.h"
machine_adc_block_obj_t madcblock_obj[] = {
- #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+ #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
{{&machine_adc_block_type}, ADC_UNIT_1, 12, -1, {0}},
{{&machine_adc_block_type}, ADC_UNIT_2, 12, -1, {0}},
- #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C6
+ #elif CONFIG_IDF_TARGET_ESP32S2
{{&machine_adc_block_type}, ADC_UNIT_1, 13, -1, {0}},
{{&machine_adc_block_type}, ADC_UNIT_2, 13, -1, {0}},
#endif