diff options
| author | blmorris <bryan.morrissey@gmail.com> | 2014-07-21 12:47:57 -0400 |
|---|---|---|
| committer | blmorris <bryan.morrissey@gmail.com> | 2014-07-21 12:47:57 -0400 |
| commit | 4038f513ea0a6be75ecbc4d8ab2bbe2349524bca (patch) | |
| tree | 2aace8a3551d5c397ec539865bbb2f6cdbc8d900 /stmhal/main.c | |
| parent | 0f4ee2e44a1e47258a8b07fb25e28286d131390c (diff) | |
| parent | 951ed9d02ffc826c68ee3af26c3530477e7e6156 (diff) | |
Merge https://github.com/micropython/micropython
Diffstat (limited to 'stmhal/main.c')
| -rw-r--r-- | stmhal/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/stmhal/main.c b/stmhal/main.c index ae4ff5141..9e1798b3b 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -43,7 +43,6 @@ #include "stackctrl.h" #include "gc.h" #include "gccollect.h" -#include "pybstdio.h" #include "readline.h" #include "pyexec.h" #include "i2c.h" @@ -64,6 +63,7 @@ #include "servo.h" #include "dac.h" #include "pybwlan.h" +#include "pybstdio.h" void SystemClock_Config(void); @@ -311,12 +311,10 @@ soft_reset: MP_OBJ_NEW_SMALL_INT(PYB_UART_6), MP_OBJ_NEW_SMALL_INT(115200), }; - pyb_uart_global_debug = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, - MP_ARRAY_SIZE(args), - 0, args); + pyb_stdio_uart = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, MP_ARRAY_SIZE(args), 0, args); } #else - pyb_uart_global_debug = NULL; + pyb_stdio_uart = NULL; #endif // Micro Python init |