diff options
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/adc.c | 14 | ||||
| -rw-r--r-- | stm/audio.c | 10 | ||||
| -rw-r--r-- | stm/exti.c | 10 | ||||
| -rw-r--r-- | stm/file.c | 8 | ||||
| -rw-r--r-- | stm/i2c.c | 12 | ||||
| -rw-r--r-- | stm/led.c | 8 | ||||
| -rw-r--r-- | stm/pin.c | 8 | ||||
| -rw-r--r-- | stm/qstrdefsport.h | 34 | ||||
| -rw-r--r-- | stm/sdcard.c | 8 | ||||
| -rw-r--r-- | stm/servo.c | 4 | ||||
| -rw-r--r-- | stm/usart.c | 10 |
11 files changed, 80 insertions, 46 deletions
@@ -324,11 +324,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vbat_obj, adc_all_read_core_v 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[] = { - { "read_channel", &adc_all_read_channel_obj}, - { "read_core_temp", &adc_all_read_core_temp_obj}, - { "read_core_vbat", &adc_all_read_core_vbat_obj}, - { "read_core_vref", &adc_all_read_core_vref_obj}, - { NULL, NULL }, + { 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_obj_type_t adc_all_type = { @@ -381,8 +381,8 @@ 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[] = { - { "read", &adc_read_obj}, - { NULL, NULL }, + { MP_QSTR_read, &adc_read_obj}, + { MP_QSTR_NULL, NULL }, }; static const mp_obj_type_t adc_type = { diff --git a/stm/audio.c b/stm/audio.c index 77337282af..5523087ec8 100644 --- a/stm/audio.c +++ b/stm/audio.c @@ -194,11 +194,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_audio_dac_obj, pyb_audio_dac); STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_audio_dma_obj, 3, pyb_audio_dma); STATIC const mp_method_t pyb_audio_methods[] = { - { "noise", &pyb_audio_noise_obj }, - { "triangle", &pyb_audio_triangle_obj }, - { "dac", &pyb_audio_dac_obj }, - { "dma", &pyb_audio_dma_obj }, - { NULL, NULL }, + { MP_QSTR_noise, &pyb_audio_noise_obj }, + { MP_QSTR_triangle, &pyb_audio_triangle_obj }, + { MP_QSTR_dac, &pyb_audio_dac_obj }, + { MP_QSTR_dma, &pyb_audio_dma_obj }, + { MP_QSTR_NULL, NULL }, }; STATIC const mp_obj_type_t pyb_audio_type = { diff --git a/stm/exti.c b/stm/exti.c index fa21eae8a3..1484b622ec 100644 --- a/stm/exti.c +++ b/stm/exti.c @@ -227,11 +227,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(exti_obj_disable_obj, exti_obj_disable); static MP_DEFINE_CONST_FUN_OBJ_1(exti_obj_swint_obj, exti_obj_swint); static const mp_method_t exti_methods[] = { - { "line", &exti_obj_line_obj }, - { "enable", &exti_obj_enable_obj }, - { "disable", &exti_obj_disable_obj }, - { "swint", &exti_obj_swint_obj }, - { NULL, NULL }, + { MP_QSTR_line, &exti_obj_line_obj }, + { MP_QSTR_enable, &exti_obj_enable_obj }, + { MP_QSTR_disable, &exti_obj_disable_obj }, + { MP_QSTR_swint, &exti_obj_swint_obj }, + { MP_QSTR_NULL, NULL }, }; static mp_obj_t exti_regs(void) { diff --git a/stm/file.c b/stm/file.c index 283159a69b..e56b05faeb 100644 --- a/stm/file.c +++ b/stm/file.c @@ -53,10 +53,10 @@ static MP_DEFINE_CONST_FUN_OBJ_1(file_obj_close_obj, file_obj_close); // TODO gc hook to close the file if not already closed static const mp_method_t file_methods[] = { - { "read", &file_obj_read_obj }, - { "write", &file_obj_write_obj }, - { "close", &file_obj_close_obj }, - {NULL, NULL}, + { MP_QSTR_read, &file_obj_read_obj }, + { MP_QSTR_write, &file_obj_write_obj }, + { MP_QSTR_close, &file_obj_close_obj }, + { MP_QSTR_NULL, NULL }, }; static const mp_obj_type_t file_obj_type = { @@ -326,12 +326,12 @@ static MP_DEFINE_CONST_FUN_OBJ_1(i2c_obj_readAndStop_obj, i2c_obj_readAndStop); static MP_DEFINE_CONST_FUN_OBJ_1(i2c_obj_stop_obj, i2c_obj_stop); static const mp_method_t i2c_methods[] = { - { "start", &i2c_obj_start_obj }, - { "write", &i2c_obj_write_obj }, - { "read", &i2c_obj_read_obj }, - { "readAndStop", &i2c_obj_readAndStop_obj }, - { "stop", &i2c_obj_stop_obj }, - { NULL, NULL }, + { MP_QSTR_start, &i2c_obj_start_obj }, + { MP_QSTR_write, &i2c_obj_write_obj }, + { MP_QSTR_read, &i2c_obj_read_obj }, + { MP_QSTR_readAndStop, &i2c_obj_readAndStop_obj }, + { MP_QSTR_stop, &i2c_obj_stop_obj }, + { MP_QSTR_NULL, NULL }, }; static const mp_obj_type_t i2c_obj_type = { @@ -110,10 +110,10 @@ static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off); static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_toggle_obj, led_obj_toggle); static const mp_method_t led_methods[] = { - { "on", &led_obj_on_obj }, - { "off", &led_obj_off_obj }, - { "toggle", &led_obj_toggle_obj }, - { NULL, NULL }, + { MP_QSTR_on, &led_obj_on_obj }, + { MP_QSTR_off, &led_obj_off_obj }, + { MP_QSTR_toggle, &led_obj_toggle_obj }, + { MP_QSTR_NULL, NULL }, }; static const mp_obj_type_t led_obj_type = { @@ -35,10 +35,10 @@ static MP_DEFINE_CONST_FUN_OBJ_1(pin_obj_port_obj, pin_obj_port); static MP_DEFINE_CONST_FUN_OBJ_1(pin_obj_pin_obj, pin_obj_pin); static const mp_method_t pin_methods[] = { - { "name", &pin_obj_name_obj }, - { "port", &pin_obj_port_obj }, - { "pin", &pin_obj_pin_obj }, - { NULL, NULL }, + { MP_QSTR_name, &pin_obj_name_obj }, + { MP_QSTR_port, &pin_obj_port_obj }, + { MP_QSTR_pin, &pin_obj_pin_obj }, + { MP_QSTR_NULL, NULL }, }; const mp_obj_type_t pin_obj_type = { diff --git a/stm/qstrdefsport.h b/stm/qstrdefsport.h index 13532892a7..ea2681f18e 100644 --- a/stm/qstrdefsport.h +++ b/stm/qstrdefsport.h @@ -55,3 +55,37 @@ Q(PULL_UP) Q(PULL_DOWN) Q(PUSH_PULL) Q(OPEN_DRAIN) +Q(on) +Q(off) +Q(toggle) +Q(line) +Q(enable) +Q(disable) +Q(swint) +Q(read_channel) +Q(read_core_temp) +Q(read_core_vbat) +Q(read_core_vref) +Q(noise) +Q(triangle) +Q(dac) +Q(dma) +Q(present) +Q(power) +Q(read) +Q(read) +Q(write) +Q(close) +Q(name) +Q(port) +Q(pin) +Q(angle) +Q(start) +Q(write) +Q(read) +Q(readAndStop) +Q(stop) +Q(status) +Q(recv_chr) +Q(send_chr) +Q(send) diff --git a/stm/sdcard.c b/stm/sdcard.c index 0b5fdb2c87..0898c42a57 100644 --- a/stm/sdcard.c +++ b/stm/sdcard.c @@ -195,10 +195,10 @@ static mp_obj_t sd_read(mp_obj_t self, mp_obj_t block_num) { static MP_DEFINE_CONST_FUN_OBJ_2(sd_read_obj, sd_read); static const mp_method_t sdcard_methods[] = { - { "present", &sd_present_obj }, - { "power", &sd_power_obj }, - { "read", &sd_read_obj }, - { NULL, NULL }, + { MP_QSTR_present, &sd_present_obj }, + { MP_QSTR_power, &sd_power_obj }, + { MP_QSTR_read, &sd_read_obj }, + { MP_QSTR_NULL, NULL }, }; static const mp_obj_type_t sdcard_type = { diff --git a/stm/servo.c b/stm/servo.c index ae266d7f65..cd6370b126 100644 --- a/stm/servo.c +++ b/stm/servo.c @@ -147,8 +147,8 @@ STATIC mp_obj_t servo_obj_angle(mp_obj_t self_in, mp_obj_t angle) { STATIC MP_DEFINE_CONST_FUN_OBJ_2(servo_obj_angle_obj, servo_obj_angle); STATIC const mp_method_t servo_methods[] = { - { "angle", &servo_obj_angle_obj }, - { NULL, NULL }, + { MP_QSTR_angle, &servo_obj_angle_obj }, + { MP_QSTR_NULL, NULL }, }; STATIC const mp_obj_type_t servo_obj_type = { diff --git a/stm/usart.c b/stm/usart.c index ac457b61f5..41a53c2fe8 100644 --- a/stm/usart.c +++ b/stm/usart.c @@ -236,11 +236,11 @@ static MP_DEFINE_CONST_FUN_OBJ_2(usart_obj_tx_char_obj, usart_obj_tx_char); static MP_DEFINE_CONST_FUN_OBJ_2(usart_obj_tx_str_obj, usart_obj_tx_str); STATIC const mp_method_t usart_methods[] = { - { "status", &usart_obj_status_obj }, - { "recv_chr", &usart_obj_rx_char_obj }, - { "send_chr", &usart_obj_tx_char_obj }, - { "send", &usart_obj_tx_str_obj }, - { NULL, NULL }, + { MP_QSTR_status, &usart_obj_status_obj }, + { MP_QSTR_recv_chr, &usart_obj_rx_char_obj }, + { MP_QSTR_send_chr, &usart_obj_tx_char_obj }, + { MP_QSTR_send, &usart_obj_tx_str_obj }, + { MP_QSTR_NULL, NULL }, }; STATIC const mp_obj_type_t usart_obj_type = { |