3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb_cdc: Report MCU type on all boards 

Always report the "product id" as the MCU type (instead of as "Klipper
firmware").

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-11-25 21:08:51 -05:00
parent 401f7a879c
commit e80ced5568
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/Config_Changes.md
View File

@ -6,9 +6,10 @@ All dates in this document are approximate.
# Changes # Changes
20191124: The USB names have changed on lpc176x, stm32, atsamd, and 20191126: The USB names have changed on micro-controllers with native
atsam. They now use the unique chip id by default. Update the USB support. They now use a unique chip id by default (where
"serial" setting in the "mcu" config section accordingly. available). Update the "serial" setting in the "mcu" config section
accordingly.
20191121: The pressure_advance_lookahead_time parameter has been 20191121: The pressure_advance_lookahead_time parameter has been
removed. See example.cfg for alternate configuration settings. removed. See example.cfg for alternate configuration settings.

4
src/generic/usb_cdc.c
View File

@ -124,11 +124,7 @@ DECL_TASK(usb_bulk_out_task);
#define CONCAT1(a, b) a ## b #define CONCAT1(a, b) a ## b
#define CONCAT(a, b) CONCAT1(a, b) #define CONCAT(a, b) CONCAT1(a, b)
#define USB_STR_MANUFACTURER u"Klipper" #define USB_STR_MANUFACTURER u"Klipper"
#if CONFIG_HAVE_CHIPID // Temporarily limit new names to boards with CHIPID
#define USB_STR_PRODUCT CONCAT(u,CONFIG_MCU) #define USB_STR_PRODUCT CONCAT(u,CONFIG_MCU)
#else
#define USB_STR_PRODUCT u"Klipper firmware"
#endif
#define USB_STR_SERIAL CONCAT(u,CONFIG_USB_SERIAL_NUMBER) #define USB_STR_SERIAL CONCAT(u,CONFIG_USB_SERIAL_NUMBER)
// String descriptors // String descriptors