Fix ALL the bugs

12 files changed, 119 insertions, 2569 deletions

diff --git a/fw/Makefile b/fw/Makefile
index 0a83aa2..53fc967 100644
--- a/fw/Makefile
+++ b/fw/Makefile
@@ -63,7 +63,7 @@ LDSCRIPT 		:= STM32F072CBUx_FLASH.ld
 ARCH_FLAGS	    := -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 SYSTEM_FLAGS    += -nostdlib -ffreestanding -nostartfiles
 
-CFLAGS	        := -O0 -std=gnu11
+CFLAGS	        := -O0 -g -std=gnu11
 CFLAGS			+= -DUSE_HAL_DRIVER -DSTM32F072xB
 CFLAGS          += -DSTM32F0 -DDEBUG=$(DEBUG)
 # ST weirdness
@@ -131,10 +131,10 @@ DOT		?= dot
 # Rules
 ########################################################################################################################
 
-all: binsize
+all: binsize $(BUILDDIR)/$(BINARY:.elf=.bin)
 
 .PHONY: binsize
-binsize: $(BUILDDIR)/$(BINARY) $(BUILDDIR)/$(BINARY:.elf=-symbol-sizes.pdf)
+binsize: $(BUILDDIR)/$(BINARY) $(BUILDDIR)/$(BINARY:.elf=-symbol-sizes.pdf) 
 	@echo
 	@$(LD) -T$(LDSCRIPT) $(LDFLAGS) -Wl,--print-memory-usage -o /dev/null $(OBJS) $(LIBS)
 	@echo
@@ -159,6 +159,9 @@ build/$(BINARY:.elf=-symbol-sizes.dot): $(OBJS) FORCE
 %.dot: %.elf
 	r2 -a arm -qc 'aa;agRd' $< 2>/dev/null >$@
 
+%.bin: %.elf
+	$(OBJCOPY) -O binary $^ $@
+
 $(BUILDDIR)/src/%.o: src/%.s
 	mkdir -p $(@D)
 	$(CC) $(COMMON_CFLAGS) $(CFLAGS) $(INT_CFLAGS) -o $@ -c $<
@@ -179,6 +182,10 @@ $(BUILDDIR)/%.o: %.c
 	mkdir -p $(@D)
 	$(CC) $(COMMON_CFLAGS) $(CFLAGS) $(EXT_CFLAGS) -o $@ -c $<
 
+.PHONY: flash
+flash: $(BUILDDIR)/$(BINARY:.elf=.bin)
+	dfu-util -a 0 -s 0x08000000 -D $^
+
 clean:
 	rm -rf $(BUILDDIR)/src
 	rm -rf $(BUILDDIR)/generated
diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
deleted file mode 100644
index 6550cd7..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_core.h

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015

-  * @brief   Header file for usbd_core.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_CORE_H

-#define __USBD_CORE_H

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_conf.h"

-#include "usbd_def.h"

-#include "usbd_ioreq.h"

-#include "usbd_ctlreq.h"

-

-/** @addtogroup STM32_USB_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_CORE

-  * @brief This file is the Header file for usbd_core.c file

-  * @{

-  */ 

-

-

-/** @defgroup USBD_CORE_Exported_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_CORE_Exported_TypesDefinitions

-  * @{

-  */

- 

-

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBD_CORE_Exported_Macros

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_CORE_Exported_Variables

-  * @{

-  */ 

-#define USBD_SOF          USBD_LL_SOF

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_CORE_Exported_FunctionsPrototype

-  * @{

-  */ 

-USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id);

-USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef USBD_Start  (USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef USBD_Stop   (USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass);

-

-USBD_StatusTypeDef USBD_RunTestMode (USBD_HandleTypeDef  *pdev); 

-USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx);

-USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx);

-

-USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup);

-USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);

-USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);

-

-USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed);

-USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev);

-

-USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);

-USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);

-

-USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev);

-

-/* USBD Low Level Driver */

-USBD_StatusTypeDef  USBD_LL_Init (USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef  USBD_LL_DeInit (USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef  USBD_LL_Start(USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef  USBD_LL_Stop (USBD_HandleTypeDef *pdev);

-USBD_StatusTypeDef  USBD_LL_OpenEP  (USBD_HandleTypeDef *pdev, 

-                                      uint8_t  ep_addr,                                      

-                                      uint8_t  ep_type,

-                                      uint16_t ep_mps);

-

-USBD_StatusTypeDef  USBD_LL_CloseEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);   

-USBD_StatusTypeDef  USBD_LL_FlushEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);   

-USBD_StatusTypeDef  USBD_LL_StallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);   

-USBD_StatusTypeDef  USBD_LL_ClearStallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);   

-uint8_t             USBD_LL_IsStallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);   

-USBD_StatusTypeDef  USBD_LL_SetUSBAddress (USBD_HandleTypeDef *pdev, uint8_t dev_addr);   

-USBD_StatusTypeDef  USBD_LL_Transmit (USBD_HandleTypeDef *pdev, 

-                                      uint8_t  ep_addr,                                      

-                                      uint8_t  *pbuf,

-                                      uint16_t  size);

-

-USBD_StatusTypeDef  USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev, 

-                                           uint8_t  ep_addr,                                      

-                                           uint8_t  *pbuf,

-                                           uint16_t  size);

-

-uint32_t USBD_LL_GetRxDataSize  (USBD_HandleTypeDef *pdev, uint8_t  ep_addr);  

-void  USBD_LL_Delay (uint32_t Delay);

-

-/**

-  * @}

-  */ 

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* __USBD_CORE_H */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

-

-

-

diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
deleted file mode 100644
index 66380fd..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_req.h

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015

-  * @brief   Header file for the usbd_req.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USB_REQUEST_H

-#define __USB_REQUEST_H

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-/* Includes ------------------------------------------------------------------*/

-#include  "usbd_def.h"

-

-

-/** @addtogroup STM32_USB_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_REQ

-  * @brief header file for the usbd_req.c file

-  * @{

-  */ 

-

-/** @defgroup USBD_REQ_Exported_Defines

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Exported_Types

-  * @{

-  */

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBD_REQ_Exported_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_REQ_Exported_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_REQ_Exported_FunctionsPrototype

-  * @{

-  */ 

-

-USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);

-USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);

-USBD_StatusTypeDef  USBD_StdEPReq  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);

-

-

-void USBD_CtlError  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef *req);

-

-void USBD_ParseSetupRequest (USBD_SetupReqTypedef *req, uint8_t *pdata);

-

-void USBD_GetString         (uint8_t *desc, uint8_t *unicode, uint16_t *len);

-/**

-  * @}

-  */ 

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* __USB_REQUEST_H */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
deleted file mode 100644
index 969e324..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_def.h

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015

-  * @brief   General defines for the usb device library 

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_DEF_H

-#define __USBD_DEF_H

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_conf.h"

-

-/** @addtogroup STM32_USBD_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USB_DEF

-  * @brief general defines for the usb device library file

-  * @{

-  */ 

-

-/** @defgroup USB_DEF_Exported_Defines

-  * @{

-  */ 

-

-#ifndef NULL

-#define NULL  0

-#endif

-

-

-#define  USB_LEN_DEV_QUALIFIER_DESC                     0x0A

-#define  USB_LEN_DEV_DESC                               0x12

-#define  USB_LEN_CFG_DESC                               0x09

-#define  USB_LEN_IF_DESC                                0x09

-#define  USB_LEN_EP_DESC                                0x07

-#define  USB_LEN_OTG_DESC                               0x03

-#define  USB_LEN_LANGID_STR_DESC                        0x04

-#define  USB_LEN_OTHER_SPEED_DESC_SIZ                   0x09

-

-#define  USBD_IDX_LANGID_STR                            0x00 

-#define  USBD_IDX_MFC_STR                               0x01 

-#define  USBD_IDX_PRODUCT_STR                           0x02

-#define  USBD_IDX_SERIAL_STR                            0x03 

-#define  USBD_IDX_CONFIG_STR                            0x04 

-#define  USBD_IDX_INTERFACE_STR                         0x05 

-

-#define  USB_REQ_TYPE_STANDARD                          0x00

-#define  USB_REQ_TYPE_CLASS                             0x20

-#define  USB_REQ_TYPE_VENDOR                            0x40

-#define  USB_REQ_TYPE_MASK                              0x60

-

-#define  USB_REQ_RECIPIENT_DEVICE                       0x00

-#define  USB_REQ_RECIPIENT_INTERFACE                    0x01

-#define  USB_REQ_RECIPIENT_ENDPOINT                     0x02

-#define  USB_REQ_RECIPIENT_MASK                         0x03

-

-#define  USB_REQ_GET_STATUS                             0x00

-#define  USB_REQ_CLEAR_FEATURE                          0x01

-#define  USB_REQ_SET_FEATURE                            0x03

-#define  USB_REQ_SET_ADDRESS                            0x05

-#define  USB_REQ_GET_DESCRIPTOR                         0x06

-#define  USB_REQ_SET_DESCRIPTOR                         0x07

-#define  USB_REQ_GET_CONFIGURATION                      0x08

-#define  USB_REQ_SET_CONFIGURATION                      0x09

-#define  USB_REQ_GET_INTERFACE                          0x0A

-#define  USB_REQ_SET_INTERFACE                          0x0B

-#define  USB_REQ_SYNCH_FRAME                            0x0C

-

-#define  USB_DESC_TYPE_DEVICE                              1

-#define  USB_DESC_TYPE_CONFIGURATION                       2

-#define  USB_DESC_TYPE_STRING                              3

-#define  USB_DESC_TYPE_INTERFACE                           4

-#define  USB_DESC_TYPE_ENDPOINT                            5

-#define  USB_DESC_TYPE_DEVICE_QUALIFIER                    6

-#define  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION           7

-#define  USB_DESC_TYPE_BOS                                 0x0F

-

-#define USB_CONFIG_REMOTE_WAKEUP                           2

-#define USB_CONFIG_SELF_POWERED                            1

-

-#define USB_FEATURE_EP_HALT                                0

-#define USB_FEATURE_REMOTE_WAKEUP                          1

-#define USB_FEATURE_TEST_MODE                              2

-

-#define USB_DEVICE_CAPABITY_TYPE                           0x10

-

-#define USB_HS_MAX_PACKET_SIZE                            512

-#define USB_FS_MAX_PACKET_SIZE                            64

-#define USB_MAX_EP0_SIZE                                  64

-

-/*  Device Status */

-#define USBD_STATE_DEFAULT                                1

-#define USBD_STATE_ADDRESSED                              2

-#define USBD_STATE_CONFIGURED                             3

-#define USBD_STATE_SUSPENDED                              4

-

-

-/*  EP0 State */    

-#define USBD_EP0_IDLE                                     0

-#define USBD_EP0_SETUP                                    1

-#define USBD_EP0_DATA_IN                                  2

-#define USBD_EP0_DATA_OUT                                 3

-#define USBD_EP0_STATUS_IN                                4

-#define USBD_EP0_STATUS_OUT                               5

-#define USBD_EP0_STALL                                    6    

-

-#define USBD_EP_TYPE_CTRL                                 0

-#define USBD_EP_TYPE_ISOC                                 1

-#define USBD_EP_TYPE_BULK                                 2

-#define USBD_EP_TYPE_INTR                                 3

-

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_DEF_Exported_TypesDefinitions

-  * @{

-  */

-

-typedef  struct  usb_setup_req 

-{

-    

-    uint8_t   bmRequest;                      

-    uint8_t   bRequest;                           

-    uint16_t  wValue;                             

-    uint16_t  wIndex;                             

-    uint16_t  wLength;                            

-}USBD_SetupReqTypedef;

-

-struct _USBD_HandleTypeDef;

-    

-typedef struct _Device_cb

-{

-  uint8_t  (*Init)             (struct _USBD_HandleTypeDef *pdev , uint8_t cfgidx);

-  uint8_t  (*DeInit)           (struct _USBD_HandleTypeDef *pdev , uint8_t cfgidx);

- /* Control Endpoints*/

-  uint8_t  (*Setup)            (struct _USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req);  

-  uint8_t  (*EP0_TxSent)       (struct _USBD_HandleTypeDef *pdev );    

-  uint8_t  (*EP0_RxReady)      (struct _USBD_HandleTypeDef *pdev );  

-  /* Class Specific Endpoints*/

-  uint8_t  (*DataIn)           (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);   

-  uint8_t  (*DataOut)          (struct _USBD_HandleTypeDef *pdev , uint8_t epnum); 

-  uint8_t  (*SOF)              (struct _USBD_HandleTypeDef *pdev); 

-  uint8_t  (*IsoINIncomplete)  (struct _USBD_HandleTypeDef *pdev , uint8_t epnum); 

-  uint8_t  (*IsoOUTIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);   

-

-  uint8_t  *(*GetHSConfigDescriptor)(uint16_t *length); 

-  uint8_t  *(*GetFSConfigDescriptor)(uint16_t *length);   

-  uint8_t  *(*GetOtherSpeedConfigDescriptor)(uint16_t *length);

-  uint8_t  *(*GetDeviceQualifierDescriptor)(uint16_t *length);

-#if (USBD_SUPPORT_USER_STRING == 1)

-  uint8_t  *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev ,uint8_t index,  uint16_t *length);   

-#endif  

-  

-} USBD_ClassTypeDef;

-

-/* Following USB Device Speed */

-typedef enum 

-{

-  USBD_SPEED_HIGH  = 0,

-  USBD_SPEED_FULL  = 1,

-  USBD_SPEED_LOW   = 2,  

-}USBD_SpeedTypeDef;

-

-/* Following USB Device status */

-typedef enum {

-  USBD_OK   = 0,

-  USBD_BUSY,

-  USBD_FAIL,

-}USBD_StatusTypeDef;

-

-/* USB Device descriptors structure */

-typedef struct

-{

-  uint8_t  *(*GetDeviceDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);  

-  uint8_t  *(*GetLangIDStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length); 

-  uint8_t  *(*GetManufacturerStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);  

-  uint8_t  *(*GetProductStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);  

-  uint8_t  *(*GetSerialStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);  

-  uint8_t  *(*GetConfigurationStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);  

-  uint8_t  *(*GetInterfaceStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length); 

-#if (USBD_LPM_ENABLED == 1)

-  uint8_t  *(*GetBOSDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length); 

-#endif  

-} USBD_DescriptorsTypeDef;

-

-/* USB Device handle structure */

-typedef struct

-{ 

-  uint32_t                status;

-  uint32_t                total_length;    

-  uint32_t                rem_length; 

-  uint32_t                maxpacket;   

-} USBD_EndpointTypeDef;

-

-/* USB Device handle structure */

-typedef struct _USBD_HandleTypeDef

-{

-  uint8_t                 id;

-  uint32_t                dev_config;

-  uint32_t                dev_default_config;

-  uint32_t                dev_config_status; 

-  USBD_SpeedTypeDef       dev_speed; 

-  USBD_EndpointTypeDef    ep_in[15];

-  USBD_EndpointTypeDef    ep_out[15];  

-  uint32_t                ep0_state;  

-  uint32_t                ep0_data_len;     

-  uint8_t                 dev_state;

-  uint8_t                 dev_old_state;

-  uint8_t                 dev_address;

-  uint8_t                 dev_connection_status;  

-  uint8_t                 dev_test_mode;

-  uint32_t                dev_remote_wakeup;

-

-  USBD_SetupReqTypedef    request;

-  USBD_DescriptorsTypeDef *pDesc;

-  USBD_ClassTypeDef       *pClass;

-  void                    *pClassData;  

-  void                    *pUserData;    

-  void                    *pData;    

-} USBD_HandleTypeDef;

-

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBD_DEF_Exported_Macros

-  * @{

-  */ 

-#define  SWAPBYTE(addr)        (((uint16_t)(*((uint8_t *)(addr)))) + \

-                               (((uint16_t)(*(((uint8_t *)(addr)) + 1))) << 8))

-

-#define LOBYTE(x)  ((uint8_t)(x & 0x00FF))

-#define HIBYTE(x)  ((uint8_t)((x & 0xFF00) >>8))

-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))

-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))

-

-

-#if  defined ( __GNUC__ )

-  #ifndef __weak

-    #define __weak   __attribute__((weak))

-  #endif /* __weak */

-  #ifndef __packed

-    #define __packed __attribute__((__packed__))

-  #endif /* __packed */

-#endif /* __GNUC__ */

-

-

-/* In HS mode and when the DMA is used, all variables and data structures dealing

-   with the DMA during the transaction process should be 4-bytes aligned */    

-

-#if defined   (__GNUC__)        /* GNU Compiler */

-  #define __ALIGN_END    __attribute__ ((aligned (4)))

-  #define __ALIGN_BEGIN         

-#else                           

-  #define __ALIGN_END

-  #if defined   (__CC_ARM)      /* ARM Compiler */

-    #define __ALIGN_BEGIN    __align(4)  

-  #elif defined (__ICCARM__)    /* IAR Compiler */

-    #define __ALIGN_BEGIN 

-  #elif defined  (__TASKING__)  /* TASKING Compiler */

-    #define __ALIGN_BEGIN    __align(4) 

-  #endif /* __CC_ARM */  

-#endif /* __GNUC__ */ 

-  

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_DEF_Exported_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_DEF_Exported_FunctionsPrototype

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* __USBD_DEF_H */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
deleted file mode 100644
index dbf8ca1..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_ioreq.h

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015

-  * @brief   Header file for the usbd_ioreq.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_IOREQ_H

-#define __USBD_IOREQ_H

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-/* Includes ------------------------------------------------------------------*/

-#include  "usbd_def.h"

-#include  "usbd_core.h"

-

-/** @addtogroup STM32_USB_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_IOREQ

-  * @brief header file for the usbd_ioreq.c file

-  * @{

-  */ 

-

-/** @defgroup USBD_IOREQ_Exported_Defines

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Exported_Types

-  * @{

-  */

-

-

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBD_IOREQ_Exported_Macros

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_IOREQ_Exported_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_IOREQ_Exported_FunctionsPrototype

-  * @{

-  */ 

-

-USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *buf,

-                               uint16_t len);

-

-USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *pbuf,

-                               uint16_t len);

-

-USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *pbuf,                                 

-                               uint16_t len);

-

-USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev, 

-                              uint8_t *pbuf,                                          

-                              uint16_t len);

-

-USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev);

-

-USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev);

-

-uint16_t  USBD_GetRxCount (USBD_HandleTypeDef  *pdev , 

-                           uint8_t epnum);

-

-/**

-  * @}

-  */ 

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* __USBD_IOREQ_H */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
deleted file mode 100644
index 86fc2de..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_core.c

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015

-  * @brief   This file provides all the USBD core functions.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_core.h"

-

-/** @addtogroup STM32_USBD_DEVICE_LIBRARY

-* @{

-*/

-

-

-/** @defgroup USBD_CORE 

-* @brief usbd core module

-* @{

-*/ 

-

-/** @defgroup USBD_CORE_Private_TypesDefinitions

-* @{

-*/ 

-/**

-* @}

-*/ 

-

-

-/** @defgroup USBD_CORE_Private_Defines

-* @{

-*/ 

-

-/**

-* @}

-*/ 

-

-

-/** @defgroup USBD_CORE_Private_Macros

-* @{

-*/ 

-/**

-* @}

-*/ 

-

-

-

-

-/** @defgroup USBD_CORE_Private_FunctionPrototypes

-* @{

-*/ 

-

-/**

-* @}

-*/ 

-

-/** @defgroup USBD_CORE_Private_Variables

-* @{

-*/ 

-

-/**

-* @}

-*/ 

-

-/** @defgroup USBD_CORE_Private_Functions

-* @{

-*/ 

-

-/**

-* @brief  USBD_Init

-*         Initializes the device stack and load the class driver

-* @param  pdev: device instance

-* @param  pdesc: Descriptor structure address

-* @param  id: Low level core index

-* @retval None

-*/

-USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id)

-{

-  /* Check whether the USB Host handle is valid */

-  if(pdev == NULL)

-  {

-    USBD_ErrLog("Invalid Device handle");

-    return USBD_FAIL; 

-  }

-  

-  /* Unlink previous class*/

-  if(pdev->pClass != NULL)

-  {

-    pdev->pClass = NULL;

-  }

-  

-  /* Assign USBD Descriptors */

-  if(pdesc != NULL)

-  {

-    pdev->pDesc = pdesc;

-  }

-  

-  /* Set Device initial State */

-  pdev->dev_state  = USBD_STATE_DEFAULT;

-  pdev->id = id;

-  /* Initialize low level driver */

-  USBD_LL_Init(pdev);

-  

-  return USBD_OK; 

-}

-

-/**

-* @brief  USBD_DeInit 

-*         Re-Initialize th device library

-* @param  pdev: device instance

-* @retval status: status

-*/

-USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)

-{

-  /* Set Default State */

-  pdev->dev_state  = USBD_STATE_DEFAULT;

-  

-  /* Free Class Resources */

-  pdev->pClass->DeInit(pdev, pdev->dev_config);  

-  

-    /* Stop the low level driver  */

-  USBD_LL_Stop(pdev); 

-  

-  /* Initialize low level driver */

-  USBD_LL_DeInit(pdev);

-  

-  return USBD_OK;

-}

-

-

-/**

-  * @brief  USBD_RegisterClass 

-  *         Link class driver to Device Core.

-  * @param  pDevice : Device Handle

-  * @param  pclass: Class handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass)

-{

-  USBD_StatusTypeDef   status = USBD_OK;

-  if(pclass != 0)

-  {

-    /* link the class to the USB Device handle */

-    pdev->pClass = pclass;

-    status = USBD_OK;

-  }

-  else

-  {

-    USBD_ErrLog("Invalid Class handle");

-    status = USBD_FAIL; 

-  }

-  

-  return status;

-}

-

-/**

-  * @brief  USBD_Start 

-  *         Start the USB Device Core.

-  * @param  pdev: Device Handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_Start  (USBD_HandleTypeDef *pdev)

-{

-  

-  /* Start the low level driver  */

-  USBD_LL_Start(pdev); 

-  

-  return USBD_OK;  

-}

-

-/**

-  * @brief  USBD_Stop 

-  *         Stop the USB Device Core.

-  * @param  pdev: Device Handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_Stop   (USBD_HandleTypeDef *pdev)

-{

-  /* Free Class Resources */

-  pdev->pClass->DeInit(pdev, pdev->dev_config);  

-

-  /* Stop the low level driver  */

-  USBD_LL_Stop(pdev); 

-  

-  return USBD_OK;  

-}

-

-/**

-* @brief  USBD_RunTestMode 

-*         Launch test mode process

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_RunTestMode (USBD_HandleTypeDef  *pdev) 

-{

-  return USBD_OK;

-}

-

-

-/**

-* @brief  USBD_SetClassConfig 

-*        Configure device and start the interface

-* @param  pdev: device instance

-* @param  cfgidx: configuration index

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx)

-{

-  USBD_StatusTypeDef   ret = USBD_FAIL;

-  

-  if(pdev->pClass != NULL)

-  {

-    /* Set configuration  and Start the Class*/

-    if(pdev->pClass->Init(pdev, cfgidx) == 0)

-    {

-      ret = USBD_OK;

-    }

-  }

-  return ret; 

-}

-

-/**

-* @brief  USBD_ClrClassConfig 

-*         Clear current configuration

-* @param  pdev: device instance

-* @param  cfgidx: configuration index

-* @retval status: USBD_StatusTypeDef

-*/

-USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx)

-{

-  /* Clear configuration  and De-initialize the Class process*/

-  pdev->pClass->DeInit(pdev, cfgidx);  

-  return USBD_OK;

-}

-

-

-/**

-* @brief  USBD_SetupStage 

-*         Handle the setup stage

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)

-{

-

-  USBD_ParseSetupRequest(&pdev->request, psetup);

-  

-  pdev->ep0_state = USBD_EP0_SETUP;

-  pdev->ep0_data_len = pdev->request.wLength;

-  

-  switch (pdev->request.bmRequest & 0x1F) 

-  {

-  case USB_REQ_RECIPIENT_DEVICE:   

-    USBD_StdDevReq (pdev, &pdev->request);

-    break;

-    

-  case USB_REQ_RECIPIENT_INTERFACE:     

-    USBD_StdItfReq(pdev, &pdev->request);

-    break;

-    

-  case USB_REQ_RECIPIENT_ENDPOINT:        

-    USBD_StdEPReq(pdev, &pdev->request);   

-    break;

-    

-  default:           

-    USBD_LL_StallEP(pdev , pdev->request.bmRequest & 0x80);

-    break;

-  }  

-  return USBD_OK;  

-}

-

-/**

-* @brief  USBD_DataOutStage 

-*         Handle data OUT stage

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata)

-{

-  USBD_EndpointTypeDef    *pep;

-  

-  if(epnum == 0) 

-  {

-    pep = &pdev->ep_out[0];

-    

-    if ( pdev->ep0_state == USBD_EP0_DATA_OUT)

-    {

-      if(pep->rem_length > pep->maxpacket)

-      {

-        pep->rem_length -=  pep->maxpacket;

-       

-        USBD_CtlContinueRx (pdev, 

-                            pdata,

-                            MIN(pep->rem_length ,pep->maxpacket));

-      }

-      else

-      {

-        if((pdev->pClass->EP0_RxReady != NULL)&&

-           (pdev->dev_state == USBD_STATE_CONFIGURED))

-        {

-          pdev->pClass->EP0_RxReady(pdev); 

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-    }

-  }

-  else if((pdev->pClass->DataOut != NULL)&&

-          (pdev->dev_state == USBD_STATE_CONFIGURED))

-  {

-    pdev->pClass->DataOut(pdev, epnum); 

-  }  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_DataInStage 

-*         Handle data in stage

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev ,uint8_t epnum, uint8_t *pdata)

-{

-  USBD_EndpointTypeDef    *pep;

-    

-  if(epnum == 0) 

-  {

-    pep = &pdev->ep_in[0];

-    

-    if ( pdev->ep0_state == USBD_EP0_DATA_IN)

-    {

-      if(pep->rem_length > pep->maxpacket)

-      {

-        pep->rem_length -=  pep->maxpacket;

-        

-        USBD_CtlContinueSendData (pdev, 

-                                  pdata, 

-                                  pep->rem_length);

-        

-        /* Prepare endpoint for premature end of transfer */

-        USBD_LL_PrepareReceive (pdev,

-                                0,

-                                NULL,

-                                0);  

-      }

-      else

-      { /* last packet is MPS multiple, so send ZLP packet */

-        if((pep->total_length % pep->maxpacket == 0) &&

-           (pep->total_length >= pep->maxpacket) &&

-             (pep->total_length < pdev->ep0_data_len ))

-        {

-          

-          USBD_CtlContinueSendData(pdev , NULL, 0);

-          pdev->ep0_data_len = 0;

-          

-        /* Prepare endpoint for premature end of transfer */

-        USBD_LL_PrepareReceive (pdev,

-                                0,

-                                NULL,

-                                0);

-        }

-        else

-        {

-          if((pdev->pClass->EP0_TxSent != NULL)&&

-             (pdev->dev_state == USBD_STATE_CONFIGURED))

-          {

-            pdev->pClass->EP0_TxSent(pdev); 

-          }          

-          USBD_CtlReceiveStatus(pdev);

-        }

-      }

-    }

-    if (pdev->dev_test_mode == 1)

-    {

-      USBD_RunTestMode(pdev); 

-      pdev->dev_test_mode = 0;

-    }

-  }

-  else if((pdev->pClass->DataIn != NULL)&& 

-          (pdev->dev_state == USBD_STATE_CONFIGURED))

-  {

-    pdev->pClass->DataIn(pdev, epnum); 

-  }  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_LL_Reset 

-*         Handle Reset event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev)

-{

-  /* Open EP0 OUT */

-  USBD_LL_OpenEP(pdev,

-              0x00,

-              USBD_EP_TYPE_CTRL,

-              USB_MAX_EP0_SIZE);

-  

-  pdev->ep_out[0].maxpacket = USB_MAX_EP0_SIZE;

-  

-  /* Open EP0 IN */

-  USBD_LL_OpenEP(pdev,

-              0x80,

-              USBD_EP_TYPE_CTRL,

-              USB_MAX_EP0_SIZE);

-  

-  pdev->ep_in[0].maxpacket = USB_MAX_EP0_SIZE;

-  /* Upon Reset call user call back */

-  pdev->dev_state = USBD_STATE_DEFAULT;

-  

-  if (pdev->pClassData) 

-    pdev->pClass->DeInit(pdev, pdev->dev_config);  

- 

-  

-  return USBD_OK;

-}

-

-

-

-

-/**

-* @brief  USBD_LL_Reset 

-*         Handle Reset event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed)

-{

-  pdev->dev_speed = speed;

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_Suspend 

-*         Handle Suspend event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev)

-{

-  pdev->dev_old_state =  pdev->dev_state;

-  pdev->dev_state  = USBD_STATE_SUSPENDED;

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_Resume 

-*         Handle Resume event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev)

-{

-  pdev->dev_state = pdev->dev_old_state;  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_SOF 

-*         Handle SOF event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev)

-{

-  if(pdev->dev_state == USBD_STATE_CONFIGURED)

-  {

-    if(pdev->pClass->SOF != NULL)

-    {

-      pdev->pClass->SOF(pdev);

-    }

-  }

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_IsoINIncomplete 

-*         Handle iso in incomplete event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)

-{

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_IsoOUTIncomplete 

-*         Handle iso out incomplete event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)

-{

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_DevConnected 

-*         Handle device connection event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev)

-{

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_DevDisconnected 

-*         Handle device disconnection event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev)

-{

-  /* Free Class Resources */

-  pdev->dev_state = USBD_STATE_DEFAULT;

-  pdev->pClass->DeInit(pdev, pdev->dev_config);  

-   

-  return USBD_OK;

-}

-/**

-* @}

-*/ 

-

-

-/**

-* @}

-*/ 

-

-

-/**

-* @}

-*/ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

-

diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
deleted file mode 100644
index 7701a6d..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
+++ /dev/null
@@ -1,782 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_req.c

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015 

-  * @brief   This file provides the standard USB requests following chapter 9.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_ctlreq.h"

-#include "usbd_ioreq.h"

-

-

-/** @addtogroup STM32_USBD_STATE_DEVICE_LIBRARY

-  * @{

-  */

-

-

-/** @defgroup USBD_REQ 

-  * @brief USB standard requests module

-  * @{

-  */ 

-

-/** @defgroup USBD_REQ_Private_TypesDefinitions

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_FunctionPrototypes

-  * @{

-  */ 

-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , 

-                               USBD_SetupReqTypedef *req);

-

-static void USBD_SetAddress(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req);

-

-static void USBD_SetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req);

-

-static void USBD_GetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req);

-

-static void USBD_GetStatus(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req);

-

-static void USBD_SetFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req);

-

-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req);

-

-static uint8_t USBD_GetLen(uint8_t *buf);

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Functions

-  * @{

-  */ 

-

-

-/**

-* @brief  USBD_StdDevReq

-*         Handle standard usb device requests

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)

-{

-  USBD_StatusTypeDef ret = USBD_OK;  

-  

-  switch (req->bRequest) 

-  {

-  case USB_REQ_GET_DESCRIPTOR: 

-    

-    USBD_GetDescriptor (pdev, req) ;

-    break;

-    

-  case USB_REQ_SET_ADDRESS:                      

-    USBD_SetAddress(pdev, req);

-    break;

-    

-  case USB_REQ_SET_CONFIGURATION:                    

-    USBD_SetConfig (pdev , req);

-    break;

-    

-  case USB_REQ_GET_CONFIGURATION:                 

-    USBD_GetConfig (pdev , req);

-    break;

-    

-  case USB_REQ_GET_STATUS:                                  

-    USBD_GetStatus (pdev , req);

-    break;

-    

-    

-  case USB_REQ_SET_FEATURE:   

-    USBD_SetFeature (pdev , req);    

-    break;

-    

-  case USB_REQ_CLEAR_FEATURE:                                   

-    USBD_ClrFeature (pdev , req);

-    break;

-    

-  default:  

-    USBD_CtlError(pdev , req);

-    break;

-  }

-  

-  return ret;

-}

-

-/**

-* @brief  USBD_StdItfReq

-*         Handle standard usb interface requests

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)

-{

-  USBD_StatusTypeDef ret = USBD_OK; 

-  

-  switch (pdev->dev_state) 

-  {

-  case USBD_STATE_CONFIGURED:

-    

-    if (LOBYTE(req->wIndex) <= USBD_MAX_NUM_INTERFACES) 

-    {

-      pdev->pClass->Setup (pdev, req); 

-      

-      if((req->wLength == 0)&& (ret == USBD_OK))

-      {

-         USBD_CtlSendStatus(pdev);

-      }

-    } 

-    else 

-    {                                               

-       USBD_CtlError(pdev , req);

-    }

-    break;

-    

-  default:

-     USBD_CtlError(pdev , req);

-    break;

-  }

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_StdEPReq

-*         Handle standard usb endpoint requests

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)

-{

-  

-  uint8_t   ep_addr;

-  USBD_StatusTypeDef ret = USBD_OK; 

-  USBD_EndpointTypeDef   *pep;

-  ep_addr  = LOBYTE(req->wIndex);   

-  

-  /* Check if it is a class request */

-  if ((req->bmRequest & 0x60) == 0x20)

-  {

-    pdev->pClass->Setup (pdev, req);

-    

-    return USBD_OK;

-  }

-  

-  switch (req->bRequest) 

-  {

-    

-  case USB_REQ_SET_FEATURE :

-    

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:          

-      if ((ep_addr != 0x00) && (ep_addr != 0x80)) 

-      {

-        USBD_LL_StallEP(pdev , ep_addr);

-      }

-      break;	

-      

-    case USBD_STATE_CONFIGURED:   

-      if (req->wValue == USB_FEATURE_EP_HALT)

-      {

-        if ((ep_addr != 0x00) && (ep_addr != 0x80)) 

-        { 

-          USBD_LL_StallEP(pdev , ep_addr);

-          

-        }

-      }

-      pdev->pClass->Setup (pdev, req);   

-      USBD_CtlSendStatus(pdev);

-      

-      break;

-      

-    default:                         

-      USBD_CtlError(pdev , req);

-      break;    

-    }

-    break;

-    

-  case USB_REQ_CLEAR_FEATURE :

-    

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:          

-      if ((ep_addr != 0x00) && (ep_addr != 0x80)) 

-      {

-        USBD_LL_StallEP(pdev , ep_addr);

-      }

-      break;	

-      

-    case USBD_STATE_CONFIGURED:   

-      if (req->wValue == USB_FEATURE_EP_HALT)

-      {

-        if ((ep_addr & 0x7F) != 0x00) 

-        {        

-          USBD_LL_ClearStallEP(pdev , ep_addr);

-          pdev->pClass->Setup (pdev, req);

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-      break;

-      

-    default:                         

-      USBD_CtlError(pdev , req);

-      break;    

-    }

-    break;

-    

-  case USB_REQ_GET_STATUS:                  

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:          

-      if ((ep_addr & 0x7F) != 0x00) 

-      {

-        USBD_LL_StallEP(pdev , ep_addr);

-      }

-      break;	

-      

-    case USBD_STATE_CONFIGURED:

-      pep = ((ep_addr & 0x80) == 0x80) ? &pdev->ep_in[ep_addr & 0x7F]:\

-                                         &pdev->ep_out[ep_addr & 0x7F];

-      if(USBD_LL_IsStallEP(pdev, ep_addr))

-      {

-        pep->status = 0x0001;     

-      }

-      else

-      {

-        pep->status = 0x0000;  

-      }

-      

-      USBD_CtlSendData (pdev,

-                        (uint8_t *)&pep->status,

-                        2);

-      break;

-      

-    default:                         

-      USBD_CtlError(pdev , req);

-      break;

-    }

-    break;

-    

-  default:

-    break;

-  }

-  return ret;

-}

-/**

-* @brief  USBD_GetDescriptor

-*         Handle Get Descriptor requests

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , 

-                               USBD_SetupReqTypedef *req)

-{

-  uint16_t len;

-  uint8_t *pbuf;

-  

-    

-  switch (req->wValue >> 8)

-  { 

-#if (USBD_LPM_ENABLED == 1)

-  case USB_DESC_TYPE_BOS:

-    pbuf = pdev->pDesc->GetBOSDescriptor(pdev->dev_speed, &len);

-    break;

-#endif    

-  case USB_DESC_TYPE_DEVICE:

-    pbuf = pdev->pDesc->GetDeviceDescriptor(pdev->dev_speed, &len);

-    break;

-    

-  case USB_DESC_TYPE_CONFIGURATION:     

-    if(pdev->dev_speed == USBD_SPEED_HIGH )   

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetHSConfigDescriptor(&len);

-      pbuf[1] = USB_DESC_TYPE_CONFIGURATION;

-    }

-    else

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(&len);

-      pbuf[1] = USB_DESC_TYPE_CONFIGURATION;

-    }

-    break;

-    

-  case USB_DESC_TYPE_STRING:

-    switch ((uint8_t)(req->wValue))

-    {

-    case USBD_IDX_LANGID_STR:

-     pbuf = pdev->pDesc->GetLangIDStrDescriptor(pdev->dev_speed, &len);        

-      break;

-      

-    case USBD_IDX_MFC_STR:

-      pbuf = pdev->pDesc->GetManufacturerStrDescriptor(pdev->dev_speed, &len);

-      break;

-      

-    case USBD_IDX_PRODUCT_STR:

-      pbuf = pdev->pDesc->GetProductStrDescriptor(pdev->dev_speed, &len);

-      break;

-      

-    case USBD_IDX_SERIAL_STR:

-      pbuf = pdev->pDesc->GetSerialStrDescriptor(pdev->dev_speed, &len);

-      break;

-      

-    case USBD_IDX_CONFIG_STR:

-      pbuf = pdev->pDesc->GetConfigurationStrDescriptor(pdev->dev_speed, &len);

-      break;

-      

-    case USBD_IDX_INTERFACE_STR:

-      pbuf = pdev->pDesc->GetInterfaceStrDescriptor(pdev->dev_speed, &len);

-      break;

-      

-    default:

-#if (USBD_SUPPORT_USER_STRING == 1)

-      pbuf = pdev->pClass->GetUsrStrDescriptor(pdev, (req->wValue) , &len);

-      break;

-#else      

-       USBD_CtlError(pdev , req);

-      return;

-#endif   

-    }

-    break;

-  case USB_DESC_TYPE_DEVICE_QUALIFIER:                   

-

-    if(pdev->dev_speed == USBD_SPEED_HIGH  )   

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(&len);

-      break;

-    }

-    else

-    {

-      USBD_CtlError(pdev , req);

-      return;

-    } 

-

-  case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:

-    if(pdev->dev_speed == USBD_SPEED_HIGH  )   

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetOtherSpeedConfigDescriptor(&len);

-      pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;

-      break; 

-    }

-    else

-    {

-      USBD_CtlError(pdev , req);

-      return;

-    }

-

-  default: 

-     USBD_CtlError(pdev , req);

-    return;

-  }

-  

-  if((len != 0)&& (req->wLength != 0))

-  {

-    

-    len = MIN(len , req->wLength);

-    

-    USBD_CtlSendData (pdev, 

-                      pbuf,

-                      len);

-  }

-  

-}

-

-/**

-* @brief  USBD_SetAddress

-*         Set device address

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_SetAddress(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req)

-{

-  uint8_t  dev_addr; 

-  

-  if ((req->wIndex == 0) && (req->wLength == 0)) 

-  {

-    dev_addr = (uint8_t)(req->wValue) & 0x7F;     

-    

-    if (pdev->dev_state == USBD_STATE_CONFIGURED) 

-    {

-      USBD_CtlError(pdev , req);

-    } 

-    else 

-    {

-      pdev->dev_address = dev_addr;

-      USBD_LL_SetUSBAddress(pdev, dev_addr);               

-      USBD_CtlSendStatus(pdev);                         

-      

-      if (dev_addr != 0) 

-      {

-        pdev->dev_state  = USBD_STATE_ADDRESSED;

-      } 

-      else 

-      {

-        pdev->dev_state  = USBD_STATE_DEFAULT; 

-      }

-    }

-  } 

-  else 

-  {

-     USBD_CtlError(pdev , req);                        

-  } 

-}

-

-/**

-* @brief  USBD_SetConfig

-*         Handle Set device configuration request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_SetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req)

-{

-  

-  static uint8_t  cfgidx;

-  

-  cfgidx = (uint8_t)(req->wValue);                 

-  

-  if (cfgidx > USBD_MAX_NUM_CONFIGURATION ) 

-  {            

-     USBD_CtlError(pdev , req);                              

-  } 

-  else 

-  {

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:

-      if (cfgidx) 

-      {                                			   							   							   				

-        pdev->dev_config = cfgidx;

-        pdev->dev_state = USBD_STATE_CONFIGURED;

-        if(USBD_SetClassConfig(pdev , cfgidx) == USBD_FAIL)

-        {

-          USBD_CtlError(pdev , req);  

-          return;

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-      else 

-      {

-         USBD_CtlSendStatus(pdev);

-      }

-      break;

-      

-    case USBD_STATE_CONFIGURED:

-      if (cfgidx == 0) 

-      {                           

-        pdev->dev_state = USBD_STATE_ADDRESSED;

-        pdev->dev_config = cfgidx;          

-        USBD_ClrClassConfig(pdev , cfgidx);

-        USBD_CtlSendStatus(pdev);

-        

-      } 

-      else  if (cfgidx != pdev->dev_config) 

-      {

-        /* Clear old configuration */

