HAL_ChibiOS: updated USB device strings

use defaults or add in serial number
7 years ago · aae1cc22f4
7 changed files with 3 additions and 38 deletions
--- a/libraries/AP_HAL_ChibiOS/hwdef/cube-red/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/cube-red/hwdef.dat
@ -25,7 +25,7 @@ USB_VENDOR 0x2DAE # ONLY FOR USE BY HEX! NOBODY ELSE
				@@ -25,7 +25,7 @@ USB_VENDOR 0x2DAE # ONLY FOR USE BY HEX! NOBODY ELSE
 USB_PRODUCT 0x1002
 USB_STRING_MANUFACTURER "Hex Technology Limited"
 USB_STRING_PRODUCT "ProfiCNC CUBE F7 FMU"
-USB_STRING_SERIAL  "100"
+USB_STRING_SERIAL  "%SERIAL%"

 # order of I2C buses
 I2C_ORDER I2C2 I2C1
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
@ -24,8 +24,8 @@ STDOUT_BAUDRATE 57600
				@@ -24,8 +24,8 @@ STDOUT_BAUDRATE 57600
 USB_VENDOR 0x0483 # ST
 USB_PRODUCT 0x5740
 USB_STRING_MANUFACTURER "ArduPilot"
-USB_STRING_PRODUCT "ChibiOS/RT Virtual COM Port"
-USB_STRING_SERIAL  "100"
+USB_STRING_PRODUCT "%BOARD%"
+USB_STRING_SERIAL  "%SERIAL%"

 # order of I2C buses
 I2C_ORDER I2C2 I2C1
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
@ -20,13 +20,6 @@ FLASH_SIZE_KB 2048
				@@ -20,13 +20,6 @@ FLASH_SIZE_KB 2048
 STDOUT_SERIAL SD7
 STDOUT_BAUDRATE 57600

-# USB setup
-USB_VENDOR 0x0483 # ST
-USB_PRODUCT 0x5740
-USB_STRING_MANUFACTURER "ArduPilot"
-USB_STRING_PRODUCT "ChibiOS/RT Virtual COM Port"
-USB_STRING_SERIAL  "100"
-
 # only one I2C bus
 I2C_ORDER I2C1

--- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
@ -34,13 +34,6 @@ CCM_RAM_SIZE_KB 64
				@@ -34,13 +34,6 @@ CCM_RAM_SIZE_KB 64
 STDOUT_SERIAL SD7
 STDOUT_BAUDRATE 57600

-# USB setup
-USB_VENDOR 0x0483 # ST
-USB_PRODUCT 0x5740
-USB_STRING_MANUFACTURER "ArduPilot"
-USB_STRING_PRODUCT "ChibiOS/RT Virtual COM Port"
-USB_STRING_SERIAL  "100"
-
 # order of I2C buses
 I2C_ORDER I2C1 I2C2

--- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
@ -21,13 +21,6 @@ STM32_VDD 330U
				@@ -21,13 +21,6 @@ STM32_VDD 330U
 STDOUT_SERIAL SD1
 STDOUT_BAUDRATE 115200

-# USB setup
-USB_VENDOR 0x0483 # ST
-USB_PRODUCT 0x5740
-USB_STRING_MANUFACTURER "ArduPilot"
-USB_STRING_PRODUCT "ChibiOS/RT Virtual COM Port"
-USB_STRING_SERIAL  "100"
-
 # only one I2C bus
 I2C_ORDER I2C1

--- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
@ -25,13 +25,6 @@ STM32_VDD 330U
				@@ -25,13 +25,6 @@ STM32_VDD 330U
 STDOUT_SERIAL SD1
 STDOUT_BAUDRATE 115200

-# USB setup
-USB_VENDOR 0x0483 # ST
-USB_PRODUCT 0x5740
-USB_STRING_MANUFACTURER "ArduPilot"
-USB_STRING_PRODUCT "RevoMini"
-USB_STRING_SERIAL  "100"
-
 # only one I2C bus
 I2C_ORDER I2C1

--- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
@ -20,13 +20,6 @@ STM32_VDD 330U
				@@ -20,13 +20,6 @@ STM32_VDD 330U
 STDOUT_SERIAL SD1
 STDOUT_BAUDRATE 115200

-# USB setup
-USB_VENDOR 0x0483 # ST
-USB_PRODUCT 0x5740
-USB_STRING_MANUFACTURER "ArduPilot"
-USB_STRING_PRODUCT "ChibiOS/RT Virtual COM Port"
-USB_STRING_SERIAL  "100"
-
 # only one I2C bus
 I2C_ORDER I2C1