diff options
author | Damien George <damien.p.george@gmail.com> | 2014-06-15 09:47:27 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-06-15 09:47:27 +0100 |
commit | 2547928148aefcf163953057979e14f46bef1170 (patch) | |
tree | f9fa0f2729143dc1ac8d4f1ff159b583dee1a389 /stmhal/modpyb.c | |
parent | c0711cbefa6a54b35c23c64f63c13dd3e78b25da (diff) | |
download | micropython-2547928148aefcf163953057979e14f46bef1170.tar.gz micropython-2547928148aefcf163953057979e14f46bef1170.zip |
stmhal: Add Python function to set UART for REPL.v1.1.1
This adds a hook to get/set pyb_uart_global_debug from Python, using
pyb.repl_uart(). You can set it to an arbitrary UART object, and then
the REPL (in and out) is repeated on this UART object (as well as on USB
CDC).
Ultimately, this will be replaced with a proper Pythonic interface to
set sys.stdin and sys.stdout.
Diffstat (limited to 'stmhal/modpyb.c')
-rw-r--r-- | stmhal/modpyb.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c index fae36b7b69..6879a2c1b7 100644 --- a/stmhal/modpyb.c +++ b/stmhal/modpyb.c @@ -29,8 +29,9 @@ #include "stm32f4xx_hal.h" -#include "misc.h" #include "mpconfig.h" +#include "misc.h" +#include "nlr.h" #include "qstr.h" #include "obj.h" #include "gc.h" @@ -302,6 +303,28 @@ STATIC mp_obj_t pyb_have_cdc(void ) { } STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_have_cdc_obj, pyb_have_cdc); +/// \function repl_uart(uart) +/// Get or set the UART object that the REPL is repeated on. +STATIC mp_obj_t pyb_repl_uart(uint n_args, const mp_obj_t *args) { + if (n_args == 0) { + if (pyb_uart_global_debug == NULL) { + return mp_const_none; + } else { + return pyb_uart_global_debug; + } + } else { + if (args[0] == mp_const_none) { + pyb_uart_global_debug = NULL; + } else if (mp_obj_get_type(args[0]) == &pyb_uart_type) { + pyb_uart_global_debug = args[0]; + } else { + nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "need a UART object")); + } + return mp_const_none; + } +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_repl_uart_obj, 0, 1, pyb_repl_uart); + /// \function hid((buttons, x, y, z)) /// Takes a 4-tuple (or list) and sends it to the USB host (the PC) to /// signal a HID mouse-motion event. @@ -342,6 +365,7 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_usb_mode), (mp_obj_t)&pyb_usb_mode_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_have_cdc), (mp_obj_t)&pyb_have_cdc_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_repl_uart), (mp_obj_t)&pyb_repl_uart_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_hid), (mp_obj_t)&pyb_hid_send_report_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_millis), (mp_obj_t)&pyb_millis_obj }, |