Skip to content

Commit 63438a3

Browse files
jonathanhoggdpgeorge
jonathanhogg
authored and
dpgeorge
committed
esp32/machine_adcblock: Add new machine.ADCBlock class and update ADC.
Rework the ADC implementation to follow the improved ADC/ADCBlock API. This adds support for calibrated voltage readings and the ADC2 block. The ADC API is backwards compatible with what it was before this change. Resolves micropython#6219.
1 parent 3300d6d commit 63438a3

File tree

8 files changed

+410
-125
lines changed

8 files changed

+410
-125
lines changed

‎ports/esp32/boards/sdkconfig.base

+5
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,8 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
5858
# To reduce iRAM usage
5959
CONFIG_ESP32_WIFI_IRAM_OPT=n
6060
CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
61+
62+
# ADC calibration
63+
CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
64+
CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
65+
CONFIG_ADC_CAL_LUT_ENABLE=y

‎ports/esp32/machine_adc.c

+162-125
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* The MIT License (MIT)
55
*
66
* Copyright (c) 2017 Nick Moore
7+
* Copyright (c) 2021 Jonathan Hogg
78
*
89
* Permission is hereby granted, free of charge, to any person obtaining a copy
910
* of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +25,6 @@
2425
* THE SOFTWARE.
2526
*/
2627

27-
2828
#include <stdio.h>
2929

3030
#include "esp_log.h"
@@ -35,176 +35,213 @@
3535
#include "py/runtime.h"
3636
#include "py/mphal.h"
3737
#include "modmachine.h"
38+
#include "machine_adc.h"
3839

39-
typedef struct _madc_obj_t {
40-
mp_obj_base_t base;
41-
gpio_num_t gpio_id;
42-
adc1_channel_t adc1_id;
43-
} madc_obj_t;
40+
#define ADCBLOCK1 (&madcblock_obj[0])
41+
#define ADCBLOCK2 (&madcblock_obj[1])
4442

4543
STATIC const madc_obj_t madc_obj[] = {
4644
#if CONFIG_IDF_TARGET_ESP32
47-
{{&machine_adc_type}, GPIO_NUM_36, ADC1_CHANNEL_0},
48-
{{&machine_adc_type}, GPIO_NUM_37, ADC1_CHANNEL_1},
49-
{{&machine_adc_type}, GPIO_NUM_38, ADC1_CHANNEL_2},
50-
{{&machine_adc_type}, GPIO_NUM_39, ADC1_CHANNEL_3},
51-
{{&machine_adc_type}, GPIO_NUM_32, ADC1_CHANNEL_4},
52-
{{&machine_adc_type}, GPIO_NUM_33, ADC1_CHANNEL_5},
53-
{{&machine_adc_type}, GPIO_NUM_34, ADC1_CHANNEL_6},
54-
{{&machine_adc_type}, GPIO_NUM_35, ADC1_CHANNEL_7},
45+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_36},
46+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_37},
47+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_38},
48+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_39},
49+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_32},
50+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_33},
51+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_34},
52+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_7, GPIO_NUM_35},
53+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_0},
54+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_1, GPIO_NUM_2},
55+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_2, GPIO_NUM_4},
56+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_3, GPIO_NUM_12},
57+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_4, GPIO_NUM_13},
58+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_5, GPIO_NUM_14},
59+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_6, GPIO_NUM_15},
60+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_25},
61+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_26},
62+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_27},
5563
#elif CONFIG_IDF_TARGET_ESP32C3
56-
{{&machine_adc_type}, GPIO_NUM_0, ADC1_CHANNEL_0},
57-
{{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_1},
58-
{{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_2},
59-
{{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_3},
60-
{{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_4},
64+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_0},
65+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_1},
66+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_2},
67+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_3},
68+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_4},
69+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_5},
6170
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
62-
{{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_0},
63-
{{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_1},
64-
{{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_2},
65-
{{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_3},
66-
{{&machine_adc_type}, GPIO_NUM_5, ADC1_CHANNEL_4},
67-
{{&machine_adc_type}, GPIO_NUM_6, ADC1_CHANNEL_5},
68-
{{&machine_adc_type}, GPIO_NUM_7, ADC1_CHANNEL_6},
69-
{{&machine_adc_type}, GPIO_NUM_8, ADC1_CHANNEL_7},
70-
{{&machine_adc_type}, GPIO_NUM_9, ADC1_CHANNEL_8},
71-
{{&machine_adc_type}, GPIO_NUM_10, ADC1_CHANNEL_9},
71+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_1},
72+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_2},
73+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_3},
74+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_4},
75+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_5},
76+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_6},
77+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_7},
78+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_7, GPIO_NUM_8},
79+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_8, GPIO_NUM_9},
80+
{{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_9, GPIO_NUM_10},
81+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_11},
82+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_1, GPIO_NUM_12},
83+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_2, GPIO_NUM_13},
84+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_3, GPIO_NUM_14},
85+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_4, GPIO_NUM_15},
86+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_5, GPIO_NUM_16},
87+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_6, GPIO_NUM_17},
88+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_18},
89+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_19},
90+
{{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_20},
7291
#endif
7392
};
7493

