esp8266: Add basic support for duplicating REPL output.

pfalcon · pfalcon · commit c961889e3472 · 2016-03-29T11:13:32.000+03:00
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c
@@ -33,6 +33,7 @@
 #include "ets_alt_task.h"
 #include "py/obj.h"
 #include "py/mpstate.h"
+#include "extmod/misc.h"
 
 extern void ets_wdt_disable(void);
 extern void wdt_feed(void);
@@ -68,24 +69,29 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
+void mp_hal_stdout_tx_char(char c) {
+    uart_tx_one_char(UART0, c);
+    mp_uos_dupterm_tx_strn(&c, 1);
+}
+
 void mp_hal_stdout_tx_str(const char *str) {
     while (*str) {
-        uart_tx_one_char(UART0, *str++);
+        mp_hal_stdout_tx_char(*str++);
     }
 }
 
 void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
     while (len--) {
-        uart_tx_one_char(UART0, *str++);
+        mp_hal_stdout_tx_char(*str++);
     }
 }
 
 void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
     while (len--) {
         if (*str == '\n') {
-            uart_tx_one_char(UART0, '\r');
+            mp_hal_stdout_tx_char('\r');
         }
-        uart_tx_one_char(UART0, *str++);
+        mp_hal_stdout_tx_char(*str++);
     }
 }
 
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
@@ -51,6 +51,7 @@
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
+#define MICROPY_PY_OS_DUPTERM       (1)
 #define MICROPY_CPYTHON_COMPAT      (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`#include "ets_alt_task.h"`
`34`	`34`	`#include "py/obj.h"`
`35`	`35`	`#include "py/mpstate.h"`
	`36`	`+#include "extmod/misc.h"`
`36`	`37`
`37`	`38`	`extern void ets_wdt_disable(void);`
`38`	`39`	`extern void wdt_feed(void);`
`@@ -68,24 +69,29 @@ int mp_hal_stdin_rx_chr(void) {`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`
	`72`	`+void mp_hal_stdout_tx_char(char c) {`
	`73`	`+ uart_tx_one_char(UART0, c);`
	`74`	`+ mp_uos_dupterm_tx_strn(&c, 1);`
	`75`	`+}`
	`76`	`+`
`71`	`77`	`void mp_hal_stdout_tx_str(const char *str) {`
`72`	`78`	`while (*str) {`
`73`		`- uart_tx_one_char(UART0, *str++);`
	`79`	`+ mp_hal_stdout_tx_char(*str++);`
`74`	`80`	`}`
`75`	`81`	`}`
`76`	`82`
`77`	`83`	`void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {`
`78`	`84`	`while (len--) {`
`79`		`- uart_tx_one_char(UART0, *str++);`
	`85`	`+ mp_hal_stdout_tx_char(*str++);`
`80`	`86`	`}`
`81`	`87`	`}`
`82`	`88`
`83`	`89`	`void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {`
`84`	`90`	`while (len--) {`
`85`	`91`	`if (*str == '\n') {`
`86`		`- uart_tx_one_char(UART0, '\r');`
	`92`	`+ mp_hal_stdout_tx_char('\r');`
`87`	`93`	`}`
`88`		`- uart_tx_one_char(UART0, *str++);`
	`94`	`+ mp_hal_stdout_tx_char(*str++);`
`89`	`95`	`}`
`90`	`96`	`}`
`91`	`97`