Fist port USB CDC

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

boards.txt

@@ -349,8 +349,8 @@ Disco.menu.Other_serial.enable_Serial2.build.enable_Serialx=-DENABLE_SERIAL2
 Nucleo_144.menu.USB_interface.enable_USB=None
 Nucleo_144.menu.USB_interface.enable_HID=HID keyboard and mouse support (if available)
 Nucleo_144.menu.USB_interface.enable_HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-#Nucleo_144.menu.USB_interface.enable_CDC=CDC (if available)
-#Nucleo_144.menu.USB_interface.enable_CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
+Nucleo_144.menu.USB_interface.enable_CDC=CDC (if available)
+Nucleo_144.menu.USB_interface.enable_CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
 
 Nucleo_64.menu.USB_interface.enable_USB=None
 Nucleo_64.menu.USB_interface.enable_HID=HID keyboard and mouse support (if available)

cores/arduino/Arduino.h

@@ -68,6 +68,7 @@ extern void loop( void ) ;
 #include "WMath.h"
 #include "HardwareSerial.h"
 #include "wiring_pulse.h"
+#include "usb_serial.h"
 #endif // __cplusplus
 
 

cores/arduino/stm32/timer.c

@@ -563,8 +563,8 @@ uint32_t getTimerIrq(TIM_TypeDef* tim)
   */
 void TimerHandleDeinit(stimer_t *obj)
 {
-  HAL_TIM_Base_DeInit(&(obj->handle));
   HAL_TIM_Base_Stop_IT(&(obj->handle));
+  HAL_TIM_Base_DeInit(&(obj->handle));
 }
 
 /**
@@ -1024,6 +1024,17 @@ void attachIntHandle(stimer_t *obj, void (*irqHandle)(stimer_t *))
   obj->irqHandle = irqHandle;
 }
 
+/**
+  * @brief  Attached an interrupt handler
+  * @param  htim : TIM handle
+  * @param  irqHandle : interrupt handler
+  * @retval none
+  */
+void timer_attach_interrupt_handle(TIM_HandleTypeDef *htim,  void (*irqHandle)(stimer_t *))
+{
+  stimer_t *obj = get_timer_obj(htim);
+  obj->irqHandle = irqHandle;
+}
 
 /******************************************************************************/
 /*                            TIMx IRQ HANDLER                                */

cores/arduino/stm32/timer.h

@@ -157,6 +157,7 @@ struct timer_s{
 
 void timer_enable_clock(TIM_HandleTypeDef *htim);
 void timer_disable_clock(TIM_HandleTypeDef *htim);
+void timer_attach_interrupt_handle(TIM_HandleTypeDef *htim,  void (*irqHandle)(stimer_t *));
 
 void TimerHandleInit(stimer_t *obj, uint16_t period, uint16_t prescaler);
 void TimerHandleDeinit(stimer_t *obj);

cores/arduino/stm32/usb_device_cdc.c

@@ -0,0 +1,28 @@
+/*
+ * <Description>
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author: YOUR NAME <> for STMicroelectronics.
+ *
+ * License type: GPLv2
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+#ifdef USBCON
+
+#ifdef USBD_USE_CDC
+#include "usbd_cdc.c"
+#endif // USBD_USE_CDC
+
+#endif //USBCON

cores/arduino/stm32/usb_interface.c

@@ -95,6 +95,10 @@
 #ifdef USBD_USE_HID_COMPOSITE
 static USBD_HandleTypeDef hUSBD_Device_HID;
 #endif //USBD_USE_HID_COMPOSITE
+#ifdef USBD_USE_CDC
+volatile USBD_HandleTypeDef hUSBD_Device_CDC;
+#endif //USBD_USE_CDC
+
 /**
   * @}
   */
@@ -118,16 +122,36 @@ static USBD_HandleTypeDef hUSBD_Device_HID;
   */
 void usbd_interface_init(void)
 {
+#if defined(USBD_USE_HID_COMPOSITE) && defined(USBD_USE_CDC)
+#error "Only one of USBD_USE_HID_COMPOSITE or USBD_USE_CDC could be defined!"
+#endif
 #ifdef USBD_USE_HID_COMPOSITE
   /* Init Device Library */
-  USBD_Init(&hUSBD_Device_HID, &HID_Desc, 0);
+  USBD_Init(&hUSBD_Device_HID, &HID_Desc, DEVICE_FS);
 
   /* Add Supported Class */
   USBD_RegisterClass(&hUSBD_Device_HID, USBD_COMPOSITE_HID_CLASS);
 
   /* Start Device Process */
   USBD_Start(&hUSBD_Device_HID);
 #endif // USBD_USE_HID_COMPOSITE
+#ifdef USBD_USE_CDC
+  /* Init Device Library */
+  if (USBD_Init(&hUSBD_Device_CDC, &CDC_Desc, DEVICE_FS) == USBD_OK) {
+
+    /* Add Supported Class */
+    if (USBD_RegisterClass(&hUSBD_Device_CDC, USBD_CDC_CLASS) == USBD_OK) {
+
+      /* Add CDC Interface Class */
+      if (USBD_CDC_RegisterInterface(&hUSBD_Device_CDC, &USBD_Interface_fops_FS) == USBD_OK) {
+
+        /* Start Device Process */
+        USBD_Start(&hUSBD_Device_CDC);
+      }
+    }
+  }
+#endif //USBD_USE_CDC
+
 }
 
 /**
@@ -139,6 +163,9 @@ void usbd_interface_mouse_sendReport(uint8_t *report, uint16_t len)
 {
 #ifdef USBD_USE_HID_COMPOSITE
   USBD_HID_MOUSE_SendReport(&hUSBD_Device_HID, report, len);
+#else
+  UNUSED(report);
+  UNUSED(len);
 #endif // USBD_USE_HID_COMPOSITE
 }
 
@@ -151,6 +178,9 @@ void usbd_interface_keyboard_sendReport(uint8_t *report, uint16_t len)
 {
 #ifdef USBD_USE_HID_COMPOSITE
   USBD_HID_KEYBOARD_SendReport(&hUSBD_Device_HID, report, len);
+#else
+  UNUSED(report);
+  UNUSED(len);
 #endif // USBD_USE_HID_COMPOSITE
 }
 

cores/arduino/stm32/usb_interface.h

@@ -53,6 +53,7 @@
 #endif
 #endif
 #include "usbd_hid_composite.h"
+#include "usbd_cdc_if.h"
 
 #ifdef __cplusplus
  extern "C" {