75-
STATIC uint8_t adc_bit_width;
94+
STATIC adc_atten_t madc_obj_atten[MP_ARRAY_SIZE(madc_obj)];
7695

77-
STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
78-
const mp_obj_t *args) {
96+
const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id) {
97+
for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
98+
const madc_obj_t *adc = &madc_obj[i];
99+
if ((block == NULL || block == adc->block) && (channel_id == -1 || channel_id == adc->channel_id) && (gpio_id == -1 || gpio_id == adc->gpio_id)) {
100+
return adc;
101+
}
102+
}
103+
return NULL;
104+
}
79105

80-
static int initialized = 0;
81-
if (!initialized) {
82-
#if CONFIG_IDF_TARGET_ESP32S2
83-
adc1_config_width(ADC_WIDTH_BIT_13);
84-
#else
85-
adc1_config_width(ADC_WIDTH_BIT_12);
86-
#endif
87-
adc_bit_width = 12;
88-
initialized = 1;
106+
STATIC void madc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
107+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
108+
mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, madc_obj_atten[self - madc_obj]);
109+
}
110+
111+
STATIC void madc_atten_helper(const madc_obj_t *self, mp_int_t atten) {
112+
esp_err_t err;
113+
if (self->block->unit_id == ADC_UNIT_1) {
114+
err = adc1_config_channel_atten(self->channel_id, atten);
115+
} else {
116+
err = adc2_config_channel_atten(self->channel_id, atten);
89117
}
118+
if (err != ESP_OK) {
119+
mp_raise_ValueError(MP_ERROR_TEXT("invalid atten"));
120+
}
121+
madc_obj_atten[self - madc_obj] = atten;
122+
}
90123

91-
mp_arg_check_num(n_args, n_kw, 1, 1, true);
92-
gpio_num_t pin_id = machine_pin_get_id(args[0]);
93-
const madc_obj_t *self = NULL;
94-
for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
95-
if (pin_id == madc_obj[i].gpio_id) {
96-
self = &madc_obj[i];
97-
break;
98-
}
124+
void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
125+
enum {
126+
ARG_atten,
127+
};
128+
129+
static const mp_arg_t allowed_args[] = {
130+
{ MP_QSTR_atten, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
131+
};
132+
133+
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
134+
mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
135+
136+
mp_int_t atten = args[ARG_atten].u_int;
137+
if (atten != -1) {
138+
madc_atten_helper(self, atten);
139+
} else if (madc_obj_atten[self - madc_obj] == -1) {
140+
madc_atten_helper(self, ADC_ATTEN_DB_0);
99141
}
142+
}
143+
144+
STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
145+
mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
146+
gpio_num_t gpio_id = machine_pin_get_id(args[0]);
147+
const madc_obj_t *self = madc_search_helper(NULL, -1, gpio_id);
100148
if (!self) {
101-
mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for ADC"));
149+
mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
102150
}
103-
esp_err_t err = adc1_config_channel_atten(self->adc1_id, ADC_ATTEN_0db);
104-
if (err == ESP_OK) {
105-
return MP_OBJ_FROM_PTR(self);
151+
152+
if (self->block->width == -1) {
153+
madcblock_bits_helper(self->block, self->block->bits);
106154
}
107-
mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
155+
156+
mp_map_t kw_args;
157+
mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
158+
madc_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
159+
160+
return MP_OBJ_FROM_PTR(self);
108161
}
109162

