Эх сурвалжийг харах

Change USB CDC device and manufacturer name

Switched to RabbitHoleComputing and ZuluSCSI-F4 for the manufacturer and
product name USB descriptors.
Morio 2 жил өмнө
parent
commit
feb3a46fb3

+ 2 - 0
lib/ZuluSCSI_platform_GD32F450/ZuluSCSI_platform.cpp

@@ -373,6 +373,8 @@ static void usb_log_poll()
 }
 }
 
 
 
 
+
+
 /*****************************************/
 /*****************************************/
 /* Crash handlers                        */
 /* Crash handlers                        */
 /*****************************************/
 /*****************************************/

+ 4 - 4
lib/ZuluSCSI_platform_GD32F450/gd32_cdc_acm_core.c

@@ -213,10 +213,10 @@ static __ALIGN_BEGIN const usb_desc_str manufacturer_string __ALIGN_END =
 {
 {
     .header = 
     .header = 
      {
      {
-         .bLength         = USB_STRING_LEN(10), 
+         .bLength         = USB_STRING_LEN(19), 
          .bDescriptorType = USB_DESCTYPE_STR,
          .bDescriptorType = USB_DESCTYPE_STR,
      },
      },
-    .unicode_string = {'G', 'i', 'g', 'a', 'D', 'e', 'v', 'i', 'c', 'e'}
+    .unicode_string = {'R', 'a', 'b', 'b', 'i', 't', 'H', 'o', 'l','e','C','o','m','p','u','t','i','n','g'}
 };
 };
 
 
 /* USB product string */
 /* USB product string */
@@ -224,10 +224,10 @@ static __ALIGN_BEGIN const usb_desc_str product_string __ALIGN_END =
 {
 {
     .header = 
     .header = 
      {
      {
-         .bLength         = USB_STRING_LEN(12), 
+         .bLength         = USB_STRING_LEN(11), 
          .bDescriptorType = USB_DESCTYPE_STR,
          .bDescriptorType = USB_DESCTYPE_STR,
      },
      },
-    .unicode_string = {'G', 'D', '3', '2', '-', 'C', 'D', 'C', '_', 'A', 'C', 'M'}
+    .unicode_string = {'Z', 'u', 'l', 'u', 'S', 'C', 'S', 'I', '-', 'F', '4'}
 };
 };
 
 
 /* USBD serial string */
 /* USBD serial string */

+ 1 - 1
lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.cpp

@@ -625,7 +625,7 @@ void platform_reset_watchdog()
 void platform_poll()
 void platform_poll()
 {
 {
     usb_log_poll();
     usb_log_poll();
-    //adc_poll();
+    adc_poll();
     
     
 #ifdef ENABLE_AUDIO_OUTPUT
 #ifdef ENABLE_AUDIO_OUTPUT
     audio_poll();
     audio_poll();

+ 1 - 0
platformio.ini

@@ -172,6 +172,7 @@ platform_packages =
     toolchain-gccarmnoneeabi@1.90201.191206
     toolchain-gccarmnoneeabi@1.90201.191206
     framework-spl-gd32@https://github.com/CommunityGD32Cores/gd32-pio-spl-package.git
     framework-spl-gd32@https://github.com/CommunityGD32Cores/gd32-pio-spl-package.git
 extra_scripts = src/build_bootloader.py
 extra_scripts = src/build_bootloader.py
+debug_tool = cmsis-dap
 debug_build_flags = -Os -ggdb -g3
 debug_build_flags = -Os -ggdb -g3
 build_flags = 
 build_flags = 
      -Os -Wall -Wno-sign-compare -ggdb -g3 -Isrc
      -Os -Wall -Wno-sign-compare -ggdb -g3 -Isrc