diff options
Diffstat (limited to 'stm/main.c')
| -rw-r--r-- | stm/main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/stm/main.c b/stm/main.c index 4114ec1979..1388a1d900 100644 --- a/stm/main.c +++ b/stm/main.c @@ -137,8 +137,10 @@ static const char *help_text = " pyb.switch() -- return True/False if switch pressed or not\n" " pyb.accel() -- get accelerometer values\n" " pyb.rand() -- get a 16-bit random number\n" -" pyb.gpio(<port>) -- get port value (port='a4' for example)\n" +" pyb.gpio(<port>) -- get port value (port='A4' for example)\n" " pyb.gpio(<port>, <val>) -- set port value, True or False, 1 or 0\n" +" pyb.ADC(<port>) -- make an analog port object (port='C0' for example)\n" +" ADC methods: read()\n" ; // get some help about available functions @@ -348,7 +350,7 @@ int readline(vstr_t *line, const char *prompt) { } void do_repl(void) { - stdout_tx_str("Micro Python build <git hash> on 2/1/2014; PYBv3 with STM32F405RG\r\n"); + stdout_tx_str("Micro Python build <git hash> on 25/1/2014; " MICROPY_HW_BOARD_NAME " with STM32F405RG\r\n"); stdout_tx_str("Type \"help()\" for more information.\r\n"); vstr_t line; @@ -378,7 +380,7 @@ void do_repl(void) { } } - mp_lexer_t *lex = mp_lexer_new_from_str_len("<stdin>", vstr_str(&line), vstr_len(&line), 0); + mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr_str(&line), vstr_len(&line), 0); qstr parse_exc_id; const char *parse_exc_msg; mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT, &parse_exc_id, &parse_exc_msg); @@ -393,6 +395,7 @@ void do_repl(void) { // parse okay mp_lexer_free(lex); mp_obj_t module_fun = mp_compile(pn, source_name, true); + mp_parse_node_free(pn); if (module_fun != mp_const_none) { nlr_buf_t nlr; uint32_t start = sys_tick_counter; @@ -439,6 +442,8 @@ bool do_file(const char *filename) { mp_lexer_free(lex); mp_obj_t module_fun = mp_compile(pn, source_name, false); + mp_parse_node_free(pn); + if (module_fun == mp_const_none) { return false; } @@ -651,7 +656,8 @@ soft_reset: rt_store_attr(m, MP_QSTR_I2C, rt_make_function_n(2, pyb_I2C)); rt_store_attr(m, MP_QSTR_gpio, (mp_obj_t)&pyb_gpio_obj); rt_store_attr(m, MP_QSTR_Usart, rt_make_function_n(2, pyb_Usart)); - rt_store_attr(m, MP_QSTR_ADC, rt_make_function_n(1, pyb_ADC)); + rt_store_attr(m, qstr_from_str("ADC_all"), (mp_obj_t)&pyb_ADC_all_obj); + rt_store_attr(m, MP_QSTR_ADC, (mp_obj_t)&pyb_ADC_obj); rt_store_name(MP_QSTR_pyb, m); rt_store_name(MP_QSTR_open, rt_make_function_n(2, pyb_io_open)); |