110-
STATIC void madc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
111-
madc_obj_t *self = self_in;
112-
mp_printf(print, "ADC(Pin(%u))", self->gpio_id);
163+
STATIC mp_obj_t madc_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
164+
const madc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
165+
madc_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
166+
return mp_const_none;
167+
}
168+
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(madc_init_obj, 1, madc_init);
169+
170+
STATIC mp_obj_t madc_block(mp_obj_t self_in) {
171+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
172+
return MP_OBJ_FROM_PTR(self->block);
173+
}
174+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_block_obj, madc_block);
175+
176+
STATIC mp_obj_t madc_read(mp_obj_t self_in) {
177+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
178+
mp_int_t raw = madcblock_read_helper(self->block, self->channel_id);
179+
return MP_OBJ_NEW_SMALL_INT(raw);
113180
}
181+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_obj, madc_read);
114182

115-
// read_u16()
116183
STATIC mp_obj_t madc_read_u16(mp_obj_t self_in) {
117-
madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
118-
uint32_t raw = adc1_get_raw(self->adc1_id);
184+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
185+
mp_uint_t raw = madcblock_read_helper(self->block, self->channel_id);
119186
// Scale raw reading to 16 bit value using a Taylor expansion (for 8 <= bits <= 16)
120-
uint32_t u16 = raw << (16 - adc_bit_width) | raw >> (2 * adc_bit_width - 16);
187+
mp_int_t bits = self->block->bits;
188+
mp_uint_t u16 = raw << (16 - bits) | raw >> (2 * bits - 16);
121189
return MP_OBJ_NEW_SMALL_INT(u16);
122190
}
123191
STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_u16_obj, madc_read_u16);
124192

125-
// Legacy method
126-
STATIC mp_obj_t madc_read(mp_obj_t self_in) {
127-
madc_obj_t *self = self_in;
128-
int val = adc1_get_raw(self->adc1_id);
129-
if (val == -1) {
130-
mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
131-
}
132-
return MP_OBJ_NEW_SMALL_INT(val);
193+
STATIC mp_obj_t madc_read_uv(mp_obj_t self_in) {
194+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
195+
adc_atten_t atten = madc_obj_atten[self - madc_obj];
196+
return MP_OBJ_NEW_SMALL_INT(madcblock_read_uv_helper(self->block, self->channel_id, atten));
133197
}
134-
MP_DEFINE_CONST_FUN_OBJ_1(madc_read_obj, madc_read);
198+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_uv_obj, madc_read_uv);
135199

136200
STATIC mp_obj_t madc_atten(mp_obj_t self_in, mp_obj_t atten_in) {
137-
madc_obj_t *self = self_in;
138-
adc_atten_t atten = mp_obj_get_int(atten_in);
139-
esp_err_t err = adc1_config_channel_atten(self->adc1_id, atten);
140-
if (err == ESP_OK) {
141-
return mp_const_none;
142-
}
143-
mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
201+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
202+
mp_int_t atten = mp_obj_get_int(atten_in);
203+
madc_atten_helper(self, atten);
204+
return mp_const_none;
144205
}
145206
MP_DEFINE_CONST_FUN_OBJ_2(madc_atten_obj, madc_atten);
146207

147-
STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
148-
adc_bits_width_t width = mp_obj_get_int(width_in);
149-
esp_err_t err = adc1_config_width(width);
150-
if (err != ESP_OK) {
151-
mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
152-
}
153-
switch (width) {
154-
#if CONFIG_IDF_TARGET_ESP32
155-
case ADC_WIDTH_9Bit:
156-
adc_bit_width = 9;
157-
break;
158-
case ADC_WIDTH_10Bit:
159-
adc_bit_width = 10;
160-
break;
161-
case ADC_WIDTH_11Bit:
162-
adc_bit_width = 11;
163-
break;
164-
case ADC_WIDTH_12Bit:
165-
adc_bit_width = 12;
166-
break;
167-
#elif CONFIG_IDF_TARGET_ESP32S2
168-
case ADC_WIDTH_BIT_13:
169-
adc_bit_width = 13;
170-
break;
171-
#elif CONFIG_IDF_TARGET_ESP32S3
172-
case ADC_WIDTH_BIT_12:
173-
adc_bit_width = 12;
174-
break;
175-
#endif
176-
default:
177-
break;
178-
}
208+
STATIC mp_obj_t madc_width(mp_obj_t self_in, mp_obj_t bits_in) {
209+
const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
210+
mp_int_t bits = mp_obj_get_int(bits_in);
211+
madcblock_bits_helper(self->block, bits);
179212
return mp_const_none;
180213
}
181-
MP_DEFINE_CONST_FUN_OBJ_2(madc_width_fun_obj, madc_width);
182-
MP_DEFINE_CONST_CLASSMETHOD_OBJ(madc_width_obj, MP_ROM_PTR(&madc_width_fun_obj));
214+
MP_DEFINE_CONST_FUN_OBJ_2(madc_width_obj, madc_width);
183215

