From 0b32e50365b6e36474e183a7240ccfc8fa56830a Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 13 Feb 2015 15:04:53 +0000 Subject: [PATCH] stmhal: Make pybstdio usable by other ports, and use it. Now all ports can use pybstdio.c to provide sys.stdin/stdout/stderr, so long as they implement mp_hal_stdin_* and mp_hal_stdout_* functions. --- cc3200/application.mk | 2 +- cc3200/hal/cc3200_hal.c | 42 ++++++++- cc3200/hal/cc3200_hal.h | 5 ++ cc3200/misc/FreeRTOSHooks.c | 1 - cc3200/misc/mperror.c | 7 +- cc3200/mods/modpyb.c | 1 - cc3200/mods/modwlan.c | 1 - cc3200/mods/pybstdio.c | 174 ------------------------------------ cc3200/mods/pybstdio.h | 31 ------- cc3200/mods/pybuart.c | 1 - cc3200/mptask.c | 1 - cc3200/telnet/telnet.c | 1 - esp8266/Makefile | 2 +- esp8266/esp_mphal.c | 17 ++-- esp8266/esp_mphal.h | 9 +- esp8266/modpyb.c | 1 - esp8266/pybstdio.c | 140 ----------------------------- esp8266/pybstdio.h | 30 ------- lib/mp-readline/readline.c | 18 ++-- stmhal/input.c | 1 - stmhal/main.c | 8 +- stmhal/modpyb.c | 1 - stmhal/mphal.c | 53 ++++++++++- stmhal/mphal.h | 5 ++ stmhal/printf.c | 4 +- stmhal/pybstdio.c | 67 ++------------ stmhal/pybstdio.h | 32 ------- stmhal/pyexec.c | 51 ++++++----- teensy/main.c | 6 +- teensy/modpyb.c | 1 - teensy/teensy_hal.c | 42 ++++++++- teensy/teensy_hal.h | 5 ++ teensy/usb.h | 7 ++ 33 files changed, 222 insertions(+), 545 deletions(-) delete mode 100644 cc3200/mods/pybstdio.c delete mode 100644 cc3200/mods/pybstdio.h delete mode 100644 esp8266/pybstdio.c delete mode 100644 esp8266/pybstdio.h delete mode 100644 stmhal/pybstdio.h create mode 100644 teensy/usb.h diff --git a/cc3200/application.mk b/cc3200/application.mk index d8e7a1ee17..fb6756fc09 100644 --- a/cc3200/application.mk +++ b/cc3200/application.mk @@ -91,7 +91,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\ pybextint.c \ pybpin.c \ pybrtc.c \ - pybstdio.c \ pybsystick.c \ pybuart.c \ ) @@ -144,6 +143,7 @@ APP_STM_SRC_C = $(addprefix stmhal/,\ moduselect.c \ printf.c \ pyexec.c \ + pybstdio.c \ string0.c \ ) diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c index 8424065c51..cae9367764 100644 --- a/cc3200/hal/cc3200_hal.c +++ b/cc3200/hal/cc3200_hal.c @@ -30,11 +30,12 @@ ******************************************************************************/ #include #include +#include #include "inc/hw_types.h" #include "inc/hw_ints.h" #include "inc/hw_nvic.h" #include "hw_memmap.h" -#include "mpconfig.h" +#include "py/mpstate.h" #include MICROPY_HAL_H #include "rom_map.h" #include "interrupt.h" @@ -43,6 +44,8 @@ #include "sdhost.h" #include "pin.h" #include "mpexception.h" +#include "telnet.h" +#include "pybuart.h" #ifdef USE_FREERTOS #include "FreeRTOS.h" @@ -126,6 +129,43 @@ void mp_hal_set_interrupt_char (int c) { mpexception_set_interrupt_char (c); } +void mp_hal_stdout_tx_str(const char *str) { + mp_hal_stdout_tx_strn(str, strlen(str)); +} + +void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) { + if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { + uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len); + } + // and also to telnet + if (telnet_is_active()) { + telnet_tx_strn(str, len); + } +} + +void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) { + // send stdout to UART + if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { + uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len); + } + // and also to telnet + if (telnet_is_active()) { + telnet_tx_strn_cooked(str, len); + } +} + +int mp_hal_stdin_rx_chr(void) { + for ( ;; ) { + if (telnet_rx_any()) { + return telnet_rx_char(); + } + else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) { + return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart)); + } + HAL_Delay(1); + } +} + /****************************************************************************** DEFINE PRIVATE FUNCTIONS ******************************************************************************/ diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h index 9562c827e8..b738ff6698 100644 --- a/cc3200/hal/cc3200_hal.h +++ b/cc3200/hal/cc3200_hal.h @@ -63,4 +63,9 @@ extern uint32_t HAL_GetTick(void); extern void HAL_Delay(uint32_t delay); extern void mp_hal_set_interrupt_char (int c); +int mp_hal_stdin_rx_chr(void); +void mp_hal_stdout_tx_str(const char *str); +void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len); +void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len); + #endif /* CC3200_LAUNCHXL_HAL_CC3200_HAL_H_ */ diff --git a/cc3200/misc/FreeRTOSHooks.c b/cc3200/misc/FreeRTOSHooks.c index 85dc2f373e..4fd5b02ad3 100644 --- a/cc3200/misc/FreeRTOSHooks.c +++ b/cc3200/misc/FreeRTOSHooks.c @@ -35,7 +35,6 @@ #include "obj.h" #include "inc/hw_memmap.h" #include "pybuart.h" -#include "pybstdio.h" #include "osi.h" diff --git a/cc3200/misc/mperror.c b/cc3200/misc/mperror.c index d858813406..12fd3d8ad9 100644 --- a/cc3200/misc/mperror.c +++ b/cc3200/misc/mperror.c @@ -37,7 +37,6 @@ #include "obj.h" #include "inc/hw_memmap.h" #include "pybuart.h" -#include "pybstdio.h" #include "utils.h" @@ -45,9 +44,9 @@ void NORETURN __fatal_error(const char *msg) { if (msg != NULL) { // wait for 20ms UtilsDelay(UTILS_DELAY_US_TO_COUNT(20000)); - stdout_tx_str("\r\nFATAL ERROR:"); - stdout_tx_str(msg); - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\nFATAL ERROR:"); + mp_hal_stdout_tx_str(msg); + mp_hal_stdout_tx_str("\r\n"); } for ( ;; ) {__WFI();} } diff --git a/cc3200/mods/modpyb.c b/cc3200/mods/modpyb.c index fe6ccc561e..869adc761c 100644 --- a/cc3200/mods/modpyb.c +++ b/cc3200/mods/modpyb.c @@ -48,7 +48,6 @@ #include "pyexec.h" #include "pybuart.h" #include "pybpin.h" -#include "pybstdio.h" #include "pybrtc.h" #include "pybsystick.h" #include "simplelink.h" diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c index 22b8cae9cf..4a19205685 100644 --- a/cc3200/mods/modwlan.c +++ b/cc3200/mods/modwlan.c @@ -42,7 +42,6 @@ #include "modwlan.h" #include "pybioctl.h" #include "pybuart.h" -#include "pybstdio.h" #include "osi.h" #include "debug.h" #include "serverstask.h" diff --git a/cc3200/mods/pybstdio.c b/cc3200/mods/pybstdio.c deleted file mode 100644 index 2d6a1c07ba..0000000000 --- a/cc3200/mods/pybstdio.c +++ /dev/null @@ -1,174 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2013, 2014 Damien P. George - * Copyright (c) 2015 Daniel Campora - * - * 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 -#include -#include -#include - -#include "py/mpstate.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "misc.h" -#include "obj.h" -#include "stream.h" -#include MICROPY_HAL_H -#include "pybuart.h" -#include "telnet.h" -#include "pybstdio.h" - -// TODO make stdin, stdout and stderr writable objects so they can -// be changed by Python code. This requires some changes, as these -// objects are in a read-only module (py/modsys.c). - -void stdout_tx_str(const char *str) { - stdout_tx_strn(str, strlen(str)); -} - -void stdout_tx_strn(const char *str, mp_uint_t len) { - if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { - uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len); - } - // and also to telnet - if (telnet_is_active()) { - telnet_tx_strn(str, len); - } -} - -void stdout_tx_strn_cooked(const char *str, mp_uint_t len) { - // send stdout to UART - if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { - uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len); - } - // and also to telnet - if (telnet_is_active()) { - telnet_tx_strn_cooked(str, len); - } -} - -int stdin_rx_chr(void) { - for ( ;; ) { - if (telnet_rx_any()) { - return telnet_rx_char(); - } - else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) { - return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart)); - } - HAL_Delay(1); - } -} - -/******************************************************************************/ -// Micro Python bindings - -#define STDIO_FD_IN (0) -#define STDIO_FD_OUT (1) -#define STDIO_FD_ERR (2) - -typedef struct _pyb_stdio_obj_t { - mp_obj_base_t base; - int fd; -} pyb_stdio_obj_t; - -void stdio_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { - pyb_stdio_obj_t *self = self_in; - print(env, "", self->fd); -} - -STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { - pyb_stdio_obj_t *self = self_in; - if (self->fd == STDIO_FD_IN) { - for (uint i = 0; i < size; i++) { - int c = stdin_rx_chr(); - if (c == '\r') { - c = '\n'; - } - ((byte*)buf)[i] = c; - } - return size; - } else { - *errcode = EPERM; - return MP_STREAM_ERROR; - } -} - -STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) { - pyb_stdio_obj_t *self = self_in; - if (self->fd == STDIO_FD_OUT || self->fd == STDIO_FD_ERR) { - stdout_tx_strn_cooked(buf, size); - return size; - } else { - *errcode = EPERM; - return MP_STREAM_ERROR; - } -} - -mp_obj_t stdio_obj___exit__(mp_uint_t n_args, const mp_obj_t *args) { - return mp_const_none; -} -static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__); - -// TODO gc hook to close the file if not already closed - -STATIC const mp_map_elem_t stdio_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_readall), (mp_obj_t)&mp_stream_readall_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj}, - { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&mp_identity_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&mp_identity_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR___exit__), (mp_obj_t)&stdio_obj___exit___obj }, -}; - -STATIC MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table); - -STATIC const mp_stream_p_t stdio_obj_stream_p = { - .read = stdio_read, - .write = stdio_write, - .is_text = true, -}; - -STATIC const mp_obj_type_t stdio_obj_type = { - { &mp_type_type }, - .name = MP_QSTR_FileIO, - // TODO .make_new? - .print = stdio_obj_print, - .getiter = mp_identity, - .iternext = mp_stream_unbuffered_iter, - .stream_p = &stdio_obj_stream_p, - .locals_dict = (mp_obj_t)&stdio_locals_dict, -}; - -/// \moduleref sys -/// \constant stdin - standard input (connected to UART0, or to telnet, configurable) -/// \constant stdout - standard output (connected to UART0, and optionally to telnet) -/// \constant stderr - standard error (connected to UART0, and optionally to telnet) -const pyb_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN}; -const pyb_stdio_obj_t mp_sys_stdout_obj = {{&stdio_obj_type}, .fd = STDIO_FD_OUT}; -const pyb_stdio_obj_t mp_sys_stderr_obj = {{&stdio_obj_type}, .fd = STDIO_FD_ERR}; diff --git a/cc3200/mods/pybstdio.h b/cc3200/mods/pybstdio.h deleted file mode 100644 index f987e8bc4a..0000000000 --- a/cc3200/mods/pybstdio.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2013, 2014 Damien P. George - * Copyright (c) 2015 Daniel Campora - * - * 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. - */ - -void stdout_tx_str(const char *str); -void stdout_tx_strn(const char *str, mp_uint_t len); -void stdout_tx_strn_cooked(const char *str, mp_uint_t len); -int stdin_rx_chr(void); diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c index 359d97d701..b612295c3b 100644 --- a/cc3200/mods/pybuart.c +++ b/cc3200/mods/pybuart.c @@ -53,7 +53,6 @@ #include "pin.h" #include "pybuart.h" #include "pybioctl.h" -#include "pybstdio.h" #include "mpexception.h" #include "osi.h" diff --git a/cc3200/mptask.c b/cc3200/mptask.c index 03cac6ed33..78eaa76f00 100644 --- a/cc3200/mptask.c +++ b/cc3200/mptask.c @@ -44,7 +44,6 @@ #include "pybuart.h" #include "pybpin.h" #include "pybrtc.h" -#include "pybstdio.h" #include "pyexec.h" #include "gccollect.h" #include "gchelper.h" diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c index 64c4805803..5ea72b280d 100644 --- a/cc3200/telnet/telnet.c +++ b/cc3200/telnet/telnet.c @@ -39,7 +39,6 @@ #include "debug.h" #include "mpexception.h" #include "serverstask.h" -#include "pybstdio.h" #include "genhdr/py-version.h" diff --git a/esp8266/Makefile b/esp8266/Makefile index 9c994c437b..76b16b1502 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -45,7 +45,6 @@ SRC_C = \ main.c \ esp_mphal.c \ gccollect.c \ - pybstdio.c \ uart.c \ modpyb.c \ modesp.c \ @@ -54,6 +53,7 @@ STM_SRC_C = $(addprefix stmhal/,\ printf.c \ string0.c \ pyexec.c \ + pybstdio.c \ ) LIB_SRC_C = $(addprefix lib/,\ diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c index 821866f689..53a1700277 100644 --- a/esp8266/esp_mphal.c +++ b/esp8266/esp_mphal.c @@ -49,23 +49,30 @@ void mp_hal_udelay(uint32_t us) { ets_delay_us(us); } -int mp_hal_uart0_rx_chr(void) { - return uart0_rx(); +int mp_hal_stdin_rx_chr(void) { + for (;;) { + int c = uart0_rx(); + if (c != -1) { + return c; + } + mp_hal_udelay(1); + mp_hal_feed_watchdog(); + } } -void mp_hal_uart0_write_str(const char *str) { +void mp_hal_stdout_tx_str(const char *str) { while (*str) { uart_tx_one_char(UART0, *str++); } } -void mp_hal_uart0_write_strn(const char *str, uint32_t len) { +void mp_hal_stdout_tx_strn(const char *str, uint32_t len) { while (len--) { uart_tx_one_char(UART0, *str++); } } -void mp_hal_uart0_write_strn_cooked(const char *str, uint32_t len) { +void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) { while (len--) { if (*str == '\n') { uart_tx_one_char(UART0, '\r'); diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h index 369b375d9d..28f2ed53a7 100644 --- a/esp8266/esp_mphal.h +++ b/esp8266/esp_mphal.h @@ -30,10 +30,10 @@ void mp_hal_init(void); void mp_hal_feed_watchdog(void); void mp_hal_udelay(uint32_t); -int mp_hal_uart0_rx_chr(void); -void mp_hal_uart0_write_str(const char *str); -void mp_hal_uart0_write_strn(const char *str, uint32_t len); -void mp_hal_uart0_write_strn_cooked(const char *str, uint32_t len); +int mp_hal_stdin_rx_chr(void); +void mp_hal_stdout_tx_str(const char *str); +void mp_hal_stdout_tx_strn(const char *str, uint32_t len); +void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len); uint32_t HAL_GetTick(void); void HAL_Delay(uint32_t Delay); @@ -43,4 +43,5 @@ uint32_t mp_hal_get_cpu_freq(void); #define UART_TASK_ID 0 void uart_task_init(); + #endif // _INCLUDED_MPHAL_H_ diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c index bb574fdb58..2687803ea6 100644 --- a/esp8266/modpyb.c +++ b/esp8266/modpyb.c @@ -31,7 +31,6 @@ #include "py/gc.h" #include "gccollect.h" #include "pyexec.h" -#include "pybstdio.h" #include MICROPY_HAL_H #include "user_interface.h" diff --git a/esp8266/pybstdio.c b/esp8266/pybstdio.c deleted file mode 100644 index d8f5f9b8f2..0000000000 --- a/esp8266/pybstdio.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - * This file is part of the Micro Python 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 -#include -#include - -#include "py/obj.h" -#include "py/stream.h" -#include "pybstdio.h" -#include MICROPY_HAL_H - -void stdout_tx_str(const char *str) { - stdout_tx_strn(str, strlen(str)); -} - -void stdout_tx_strn(const char *str, mp_uint_t len) { - mp_hal_uart0_write_strn(str, len); -} - -void stdout_tx_strn_cooked(const char *str, mp_uint_t len) { - mp_hal_uart0_write_strn_cooked(str, len); -} - -int stdin_rx_chr(void) { - for (;;) { - int c = mp_hal_uart0_rx_chr(); - if (c != -1) { - return c; - } - mp_hal_udelay(1); - mp_hal_feed_watchdog(); - } -} - -/******************************************************************************/ -// Micro Python bindings - -#define STDIO_FD_IN (0) -#define STDIO_FD_OUT (1) -#define STDIO_FD_ERR (2) - -typedef struct _pyb_stdio_obj_t { - mp_obj_base_t base; - int fd; -} pyb_stdio_obj_t; - -void stdio_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { - pyb_stdio_obj_t *self = self_in; - print(env, "", self->fd); -} - -STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { - pyb_stdio_obj_t *self = self_in; - if (self->fd == STDIO_FD_IN) { - for (uint i = 0; i < size; i++) { - int c = stdin_rx_chr(); - if (c == '\r') { - c = '\n'; - } - ((byte*)buf)[i] = c; - } - return size; - } else { - *errcode = EPERM; - return MP_STREAM_ERROR; - } -} - -STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) { - pyb_stdio_obj_t *self = self_in; - if (self->fd == STDIO_FD_OUT || self->fd == STDIO_FD_ERR) { - stdout_tx_strn_cooked(buf, size); - return size; - } else { - *errcode = EPERM; - return MP_STREAM_ERROR; - } -} - -STATIC mp_obj_t stdio_obj___exit__(mp_uint_t n_args, const mp_obj_t *args) { - return mp_const_none; -} -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__); - -STATIC const mp_map_elem_t stdio_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_readall), (mp_obj_t)&mp_stream_readall_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj}, - { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&mp_identity_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&mp_identity_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR___exit__), (mp_obj_t)&stdio_obj___exit___obj }, -}; - -STATIC MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table); - -STATIC const mp_stream_p_t stdio_obj_stream_p = { - .read = stdio_read, - .write = stdio_write, - .is_text = true, -}; - -STATIC const mp_obj_type_t stdio_obj_type = { - { &mp_type_type }, - .name = MP_QSTR_FileIO, - .print = stdio_obj_print, - .getiter = mp_identity, - .iternext = mp_stream_unbuffered_iter, - .stream_p = &stdio_obj_stream_p, - .locals_dict = (mp_obj_t)&stdio_locals_dict, -}; - -const pyb_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN}; -const pyb_stdio_obj_t mp_sys_stdout_obj = {{&stdio_obj_type}, .fd = STDIO_FD_OUT}; -const pyb_stdio_obj_t mp_sys_stderr_obj = {{&stdio_obj_type}, .fd = STDIO_FD_ERR}; diff --git a/esp8266/pybstdio.h b/esp8266/pybstdio.h deleted file mode 100644 index bd854f18cb..0000000000 --- a/esp8266/pybstdio.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the Micro Python 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. - */ - -void stdout_tx_str(const char *str); -void stdout_tx_strn(const char *str, mp_uint_t len); -void stdout_tx_strn_cooked(const char *str, mp_uint_t len); -int stdin_rx_chr(void); diff --git a/lib/mp-readline/readline.c b/lib/mp-readline/readline.c index 2bbbc5385d..53376708f8 100644 --- a/lib/mp-readline/readline.c +++ b/lib/mp-readline/readline.c @@ -30,7 +30,7 @@ #include "py/mpstate.h" #include "readline.h" -#include "pybstdio.h" +#include MICROPY_HAL_H #if 0 // print debugging info #define DEBUG_PRINT (1) @@ -60,20 +60,20 @@ STATIC char *str_dup_maybe(const char *str) { STATIC void move_cursor_back(uint pos) { if (pos <= 4) { // fast path for most common case of 1 step back - stdout_tx_strn("\b\b\b\b", pos); + mp_hal_stdout_tx_strn("\b\b\b\b", pos); } else { char vt100_command[6]; // snprintf needs space for the terminating null character int n = snprintf(&vt100_command[0], sizeof(vt100_command), "\x1b[%u", pos); if (n > 0) { vt100_command[n] = 'D'; // replace null char - stdout_tx_strn(vt100_command, n + 1); + mp_hal_stdout_tx_strn(vt100_command, n + 1); } } } STATIC void erase_line_from_cursor(void) { - stdout_tx_strn("\x1b[K", 3); + mp_hal_stdout_tx_strn("\x1b[K", 3); } typedef struct _readline_t { @@ -107,7 +107,7 @@ int readline_process_char(int c) { goto end_key; } else if (c == '\r') { // newline - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); if (rl.line->len > rl.orig_line_len && (MP_STATE_PORT(readline_hist)[0] == NULL || strcmp(MP_STATE_PORT(readline_hist)[0], rl.line->buf + rl.orig_line_len) != 0)) { // a line which is not empty and different from the last one // so update the history @@ -245,13 +245,13 @@ end_key: erase_line_from_cursor(); } // draw new chars - stdout_tx_strn(rl.line->buf + rl.cursor_pos, rl.line->len - rl.cursor_pos); + mp_hal_stdout_tx_strn(rl.line->buf + rl.cursor_pos, rl.line->len - rl.cursor_pos); // move cursor forward if needed (already moved forward by length of line, so move it back) move_cursor_back(rl.line->len - (rl.cursor_pos + redraw_step_forward)); rl.cursor_pos += redraw_step_forward; } else if (redraw_step_forward > 0) { // draw over old chars to move cursor forwards - stdout_tx_strn(rl.line->buf + rl.cursor_pos, redraw_step_forward); + mp_hal_stdout_tx_strn(rl.line->buf + rl.cursor_pos, redraw_step_forward); rl.cursor_pos += redraw_step_forward; } @@ -273,10 +273,10 @@ void readline_init(vstr_t *line) { } int readline(vstr_t *line, const char *prompt) { - stdout_tx_str(prompt); + mp_hal_stdout_tx_str(prompt); readline_init(line); for (;;) { - int c = stdin_rx_chr(); + int c = mp_hal_stdin_rx_chr(); int r = readline_process_char(c); if (r >= 0) { return r; diff --git a/stmhal/input.c b/stmhal/input.c index b1c8c1f78f..07e7ba35ca 100644 --- a/stmhal/input.c +++ b/stmhal/input.c @@ -27,7 +27,6 @@ #include "py/nlr.h" #include "py/obj.h" #include "readline.h" -#include "usb.h" STATIC mp_obj_t mp_builtin_input(uint n_args, const mp_obj_t *args) { if (n_args == 1) { diff --git a/stmhal/main.c b/stmhal/main.c index 2cb25d8647..a53fd05ca2 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -57,8 +57,8 @@ #include "accel.h" #include "servo.h" #include "dac.h" -#include "pybstdio.h" #include "modnetwork.h" +#include MICROPY_HAL_H void SystemClock_Config(void); @@ -86,8 +86,8 @@ void NORETURN __fatal_error(const char *msg) { led_state(2, 1); led_state(3, 1); led_state(4, 1); - stdout_tx_strn("\nFATAL ERROR:\n", 14); - stdout_tx_strn(msg, strlen(msg)); + mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14); + mp_hal_stdout_tx_strn(msg, strlen(msg)); for (uint i = 0;;) { led_toggle(((i++) & 3) + 1); for (volatile uint delay = 0; delay < 10000000; delay++) { @@ -383,7 +383,7 @@ soft_reset: MP_OBJ_NEW_SMALL_INT(PYB_UART_6), MP_OBJ_NEW_SMALL_INT(115200), }; - pyb_stdio_uart = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, MP_ARRAY_SIZE(args), 0, args); + MP_STATE_PORT(pyb_stdio_uart) = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, MP_ARRAY_SIZE(args), 0, args); } #else MP_STATE_PORT(pyb_stdio_uart) = NULL; diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c index 179f66fca3..40189c1e77 100644 --- a/stmhal/modpyb.c +++ b/stmhal/modpyb.c @@ -56,7 +56,6 @@ #include "dac.h" #include "lcd.h" #include "usb.h" -#include "pybstdio.h" #include "ff.h" #include "diskio.h" #include "fsusermount.h" diff --git a/stmhal/mphal.c b/stmhal/mphal.c index 093690d594..73df2e626d 100644 --- a/stmhal/mphal.c +++ b/stmhal/mphal.c @@ -1,8 +1,9 @@ #include +#include -#include "py/nlr.h" -#include "py/obj.h" +#include "py/mpstate.h" #include "usb.h" +#include "uart.h" #include "mphal.h" // this table converts from HAL_StatusTypeDef to POSIX errno @@ -20,3 +21,51 @@ NORETURN void mp_hal_raise(HAL_StatusTypeDef status) { void mp_hal_set_interrupt_char(int c) { usb_vcp_set_interrupt_char(c); } + +int mp_hal_stdin_rx_chr(void) { + for (;;) { +#if 0 +#ifdef USE_HOST_MODE + pyb_usb_host_process(); + int c = pyb_usb_host_get_keyboard(); + if (c != 0) { + return c; + } +#endif +#endif + + byte c; + if (usb_vcp_recv_byte(&c) != 0) { + return c; + } else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) { + return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart)); + } + __WFI(); + } +} + +void mp_hal_stdout_tx_str(const char *str) { + mp_hal_stdout_tx_strn(str, strlen(str)); +} + +void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) { + if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { + uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len); + } +#if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD + lcd_print_strn(str, len); +#endif + if (usb_vcp_is_enabled()) { + usb_vcp_send_strn(str, len); + } +} + +void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) { + // send stdout to UART and USB CDC VCP + if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { + uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len); + } + if (usb_vcp_is_enabled()) { + usb_vcp_send_strn_cooked(str, len); + } +} diff --git a/stmhal/mphal.h b/stmhal/mphal.h index fb567d1411..b705facc43 100644 --- a/stmhal/mphal.h +++ b/stmhal/mphal.h @@ -11,3 +11,8 @@ extern const byte mp_hal_status_to_errno_table[4]; NORETURN void mp_hal_raise(HAL_StatusTypeDef status); void mp_hal_set_interrupt_char(int c); // -1 to disable + +int mp_hal_stdin_rx_chr(void); +void mp_hal_stdout_tx_str(const char *str); +void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len); +void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len); diff --git a/stmhal/printf.c b/stmhal/printf.c index f7a4f1038f..7af4f659d2 100644 --- a/stmhal/printf.c +++ b/stmhal/printf.c @@ -30,14 +30,14 @@ #include "py/obj.h" #include "py/pfenv.h" -#include "pybstdio.h" +#include MICROPY_HAL_H #if MICROPY_PY_BUILTINS_FLOAT #include "py/formatfloat.h" #endif STATIC void stdout_print_strn(void *dummy_env, const char *str, mp_uint_t len) { - stdout_tx_strn_cooked(str, len); + mp_hal_stdout_tx_strn_cooked(str, len); } STATIC const pfenv_t pfenv_stdout = {0, stdout_print_strn}; diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c index d8ccc1be0a..6b99049817 100644 --- a/stmhal/pybstdio.c +++ b/stmhal/pybstdio.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2013, 2014 Damien P. George + * Copyright (c) 2013, 2014, 2015 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 @@ -25,70 +25,17 @@ */ #include -#include #include #include -#include "py/mpstate.h" #include "py/obj.h" #include "py/stream.h" -#include "usb.h" -#include "uart.h" -#include "pybstdio.h" #include MICROPY_HAL_H // TODO make stdin, stdout and stderr writable objects so they can // be changed by Python code. This requires some changes, as these // objects are in a read-only module (py/modsys.c). -void stdout_tx_str(const char *str) { - stdout_tx_strn(str, strlen(str)); -} - -void stdout_tx_strn(const char *str, mp_uint_t len) { - if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { - uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len); - } -#if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD - lcd_print_strn(str, len); -#endif - if (usb_vcp_is_enabled()) { - usb_vcp_send_strn(str, len); - } -} - -void stdout_tx_strn_cooked(const char *str, mp_uint_t len) { - // send stdout to UART and USB CDC VCP - if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { - uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len); - } - if (usb_vcp_is_enabled()) { - usb_vcp_send_strn_cooked(str, len); - } -} - -int stdin_rx_chr(void) { - for (;;) { -#if 0 -#ifdef USE_HOST_MODE - pyb_usb_host_process(); - int c = pyb_usb_host_get_keyboard(); - if (c != 0) { - return c; - } -#endif -#endif - - byte c; - if (usb_vcp_recv_byte(&c) != 0) { - return c; - } else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) { - return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart)); - } - __WFI(); - } -} - /******************************************************************************/ // Micro Python bindings @@ -110,7 +57,7 @@ STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *er pyb_stdio_obj_t *self = self_in; if (self->fd == STDIO_FD_IN) { for (uint i = 0; i < size; i++) { - int c = stdin_rx_chr(); + int c = mp_hal_stdin_rx_chr(); if (c == '\r') { c = '\n'; } @@ -126,7 +73,7 @@ STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *er STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) { pyb_stdio_obj_t *self = self_in; if (self->fd == STDIO_FD_OUT || self->fd == STDIO_FD_ERR) { - stdout_tx_strn_cooked(buf, size); + mp_hal_stdout_tx_strn_cooked(buf, size); return size; } else { *errcode = EPERM; @@ -134,10 +81,10 @@ STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, } } -mp_obj_t stdio_obj___exit__(mp_uint_t n_args, const mp_obj_t *args) { +STATIC mp_obj_t stdio_obj___exit__(mp_uint_t n_args, const mp_obj_t *args) { return mp_const_none; } -static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__); // TODO gc hook to close the file if not already closed @@ -171,10 +118,6 @@ STATIC const mp_obj_type_t stdio_obj_type = { .locals_dict = (mp_obj_t)&stdio_locals_dict, }; -/// \moduleref sys -/// \constant stdin - standard input (connected to USB VCP, and optional UART object) -/// \constant stdout - standard output (connected to USB VCP, and optional UART object) -/// \constant stderr - standard error (connected to USB VCP, and optional UART object) const pyb_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN}; const pyb_stdio_obj_t mp_sys_stdout_obj = {{&stdio_obj_type}, .fd = STDIO_FD_OUT}; const pyb_stdio_obj_t mp_sys_stderr_obj = {{&stdio_obj_type}, .fd = STDIO_FD_ERR}; diff --git a/stmhal/pybstdio.h b/stmhal/pybstdio.h deleted file mode 100644 index 08a2d03638..0000000000 --- a/stmhal/pybstdio.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2013, 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. - */ - -extern struct _pyb_uart_obj_t *pyb_stdio_uart; - -void stdout_tx_str(const char *str); -void stdout_tx_strn(const char *str, mp_uint_t len); -void stdout_tx_strn_cooked(const char *str, mp_uint_t len); -int stdin_rx_chr(void); diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c index 992462dd0b..27c206ce39 100644 --- a/stmhal/pyexec.c +++ b/stmhal/pyexec.c @@ -39,7 +39,6 @@ #endif #include "readline.h" #include "pyexec.h" -#include "pybstdio.h" #include "genhdr/py-version.h" pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL; @@ -73,7 +72,7 @@ STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_ki nlr_pop(); ret = 1; if (exec_flags & EXEC_FLAG_PRINT_EOF) { - stdout_tx_strn("\x04", 1); + mp_hal_stdout_tx_strn("\x04", 1); } } else { // uncaught exception @@ -81,7 +80,7 @@ STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_ki mp_hal_set_interrupt_char(-1); // disable interrupt // print EOF after normal output if (exec_flags & EXEC_FLAG_PRINT_EOF) { - stdout_tx_strn("\x04", 1); + mp_hal_stdout_tx_strn("\x04", 1); } // check for SystemExit if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_SystemExit)) { @@ -110,7 +109,7 @@ STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_ki } if (exec_flags & EXEC_FLAG_PRINT_EOF) { - stdout_tx_strn("\x04", 1); + mp_hal_stdout_tx_strn("\x04", 1); } return ret; @@ -121,19 +120,19 @@ int pyexec_raw_repl(void) { vstr_init(&line, 32); raw_repl_reset: - stdout_tx_str("raw REPL; CTRL-B to exit\r\n"); + mp_hal_stdout_tx_str("raw REPL; CTRL-B to exit\r\n"); for (;;) { vstr_reset(&line); - stdout_tx_str(">"); + mp_hal_stdout_tx_str(">"); for (;;) { - int c = stdin_rx_chr(); + int c = mp_hal_stdin_rx_chr(); if (c == CHAR_CTRL_A) { // reset raw REPL goto raw_repl_reset; } else if (c == CHAR_CTRL_B) { // change to friendly REPL - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); vstr_clear(&line); pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL; return 0; @@ -150,11 +149,11 @@ raw_repl_reset: } // indicate reception of command - stdout_tx_str("OK"); + mp_hal_stdout_tx_str("OK"); if (line.len == 0) { // exit for a soft reset - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); vstr_clear(&line); return PYEXEC_FORCED_EXIT; } @@ -184,7 +183,7 @@ void pyexec_friendly_repl_init(void) { vstr_init(&repl.line, 32); repl.cont_line = false; readline_init(&repl.line); - stdout_tx_str(">>> "); + mp_hal_stdout_tx_str(">>> "); } void pyexec_friendly_repl_reset() { @@ -201,20 +200,20 @@ int pyexec_friendly_repl_process_char(int c) { if (ret == CHAR_CTRL_A) { // change to raw REPL pyexec_mode_kind = PYEXEC_MODE_RAW_REPL; - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); vstr_clear(&repl.line); return PYEXEC_SWITCH_MODE; } else if (ret == CHAR_CTRL_B) { // reset friendly REPL - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); goto friendly_repl_reset; } else if (ret == CHAR_CTRL_C) { // break - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); goto input_restart; } else if (ret == CHAR_CTRL_D) { // exit for a soft reset - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); vstr_clear(&repl.line); return PYEXEC_FORCED_EXIT; } else if (vstr_len(&repl.line) == 0) { @@ -231,7 +230,7 @@ int pyexec_friendly_repl_process_char(int c) { vstr_add_byte(&repl.line, '\n'); repl.cont_line = true; - stdout_tx_str("... "); + mp_hal_stdout_tx_str("... "); readline_note_newline(); return 0; @@ -239,7 +238,7 @@ int pyexec_friendly_repl_process_char(int c) { if (ret == CHAR_CTRL_C) { // cancel everything - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); repl.cont_line = false; goto input_restart; } else if (ret == CHAR_CTRL_D) { @@ -253,7 +252,7 @@ int pyexec_friendly_repl_process_char(int c) { if (mp_repl_continue_with_input(vstr_null_terminated_str(&repl.line))) { vstr_add_byte(&repl.line, '\n'); - stdout_tx_str("... "); + mp_hal_stdout_tx_str("... "); readline_note_newline(); return 0; } @@ -272,7 +271,7 @@ exec: ; friendly_repl_reset: // TODO input_restart: pyexec_friendly_repl_reset(); - stdout_tx_str(">>> "); + mp_hal_stdout_tx_str(">>> "); return 0; } } @@ -290,8 +289,8 @@ int pyexec_friendly_repl(void) { #endif friendly_repl_reset: - stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); - stdout_tx_str("Type \"help()\" for more information.\r\n"); + mp_hal_stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); + mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n"); // to test ctrl-C /* @@ -318,21 +317,21 @@ friendly_repl_reset: if (ret == CHAR_CTRL_A) { // change to raw REPL - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); vstr_clear(&line); pyexec_mode_kind = PYEXEC_MODE_RAW_REPL; return 0; } else if (ret == CHAR_CTRL_B) { // reset friendly REPL - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); goto friendly_repl_reset; } else if (ret == CHAR_CTRL_C) { // break - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); continue; } else if (ret == CHAR_CTRL_D) { // exit for a soft reset - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); vstr_clear(&line); return PYEXEC_FORCED_EXIT; } else if (vstr_len(&line) == 0) { @@ -344,7 +343,7 @@ friendly_repl_reset: ret = readline(&line, "... "); if (ret == CHAR_CTRL_C) { // cancel everything - stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str("\r\n"); goto input_restart; } else if (ret == CHAR_CTRL_D) { // stop entering compound statement diff --git a/teensy/main.c b/teensy/main.c index 66f3d935f7..4fa7aaab3e 100644 --- a/teensy/main.c +++ b/teensy/main.c @@ -18,11 +18,9 @@ #include MICROPY_HAL_H #include "servo.h" -#include "usb.h" #include "led.h" #include "uart.h" #include "pin.h" -#include "pybstdio.h" extern uint32_t _heap_start; @@ -43,8 +41,8 @@ void NORETURN __fatal_error(const char *msg) { led_state(2, 1); led_state(3, 1); led_state(4, 1); - stdout_tx_strn("\nFATAL ERROR:\n", 14); - stdout_tx_strn(msg, strlen(msg)); + mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14); + mp_hal_stdout_tx_strn(msg, strlen(msg)); for (uint i = 0;;) { led_toggle(((i++) & 3) + 1); for (volatile uint delay = 0; delay < 10000000; delay++) { diff --git a/teensy/modpyb.c b/teensy/modpyb.c index 13454b2534..a59e3b4f57 100644 --- a/teensy/modpyb.c +++ b/teensy/modpyb.c @@ -56,7 +56,6 @@ #include "dac.h" #include "usb.h" #include "portmodules.h" -#include "pybstdio.h" /// \module pyb - functions related to the pyboard /// diff --git a/teensy/teensy_hal.c b/teensy/teensy_hal.c index c28dd91828..312aca0581 100644 --- a/teensy/teensy_hal.c +++ b/teensy/teensy_hal.c @@ -1,9 +1,10 @@ #include +#include -#include "py/mpconfig.h" - +#include "py/mpstate.h" +#include "usb.h" +#include "uart.h" #include "Arduino.h" - #include MICROPY_HAL_H uint32_t HAL_GetTick(void) { @@ -19,3 +20,38 @@ void mp_hal_set_interrupt_char(int c) { // an exception when a certain character is received. That just means that // you can't press Control-C and get your python script to stop. } + +int mp_hal_stdin_rx_chr(void) { + for (;;) { + byte c; + if (usb_vcp_recv_byte(&c) != 0) { + return c; + } else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) { + return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart)); + } + __WFI(); + } +} + +void mp_hal_stdout_tx_str(const char *str) { + mp_hal_stdout_tx_strn(str, strlen(str)); +} + +void mp_hal_stdout_tx_strn(const char *str, uint32_t len) { + if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { + uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len); + } + if (usb_vcp_is_enabled()) { + usb_vcp_send_strn(str, len); + } +} + +void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) { + // send stdout to UART and USB CDC VCP + if (MP_STATE_PORT(pyb_stdio_uart) != NULL) { + uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len); + } + if (usb_vcp_is_enabled()) { + usb_vcp_send_strn_cooked(str, len); + } +} diff --git a/teensy/teensy_hal.h b/teensy/teensy_hal.h index ee434fd209..f5c6d18d7d 100644 --- a/teensy/teensy_hal.h +++ b/teensy/teensy_hal.h @@ -116,6 +116,11 @@ uint32_t HAL_GetTick(void); void HAL_Delay(uint32_t Delay); void mp_hal_set_interrupt_char(int c); +int mp_hal_stdin_rx_chr(void); +void mp_hal_stdout_tx_str(const char *str); +void mp_hal_stdout_tx_strn(const char *str, uint32_t len); +void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len); + void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *init); #define GPIO_read_pin(gpio, pin) (((gpio)->PDIR >> (pin)) & 1) diff --git a/teensy/usb.h b/teensy/usb.h new file mode 100644 index 0000000000..949d7a59c0 --- /dev/null +++ b/teensy/usb.h @@ -0,0 +1,7 @@ +bool usb_vcp_is_connected(void); +bool usb_vcp_is_enabled(void); +int usb_vcp_rx_num(void); +int usb_vcp_recv_byte(uint8_t *ptr); +void usb_vcp_send_str(const char* str); +void usb_vcp_send_strn(const char* str, int len); +void usb_vcp_send_strn_cooked(const char *str, int len);