From afea8914d003f4ac48b0f2ce9b0fbf022dab6beb Mon Sep 17 00:00:00 2001
From: Boris Honman <justin@jojcorp.com>
Date: Thu, 22 Aug 2019 04:09:06 -0400
Subject: [PATCH] changed USB string identifiers to match the real device

---
 bootloader/src/usb_descriptors.c | 11 +++++------
 firmware/src/usb_descriptors.c   | 10 ++++------
 genDescriptorString.py           | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 genDescriptorString.py

diff --git a/bootloader/src/usb_descriptors.c b/bootloader/src/usb_descriptors.c
index e4018e4..473bee9 100644
--- a/bootloader/src/usb_descriptors.c
+++ b/bootloader/src/usb_descriptors.c
@@ -234,15 +234,14 @@ ROM uint8_t CFG01[CONFIG_DESC_TOTAL_LEN]={
 ROM struct{uint8_t bLength;uint8_t bDscType;uint16_t string[1];}sd000={
 sizeof(sd000),DSC_STR,0x0409};
 
-ROM struct{uint8_t bLength;uint8_t bDscType;uint16_t string[25];}sd001={
+ROM struct{uint8_t bLength;uint8_t bDscType;uint16_t string[6];}sd001={
 sizeof(sd001),DSC_STR,
-'M','i','c','r','o','c','h','i','p',' ',
-'T','e','c','h','n','o','l','o','g','y',' ','I','n','c','.'};
+'H','o','n','m','a','n'};
 
-ROM struct{uint8_t bLength;uint8_t bDscType;uint16_t string[18];}sd002={
+ROM struct{uint8_t bLength;uint8_t bDscType;uint16_t string[29];}sd002={
 sizeof(sd002),DSC_STR,
-'H','I','D',' ','U','S','B',' ','B','o','o',
-'t','l','o','a','d','e','r'};
+'B','I','A',' ','M','i','c','r','o','D','D','R',' ',
+'(','F','W',' ','u','p','d','a','t','e',' ','m','o','d','e',')'};
 
 ROM uint8_t hid_rpt01[HID_RPT01_SIZE]=
 //  First byte in each row is the "item".  First byte's two least significant
diff --git a/firmware/src/usb_descriptors.c b/firmware/src/usb_descriptors.c
index 4455997..c02f922 100644
--- a/firmware/src/usb_descriptors.c
+++ b/firmware/src/usb_descriptors.c
@@ -213,16 +213,14 @@ sizeof(sd000),USB_DESCRIPTOR_STRING,{0x0409
 }};
 
 //Manufacturer string descriptor
-const struct{uint8_t bLength;uint8_t bDscType;uint16_t string[25];}sd001={
+const struct{uint8_t bLength;uint8_t bDscType;uint16_t string[6];}sd001={
 sizeof(sd001),USB_DESCRIPTOR_STRING,
-{'M','i','c','r','o','c','h','i','p',' ',
-'T','e','c','h','n','o','l','o','g','y',' ','I','n','c','.'
-}};
+{'H','o','n','m','a','n'}};
 
 //Product string descriptor
-const struct{uint8_t bLength;uint8_t bDscType;uint16_t string[13];}sd002={
+const struct{uint8_t bLength;uint8_t bDscType;uint16_t string[12];}sd002={
 sizeof(sd002),USB_DESCRIPTOR_STRING,
-{'J','o','y','s','t','i','c','k',' ','D','e','m','o'
+{'B','I','A',' ','M','i','c','r','o','D','D','R'
 }};
 
 //Array of configuration descriptors
diff --git a/genDescriptorString.py b/genDescriptorString.py
new file mode 100644
index 0000000..7017b13
--- /dev/null
+++ b/genDescriptorString.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+import sys
+
+if not len(sys.argv) > 1:
+    exit(0)
+
+instr = ' '.join(sys.argv[1:])
+count = 0
+print('')
+for c in instr:
+    print(f"'{c}',", end='')
+    count += 1
+print('')
+print(f"size: {count}")
+print('')
\ No newline at end of file