-        USBD_ClrClassConfig(pdev , pdev->dev_config);

-        

-        /* set new configuration */

-        pdev->dev_config = cfgidx;

-        if(USBD_SetClassConfig(pdev , cfgidx) == USBD_FAIL)

-        {

-          USBD_CtlError(pdev , req);  

-          return;

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-      else

-      {

-        USBD_CtlSendStatus(pdev);

-      }

-      break;

-      

-    default:					

-       USBD_CtlError(pdev , req);                     

-      break;

-    }

-  }

-}

-

-/**

-* @brief  USBD_GetConfig

-*         Handle Get device configuration request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_GetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req)

-{

-

-  if (req->wLength != 1) 

-  {                   

-     USBD_CtlError(pdev , req);

-  }

-  else 

-  {

-    switch (pdev->dev_state )  

-    {

-    case USBD_STATE_ADDRESSED:                     

-      pdev->dev_default_config = 0;

-      USBD_CtlSendData (pdev, 

-                        (uint8_t *)&pdev->dev_default_config,

-                        1);

-      break;

-      

-    case USBD_STATE_CONFIGURED:   

-      

-      USBD_CtlSendData (pdev, 

-                        (uint8_t *)&pdev->dev_config,

-                        1);

-      break;

-      

-    default:

-       USBD_CtlError(pdev , req);

-      break;

-    }

-  }

-}

-

-/**

-* @brief  USBD_GetStatus

-*         Handle Get Status request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_GetStatus(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req)

-{

-  

-    

-  switch (pdev->dev_state) 

-  {

-  case USBD_STATE_ADDRESSED:

-  case USBD_STATE_CONFIGURED:

-    

-#if ( USBD_SELF_POWERED == 1)

-    pdev->dev_config_status = USB_CONFIG_SELF_POWERED;                                  

-#else

-    pdev->dev_config_status = 0;                                   

-#endif

-                      

-    if (pdev->dev_remote_wakeup) 

-    {

-       pdev->dev_config_status |= USB_CONFIG_REMOTE_WAKEUP;                                

-    }

-    

-    USBD_CtlSendData (pdev, 

-                      (uint8_t *)& pdev->dev_config_status,

-                      2);

-    break;

-    

-  default :

-    USBD_CtlError(pdev , req);                        

-    break;

-  }

-}

-

-

-/**

-* @brief  USBD_SetFeature

-*         Handle Set device feature request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_SetFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req)

-{

-

-  if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)

-  {

-    pdev->dev_remote_wakeup = 1;  

-    pdev->pClass->Setup (pdev, req);   

-    USBD_CtlSendStatus(pdev);

-  }

-

-}

-

-

-/**

-* @brief  USBD_ClrFeature

-*         Handle clear device feature request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req)

-{

-  switch (pdev->dev_state)

-  {

-  case USBD_STATE_ADDRESSED:

-  case USBD_STATE_CONFIGURED:

-    if (req->wValue == USB_FEATURE_REMOTE_WAKEUP) 

-    {

-      pdev->dev_remote_wakeup = 0; 

-      pdev->pClass->Setup (pdev, req);   

-      USBD_CtlSendStatus(pdev);

-    }

-    break;

-    

-  default :

-     USBD_CtlError(pdev , req);

-    break;

-  }

-}

-

-/**

-* @brief  USBD_ParseSetupRequest 

-*         Copy buffer into setup structure

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval None

-*/

-

-void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)

-{

-  req->bmRequest     = *(uint8_t *)  (pdata);

-  req->bRequest      = *(uint8_t *)  (pdata +  1);

-  req->wValue        = SWAPBYTE      (pdata +  2);

-  req->wIndex        = SWAPBYTE      (pdata +  4);

-  req->wLength       = SWAPBYTE      (pdata +  6);

-

-}

-

-/**

-* @brief  USBD_CtlError 

-*         Handle USB low level Error

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval None

-*/

-

-void USBD_CtlError( USBD_HandleTypeDef *pdev ,

-                            USBD_SetupReqTypedef *req)

-{

-  USBD_LL_StallEP(pdev , 0x80);

-  USBD_LL_StallEP(pdev , 0);

-}

-

-

-/**

-  * @brief  USBD_GetString

-  *         Convert Ascii string into unicode one

-  * @param  desc : descriptor buffer

-  * @param  unicode : Formatted string buffer (unicode)

-  * @param  len : descriptor length

-  * @retval None

-  */

-void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len)

-{

-  uint8_t idx = 0;

-  

-  if (desc != NULL) 

-  {

-    *len =  USBD_GetLen(desc) * 2 + 2;    

-    unicode[idx++] = *len;

-    unicode[idx++] =  USB_DESC_TYPE_STRING;

-    

-    while (*desc != '\0') 

-    {

-      unicode[idx++] = *desc++;

-      unicode[idx++] =  0x00;

-    }

-  } 

-}

-

-/**

-  * @brief  USBD_GetLen

-  *         return the string length

-   * @param  buf : pointer to the ascii string buffer

-  * @retval string length

-  */

-static uint8_t USBD_GetLen(uint8_t *buf)

-{

-    uint8_t  len = 0;

-

-    while (*buf != '\0') 

-    {

-        len++;

-        buf++;

-    }

-

-    return len;

-}

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

diff --git a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
deleted file mode 100644
index d66d777..0000000
--- a/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/**

-  ******************************************************************************

-  * @file    usbd_ioreq.c

-  * @author  MCD Application Team

-  * @version V2.4.2

-  * @date    11-December-2015

-  * @brief   This file provides the IO requests APIs for control endpoints.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_ioreq.h"

-

-/** @addtogroup STM32_USB_DEVICE_LIBRARY

-  * @{

-  */

-

-

-/** @defgroup USBD_IOREQ 

-  * @brief control I/O requests module

-  * @{

-  */ 

-

-/** @defgroup USBD_IOREQ_Private_TypesDefinitions

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_FunctionPrototypes

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Functions

-  * @{

-  */ 

-

-/**

-* @brief  USBD_CtlSendData

-*         send data on the ctl pipe

-* @param  pdev: device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be sent

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *pbuf,

-                               uint16_t len)

-{

-  /* Set EP0 State */

-  pdev->ep0_state          = USBD_EP0_DATA_IN;                                      

-  pdev->ep_in[0].total_length = len;

-  pdev->ep_in[0].rem_length   = len;

- /* Start the transfer */

-  USBD_LL_Transmit (pdev, 0x00, pbuf, len);  

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlContinueSendData

-*         continue sending data on the ctl pipe

-* @param  pdev: device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be sent

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev, 

-                                       uint8_t *pbuf,

-                                       uint16_t len)

-{

- /* Start the next transfer */

-  USBD_LL_Transmit (pdev, 0x00, pbuf, len);   

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlPrepareRx

-*         receive data on the ctl pipe

-* @param  pdev: device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be received

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev,

-                                  uint8_t *pbuf,                                  

-                                  uint16_t len)

-{

-  /* Set EP0 State */

-  pdev->ep0_state = USBD_EP0_DATA_OUT; 

-  pdev->ep_out[0].total_length = len;

-  pdev->ep_out[0].rem_length   = len;

-  /* Start the transfer */

-  USBD_LL_PrepareReceive (pdev,

-                          0,

-                          pbuf,

-                         len);

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlContinueRx

-*         continue receive data on the ctl pipe

-* @param  pdev: device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be received

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev, 

-                                          uint8_t *pbuf,                                          

-                                          uint16_t len)

