aboutsummaryrefslogtreecommitdiff
path: root/stm/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'stm/main.c')
-rw-r--r--stm/main.c240
1 files changed, 4 insertions, 236 deletions
diff --git a/stm/main.c b/stm/main.c
index 2bf7c1ba3..528408b01 100644
--- a/stm/main.c
+++ b/stm/main.c
@@ -28,11 +28,11 @@
#include "compile.h"
#include "runtime0.h"
#include "runtime.h"
-#include "repl.h"
#include "gc.h"
#include "gccollect.h"
#include "systick.h"
#include "pendsv.h"
+#include "pyexec.h"
#include "led.h"
#include "servo.h"
#include "lcd.h"
@@ -214,13 +214,6 @@ static mp_obj_t pyb_info(void) {
return mp_const_none;
}
-static bool repl_display_debugging_info = 0;
-
-static mp_obj_t pyb_set_repl_info(mp_obj_t o_value) {
- repl_display_debugging_info = mp_obj_get_int(o_value);
- return mp_const_none;
-}
-
static void SYSCLKConfig_STOP(void) {
/* After wake-up from STOP reconfigure the system clock */
/* Enable HSE */
@@ -266,231 +259,6 @@ static mp_obj_t pyb_standby(void) {
return mp_const_none;
}
-char *strdup(const char *str) {
- uint32_t len = strlen(str);
- char *s2 = m_new(char, len + 1);
- memcpy(s2, str, len);
- s2[len] = 0;
- return s2;
-}
-
-#define READLINE_HIST_SIZE (8)
-
-static const char *readline_hist[READLINE_HIST_SIZE] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
-
-void stdout_tx_str(const char *str) {
- if (pyb_usart_global_debug != PYB_USART_NONE) {
- usart_tx_str(pyb_usart_global_debug, str);
- }
-#if defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
- lcd_print_str(str);
-#endif
- usb_vcp_send_str(str);
-}
-
-int readline(vstr_t *line, const char *prompt) {
- stdout_tx_str(prompt);
- int len = vstr_len(line);
- int escape = 0;
- int hist_num = 0;
- for (;;) {
- char c;
- for (;;) {
-#ifdef USE_HOST_MODE
- pyb_usb_host_process();
- c = pyb_usb_host_get_keyboard();
- if (c != 0) {
- break;
- }
-#endif
- if (usb_vcp_rx_any() != 0) {
- c = usb_vcp_rx_get();
- break;
- } else if (pyb_usart_global_debug != PYB_USART_NONE && usart_rx_any(pyb_usart_global_debug)) {
- c = usart_rx_char(pyb_usart_global_debug);
- break;
- }
- sys_tick_delay_ms(1);
- if (storage_needs_flush()) {
- storage_flush();
- }
- }
- if (escape == 0) {
- if (c == VCP_CHAR_CTRL_D && vstr_len(line) == len) {
- return 0;
- } else if (c == '\r') {
- stdout_tx_str("\r\n");
- for (int i = READLINE_HIST_SIZE - 1; i > 0; i--) {
- readline_hist[i] = readline_hist[i - 1];
- }
- readline_hist[0] = strdup(vstr_str(line));
- return 1;
- } else if (c == 27) {
- escape = true;
- } else if (c == 127) {
- if (vstr_len(line) > len) {
- vstr_cut_tail(line, 1);
- stdout_tx_str("\b \b");
- }
- } else if (32 <= c && c <= 126) {
- vstr_add_char(line, c);
- stdout_tx_str(line->buf + line->len - 1);
- }
- } else if (escape == 1) {
- if (c == '[') {
- escape = 2;
- } else {
- escape = 0;
- }
- } else if (escape == 2) {
- escape = 0;
- if (c == 'A') {
- // up arrow
- if (hist_num < READLINE_HIST_SIZE && readline_hist[hist_num] != NULL) {
- // erase line
- for (int i = line->len - len; i > 0; i--) {
- stdout_tx_str("\b \b");
- }
- // set line to history
- line->len = len;
- vstr_add_str(line, readline_hist[hist_num]);
- // draw line
- stdout_tx_str(readline_hist[hist_num]);
- // increase hist num
- hist_num += 1;
- }
- }
- } else {
- escape = 0;
- }
- sys_tick_delay_ms(10);
- }
-}
-
-void do_repl(void) {
-#if defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
- // in host mode, we enable the LCD for the repl
- mp_obj_t lcd_o = rt_call_function_0(rt_load_name(qstr_from_str("LCD")));
- rt_call_function_1(rt_load_attr(lcd_o, qstr_from_str("light")), mp_const_true);
-#endif
-
- 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;
- vstr_init(&line, 32);
-
- for (;;) {
- vstr_reset(&line);
- int ret = readline(&line, ">>> ");
- if (ret == 0) {
- // EOF
- break;
- }
-
- if (vstr_len(&line) == 0) {
- continue;
- }
-
- if (mp_repl_is_compound_stmt(vstr_str(&line))) {
- for (;;) {
- vstr_add_char(&line, '\n');
- int len = vstr_len(&line);
- int ret = readline(&line, "... ");
- if (ret == 0 || vstr_len(&line) == len) {
- // done entering compound statement
- break;
- }
- }
- }
-
- mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr_str(&line), vstr_len(&line), 0);
- mp_parse_error_kind_t parse_error_kind;
- mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT, &parse_error_kind);
- qstr source_name = mp_lexer_source_name(lex);
-
- if (pn == MP_PARSE_NODE_NULL) {
- // parse error
- mp_parse_show_exception(lex, parse_error_kind);
- mp_lexer_free(lex);
- } else {
- // 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;
- if (nlr_push(&nlr) == 0) {
- usb_vcp_set_interrupt_char(VCP_CHAR_CTRL_C); // allow ctrl-C to interrupt us
- rt_call_function_0(module_fun);
- usb_vcp_set_interrupt_char(VCP_CHAR_NONE); // disable interrupt
- nlr_pop();
- } else {
- // uncaught exception
- // FIXME it could be that an interrupt happens just before we disable it here
- usb_vcp_set_interrupt_char(VCP_CHAR_NONE); // disable interrupt
- mp_obj_print_exception((mp_obj_t)nlr.ret_val);
- }
-
- // display debugging info if wanted
- if (repl_display_debugging_info) {
- uint32_t ticks = sys_tick_counter - start; // TODO implement a function that does this properly
- printf("took %lu ms\n", ticks);
- gc_collect();
- pyb_info();
- }
- }
- }
- }
-
- stdout_tx_str("\r\n");
-}
-
-bool do_file(const char *filename) {
- mp_lexer_t *lex = mp_lexer_new_from_file(filename);
-
- if (lex == NULL) {
- printf("could not open file '%s' for reading\n", filename);
- return false;
- }
-
- mp_parse_error_kind_t parse_error_kind;
- mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT, &parse_error_kind);
- qstr source_name = mp_lexer_source_name(lex);
-
- if (pn == MP_PARSE_NODE_NULL) {
- // parse error
- mp_parse_show_exception(lex, parse_error_kind);
- mp_lexer_free(lex);
- return false;
- }
-
- 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;
- }
-
- nlr_buf_t nlr;
- if (nlr_push(&nlr) == 0) {
- usb_vcp_set_interrupt_char(VCP_CHAR_CTRL_C); // allow ctrl-C to interrupt us
- rt_call_function_0(module_fun);
- usb_vcp_set_interrupt_char(VCP_CHAR_NONE); // disable interrupt
- nlr_pop();
- return true;
- } else {
- // uncaught exception
- // FIXME it could be that an interrupt happens just before we disable it here
- usb_vcp_set_interrupt_char(VCP_CHAR_NONE); // disable interrupt
- mp_obj_print_exception((mp_obj_t)nlr.ret_val);
- return false;
- }
-}
-
mp_obj_t pyb_gpio(uint n_args, mp_obj_t *args) {
//assert(1 <= n_args && n_args <= 2);
@@ -809,7 +577,7 @@ soft_reset:
}
// run /boot.py
- if (!do_file("0:/boot.py")) {
+ if (!pyexec_file("0:/boot.py")) {
flash_error(4);
}
@@ -861,7 +629,7 @@ soft_reset:
} else {
vstr_add_str(vstr, mp_obj_str_get_str(pyb_config_main));
}
- if (!do_file(vstr_str(vstr))) {
+ if (!pyexec_file(vstr_str(vstr))) {
flash_error(3);
}
vstr_free(vstr);
@@ -909,7 +677,7 @@ soft_reset:
pyb_wlan_start();
#endif
- do_repl();
+ pyexec_repl();
printf("PYB: sync filesystems\n");
pyb_sync();
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-17 20:42:44 +0000