mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated teensys usb.c and switched to using usb.h from stmhal. 

Removed the local usb.h from teensey directory and now uses
the usb.h from the stmhal directory.
Fixed the deploy target to use abspath.
This commit is contained in:
Dave Hylands 2014-08-03 09:55:24 -07:00
parent 8362bffb2e
commit ecb5792f88
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
teensy/Makefile
View File

@ -104,7 +104,7 @@ TOOLS_PATH = $(ARDUINO)/hardware/tools
post_compile: $(BUILD)/micropython-mz.hex
$(ECHO) "Preparing $@ for upload"
$(Q)$(TOOLS_PATH)/teensy_post_compile -file="$(basename $(<F))" -path="$(<D)" -tools="$(TOOLS_PATH)"
$(Q)$(TOOLS_PATH)/teensy_post_compile -file="$(basename $(<F))" -path="$(abspath $(<D))" -tools="$(TOOLS_PATH)"
reboot:
$(ECHO) "REBOOT"

22
teensy/usb.c
View File

@ -1,18 +1,25 @@
#include <string.h>
#include <stdint.h>
#include "Arduino.h"
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "usb.h"
#include "usb_serial.h"
int usb_vcp_is_connected(void)
bool usb_vcp_is_connected(void)
{
return usb_configuration && (usb_cdc_line_rtsdtr & (USB_SERIAL_DTR | USB_SERIAL_RTS));
}
int usb_vcp_is_enabled(void)
bool usb_vcp_is_enabled(void)
{
return 1;
return true;
}
void usb_vcp_set_interrupt_char(int c) {
@ -25,9 +32,14 @@ int usb_vcp_rx_num(void) {
return usb_serial_available();
}
int usb_vcp_recv_byte(void)
int usb_vcp_recv_byte(uint8_t *ptr)
{
return usb_serial_getchar();
int ch = usb_serial_getchar();
if (ch < 0) {
return 0;
}
*ptr = ch;
return 1;
}
void usb_vcp_send_str(const char* str)

9
teensy/usb.h
View File

@ -1,9 +0,0 @@
void usb_init(void);
int usb_vcp_is_enabled(void);
int usb_vcp_is_connected(void);
int usb_vcp_rx_any(void);
char usb_vcp_rx_get(void);
void usb_vcp_send_str(const char* str);
void usb_vcp_send_strn(const char* str, int len);
void usb_vcp_send_strn_cooked(const char *str, int len);
void usb_hid_send_report(uint8_t *buf); // 4 bytes for mouse: ?, x, y, ?