diff options
| author | Dave Hylands <dhylands@gmail.com> | 2014-08-02 21:28:32 -0700 |
|---|---|---|
| committer | Dave Hylands <dhylands@gmail.com> | 2014-08-02 21:28:32 -0700 |
| commit | e40c72210fef12db4b10e1070b9254ebc962c07e (patch) | |
| tree | 51c99ae47d0cb9166a76cd0b914ea8abe6df744c /teensy | |
| parent | 8464be15ed7001edad55f911177ca70f0175d4ca (diff) | |
Fix teensy to work with the latest tree.
Diffstat (limited to 'teensy')
| -rw-r--r-- | teensy/main.c | 4 | ||||
| -rw-r--r-- | teensy/modpyb.c | 2 | ||||
| -rw-r--r-- | teensy/usb.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/teensy/main.c b/teensy/main.c index fdedff89c..a5b2d5b52 100644 --- a/teensy/main.c +++ b/teensy/main.c @@ -15,7 +15,6 @@ #include "gc.h" #include "gccollect.h" #include "pyexec.h" -#include "pybstdio.h" #include "readline.h" #include "Arduino.h" @@ -24,8 +23,9 @@ #include "servo.h" #include "usb.h" #include "led.h" - +#include "uart.h" //#include "pin.h" +#include "pybstdio.h" extern uint32_t _heap_start; diff --git a/teensy/modpyb.c b/teensy/modpyb.c index 64b9bda2d..81149d89b 100644 --- a/teensy/modpyb.c +++ b/teensy/modpyb.c @@ -39,7 +39,6 @@ #include "gc.h" #include "gccollect.h" #include "systick.h" -#include "pybstdio.h" #include "pyexec.h" #include "led.h" #include "pin.h" @@ -59,6 +58,7 @@ #include "dac.h" #include "usb.h" #include "portmodules.h" +#include "pybstdio.h" /// \module pyb - functions related to the pyboard /// diff --git a/teensy/usb.c b/teensy/usb.c index 5af5d7e44..37c479ec7 100644 --- a/teensy/usb.c +++ b/teensy/usb.c @@ -25,7 +25,7 @@ int usb_vcp_rx_num(void) { return usb_serial_available(); } -char usb_vcp_rx_get(void) +int usb_vcp_recv_byte(void) { return usb_serial_getchar(); } |