djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mimxrt/usb: Change macro name MICROPY_HW_USB_STR_MANUF.

Browse Source 
Change it into MICROPY_HW_USB_MANUFACTURER_STRING to be compatible with
other ports.
This commit is contained in:
robert-hh 2022-11-09 07:39:54 +01:00
parent f44246c4c9
commit 2a4825848c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
View File

@ -1,6 +1,6 @@
#define MICROPY_HW_BOARD_NAME "RT1010-Py-DevKIT"
#define MICROPY_HW_MCU_NAME "MIMXRT1011DAE5A"
#define MICROPY_HW_USB_STR_MANUF "Olimex Ltd."
#define MICROPY_HW_USB_MANUFACTURER_STRING "Olimex Ltd."
#define MICROPY_HW_USB_VID 0x15ba
#define MICROPY_HW_USB_PID 0x0046
#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (0)

6
ports/mimxrt/tusb_port.c
View File

@ -35,8 +35,8 @@
#define MICROPY_HW_USB_PID (0x9802)
#endif
#ifndef MICROPY_HW_USB_STR_MANUF
#define MICROPY_HW_USB_STR_MANUF ("MicroPython")
#ifndef MICROPY_HW_USB_MANUFACTURER_STRING
#define MICROPY_HW_USB_MANUFACTURER_STRING ("MicroPython")
#endif
#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
@ -85,7 +85,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
};
static const char *const usbd_desc_str[] = {
[USBD_STR_MANUF] = MICROPY_HW_USB_STR_MANUF,
[USBD_STR_MANUF] = MICROPY_HW_USB_MANUFACTURER_STRING,
[USBD_STR_PRODUCT] = MICROPY_HW_BOARD_NAME,
[USBD_STR_SERIAL] = "00000000000000000000",
[USBD_STR_CDC] = "Board CDC",