Commit ce23f67d authored by Damien George's avatar Damien George
Browse files

Merge pull request #784 from dhylands/fix-teensy-2014-08-02

Fix teensy to work with the latest tree.
parents 2e41646e e40c7221
......@@ -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;
......
......@@ -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
///
......
......@@ -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();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment