stm32duino · ghost · Jul 27, 2017 · Jul 27, 2017 · Jul 27, 2017 · Jul 27, 2017
diff --git a/boards.txt b/boards.txt
@@ -346,26 +346,18 @@ Disco.menu.Other_serial.enable_Serial2=Serial2 (if available)
 Disco.menu.Other_serial.enable_Serial2.build.enable_Serialx=-DENABLE_SERIAL2
 
 # USB connectivity
-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_usb=None
+Nucleo_144.menu.USB_interface.enable_usb_periph=Enable USB (if available)
+Nucleo_144.menu.USB_interface.enable_usb_periph.build.enable_usb={build.usb_flags}
 
 Nucleo_64.menu.USB_interface.enable_USB=None
-Nucleo_64.menu.USB_interface.enable_HID=HID keyboard and mouse support (if available)
-Nucleo_64.menu.USB_interface.enable_HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-#Nucleo_64.menu.USB_interface.enable_CDC=CDC (if available)
-#Nucleo_64.menu.USB_interface.enable_CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
+Nucleo_64.menu.USB_interface.enable_usb_periph=Enable USB (if available)
+Nucleo_64.menu.USB_interface.enable_usb_periph.build.enable_usb={build.usb_flags}
 
 Nucleo_32.menu.USB_interface.enable_USB=None
-Nucleo_32.menu.USB_interface.enable_HID=HID keyboard and mouse support (if available)
-Nucleo_32.menu.USB_interface.enable_HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-#Nucleo_32.menu.USB_interface.enable_CDC=CDC (if available)
-#Nucleo_32.menu.USB_interface.enable_CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
+Nucleo_32.menu.USB_interface.enable_usb_periph=Enable USB (if available)
+Nucleo_32.menu.USB_interface.enable_usb_periph.build.enable_usb={build.usb_flags}
 
 Disco.menu.USB_interface.enable_USB=None
-Disco.menu.USB_interface.enable_HID=HID keyboard and mouse support (if available)
-Disco.menu.USB_interface.enable_HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-#Disco.menu.USB_interface.enable_CDC=CDC (if available)
-#Disco.menu.USB_interface.enable_CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
+Disco.menu.USB_interface.enable_usb_periph=Enable USB (if available)
+Disco.menu.USB_interface.enable_usb_periph.build.enable_usb={build.usb_flags}
diff --git a/cores/arduino/chip.h b/cores/arduino/chip.h
@@ -34,9 +34,6 @@
 #include "timer.h"
 #include "twi.h"
 #include "stm32_eeprom.h"
-#ifdef USBCON
-#include "usb_interface.h"
-#endif //USBCON
 
 #include "ethernet.h"
 

diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
@@ -39,10 +39,6 @@ int main( void )
 {
 	initVariant();
 
-#if defined(USBCON)
-	usbd_interface_init();
-#endif
-
 	setup();
 
 	for (;;)

diff --git a/cores/arduino/stm32/timer.c b/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                                */

diff --git a/cores/arduino/stm32/timer.h b/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);

diff --git a/cores/arduino/stm32/usb_interface.c b/cores/arduino/stm32/usb_interface.c
diff --git a/cores/arduino/wiring.h b/cores/arduino/wiring.h
@@ -20,6 +20,8 @@
 #ifndef _WIRING_
 #define _WIRING_
 
+#include <clock.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/libraries/Keyboard/src/Keyboard.cpp b/libraries/Keyboard/src/Keyboard.cpp
@@ -20,7 +20,7 @@
 */
 
 #include "Keyboard.h"
-#include "usbd_hid_composite.h"
+#include "USBHIDComposite.h"
 
 #if defined(USBCON)
 
@@ -34,18 +34,20 @@ Keyboard_::Keyboard_(void)
 
 void Keyboard_::begin(void)
 {
+  HID.begin();
 }
 
 void Keyboard_::end(void)
 {
+  HID.end();
 }
 
 void Keyboard_::sendReport(KeyReport* keys)
 {
   uint8_t buf[8] = {keys->modifiers, keys->reserved, keys->keys[0], keys->keys[1],
                     keys->keys[2], keys->keys[3], keys->keys[4], keys->keys[5]};
 
-  usbd_interface_keyboard_sendReport(buf, 8);
+  HID.keyboardSend(buf, 8);
 
   //delay required to prevent persistent key when call print
   delay(20);

diff --git a/libraries/Keyboard/src/Keyboard.h b/libraries/Keyboard/src/Keyboard.h
@@ -24,9 +24,9 @@
 
 #include <Arduino.h>
 
-#if !defined(USBCON) || !defined(USBD_USE_HID_COMPOSITE)
+#if !defined(USBCON)
 
-#error "USB HID not enabled! Select 'HID' in the 'Tools->USB interface' menu."
+#error "USB not enabled! Select 'USB Enable' in the 'Tools->USB interface' menu."
 
 #else
 

diff --git a/libraries/Mouse/src/Mouse.cpp b/libraries/Mouse/src/Mouse.cpp
@@ -20,7 +20,7 @@
 */
 
 #include "Mouse.h"
-#include "usbd_hid_composite.h"
+#include "USBHIDComposite.h"
 
 #if defined(USBCON)
 
@@ -34,10 +34,12 @@ Mouse_::Mouse_(void) : _buttons(0)
 
 void Mouse_::begin(void)
 {
+	HID.begin();
 }
 
 void Mouse_::end(void)
 {
+	HID.end();
 }
 
 void Mouse_::click(uint8_t b)
@@ -56,7 +58,7 @@ void Mouse_::move(signed char x, signed char y, signed char wheel)
 	m[2] = y;
 	m[3] = wheel;
 
-  usbd_interface_mouse_sendReport(m, 4);
+  HID.mouseSend(m, 4);
 }
 
 void Mouse_::buttons(uint8_t b)

diff --git a/libraries/Mouse/src/Mouse.h b/libraries/Mouse/src/Mouse.h
@@ -24,9 +24,9 @@
 
 #include <Arduino.h>
 
-#if !defined(USBCON) || !defined(USBD_USE_HID_COMPOSITE)
+#if !defined(USBCON)
 
-#error "USB HID not enabled! Select 'HID' in the 'Tools->USB interface' menu."
+#error "USB not enabled! Select 'USB Enable' in the 'Tools->USB interface' menu."
 
 #else
 

diff --git a/libraries/USBHIDComposite/README.md b/libraries/USBHIDComposite/README.md
@@ -0,0 +1,14 @@
+# USBHIDComposite
+
+Arduino library to provide USB HID class with Mouse and Keyboard descriptors.  
+
+This library functions allow to configure the USB peripheral and to send mouse  
+and keyboard report descriptors.
+
+* HID.begin()
+* HID.end()
+* HID.mouseSend()
+* HID.keyboardSend()
+
+For more information about this library please visit us at  
+https://github.com/stm32duino/Arduino_Core_STM32
diff --git a/libraries/USBHIDComposite/keywords.txt b/libraries/USBHIDComposite/keywords.txt
@@ -0,0 +1,22 @@
+#######################################
+# Syntax Coloring Map For HID
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+HID	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+begin	KEYWORD2
+end	KEYWORD2
+mouseSend	KEYWORD2
+keyboardSend	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################