diff options
| -rw-r--r-- | stm/Makefile | 6 | ||||
| -rw-r--r-- | stm/lcd.c | 2 | ||||
| -rw-r--r-- | stm/lib/usbd_pyb_core.c | 2 | ||||
| -rw-r--r-- | stm/main.c | 21 | ||||
| -rw-r--r-- | stm/usb.c | 1 | ||||
| -rw-r--r-- | stm/usb.h | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/stm/Makefile b/stm/Makefile index efd2ec60b0..a305a9bcab 100644 --- a/stm/Makefile +++ b/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 \ @@ -1,4 +1,6 @@ #include <stm32f4xx_gpio.h> + +#include "misc.h" #include "systick.h" #include "lcd.h" #include "font_petme128_8x8.h" diff --git a/stm/lib/usbd_pyb_core.c b/stm/lib/usbd_pyb_core.c index ea8f05a81c..5d6e6d9b95 100644 --- a/stm/lib/usbd_pyb_core.c +++ b/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"
diff --git a/stm/main.c b/stm/main.c index 30099d3663..ca14d1ce9d 100644 --- a/stm/main.c +++ b/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(); } @@ -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; diff --git a/stm/usb.h b/stm/usb.h new file mode 100644 index 0000000000..c5060a0107 --- /dev/null +++ b/stm/usb.h @@ -0,0 +1,2 @@ +void usb_init(); +void usb_vcp_send(const char* str, int len); |