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).
130 lines
5.2 KiB
C
130 lines
5.2 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2015 Josef Gajdusek
|
|
*
|
|
* 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 <string.h>
|
|
|
|
#include "py/objtuple.h"
|
|
#include "py/objstr.h"
|
|
#include "extmod/misc.h"
|
|
#include "extmod/vfs.h"
|
|
#include "extmod/vfs_fat.h"
|
|
#include "genhdr/mpversion.h"
|
|
#include "esp_mphal.h"
|
|
#include "user_interface.h"
|
|
|
|
STATIC const qstr os_uname_info_fields[] = {
|
|
MP_QSTR_sysname, MP_QSTR_nodename,
|
|
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
|
|
};
|
|
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
|
|
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
|
|
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
|
|
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
|
|
|
|
STATIC mp_obj_tuple_t os_uname_info_obj = {
|
|
.base = {&mp_type_attrtuple},
|
|
.len = 5,
|
|
.items = {
|
|
(mp_obj_t)&os_uname_info_sysname_obj,
|
|
(mp_obj_t)&os_uname_info_nodename_obj,
|
|
NULL,
|
|
(mp_obj_t)&os_uname_info_version_obj,
|
|
(mp_obj_t)&os_uname_info_machine_obj,
|
|
(void *)os_uname_info_fields,
|
|
}
|
|
};
|
|
|
|
STATIC mp_obj_t os_uname(void) {
|
|
// We must populate the "release" field each time in case it was GC'd since the last call.
|
|
const char *ver = system_get_sdk_version();
|
|
os_uname_info_obj.items[2] = mp_obj_new_str(ver, strlen(ver));
|
|
return (mp_obj_t)&os_uname_info_obj;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
|
|
|
|
STATIC mp_obj_t os_urandom(mp_obj_t num) {
|
|
mp_int_t n = mp_obj_get_int(num);
|
|
vstr_t vstr;
|
|
vstr_init_len(&vstr, n);
|
|
for (int i = 0; i < n; i++) {
|
|
vstr.buf[i] = *WDEV_HWRNG;
|
|
}
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
|
|
|
|
// We wrap the mp_uos_dupterm function to detect if a UART is attached or not
|
|
mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args) {
|
|
mp_obj_t prev_obj = mp_uos_dupterm_obj.fun.var(n_args, args);
|
|
if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
|
|
++uart_attached_to_dupterm;
|
|
}
|
|
if (mp_obj_get_type(prev_obj) == &pyb_uart_type) {
|
|
--uart_attached_to_dupterm;
|
|
}
|
|
return prev_obj;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_dupterm_obj, 1, 2, os_dupterm);
|
|
|
|
STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
|
|
(void)obj_in;
|
|
mp_hal_signal_dupterm_input();
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
|
|
|
|
STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
|
|
{ MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
|
|
#if MICROPY_PY_OS_DUPTERM
|
|
{ MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&os_dupterm_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
|
|
#endif
|
|
#if MICROPY_VFS_FAT
|
|
{ MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
|
|
{ MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
|
|
#endif
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
|
|
|
|
const mp_obj_module_t uos_module = {
|
|
.base = { &mp_type_module },
|
|
.globals = (mp_obj_dict_t*)&os_module_globals,
|
|
};
|