diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-11-25 21:08:51 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-26 08:45:20 -0500 |
| commit | e80ced5568c0a6c8b59035070db7b05df8d7b39c (patch) | |
| tree | 86ab1c20361901ef5dcaa752fd1dcd7db4927c67 | |
| parent | 401f7a879cf80c744203a53aed17d05356ddc4fc (diff) | |
| download | kutter-e80ced5568c0a6c8b59035070db7b05df8d7b39c.tar.gz kutter-e80ced5568c0a6c8b59035070db7b05df8d7b39c.tar.xz kutter-e80ced5568c0a6c8b59035070db7b05df8d7b39c.zip | |
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>
| -rw-r--r-- | docs/Config_Changes.md | 7 | ||||
| -rw-r--r-- | src/generic/usb_cdc.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md index 57cf4176..efd075d0 100644 --- a/docs/Config_Changes.md +++ b/docs/Config_Changes.md @@ -6,9 +6,10 @@ All dates in this document are approximate. # Changes -20191124: The USB names have changed on lpc176x, stm32, atsamd, and -atsam. They now use the unique chip id by default. Update the -"serial" setting in the "mcu" config section accordingly. +20191126: The USB names have changed on micro-controllers with native +USB support. They now use a unique chip id by default (where +available). Update the "serial" setting in the "mcu" config section +accordingly. 20191121: The pressure_advance_lookahead_time parameter has been removed. See example.cfg for alternate configuration settings. diff --git a/src/generic/usb_cdc.c b/src/generic/usb_cdc.c index 9adc0aa9..a282a604 100644 --- a/src/generic/usb_cdc.c +++ b/src/generic/usb_cdc.c @@ -124,11 +124,7 @@ DECL_TASK(usb_bulk_out_task); #define CONCAT1(a, b) a ## b #define CONCAT(a, b) CONCAT1(a, b) #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) -#else -#define USB_STR_PRODUCT u"Klipper firmware" -#endif #define USB_STR_SERIAL CONCAT(u,CONFIG_USB_SERIAL_NUMBER) // String descriptors |