184216
STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
217+
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&madc_init_obj) },
218+
{ MP_ROM_QSTR(MP_QSTR_block), MP_ROM_PTR(&madc_block_obj) },
219+
{ MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&madc_read_obj) },
185220
{ MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&madc_read_u16_obj) },
221+
{ MP_ROM_QSTR(MP_QSTR_read_uv), MP_ROM_PTR(&madc_read_uv_obj) },
186222

187-
{ MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&madc_read_obj) },
223+
// Legacy API methods:
188224
{ MP_ROM_QSTR(MP_QSTR_atten), MP_ROM_PTR(&madc_atten_obj) },
189225
{ MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&madc_width_obj) },
190226

191-
{ MP_ROM_QSTR(MP_QSTR_ATTN_0DB), MP_ROM_INT(ADC_ATTEN_0db) },
192-
{ MP_ROM_QSTR(MP_QSTR_ATTN_2_5DB), MP_ROM_INT(ADC_ATTEN_2_5db) },
193-
{ MP_ROM_QSTR(MP_QSTR_ATTN_6DB), MP_ROM_INT(ADC_ATTEN_6db) },
194-
{ MP_ROM_QSTR(MP_QSTR_ATTN_11DB), MP_ROM_INT(ADC_ATTEN_11db) },
227+
{ MP_ROM_QSTR(MP_QSTR_ATTN_0DB), MP_ROM_INT(ADC_ATTEN_DB_0) },
228+
{ MP_ROM_QSTR(MP_QSTR_ATTN_2_5DB), MP_ROM_INT(ADC_ATTEN_DB_2_5) },
229+
{ MP_ROM_QSTR(MP_QSTR_ATTN_6DB), MP_ROM_INT(ADC_ATTEN_DB_6) },
230+
{ MP_ROM_QSTR(MP_QSTR_ATTN_11DB), MP_ROM_INT(ADC_ATTEN_DB_11) },
195231

196232
#if CONFIG_IDF_TARGET_ESP32
197-
{ MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(ADC_WIDTH_9Bit) },
198-
{ MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
199-
{ MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
200-
{ MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
201-
#elif CONFIG_IDF_TARGET_ESP32S2
202-
{ MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
203-
#elif CONFIG_IDF_TARGET_ESP32S3
204-
{ MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_BIT_12) },
233+
{ MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(9) },
234+
{ MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(10) },
235+
{ MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(11) },
236+
#endif
237+
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
238+
{ MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(12) },
239+
#endif
240+
#if CONFIG_IDF_TARGET_ESP32S2
241+
{ MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(13) },
205242
#endif
206-
};
207243

244+
};
208245
STATIC MP_DEFINE_CONST_DICT(madc_locals_dict, madc_locals_dict_table);
209246

210247
const mp_obj_type_t machine_adc_type = {

‎ports/esp32/machine_adc.h

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#ifndef MICROPY_INCLUDED_MACHINE_ADC_H
2+
#define MICROPY_INCLUDED_MACHINE_ADC_H
3+
4+
#include "machine_adcblock.h"
5+
6+
typedef struct _madc_obj_t {
7+
mp_obj_base_t base;
8+
madcblock_obj_t *block;
9+
adc_channel_t channel_id;
10+
gpio_num_t gpio_id;
11+
} madc_obj_t;
12+
13+
extern const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id);
14+
extern void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
15+
16+
#endif // MICROPY_INCLUDED_MACHINE_ADC_H

0 commit comments

Comments
 (0)