-{

-

-  USBD_LL_PrepareReceive (pdev,

-                          0,                     

-                          pbuf,                         

-                          len);

-  return USBD_OK;

-}

-/**

-* @brief  USBD_CtlSendStatus

-*         send zero lzngth packet on the ctl pipe

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev)

-{

-

-  /* Set EP0 State */

-  pdev->ep0_state = USBD_EP0_STATUS_IN;

-  

- /* Start the transfer */

-  USBD_LL_Transmit (pdev, 0x00, NULL, 0);   

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlReceiveStatus

-*         receive zero lzngth packet on the ctl pipe

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev)

-{

-  /* Set EP0 State */

-  pdev->ep0_state = USBD_EP0_STATUS_OUT; 

-  

- /* Start the transfer */  

-  USBD_LL_PrepareReceive ( pdev,

-                    0,

-                    NULL,

-                    0);  

-

-  return USBD_OK;

-}

-

-

-/**

-* @brief  USBD_GetRxCount

-*         returns the received data length

-* @param  pdev: device instance

-* @param  ep_addr: endpoint address

-* @retval Rx Data blength

-*/

-uint16_t  USBD_GetRxCount (USBD_HandleTypeDef  *pdev , uint8_t ep_addr)

-{

-  return USBD_LL_GetRxDataSize(pdev, ep_addr);

-}

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

diff --git a/fw/src/main.c b/fw/src/main.c
index 982b1c2..f4a34d7 100644
--- a/fw/src/main.c
+++ b/fw/src/main.c
@@ -104,21 +104,6 @@ int main(void)
     }

 }

 

-void __libc_init_array(void);

-void __libc_init_array() {

-    /* FIXME Do we even need this? */

-}

-

-void _init(void);

-void _init() {

-    /* FIXME Do we even need this? */

-}

-

-void __assert_func (const char *file, int line, const char * func, const char * exp) {

-    asm volatile ("bkpt");

-    while (1);

-}

-

 static uint32_t poll_encoders() {

     static bool tx_vol_reset = 0;

     static uint16_t tim1_last = 0, tim3_last = 0; /* timers init to 0 */

@@ -173,176 +158,6 @@ static uint32_t poll_keys() {
     return keybits;

 }

 

-const uint8_t _asciimap[128] =

-{

-    0x00,             // NUL

-    0x00,             // SOH

-    0x00,             // STX

-    0x00,             // ETX

-    0x00,             // EOT

-    0x00,             // ENQ

-    0x00,             // ACK

-    0x00,             // BEL

-    0x2a,           // BS   Backspace

-    0x2b,           // TAB  Tab

-    0x28,           // LF   Enter

-    0x00,             // VT

-    0x00,             // FF

-    0x00,             // CR

-    0x00,             // SO

-    0x00,             // SI

-    0x00,             // DEL

-    0x00,             // DC1

-    0x00,             // DC2

-    0x00,             // DC3

-    0x00,             // DC4

-    0x00,             // NAK

-    0x00,             // SYN

-    0x00,             // ETB

-    0x00,             // CAN

-    0x00,             // EM

-    0x00,             // SUB

-    0x00,             // ESC

-    0x00,             // FS

-    0x00,             // GS

-    0x00,             // RS

-    0x00,             // US

-

-    0x2c,          //  ' '

-    0x1e|0x80,    // !

-    0x34|0x80,    // "

-    0x20|0x80,    // #

-    0x21|0x80,    // $

-    0x22|0x80,    // %

-    0x24|0x80,    // &

-    0x34,          // '

-    0x26|0x80,    // (

-    0x27|0x80,    // )

-    0x25|0x80,    // *

-    0x2e|0x80,    // +

-    0x36,          // ,

-    0x2d,          // -

-    0x37,          // .

-    0x38,          // /

-    0x27,          // 0

-    0x1e,          // 1

-    0x1f,          // 2

-    0x20,          // 3

-    0x21,          // 4

-    0x22,          // 5

-    0x23,          // 6

-    0x24,          // 7

-    0x25,          // 8

-    0x26,          // 9

-    0x33|0x80,      // :

-    0x33,          // ;

-    0x36|0x80,      // <

-    0x2e,          // =

-    0x37|0x80,      // >

-    0x38|0x80,      // ?

-    0x1f|0x80,      // @

-    0x04|0x80,      // A

-    0x05|0x80,      // B

-    0x06|0x80,      // C

-    0x07|0x80,      // D

-    0x08|0x80,      // E

-    0x09|0x80,      // F

-    0x0a|0x80,      // G

-    0x0b|0x80,      // H

-    0x0c|0x80,      // I

-    0x0d|0x80,      // J

-    0x0e|0x80,      // K

-    0x0f|0x80,      // L

-    0x10|0x80,      // M

-    0x11|0x80,      // N

-    0x12|0x80,      // O

-    0x13|0x80,      // P

-    0x14|0x80,      // Q

-    0x15|0x80,      // R

-    0x16|0x80,      // S

-    0x17|0x80,      // T

-    0x18|0x80,      // U

-    0x19|0x80,      // V

-    0x1a|0x80,      // W

-    0x1b|0x80,      // X

-    0x1c|0x80,      // Y

-    0x1d|0x80,      // Z

-    0x2f,          // [

-    0x31,          // bslash

-    0x30,          // ]

-    0x23|0x80,    // ^

-    0x2d|0x80,    // _

-    0x35,          // `

-    0x04,          // a

-    0x05,          // b

-    0x06,          // c

-    0x07,          // d

-    0x08,          // e

-    0x09,          // f

-    0x0a,          // g

-    0x0b,          // h

-    0x0c,          // i

-    0x0d,          // j

-    0x0e,          // k

-    0x0f,          // l

-    0x10,          // m

-    0x11,          // n

-    0x12,          // o

-    0x13,          // p

-    0x14,          // q

-    0x15,          // r

-    0x16,          // s

-    0x17,          // t

-    0x18,          // u

-    0x19,          // v

-    0x1a,          // w

-    0x1b,          // x

-    0x1c,          // y

-    0x1d,          // z

-    0x2f|0x80,    // {

-    0x31|0x80,    // |

-    0x30|0x80,    // }

-    0x35|0x80,    // ~

-    0               // DEL

-};

-

-

-void sendChar(uint8_t ch){

-    if( ch > 128 ) ch -=128;

-

-    key.id = 1;

-    key.keycode[0]=_asciimap[ch]&0x7F;

-    key.keycode[1]=0;

-

-    if ( _asciimap[ch] & 0x80) key.modifier |= 0x02;

-

-    for(int i=0; i< 4;i++){

-        USBD_HID_SendReport(&hUsbDeviceFS, (uint8_t *)&key, sizeof(key));

-        HAL_Delay(10);

-    }

-    memset(key.keycode, 0 , sizeof(key.keycode));

-    key.modifier = 0;

-    USBD_HID_SendReport(&hUsbDeviceFS, (uint8_t *)&key, sizeof(key));

-    HAL_Delay(10);

-}

-

-void sendCharWrong(uint8_t ch){

-    key.id = 1;

-    key.keycode[0]=ch&0x7F;

-    key.keycode[1]=0;

-

-    if ( _asciimap[ch] & 0x80) key.modifier |= 0x02;

-

-    for(int i=0; i< 4;i++){

-        USBD_HID_SendReport(&hUsbDeviceFS, (uint8_t *)&key, sizeof(key));

-        HAL_Delay(10);

-    }

-    memset(key.keycode, 0 , sizeof(key.keycode));

-    key.modifier = 0;

-    USBD_HID_SendReport(&hUsbDeviceFS, (uint8_t *)&key, sizeof(key));

-    HAL_Delay(10);

-}

-

 void sendKeybits(uint8_t keybits){

     uint8_t report[2];

     report[0]= HID_MEDIA_REPORT;

@@ -477,3 +292,18 @@ void Error_Handler(void)
     }

 }

 

+void __libc_init_array(void);

+void __libc_init_array() {

+    /* FIXME Do we even need this? */

+}

+

+void _init(void);

+void _init() {

+    /* FIXME Do we even need this? */

+}

+

+void __assert_func (const char *file, int line, const char * func, const char * exp) {

+    asm volatile ("bkpt");

+    while (1);

+}

+

