diff options
| author | Damien George <damien@micropython.org> | 2021-08-05 12:01:01 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-08-07 23:13:58 +1000 |
| commit | f28e8b90730a3af5dc4149dd2d4e25468944aff6 (patch) | |
| tree | 7c34af5c345d72332df5aca9e964e7b4bd294ecd /ports/stm32/mpconfigboard_common.h | |
| parent | 96c6b8cae3ad5037c41f4e029974fb17d727d012 (diff) | |
| download | micropython-f28e8b90730a3af5dc4149dd2d4e25468944aff6.tar.gz micropython-f28e8b90730a3af5dc4149dd2d4e25468944aff6.zip | |
stm32/usbd_desc: Rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'ports/stm32/mpconfigboard_common.h')
| -rw-r--r-- | ports/stm32/mpconfigboard_common.h | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h index 46456420da..24c5e1a3cd 100644 --- a/ports/stm32/mpconfigboard_common.h +++ b/ports/stm32/mpconfigboard_common.h @@ -180,9 +180,17 @@ /*****************************************************************************/ // USB configuration -// The USBD_xxx VID/PID macros have been renamed to MICROPY_HW_USB_xxx. -#ifdef USBD_VID -#error "Old USBD_VID configuration option used" +// The USBD_xxx macros have been renamed to MICROPY_HW_USB_xxx. +#if defined(USBD_VID) \ + || defined(USBD_LANGID_STRING) \ + || defined(USBD_MANUFACTURER_STRING) \ + || defined(USBD_PRODUCT_HS_STRING) \ + || defined(USBD_PRODUCT_FS_STRING) \ + || defined(USBD_CONFIGURATION_HS_STRING) \ + || defined(USBD_INTERFACE_HS_STRING) \ + || defined(USBD_CONFIGURATION_FS_STRING) \ + || defined(USBD_INTERFACE_FS_STRING) +#error "Old USBD_xxx configuration option used, renamed to MICROPY_HW_USB_xxx" #endif // Default VID and PID values to use for the USB device. If MICROPY_HW_USB_VID @@ -204,6 +212,38 @@ #define MICROPY_HW_USB_PID_CDC3_MSC_HID (0x980a) #endif +#ifndef MICROPY_HW_USB_LANGID_STRING +#define MICROPY_HW_USB_LANGID_STRING 0x409 +#endif + +#ifndef MICROPY_HW_USB_MANUFACTURER_STRING +#define MICROPY_HW_USB_MANUFACTURER_STRING "MicroPython" +#endif + +#ifndef MICROPY_HW_USB_PRODUCT_HS_STRING +#define MICROPY_HW_USB_PRODUCT_HS_STRING "Pyboard Virtual Comm Port in HS Mode" +#endif + +#ifndef MICROPY_HW_USB_PRODUCT_FS_STRING +#define MICROPY_HW_USB_PRODUCT_FS_STRING "Pyboard Virtual Comm Port in FS Mode" +#endif + +#ifndef MICROPY_HW_USB_CONFIGURATION_HS_STRING +#define MICROPY_HW_USB_CONFIGURATION_HS_STRING "Pyboard Config" +#endif + +#ifndef MICROPY_HW_USB_INTERFACE_HS_STRING +#define MICROPY_HW_USB_INTERFACE_HS_STRING "Pyboard Interface" +#endif + +#ifndef MICROPY_HW_USB_CONFIGURATION_FS_STRING +#define MICROPY_HW_USB_CONFIGURATION_FS_STRING "Pyboard Config" +#endif + +#ifndef MICROPY_HW_USB_INTERFACE_FS_STRING +#define MICROPY_HW_USB_INTERFACE_FS_STRING "Pyboard Interface" +#endif + /*****************************************************************************/ // General configuration |