diff options
Diffstat (limited to 'stmhal/adc.c')
| -rw-r--r-- | stmhal/adc.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/stmhal/adc.c b/stmhal/adc.c index 7d0d3da99b..f05e7823dd 100644 --- a/stmhal/adc.c +++ b/stmhal/adc.c @@ -7,6 +7,7 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" +#include "map.h" #include "adc.h" #include "pin.h" #include "build/pins.h" @@ -163,17 +164,18 @@ STATIC mp_obj_t adc_read(mp_obj_t self_in) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read); -STATIC const mp_method_t adc_methods[] = { - { MP_QSTR_read, &adc_read_obj}, - { MP_QSTR_NULL, NULL }, +STATIC const mp_map_elem_t adc_locals_dict_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&adc_read_obj}, }; +STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table); + const mp_obj_type_t pyb_adc_type = { { &mp_type_type }, .name = MP_QSTR_ADC, .print = adc_print, .make_new = adc_make_new, - .methods = adc_methods, + .locals_dict = (mp_obj_t)&adc_locals_dict, }; /******************************************************************************/ @@ -320,19 +322,20 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_temp_obj, adc_all_read_core_t STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vbat_obj, adc_all_read_core_vbat); STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref); -STATIC const mp_method_t adc_all_methods[] = { - { MP_QSTR_read_channel, &adc_all_read_channel_obj}, - { MP_QSTR_read_core_temp, &adc_all_read_core_temp_obj}, - { MP_QSTR_read_core_vbat, &adc_all_read_core_vbat_obj}, - { MP_QSTR_read_core_vref, &adc_all_read_core_vref_obj}, - { MP_QSTR_NULL, NULL }, +STATIC const mp_map_elem_t adc_all_locals_dict_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR_read_channel), (mp_obj_t) &adc_all_read_channel_obj}, + { MP_OBJ_NEW_QSTR(MP_QSTR_read_core_temp), (mp_obj_t)&adc_all_read_core_temp_obj}, + { MP_OBJ_NEW_QSTR(MP_QSTR_read_core_vbat), (mp_obj_t)&adc_all_read_core_vbat_obj}, + { MP_OBJ_NEW_QSTR(MP_QSTR_read_core_vref), (mp_obj_t)&adc_all_read_core_vref_obj}, }; +STATIC MP_DEFINE_CONST_DICT(adc_all_locals_dict, adc_all_locals_dict_table); + STATIC const mp_obj_type_t adc_all_type = { { &mp_type_type }, .name = MP_QSTR_ADC, .print = adc_all_print, - .methods = adc_all_methods, + .locals_dict = (mp_obj_t)&adc_all_locals_dict, }; STATIC mp_obj_t pyb_ADC_all(mp_obj_t resolution) { |