Merge branch 'qt6'

jankae · Jul 16, 2023 · 7370ed7 · 7370ed7
2 parents 8962965 + 727040c
commit 7370ed7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.cpp b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.cpp
@@ -14,6 +14,7 @@ using USBID = struct {
 static constexpr USBID IDs[] = {
     {0x0483, 0x564e},
     {0x0483, 0x4121},
+    {0x1209, 0x4121},
 };
 
 USBInBuffer::USBInBuffer(libusb_device_handle *handle, unsigned char endpoint, int buffer_size) :

diff --git a/Software/VNA_embedded/Application/Drivers/USB/Core/Src/usbd_desc.c b/Software/VNA_embedded/Application/Drivers/USB/Core/Src/usbd_desc.c
@@ -63,10 +63,10 @@
   * @{
   */
 
-#define USBD_VID     					0x0483
+#define USBD_VID     					0x1209
 #define USBD_PID_FS     				0x4121
 #define USBD_LANGID_STRING     			0x0409
-#define USBD_MANUFACTURER_STRING    	"STMicroelectronics"
+#define USBD_MANUFACTURER_STRING    	"LibreVNA"
 #define USBD_PRODUCT_STRING_FS     		"VNA"
 #define USBD_CONFIGURATION_STRING_FS	"CustomUSBDevice Config"
 #define USBD_INTERFACE_STRING_FS     	"CustomUSBDevice Interface"