djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266/uart: Get ctrl-C working now that event-based REPL is disabled.

Browse Source
This commit is contained in:
Damien George 2016-04-01 14:53:01 +03:00 committed by Paul Sokolovsky
parent fb6cc96951
commit 6a051a8e0b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
esp8266/uart.c
View File

@ -38,6 +38,11 @@ static os_event_t uart_evt_queue[16];
static void uart0_rx_intr_handler(void *para); static void uart0_rx_intr_handler(void *para);
void soft_reset(void);
void mp_keyboard_interrupt(void);
int interrupt_char;
/****************************************************************************** /******************************************************************************
* FunctionName : uart_config * FunctionName : uart_config
* Description : Internal used function * Description : Internal used function
@ -168,8 +173,12 @@ static void uart0_rx_intr_handler(void *para) {
while (READ_PERI_REG(UART_STATUS(uart_no)) & (UART_RXFIFO_CNT << UART_RXFIFO_CNT_S)) { while (READ_PERI_REG(UART_STATUS(uart_no)) & (UART_RXFIFO_CNT << UART_RXFIFO_CNT_S)) {
uint8 RcvChar = READ_PERI_REG(UART_FIFO(uart_no)) & 0xff; uint8 RcvChar = READ_PERI_REG(UART_FIFO(uart_no)) & 0xff;
if (RcvChar == interrupt_char) {
mp_keyboard_interrupt();
} else {
ringbuf_put(&input_buf, RcvChar); ringbuf_put(&input_buf, RcvChar);
} }
}
mp_hal_signal_input(); mp_hal_signal_input();
@ -237,10 +246,6 @@ void ICACHE_FLASH_ATTR uart_reattach() {
#include "py/obj.h" #include "py/obj.h"
#include "lib/utils/pyexec.h" #include "lib/utils/pyexec.h"
void soft_reset(void);
void mp_keyboard_interrupt(void);
int interrupt_char;
#if MICROPY_REPL_EVENT_DRIVEN #if MICROPY_REPL_EVENT_DRIVEN
void uart_task_handler(os_event_t *evt) { void uart_task_handler(os_event_t *evt) {
if (pyexec_repl_active) { if (pyexec_repl_active) {