Added serial number digits to usb itf strings

Author: Ultrawipf

CHANGELOG.md

@@ -1,2 +1,5 @@
 ### Changes this version:
+- Added part of unique serial number to usb interface names for easier identification of multiple devices
+  
+### Changes in 1.12.x:
 - Added support for Simplemotion V2 (Ioni/Argon motor drivers)

Firmware/FFBoard/Inc/USBdevice.h

@@ -21,10 +21,11 @@
  * This class defines a usb device and implements callbacks for getting the basic
  * usb descriptors for tinyusb.
  * Different usb configurations are predefined in usb_descriptors.c
+ * appendSerial: adds the last n chars of the serial number to the interface strings
  */
 class USBdevice : public cpp_freertos::Thread {
 public:
-	USBdevice(const tusb_desc_device_t* deviceDesc,const uint8_t (*confDesc),const usb_string_desc_t* strings);
+	USBdevice(const tusb_desc_device_t* deviceDesc,const uint8_t (*confDesc),const usb_string_desc_t* strings,uint8_t appendSerial = 4);
 	virtual ~USBdevice();
 	void Run(); // Thread loop
 	void virtual registerUsb();
@@ -38,6 +39,7 @@ class USBdevice : public cpp_freertos::Thread {
 	const tusb_desc_device_t* desc_device;
 	const uint8_t* desc_conf; // Device configuration descriptor
 	const usb_string_desc_t* string_desc;
+	uint8_t appendSerial;
 };
 
 #endif /* USB_SRC_USBDEVICE_H_ */

Firmware/FFBoard/Inc/constants.h

@@ -8,7 +8,7 @@
  * For more settings see target_constants.h in a target specific folder
  */
 
-static const uint8_t SW_VERSION_INT[3] = {1,12,0}; // Version as array. 8 bit each!
+static const uint8_t SW_VERSION_INT[3] = {1,12,1}; // Version as array. 8 bit each!
 #define MAX_AXIS 2 // ONLY USE 2 for now else screws HID Reports
 #define FLASH_VERSION 0 // Counter to increase whenever a full flash erase is required.
 

Firmware/FFBoard/Src/USBdevice.cpp

@@ -10,8 +10,8 @@
 
 uint16_t _desc_str[USB_STRING_DESC_BUF_SIZE]; // String buffer
 
-USBdevice::USBdevice(const tusb_desc_device_t* deviceDesc,const uint8_t (*confDesc),const usb_string_desc_t* strings) :
-Thread("USB", 256, 40), desc_device(deviceDesc), desc_conf(confDesc), string_desc(strings) {
+USBdevice::USBdevice(const tusb_desc_device_t* deviceDesc,const uint8_t (*confDesc),const usb_string_desc_t* strings, uint8_t appendSerial) :
+Thread("USB", 256, 40), desc_device(deviceDesc), desc_conf(confDesc), string_desc(strings),appendSerial(appendSerial) {
 
 }
 
@@ -75,6 +75,11 @@ uint16_t* USBdevice::getUsbStringDesc(uint8_t index,uint16_t langid){
 			field = string_desc->manufacturer;
 		}else if(index > 3 && ((index - 4) < (int)string_desc->interfaces.size())){
 			field = string_desc->interfaces[index-4];
+			if(appendSerial){
+				field += "(";
+				field.append(getUsbSerial().substr(0, appendSerial));
+				field += ")";
+			}
 		}else{
 			return NULL;
 		}