Fix up linker script; improve startup code; printf to USB.

1 files changed, 9 insertions, 8 deletions

diff --git a/stm/usb.c b/stm/usb.c
index eea7e5a0a6..fdb088638b 100644
--- a/stm/usb.c
+++ b/stm/usb.c
@@ -1,21 +1,22 @@
 #include "usb_core.h"
 #include "usbd_core.h"
+#include "usbd_cdc_core.h"
 #include "usbd_pyb_core.h"
 #include "usbd_usr.h"
 #include "usbd_desc.h"
 
-//extern CDC_IF_Prop_TypeDef APP_FOPS;
+extern CDC_IF_Prop_TypeDef VCP_fops;
 
+int is_enabled = 0;
 USB_OTG_CORE_HANDLE USB_OTG_dev;
 
-void usb_vcp_init() {
-    //USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_CDC_cb, &USR_cb);
+void usb_init() {
+    USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_PYB_cb, &USR_cb);
+    is_enabled = 1;
 }
 
 void usb_vcp_send(const char* str, int len) {
-    //APP_FOPS.pIf_DataTx(str, len);
-}
-
-void usb_init() {
-    USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_PYB_cb, &USR_cb);
+    if (is_enabled) {
+        VCP_fops.pIf_DataTx((const uint8_t*)str, len);
+    }
 }