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).
204 lines
5.5 KiB
C
204 lines
5.5 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 "ets_sys.h"
|
|
#include "etshal.h"
|
|
#include "uart.h"
|
|
#include "esp_mphal.h"
|
|
#include "user_interface.h"
|
|
#include "ets_alt_task.h"
|
|
#include "py/runtime.h"
|
|
#include "extmod/misc.h"
|
|
#include "lib/utils/pyexec.h"
|
|
|
|
STATIC byte stdin_ringbuf_array[256];
|
|
ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
|
|
void mp_hal_debug_tx_strn_cooked(void *env, const char *str, uint32_t len);
|
|
const mp_print_t mp_debug_print = {NULL, mp_hal_debug_tx_strn_cooked};
|
|
|
|
int uart_attached_to_dupterm;
|
|
|
|
void mp_hal_init(void) {
|
|
//ets_wdt_disable(); // it's a pain while developing
|
|
mp_hal_rtc_init();
|
|
uart_init(UART_BIT_RATE_115200, UART_BIT_RATE_115200);
|
|
uart_attached_to_dupterm = 0;
|
|
}
|
|
|
|
void mp_hal_delay_us(uint32_t us) {
|
|
uint32_t start = system_get_time();
|
|
while (system_get_time() - start < us) {
|
|
ets_event_poll();
|
|
}
|
|
}
|
|
|
|
int mp_hal_stdin_rx_chr(void) {
|
|
for (;;) {
|
|
int c = ringbuf_get(&stdin_ringbuf);
|
|
if (c != -1) {
|
|
return c;
|
|
}
|
|
#if 0
|
|
// Idles CPU but need more testing before enabling
|
|
if (!ets_loop_iter()) {
|
|
asm("waiti 0");
|
|
}
|
|
#else
|
|
mp_hal_delay_us(1);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
#if 0
|
|
void mp_hal_debug_str(const char *str) {
|
|
while (*str) {
|
|
uart_tx_one_char(UART0, *str++);
|
|
}
|
|
uart_flush(UART0);
|
|
}
|
|
#endif
|
|
|
|
void mp_hal_stdout_tx_str(const char *str) {
|
|
mp_uos_dupterm_tx_strn(str, strlen(str));
|
|
}
|
|
|
|
void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
|
|
mp_uos_dupterm_tx_strn(str, len);
|
|
}
|
|
|
|
void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
|
|
const char *last = str;
|
|
while (len--) {
|
|
if (*str == '\n') {
|
|
if (str > last) {
|
|
mp_uos_dupterm_tx_strn(last, str - last);
|
|
}
|
|
mp_uos_dupterm_tx_strn("\r\n", 2);
|
|
++str;
|
|
last = str;
|
|
} else {
|
|
++str;
|
|
}
|
|
}
|
|
if (str > last) {
|
|
mp_uos_dupterm_tx_strn(last, str - last);
|
|
}
|
|
}
|
|
|
|
void mp_hal_debug_tx_strn_cooked(void *env, const char *str, uint32_t len) {
|
|
(void)env;
|
|
while (len--) {
|
|
if (*str == '\n') {
|
|
uart_tx_one_char(UART0, '\r');
|
|
}
|
|
uart_tx_one_char(UART0, *str++);
|
|
}
|
|
}
|
|
|
|
uint32_t mp_hal_ticks_ms(void) {
|
|
return ((uint64_t)system_time_high_word << 32 | (uint64_t)system_get_time()) / 1000;
|
|
}
|
|
|
|
uint32_t mp_hal_ticks_us(void) {
|
|
return system_get_time();
|
|
}
|
|
|
|
void mp_hal_delay_ms(uint32_t delay) {
|
|
mp_hal_delay_us(delay * 1000);
|
|
}
|
|
|
|
void ets_event_poll(void) {
|
|
ets_loop_iter();
|
|
mp_handle_pending();
|
|
}
|
|
|
|
void __assert_func(const char *file, int line, const char *func, const char *expr) {
|
|
printf("assert:%s:%d:%s: %s\n", file, line, func, expr);
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_AssertionError,
|
|
"C-level assert"));
|
|
}
|
|
|
|
void mp_hal_signal_input(void) {
|
|
#if MICROPY_REPL_EVENT_DRIVEN
|
|
system_os_post(UART_TASK_ID, 0, 0);
|
|
#endif
|
|
}
|
|
|
|
STATIC void dupterm_task_handler(os_event_t *evt) {
|
|
static byte lock;
|
|
if (lock) {
|
|
return;
|
|
}
|
|
lock = 1;
|
|
while (1) {
|
|
int c = mp_uos_dupterm_rx_chr();
|
|
if (c < 0) {
|
|
break;
|
|
}
|
|
ringbuf_put(&stdin_ringbuf, c);
|
|
}
|
|
mp_hal_signal_input();
|
|
lock = 0;
|
|
}
|
|
|
|
STATIC os_event_t dupterm_evt_queue[4];
|
|
|
|
void dupterm_task_init() {
|
|
system_os_task(dupterm_task_handler, DUPTERM_TASK_ID, dupterm_evt_queue, MP_ARRAY_SIZE(dupterm_evt_queue));
|
|
}
|
|
|
|
void mp_hal_signal_dupterm_input(void) {
|
|
system_os_post(DUPTERM_TASK_ID, 0, 0);
|
|
}
|
|
|
|
// Get pointer to esf_buf bookkeeping structure
|
|
void *ets_get_esf_buf_ctlblk(void) {
|
|
// Get literal ptr before start of esf_rx_buf_alloc func
|
|
extern void *esf_rx_buf_alloc();
|
|
return ((void**)esf_rx_buf_alloc)[-1];
|
|
}
|
|
|
|
// Get number of esf_buf free buffers of given type, as encoded by index
|
|
// idx 0 corresponds to buf types 1, 2; 1 - 4; 2 - 5; 3 - 7; 4 - 8
|
|
// Only following buf types appear to be used:
|
|
// 1 - tx buffer, 5 - management frame tx buffer; 8 - rx buffer
|
|
int ets_esf_free_bufs(int idx) {
|
|
uint32_t *p = ets_get_esf_buf_ctlblk();
|
|
uint32_t *b = (uint32_t*)p[idx];
|
|
int cnt = 0;
|
|
while (b) {
|
|
b = (uint32_t*)b[0x20 / 4];
|
|
cnt++;
|
|
}
|
|
return cnt;
|
|
}
|
|
|
|
extern int mp_stream_errno;
|
|
int *__errno() {
|
|
return &mp_stream_errno;
|
|
}
|