afd0701bf7
This patch makes it so that UART(0) can by dynamically attached to and detached from the REPL by using the uos.dupterm function. Since WebREPL uses dupterm slot 0 the UART uses dupterm slot 1 (a slot which is newly introduced by this patch). UART(0) must now be attached manually in boot.py (or otherwise) and inisetup.py is changed to provide code to do this. For example, to attach use: import uos, machine uart = machine.UART(0, 115200) uos.dupterm(uart, 1) and to detach use: uos.dupterm(None, 1) When attached, all incoming chars on UART(0) go straight to stdin so uart.read() will always return None. Use sys.stdin.read() if it's needed to read characters from the UART(0) while it's also used for the REPL (or detach, read, then reattach). When detached the UART(0) can be used for other purposes. If there are no objects in any of the dupterm slots when the REPL is started (on hard or soft reset) then UART(0) is automatically attached. Without this, the only way to recover a board without a REPL would be to completely erase and reflash (which would install the default boot.py which attaches the REPL).
174 lines
5.2 KiB
C
174 lines
5.2 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "py/compile.h"
|
|
#include "py/runtime.h"
|
|
#include "py/stackctrl.h"
|
|
#include "py/mperrno.h"
|
|
#include "py/mphal.h"
|
|
#include "py/gc.h"
|
|
#include "extmod/misc.h"
|
|
#include "lib/mp-readline/readline.h"
|
|
#include "lib/utils/pyexec.h"
|
|
#include "gccollect.h"
|
|
#include "user_interface.h"
|
|
|
|
STATIC char heap[36 * 1024];
|
|
|
|
STATIC void mp_reset(void) {
|
|
mp_stack_set_top((void*)0x40000000);
|
|
mp_stack_set_limit(8192);
|
|
mp_hal_init();
|
|
gc_init(heap, heap + sizeof(heap));
|
|
mp_init();
|
|
mp_obj_list_init(mp_sys_path, 0);
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
|
|
mp_obj_list_init(mp_sys_argv, 0);
|
|
#if MICROPY_EMIT_XTENSA || MICROPY_EMIT_INLINE_XTENSA
|
|
extern void esp_native_code_init(void);
|
|
esp_native_code_init();
|
|
#endif
|
|
pin_init0();
|
|
readline_init0();
|
|
dupterm_task_init();
|
|
#if MICROPY_MODULE_FROZEN
|
|
pyexec_frozen_module("_boot.py");
|
|
pyexec_file("boot.py");
|
|
if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
|
|
pyexec_file("main.py");
|
|
}
|
|
#endif
|
|
|
|
// Check if there are any dupterm objects registered and if not then
|
|
// activate UART(0), or else there will never be any chance to get a REPL
|
|
size_t idx;
|
|
for (idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
|
|
if (MP_STATE_VM(dupterm_objs[idx]) != MP_OBJ_NULL) {
|
|
break;
|
|
}
|
|
}
|
|
if (idx == MICROPY_PY_OS_DUPTERM) {
|
|
mp_obj_t args[2];
|
|
args[0] = MP_OBJ_NEW_SMALL_INT(0);
|
|
args[1] = MP_OBJ_NEW_SMALL_INT(115200);
|
|
args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
|
|
args[1] = MP_OBJ_NEW_SMALL_INT(1);
|
|
extern mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args);
|
|
os_dupterm(2, args);
|
|
mp_hal_stdout_tx_str("Activated UART(0) for REPL\r\n");
|
|
}
|
|
}
|
|
|
|
void soft_reset(void) {
|
|
mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
|
|
mp_hal_delay_us(10000); // allow UART to flush output
|
|
mp_reset();
|
|
#if MICROPY_REPL_EVENT_DRIVEN
|
|
pyexec_event_repl_init();
|
|
#endif
|
|
}
|
|
|
|
void init_done(void) {
|
|
#if MICROPY_REPL_EVENT_DRIVEN
|
|
uart_task_init();
|
|
#endif
|
|
mp_reset();
|
|
mp_hal_stdout_tx_str("\r\n");
|
|
#if MICROPY_REPL_EVENT_DRIVEN
|
|
pyexec_event_repl_init();
|
|
#endif
|
|
|
|
#if !MICROPY_REPL_EVENT_DRIVEN
|
|
soft_reset:
|
|
for (;;) {
|
|
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
|
|
if (pyexec_raw_repl() != 0) {
|
|
break;
|
|
}
|
|
} else {
|
|
if (pyexec_friendly_repl() != 0) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
soft_reset();
|
|
goto soft_reset;
|
|
#endif
|
|
}
|
|
|
|
void user_init(void) {
|
|
system_init_done_cb(init_done);
|
|
}
|
|
|
|
#if !MICROPY_VFS
|
|
mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
|
|
mp_raise_OSError(MP_ENOENT);
|
|
}
|
|
|
|
mp_import_stat_t mp_import_stat(const char *path) {
|
|
(void)path;
|
|
return MP_IMPORT_STAT_NO_EXIST;
|
|
}
|
|
|
|
mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
|
return mp_const_none;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
|
|
|
|
#endif
|
|
|
|
void MP_FASTCODE(nlr_jump_fail)(void *val) {
|
|
printf("NLR jump failed\n");
|
|
for (;;) {
|
|
}
|
|
}
|
|
|
|
//void __assert(const char *file, int line, const char *func, const char *expr) {
|
|
void __assert(const char *file, int line, const char *expr) {
|
|
printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
|
|
for (;;) {
|
|
}
|
|
}
|
|
|
|
#if !MICROPY_DEBUG_PRINTERS
|
|
// With MICROPY_DEBUG_PRINTERS disabled DEBUG_printf is not defined but it
|
|
// is still needed by esp-open-lwip for debugging output, so define it here.
|
|
#include <stdarg.h>
|
|
int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args);
|
|
int DEBUG_printf(const char *fmt, ...) {
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
int ret = mp_vprintf(&MICROPY_DEBUG_PRINTER_DEST, fmt, ap);
|
|
va_end(ap);
|
|
return ret;
|
|
}
|
|
#endif
|