diff --git a/fw/src/usbd_conf.c b/fw/src/usbd_conf.c
index b6815e5..9d82e40 100644
--- a/fw/src/usbd_conf.c
+++ b/fw/src/usbd_conf.c
@@ -578,14 +578,14 @@ void USBD_LL_Delay(uint32_t Delay /* ms */)
     HAL_Delay(Delay);

 }

 

-static USBD_HID_HandleTypeDef *static_hid_handle;

+static USBD_HID_HandleTypeDef static_hid_handle;

 static bool static_hid_handle_allocated = false;

 

 void *USBD_static_malloc(uint32_t size)

 {

     assert(!static_hid_handle_allocated);

     static_hid_handle_allocated = true;

-    return static_hid_handle;

+    return &static_hid_handle;

 }

 

 void USBD_static_free(void *p)

diff --git a/fw/src/usbd_hid.c b/fw/src/usbd_hid.c
index 4d313b4..eaf7878 100644
--- a/fw/src/usbd_hid.c
+++ b/fw/src/usbd_hid.c
@@ -10,6 +10,7 @@ static uint8_t  *USBD_HID_GetCfgDesc (uint16_t *length);
 static uint8_t  *USBD_HID_GetDeviceQualifierDesc (uint16_t *length); 
 static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum); 
 static uint8_t  USBD_HID_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t  USBD_HID_EP0_RxReady(USBD_HandleTypeDef  *pdev);
 
 USBD_ClassTypeDef  USBD_HID = 
 {
@@ -17,7 +18,7 @@ USBD_ClassTypeDef  USBD_HID =
     USBD_HID_DeInit,
     USBD_HID_Setup,
     NULL, /* EP0_TxSent */  
-    NULL, /* EP0_RxReady */
+    USBD_HID_EP0_RxReady,
     USBD_HID_DataIn,
     USBD_HID_DataOut,
     NULL, /* SOF */
@@ -233,64 +234,73 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *
 
     switch (req->bmRequest & USB_REQ_TYPE_MASK)
     {
-    case USB_REQ_TYPE_CLASS :  
-        switch (req->bRequest) {
-        case HID_REQ_SET_PROTOCOL:
-            hhid->Protocol = (uint8_t)(req->wValue);
-            break;
-
-        case HID_REQ_GET_PROTOCOL:
-            USBD_CtlSendData (pdev, 
-                    (uint8_t *)&hhid->Protocol,
-                    1);    
-            break;
-
-        case HID_REQ_SET_IDLE:
-            hhid->IdleState = (uint8_t)(req->wValue >> 8);
-            break;
-
-        case HID_REQ_GET_IDLE:
-            USBD_CtlSendData (pdev, 
-                    (uint8_t *)&hhid->IdleState,
-                    1);        
-            break;      
-
-        default:
-            USBD_CtlError (pdev, req);
-            return USBD_FAIL; 
-        }
-        break;
-
-    case USB_REQ_TYPE_STANDARD:
-        switch (req->bRequest) {
-        case USB_REQ_GET_DESCRIPTOR: 
-            if( req->wValue >> 8 == HID_REPORT_DESC)
-            {
-                len = MIN(HID_REPORT_DESC_SIZE , req->wLength);
-                pbuf = HID_ReportDesc;
+        case USB_REQ_TYPE_CLASS :  
+            switch (req->bRequest) {
+                case HID_REQ_SET_PROTOCOL:
+                    hhid->Protocol = (uint8_t)(req->wValue);
+                    break;
+
+                case HID_REQ_GET_PROTOCOL:
+                    USBD_CtlSendData (pdev, 
+                            (uint8_t *)&hhid->Protocol,
+                            1);    
+                    break;
+
+                case HID_REQ_SET_IDLE:
+                    hhid->IdleState = (uint8_t)(req->wValue >> 8);
+                    break;
+
+                case HID_REQ_GET_IDLE:
+                    USBD_CtlSendData (pdev, 
+                            (uint8_t *)&hhid->IdleState,
+                            1);        
+                    break;      
+
+                case HID_REQ_SET_REPORT:
+                    hhid->IsReportAvailable = 1U;
+                    if (req->wLength > sizeof(hhid->Report_buf)) {
+                        USBD_CtlError (pdev, req);
+                        return USBD_FAIL; 
+                    }
+                    (void)USBD_CtlPrepareRx(pdev, hhid->Report_buf, req->wLength);
+                    break;
+
+                default:
+                    USBD_CtlError (pdev, req);
+                    return USBD_FAIL; 
             }
-            else if( req->wValue >> 8 == HID_DESCRIPTOR_TYPE)
-            {
-                pbuf = USBD_HID_Desc;   
-                len = MIN(USB_HID_DESC_SIZ , req->wLength);
-            }
-
-            USBD_CtlSendData (pdev, 
-                    pbuf,
-                    len);
-
-            break;
-
-        case USB_REQ_GET_INTERFACE :
-            USBD_CtlSendData (pdev,
-                    (uint8_t *)&hhid->AltSetting,
-                    1);
             break;
 
-        case USB_REQ_SET_INTERFACE :
-            hhid->AltSetting = (uint8_t)(req->wValue);
-            break;
-        }
+        case USB_REQ_TYPE_STANDARD:
+            switch (req->bRequest) {
+                case USB_REQ_GET_DESCRIPTOR: 
+                    if( req->wValue >> 8 == HID_REPORT_DESC)
+                    {
+                        len = MIN(HID_REPORT_DESC_SIZE , req->wLength);
+                        pbuf = HID_ReportDesc;
+                    }
+                    else if( req->wValue >> 8 == HID_DESCRIPTOR_TYPE)
+                    {
+                        pbuf = USBD_HID_Desc;   
+                        len = MIN(USB_HID_DESC_SIZ , req->wLength);
+                    }
+
+                    USBD_CtlSendData (pdev, 
+                            pbuf,
+                            len);
+
+                    break;
+
+                case USB_REQ_GET_INTERFACE :
+                    USBD_CtlSendData (pdev,
+                            (uint8_t *)&hhid->AltSetting,
+                            1);
+                    break;
+
+                case USB_REQ_SET_INTERFACE :
+                    hhid->AltSetting = (uint8_t)(req->wValue);
+                    break;
+            }
     }
     return USBD_OK;
 }
@@ -302,8 +312,8 @@ uint8_t USBD_HID_SendReport (USBD_HandleTypeDef  *pdev, uint8_t *report, uint16_
     if (pdev->dev_state != USBD_STATE_CONFIGURED )
         return USBD_OK;
 
-    if(hhid->state == HID_IDLE)
-        return USBD_OK;
+    if(hhid->state != HID_IDLE)
+        return USBD_BUSY;
 
     hhid->state = HID_BUSY;
     USBD_LL_Transmit(pdev, HID_EPIN_ADDR, report, len);
@@ -371,3 +381,24 @@ static uint8_t  *USBD_HID_GetDeviceQualifierDesc (uint16_t *length)
     return USBD_HID_DeviceQualifierDesc;
 }
 
+/**
+ * @brief  USBD_CUSTOM_HID_EP0_RxReady
+ *         Handles control request data.
+ * @param  pdev: device instance
+ * @retval status
+ */
+static uint8_t USBD_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
+{
+    USBD_HID_HandleTypeDef     *hhid = (USBD_HID_HandleTypeDef*) pdev->pClassData;
+
+    if (!hhid)
+        return (uint8_t)USBD_FAIL;
+
+    if (hhid->IsReportAvailable == 1U) {
+        /* FIXME ignore for now */
+        hhid->IsReportAvailable = 0U;
+    }
+
+    return (uint8_t)USBD_OK;
+}
+
diff --git a/fw/src/usbd_hid.h b/fw/src/usbd_hid.h
index fa2f0a2..528747d 100644
--- a/fw/src/usbd_hid.h
+++ b/fw/src/usbd_hid.h
@@ -35,6 +35,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include  "usbd_ioreq.h"
+#include <stdbool.h>
 
 /** @addtogroup STM32_USB_DEVICE_LIBRARY
   * @{
@@ -134,6 +135,8 @@ typedef struct
   uint32_t             Protocol;   
   uint32_t             IdleState;  
   uint32_t             AltSetting;
+  bool                 IsReportAvailable;
+  uint8_t              Report_buf[8];
   HID_StateTypeDef     state;  
 }
 USBD_HID_HandleTypeDef;