From aae1cc22f46ee60a7942a4866ddef69e1b4d12e5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Tue, 6 Feb 2018 09:48:41 +1100
Subject: [PATCH] HAL_ChibiOS: updated USB device strings

use defaults or add in serial number
---
 libraries/AP_HAL_ChibiOS/hwdef/cube-red/hwdef.dat  | 2 +-
 libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat     | 4 ++--
 libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat     | 7 -------
 libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat | 7 -------
 libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat  | 7 -------
 libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat | 7 -------
 libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat   | 7 -------
 7 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/cube-red/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/cube-red/hwdef.dat
index 4d1dff5b52..4281f9146c 100644
--- 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
 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
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
index 084bd7760d..87cafc0318 100644
--- 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
 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
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
index fb279b6e04..287eaf9766 100644
--- 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
 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
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
index 1b8c1c9ad5..5caf95ed40 100644
--- 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
 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
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
index 5d9d5f65c9..9c9140950c 100644
--- 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
 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
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
index fc35e65d2d..9d6b551166 100644
--- 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
 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
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
index 565ee38bd9..502f8b38b3 100644
--- 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
 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