From 5aa115a4bc54a637c2357854e3e01ce7995e6ce8 Mon Sep 17 00:00:00 2001 From: dmfaria Date: Fri, 14 Jun 2024 15:43:26 -0300 Subject: [PATCH] esp32/adc: Set ADC to 12bit by default on esp32c6. Signed-off-by: Andrew Leech --- ports/esp32/adc.c | 2 +- ports/esp32/machine_adc_block.c | 4 ++-- 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