All selection of USB Type (None,CDC,CDC+MSC)

Author: GrumpyOldPizza

boards.txt

@@ -32,38 +32,82 @@
 
 #if defined(USBCON)
 
+#define USB_TYPE_NONE    0
+#define USB_TYPE_CDC     1
+#define USB_TYPE_CDC_MSC 2
+
+#if (USB_TYPE == USB_TYPE_CDC_MSC)
+#define USB_CLASS USBD_CDC_MSC_Initialize
+#elif (USB_TYPE == USB_TYPE_CDC)
+#define USB_CLASS USBD_CDC_Initialize
+#endif
+
+static const uint8_t USBDDeviceDescriptor[] = {
+  0x12,                       /* bLength */
+  0x01,                       /* bDescriptorType */ 
+  0x00, 0x02,                 /* bcdUSB */
+  0xef,                       /* bDeviceClass */
+  0x02,                       /* bDeviceSubClass */
+  0x01,                       /* bDeviceProtocol */
+  64,                         /* bMaxPacketSize */
+  LOBYTE(USB_VID),            /* idVendor */
+  HIBYTE(USB_VID),            /* idVendor */
+  LOBYTE(USB_PID),            /* idVendor */
+  HIBYTE(USB_PID),            /* idVendor */
+  0x00, 0x02,                 /* bcdDevice rel. 2.00 */
+  1,                          /* Index of manufacturer string */
+  2,                          /* Index of product string */
+  3,                          /* Index of serial number string */
+  1,                          /* bNumConfigurations */
+};
+
+static const char16_t * USBManufacturer = USB_MANUFACTURER;
+static const char16_t * USBProduct = USB_PRODUCT;
+
 void USBDeviceClass::init()
 {
-    USBD_Initialize(STM32L4_CONFIG_USB_VBUS, STM32L4_USB_IRQ_PRIORITY);
+#if defined(USB_CLASS)
+    USBD_Initialize(USBDDeviceDescriptor, (const uint8_t*)USBManufacturer, (const uint8_t*)USBProduct, USB_CLASS, STM32L4_CONFIG_USB_VBUS, STM32L4_USB_IRQ_PRIORITY);
+#endif
 
     initialized = true;
 }
 
 bool USBDeviceClass::attach()
 {
+#if defined(USB_CLASS)
     if (!initialized)
 	return false;
 
     USBD_Attach();
 
     return true;
+#else
+    return false;
+#endif
 }
 
 bool USBDeviceClass::detach()
 {
+#if defined(USB_CLASS)
     if (!initialized)
 	return false;
 
     USBD_Detach();
 
     return true;
+#else
+    return false;
+#endif
 }
 
 void USBDeviceClass::poll()
 {
+#if defined(USB_CLASS)
     if (initialized) {
 	USBD_Poll();
     }
+#endif
 }
 
 bool USBDeviceClass::connected()

cores/stm32l4/USBCore.cpp

@@ -69,7 +69,13 @@ extern "C" {
 #define STM32L4_TONE_IRQ_PRIORITY    2
 #define STM32L4_SERVO_IRQ_PRIORITY   1
 
-extern void USBD_Initialize(unsigned int pin_vbus, unsigned int priority);
+#define LOBYTE(x)  ((uint8_t)(x & 0x00FF))
+#define HIBYTE(x)  ((uint8_t)((x & 0xFF00) >>8))
+
+extern void USBD_CDC_Initialize(void *);
+extern void USBD_CDC_MSC_Initialize(void *);
+
+extern void USBD_Initialize(const uint8_t *device, const uint8_t *manufacturer, const uint8_t *product, void(*initialize)(void *), unsigned int pin_vbus, unsigned int priority);
 extern void USBD_Attach(void);
 extern void USBD_Detach(void);
 extern void USBD_Poll(void);

cores/stm32l4/stm32l4_wiring_private.h

@@ -31,13 +31,13 @@ compiler.warning_flags.all=-Wall -Wextra
 
 compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 compiler.c.cmd=arm-none-eabi-gcc
-compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
+compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g {build.flags.optimize} {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib -MMD
 compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.c.elf.flags=-Os -Wl,--gc-sections -save-temps
+compiler.c.elf.flags=-g {build.flags.optimize} -Wl,--gc-sections -save-temps
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-c -g -x assembler-with-cpp
 compiler.cpp.cmd=arm-none-eabi-g++
-compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu++11 -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -MMD
+compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g {build.flags.optimize} {compiler.warning_flags} -std=gnu++11 -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib -fno-rtti -fno-exceptions -MMD
 compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs
 compiler.objcopy.cmd=arm-none-eabi-objcopy
@@ -64,6 +64,10 @@ compiler.S.extra_flags=
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
+# USB Flags
+# ---------
+build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' '-DUSB_TYPE={build.usb_type}'
+
 # Compile patterns
 # ----------------
 
@@ -82,7 +86,7 @@ archive_file_path={build.path}/{archive_file}
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group "{build.path}/{archive_file}"  -Wl,--end-group {build.variant_system_libs} -lc -lm
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {build.flags.ldspecs} {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group "{build.path}/{archive_file}"  -Wl,--end-group {build.variant_system_libs} -lc -lm
 
 ## Create output (bin file)
 recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"

platform.txt

@@ -49,12 +49,12 @@
 /** @defgroup usbd_cdc_Exported_Defines
   * @{
   */ 
-#define CDC_IN_EP                                   0x83  /* EP1 for data IN */
-#define CDC_OUT_EP                                  0x03  /* EP1 for data OUT */
-#define CDC_CMD_EP                                  0x82  /* EP2 for CDC commands */
+#define CDC_CMD_EP                                  0x81  /* EP1 for CDC commands */
+#define CDC_IN_EP                                   0x82  /* EP2 for data IN */
+#define CDC_OUT_EP                                  0x02  /* EP2 for data OUT */
 
-#define CDC_CONTROL_INTERFACE                       1
-#define CDC_DATA_INTERFACE                          2
+#define CDC_CONTROL_INTERFACE                       0
+#define CDC_DATA_INTERFACE                          1
 
 /* CDC Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */
 #define CDC_DATA_HS_MAX_PACKET_SIZE                 512  /* Endpoint IN & OUT Packet size */

system/STM32L4xx/Lib/libstm32l432.a

@@ -59,10 +59,10 @@
 #define USB_MSC_CONFIG_DESC_SIZ      32
 
 
-#define MSC_EPIN_ADDR                0x81 
-#define MSC_EPOUT_ADDR               0x01 
+#define MSC_EPIN_ADDR                0x83 
+#define MSC_EPOUT_ADDR               0x03 
 
-#define MSC_INTERFACE                0
+#define MSC_INTERFACE                2
 
 /**
   * @}