Browse Source

Try to re-add USB support...

pull/3/head
Damien 11 years ago
parent
commit
fb42ec17bc
  1. 6
      stm/Makefile
  2. 2
      stm/lcd.c
  3. 2
      stm/lib/usbd_pyb_core.c
  4. 21
      stm/main.c
  5. 1
      stm/usb.c
  6. 2
      stm/usb.h

6
stm/Makefile

@ -29,11 +29,9 @@ SRC_S = \
startup_stm32f40xx.s \
PY_O = \
nlrthumb.o \
# nlrthumb.o \
malloc.o \
qstr.o \
runtime.o \
vm.o \
# misc.o \
lexer.o \
parse.o \
@ -45,6 +43,8 @@ PY_O = \
asmthumb.o \
emitnthumb.o \
emitinlinethumb.o \
runtime.o \
vm.o \
SRC_FATFS = \
ff.c \

2
stm/lcd.c

@ -1,4 +1,6 @@
#include <stm32f4xx_gpio.h>
#include "misc.h"
#include "systick.h"
#include "lcd.h"
#include "font_petme128_8x8.h"

2
stm/lib/usbd_pyb_core.c

@ -64,6 +64,8 @@
*/
/* Includes ------------------------------------------------------------------*/
#include <stdio.h>
#include "usbd_cdc_core.h"
#include "usbd_desc.h"
#include "usbd_req.h"

21
stm/main.c

@ -9,6 +9,7 @@
#include "led.h"
#include "lcd.h"
#include "storage.h"
#include "usb.h"
static void impl02_c_version() {
int x = 0;
@ -199,6 +200,7 @@ void __fatal_error(const char *msg) {
#include "compile.h"
#include "runtime.h"
#if 0
py_obj_t pyb_delay(py_obj_t count) {
sys_tick_delay_ms(rt_get_int(count));
return py_const_none;
@ -216,13 +218,14 @@ py_obj_t pyb_sw() {
return py_const_false;
}
}
#endif
#include "ff.h"
FATFS fatfs0;
#include "nlr.h"
/*
#include "nlr.h"
void g(uint i) {
printf("g:%d\n", i);
if (i & 1) {
@ -327,8 +330,8 @@ int main() {
storage_init();
// Python init
qstr_init();
rt_init();
//qstr_init();
//rt_init();
// print a message
printf(" micro py board\n");
@ -408,18 +411,8 @@ int main() {
// turn boot-up LED off
led_state(PYB_LED_G1, 0);
/*
for (;;) {
led_state(PYB_LED_G2, 1);
sys_tick_wait_at_least(sys_tick_counter, 500);
led_state(PYB_LED_G2, 0);
sys_tick_wait_at_least(sys_tick_counter, 500);
}
*/
// USB
if (0) {
void usb_init();
if (1) {
usb_init();
}

1
stm/usb.c

@ -4,6 +4,7 @@
#include "usbd_pyb_core.h"
#include "usbd_usr.h"
#include "usbd_desc.h"
#include "usb.h"
extern CDC_IF_Prop_TypeDef VCP_fops;

2
stm/usb.h

@ -0,0 +1,2 @@
void usb_init();
void usb_vcp_send(const char* str, int len);
Loading…
Cancel
Save