diff --git a/boards.txt b/boards.txt
index 1720c8c0a0..49da757207 100644
--- a/boards.txt
+++ b/boards.txt
@@ -23,6 +23,23 @@ Nucleo_144.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build
 Nucleo_144.build.flash_offset=0x0
 Nucleo_144.upload.maximum_size=0
 Nucleo_144.upload.maximum_data_size=0
+Nucleo_144.vid.0=0x0483
+Nucleo_144.pid.0=0x5740
+Nucleo_144.vid.1=0x0483
+# STlink V1/V2.1/V3
+Nucleo_144.pid.1=0x3744
+Nucleo_144.vid.2=0x0483
+Nucleo_144.pid.2=0x3748
+Nucleo_144.vid.3=0x0483
+Nucleo_144.pid.3=0x374b
+Nucleo_144.vid.4=0x0483
+Nucleo_144.pid.4=0x374e
+Nucleo_144.vid.5=0x0483
+Nucleo_144.pid.5=0x374f
+Nucleo_144.vid.6=0x0483
+Nucleo_144.pid.6=0x3752
+Nucleo_144.vid.7=0x0483
+Nucleo_144.pid.7=0x3753
 
 # NUCLEO_F207ZG board
 Nucleo_144.menu.pnum.NUCLEO_F207ZG=Nucleo F207ZG
@@ -294,18 +311,18 @@ Nucleo_144.menu.upload_method.MassStorage.upload.protocol=
 Nucleo_144.menu.upload_method.MassStorage.upload.tool=massStorageCopy
 
 Nucleo_144.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Nucleo_144.menu.upload_method.swdMethod.upload.protocol=0
+Nucleo_144.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_144.menu.upload_method.swdMethod.upload.options=
 Nucleo_144.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Nucleo_144.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-Nucleo_144.menu.upload_method.serialMethod.upload.protocol=1
-Nucleo_144.menu.upload_method.serialMethod.upload.options={serial.port.file}
+Nucleo_144.menu.upload_method.serialMethod.upload.protocol=serial
+Nucleo_144.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 Nucleo_144.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 Nucleo_144.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Nucleo_144.menu.upload_method.dfuMethod.upload.protocol=2
-Nucleo_144.menu.upload_method.dfuMethod.upload.options=
+Nucleo_144.menu.upload_method.dfuMethod.upload.protocol=dfu
+Nucleo_144.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_144.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -320,6 +337,22 @@ Nucleo_64.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.
 Nucleo_64.build.flash_offset=0x0
 Nucleo_64.upload.maximum_size=0
 Nucleo_64.upload.maximum_data_size=0
+Nucleo_64.vid.0=0x0483
+Nucleo_64.pid.0=0x5740
+# STlink V1/V2.1/V3
+Nucleo_64.pid.1=0x3744
+Nucleo_64.vid.2=0x0483
+Nucleo_64.pid.2=0x3748
+Nucleo_64.vid.3=0x0483
+Nucleo_64.pid.3=0x374b
+Nucleo_64.vid.4=0x0483
+Nucleo_64.pid.4=0x374e
+Nucleo_64.vid.5=0x0483
+Nucleo_64.pid.5=0x374f
+Nucleo_64.vid.6=0x0483
+Nucleo_64.pid.6=0x3752
+Nucleo_64.vid.7=0x0483
+Nucleo_64.pid.7=0x3753
 
 # NUCLEO_C031C6 board
 Nucleo_64.menu.pnum.NUCLEO_C031C6=Nucleo C031C6
@@ -697,18 +730,18 @@ Nucleo_64.menu.upload_method.MassStorage.upload.protocol=
 Nucleo_64.menu.upload_method.MassStorage.upload.tool=massStorageCopy
 
 Nucleo_64.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Nucleo_64.menu.upload_method.swdMethod.upload.protocol=0
+Nucleo_64.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_64.menu.upload_method.swdMethod.upload.options=
 Nucleo_64.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Nucleo_64.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-Nucleo_64.menu.upload_method.serialMethod.upload.protocol=1
-Nucleo_64.menu.upload_method.serialMethod.upload.options={serial.port.file}
+Nucleo_64.menu.upload_method.serialMethod.upload.protocol=serial
+Nucleo_64.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 Nucleo_64.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 Nucleo_64.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Nucleo_64.menu.upload_method.dfuMethod.upload.protocol=2
-Nucleo_64.menu.upload_method.dfuMethod.upload.options=
+Nucleo_64.menu.upload_method.dfuMethod.upload.protocol=dfu
+Nucleo_64.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_64.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -723,6 +756,22 @@ Nucleo_32.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.
 Nucleo_32.build.flash_offset=0x0
 Nucleo_32.upload.maximum_size=0
 Nucleo_32.upload.maximum_data_size=0
+Nucleo_32.vid.0=0x0483
+Nucleo_32.pid.0=0x5740
+# STlink V1/V2.1/V3
+Nucleo_32.pid.1=0x3744
+Nucleo_32.vid.2=0x0483
+Nucleo_32.pid.2=0x3748
+Nucleo_32.vid.3=0x0483
+Nucleo_32.pid.3=0x374b
+Nucleo_32.vid.4=0x0483
+Nucleo_32.pid.4=0x374e
+Nucleo_32.vid.5=0x0483
+Nucleo_32.pid.5=0x374f
+Nucleo_32.vid.6=0x0483
+Nucleo_32.pid.6=0x3752
+Nucleo_32.vid.7=0x0483
+Nucleo_32.pid.7=0x3753
 
 # NUCLEO_F031K6 board
 Nucleo_32.menu.pnum.NUCLEO_F031K6=Nucleo F031K6
@@ -827,18 +876,18 @@ Nucleo_32.menu.upload_method.MassStorage.upload.protocol=
 Nucleo_32.menu.upload_method.MassStorage.upload.tool=massStorageCopy
 
 Nucleo_32.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Nucleo_32.menu.upload_method.swdMethod.upload.protocol=0
+Nucleo_32.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_32.menu.upload_method.swdMethod.upload.options=
 Nucleo_32.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Nucleo_32.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-Nucleo_32.menu.upload_method.serialMethod.upload.protocol=1
-Nucleo_32.menu.upload_method.serialMethod.upload.options={serial.port.file}
+Nucleo_32.menu.upload_method.serialMethod.upload.protocol=serial
+Nucleo_32.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 Nucleo_32.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 Nucleo_32.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Nucleo_32.menu.upload_method.dfuMethod.upload.protocol=2
-Nucleo_32.menu.upload_method.dfuMethod.upload.options=
+Nucleo_32.menu.upload_method.dfuMethod.upload.protocol=dfu
+Nucleo_32.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_32.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -853,6 +902,22 @@ Disco.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 Disco.build.flash_offset=0x0
 Disco.upload.maximum_size=0
 Disco.upload.maximum_data_size=0
+Disco.vid.0=0x0483
+Disco.pid.0=0x5740
+# STlink V1/V2.1/V3
+Disco.pid.1=0x3744
+Disco.vid.2=0x0483
+Disco.pid.2=0x3748
+Disco.vid.3=0x0483
+Disco.pid.3=0x374b
+Disco.vid.4=0x0483
+Disco.pid.4=0x374e
+Disco.vid.5=0x0483
+Disco.pid.5=0x374f
+Disco.vid.6=0x0483
+Disco.pid.6=0x3752
+Disco.vid.7=0x0483
+Disco.pid.7=0x3753
 
 # B_G431B_ESC1 board
 Disco.menu.pnum.B_G431B_ESC1=B-G431B-ESC1
@@ -1095,18 +1160,18 @@ Disco.menu.upload_method.MassStorage.upload.protocol=
 Disco.menu.upload_method.MassStorage.upload.tool=massStorageCopy
 
 Disco.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Disco.menu.upload_method.swdMethod.upload.protocol=0
+Disco.menu.upload_method.swdMethod.upload.protocol=swd
 Disco.menu.upload_method.swdMethod.upload.options=
 Disco.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Disco.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-Disco.menu.upload_method.serialMethod.upload.protocol=1
-Disco.menu.upload_method.serialMethod.upload.options={serial.port.file}
+Disco.menu.upload_method.serialMethod.upload.protocol=serial
+Disco.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 Disco.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 Disco.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Disco.menu.upload_method.dfuMethod.upload.protocol=2
-Disco.menu.upload_method.dfuMethod.upload.options=
+Disco.menu.upload_method.dfuMethod.upload.protocol=dfu
+Disco.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Disco.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -1121,6 +1186,22 @@ Eval.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSeri
 Eval.build.flash_offset=0x0
 Eval.upload.maximum_size=0
 Eval.upload.maximum_data_size=0
+Eval.vid.0=0x0483
+Eval.pid.0=0x5740
+# STlink V1/V2.1/V3
+Eval.pid.1=0x3744
+Eval.vid.2=0x0483
+Eval.pid.2=0x3748
+Eval.vid.3=0x0483
+Eval.pid.3=0x374b
+Eval.vid.4=0x0483
+Eval.pid.4=0x374e
+Eval.vid.5=0x0483
+Eval.pid.5=0x374f
+Eval.vid.6=0x0483
+Eval.pid.6=0x3752
+Eval.vid.7=0x0483
+Eval.pid.7=0x3753
 
 # STEVAL_MKSBOX1V1 board
 Eval.menu.pnum.STEVAL_MKSBOX1V1=SensorTile.box
@@ -1150,13 +1231,13 @@ Eval.menu.pnum.STEVAL_MKBOXPRO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 
 # Upload menu
 Eval.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Eval.menu.upload_method.swdMethod.upload.protocol=0
+Eval.menu.upload_method.swdMethod.upload.protocol=swd
 Eval.menu.upload_method.swdMethod.upload.options=
 Eval.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Eval.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Eval.menu.upload_method.dfuMethod.upload.protocol=2
-Eval.menu.upload_method.dfuMethod.upload.options=
+Eval.menu.upload_method.dfuMethod.upload.protocol=dfu
+Eval.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Eval.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -1212,6 +1293,8 @@ GenC0.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=
 GenC0.build.flash_offset=0x0
 GenC0.upload.maximum_size=0
 GenC0.upload.maximum_data_size=0
+GenC0.vid.0=0x0483
+GenC0.pid.0=0x5740
 
 # Generic C011D6Yx
 GenC0.menu.pnum.GENERIC_C011D6YX=Generic C011D6Yx
@@ -1303,13 +1386,13 @@ GenC0.menu.pnum.GENERIC_C031F6PX.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)
 
 # Upload menu
 GenC0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenC0.menu.upload_method.swdMethod.upload.protocol=0
+GenC0.menu.upload_method.swdMethod.upload.protocol=swd
 GenC0.menu.upload_method.swdMethod.upload.options=
 GenC0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenC0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenC0.menu.upload_method.serialMethod.upload.protocol=1
-GenC0.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenC0.menu.upload_method.serialMethod.upload.protocol=serial
+GenC0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenC0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 ###############################
@@ -1324,6 +1407,8 @@ GenF0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenF0.build.flash_offset=0x0
 GenF0.upload.maximum_size=0
 GenF0.upload.maximum_data_size=0
+GenF0.vid.0=0x0483
+GenF0.pid.0=0x5740
 
 # DEMO_F030F4 board
 GenF0.menu.pnum.DEMO_F030F4=STM32F030F4 Demo board (HSE 8Mhz)
@@ -2106,18 +2191,18 @@ GenF0.menu.pnum.GENERIC_F098VCTX.build.variant=STM32F0xx/F098VC(H-T)
 
 # Upload menu
 GenF0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenF0.menu.upload_method.swdMethod.upload.protocol=0
+GenF0.menu.upload_method.swdMethod.upload.protocol=swd
 GenF0.menu.upload_method.swdMethod.upload.options=
 GenF0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenF0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenF0.menu.upload_method.serialMethod.upload.protocol=1
-GenF0.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenF0.menu.upload_method.serialMethod.upload.protocol=serial
+GenF0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenF0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenF0.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenF0.menu.upload_method.dfuMethod.upload.protocol=2
-GenF0.menu.upload_method.dfuMethod.upload.options=
+GenF0.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenF0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -2132,6 +2217,11 @@ GenF1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenF1.build.flash_offset=0x0
 GenF1.upload.maximum_size=0
 GenF1.upload.maximum_data_size=0
+GenF1.vid.0=0x0483
+GenF1.pid.0=0x5740
+# DFU mode on built-in bootloader not available, assuming using STM32duino-bootloader
+GenF1.upload.vid.0=0xleaf
+GenF1.upload.pid.0=0x0003
 
 # BLUEPILL_F103C6 board
 GenF1.menu.pnum.BLUEPILL_F103C6=BluePill F103C6 (32K)
@@ -2834,18 +2924,18 @@ GenF1.menu.pnum.GENERIC_F103ZGTX.build.variant=STM32F1xx/F103Z(F-G)(H-T)
 
 # Upload menu
 GenF1.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenF1.menu.upload_method.swdMethod.upload.protocol=0
+GenF1.menu.upload_method.swdMethod.upload.protocol=swd
 GenF1.menu.upload_method.swdMethod.upload.options=
 GenF1.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenF1.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenF1.menu.upload_method.serialMethod.upload.protocol=1
-GenF1.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenF1.menu.upload_method.serialMethod.upload.protocol=serial
+GenF1.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenF1.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenF1.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenF1.menu.upload_method.dfuMethod.upload.protocol=2
-GenF1.menu.upload_method.dfuMethod.upload.options=
+GenF1.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenF1.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF1.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 GenF1.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
@@ -2861,7 +2951,6 @@ GenF1.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
 GenF1.menu.upload_method.dfu2Method=Maple DFU Bootloader 2.0
 GenF1.menu.upload_method.dfu2Method.upload.protocol=maple
 GenF1.menu.upload_method.dfu2Method.upload.tool=maple_upload
-GenF1.menu.upload_method.dfu2Method.upload.usbID=1EAF:0003
 GenF1.menu.upload_method.dfu2Method.upload.altID=2
 GenF1.menu.upload_method.dfu2Method.build.flash_offset=0x2000
 GenF1.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF
@@ -2869,7 +2958,6 @@ GenF1.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF
 GenF1.menu.upload_method.dfuoMethod=Maple DFU Bootloader original
 GenF1.menu.upload_method.dfuoMethod.upload.protocol=maple
 GenF1.menu.upload_method.dfuoMethod.upload.tool=maple_upload
-GenF1.menu.upload_method.dfuoMethod.upload.usbID=1EAF:0003
 GenF1.menu.upload_method.dfuoMethod.upload.altID=1
 GenF1.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
 GenF1.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
@@ -2886,6 +2974,8 @@ GenF2.build.series=STM32F2xx
 GenF2.build.flash_offset=0x0
 GenF2.upload.maximum_size=0
 GenF2.upload.maximum_data_size=0
+GenF2.vid.0=0x0483
+GenF2.pid.0=0x5740
 
 # Generic F205RBTx
 GenF2.menu.pnum.GENERIC_F205RBTX=Generic F205RBTx
@@ -3265,18 +3355,18 @@ GenF2.menu.pnum.GENERIC_F217ZGTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E
 
 # Upload menu
 GenF2.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenF2.menu.upload_method.swdMethod.upload.protocol=0
+GenF2.menu.upload_method.swdMethod.upload.protocol=swd
 GenF2.menu.upload_method.swdMethod.upload.options=
 GenF2.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenF2.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenF2.menu.upload_method.serialMethod.upload.protocol=1
-GenF2.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenF2.menu.upload_method.serialMethod.upload.protocol=serial
+GenF2.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenF2.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenF2.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenF2.menu.upload_method.dfuMethod.upload.protocol=2
-GenF2.menu.upload_method.dfuMethod.upload.options=
+GenF2.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenF2.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF2.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -3294,6 +3384,8 @@ GenF3.build.series=STM32F3xx
 GenF3.build.flash_offset=0x0
 GenF3.upload.maximum_size=0
 GenF3.upload.maximum_data_size=0
+GenF3.vid.0=0x0483
+GenF3.pid.0=0x5740
 
 # BLACKPILL_F303CC
 GenF3.menu.pnum.BLACKPILL_F303CC=RobotDyn BlackPill F303CC
@@ -3667,18 +3759,18 @@ GenF3.menu.pnum.GENERIC_F398VETX.build.variant=STM32F3xx/F398VET
 
 # Upload menu
 GenF3.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenF3.menu.upload_method.swdMethod.upload.protocol=0
+GenF3.menu.upload_method.swdMethod.upload.protocol=swd
 GenF3.menu.upload_method.swdMethod.upload.options=
 GenF3.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenF3.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenF3.menu.upload_method.serialMethod.upload.protocol=1
-GenF3.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenF3.menu.upload_method.serialMethod.upload.protocol=serial
+GenF3.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenF3.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenF3.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenF3.menu.upload_method.dfuMethod.upload.protocol=2
-GenF3.menu.upload_method.dfuMethod.upload.options=
+GenF3.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenF3.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF3.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 GenF3.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
@@ -3700,6 +3792,8 @@ GenF4.build.series=STM32F4xx
 GenF4.build.flash_offset=0x0
 GenF4.upload.maximum_size=0
 GenF4.upload.maximum_data_size=0
+GenF4.vid.0=0x0483
+GenF4.pid.0=0x5740
 
 # Black F407VE
 # https://github.com/mcauser/BLACK_F407VEZ
@@ -4569,18 +4663,18 @@ GenF4.menu.pnum.GENERIC_F446ZETX.build.variant=STM32F4xx/F446Z(C-E)(H-J-T)
 
 # Upload menu
 GenF4.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenF4.menu.upload_method.swdMethod.upload.protocol=0
+GenF4.menu.upload_method.swdMethod.upload.protocol=swd
 GenF4.menu.upload_method.swdMethod.upload.options=
 GenF4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenF4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenF4.menu.upload_method.serialMethod.upload.protocol=1
-GenF4.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenF4.menu.upload_method.serialMethod.upload.protocol=serial
+GenF4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenF4.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenF4.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenF4.menu.upload_method.dfuMethod.upload.protocol=2
-GenF4.menu.upload_method.dfuMethod.upload.options=
+GenF4.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenF4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 GenF4.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
@@ -4608,6 +4702,8 @@ GenF7.build.series=STM32F7xx
 GenF7.build.flash_offset=0x0
 GenF7.upload.maximum_size=0
 GenF7.upload.maximum_data_size=0
+GenF7.vid.0=0x0483
+GenF7.pid.0=0x5740
 
 # Generic F722RCTx
 GenF7.menu.pnum.GENERIC_F722RCTX=Generic F722RCTx
@@ -5051,18 +5147,18 @@ GenF7.menu.pnum.GENERIC_F777ZITX.build.variant=STM32F7xx/F765Z(G-I)T_F767Z(G-I)T
 
 # Upload menu
 GenF7.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenF7.menu.upload_method.swdMethod.upload.protocol=0
+GenF7.menu.upload_method.swdMethod.upload.protocol=swd
 GenF7.menu.upload_method.swdMethod.upload.options=
 GenF7.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenF7.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenF7.menu.upload_method.serialMethod.upload.protocol=1
-GenF7.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenF7.menu.upload_method.serialMethod.upload.protocol=serial
+GenF7.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenF7.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenF7.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenF7.menu.upload_method.dfuMethod.upload.protocol=2
-GenF7.menu.upload_method.dfuMethod.upload.options=
+GenF7.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenF7.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF7.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ###############################
@@ -5077,6 +5173,8 @@ GenG0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenG0.build.flash_offset=0x0
 GenG0.upload.maximum_size=0
 GenG0.upload.maximum_data_size=0
+GenG0.vid.0=0x0483
+GenG0.pid.0=0x5740
 
 # AGAFIA SG0
 GenG0.menu.pnum.AGAFIA_SG0=AGAFIA SG0
@@ -6306,18 +6404,18 @@ GenG0.menu.pnum.GENERIC_G0C1RETX.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E
 
 # Upload menu
 GenG0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenG0.menu.upload_method.swdMethod.upload.protocol=0
+GenG0.menu.upload_method.swdMethod.upload.protocol=swd
 GenG0.menu.upload_method.swdMethod.upload.options=
 GenG0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenG0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenG0.menu.upload_method.serialMethod.upload.protocol=1
-GenG0.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenG0.menu.upload_method.serialMethod.upload.protocol=serial
+GenG0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenG0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenG0.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenG0.menu.upload_method.dfuMethod.upload.protocol=2
-GenG0.menu.upload_method.dfuMethod.upload.options=
+GenG0.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenG0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenG0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ###############################
@@ -6334,6 +6432,8 @@ GenG4.build.series=STM32G4xx
 GenG4.build.flash_offset=0x0
 GenG4.upload.maximum_size=0
 GenG4.upload.maximum_data_size=0
+GenG4.vid.0=0x0483
+GenG4.pid.0=0x5740
 
 # Generic G431C6Tx
 GenG4.menu.pnum.GENERIC_G431C6TX=Generic G431C6Tx
@@ -7343,22 +7443,20 @@ GenG4.menu.pnum.GENERIC_G4A1VETX.build.board=GENERIC_G4A1VETX
 GenG4.menu.pnum.GENERIC_G4A1VETX.build.product_line=STM32G4A1xx
 GenG4.menu.pnum.GENERIC_G4A1VETX.build.variant=STM32G4xx/G491V(C-E)T_G4A1VET
 
-
-
 # Upload menu
 GenG4.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenG4.menu.upload_method.swdMethod.upload.protocol=0
+GenG4.menu.upload_method.swdMethod.upload.protocol=swd
 GenG4.menu.upload_method.swdMethod.upload.options=
 GenG4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenG4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenG4.menu.upload_method.serialMethod.upload.protocol=1
-GenG4.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenG4.menu.upload_method.serialMethod.upload.protocol=serial
+GenG4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenG4.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenG4.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenG4.menu.upload_method.dfuMethod.upload.protocol=2
-GenG4.menu.upload_method.dfuMethod.upload.options=
+GenG4.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenG4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenG4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -7375,6 +7473,8 @@ GenH5.build.series=STM32H5xx
 GenH5.build.flash_offset=0x0
 GenH5.upload.maximum_size=0
 GenH5.upload.maximum_data_size=0
+GenH5.vid.0=0x0483
+GenH5.pid.0=0x5740
 
 # Generic H503RBTx
 GenH5.menu.pnum.GENERIC_H503RBTX=Generic H503RBTx
@@ -7426,18 +7526,18 @@ GenH5.menu.pnum.GENERIC_H573ZITX.build.variant=STM32H5xx/H563Z(G-I)T_H573ZIT
 
 # Upload menu
 GenH5.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenH5.menu.upload_method.swdMethod.upload.protocol=0
+GenH5.menu.upload_method.swdMethod.upload.protocol=swd
 GenH5.menu.upload_method.swdMethod.upload.options=
 GenH5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenH5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenH5.menu.upload_method.serialMethod.upload.protocol=1
-GenH5.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenH5.menu.upload_method.serialMethod.upload.protocol=serial
+GenH5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenH5.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenH5.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenH5.menu.upload_method.dfuMethod.upload.protocol=2
-GenH5.menu.upload_method.dfuMethod.upload.options=
+GenH5.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenH5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenH5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -7454,6 +7554,8 @@ GenH7.build.mcu=cortex-m7
 GenH7.build.flash_offset=0x0
 GenH7.upload.maximum_size=0
 GenH7.upload.maximum_data_size=0
+GenH7.vid.0=0x0483
+GenH7.pid.0=0x5740
 
 # Daisy Seed board
 GenH7.menu.pnum.DAISY_SEED=Daisy Seed
@@ -7938,18 +8040,18 @@ GenH7.menu.pnum.GENERIC_H757XIHX.build.variant=STM32H7xx/H742X(G-I)H_H743X(G-I)H
 
 # Upload menu
 GenH7.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenH7.menu.upload_method.swdMethod.upload.protocol=0
+GenH7.menu.upload_method.swdMethod.upload.protocol=swd
 GenH7.menu.upload_method.swdMethod.upload.options=
 GenH7.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenH7.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenH7.menu.upload_method.serialMethod.upload.protocol=1
-GenH7.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenH7.menu.upload_method.serialMethod.upload.protocol=serial
+GenH7.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenH7.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenH7.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenH7.menu.upload_method.dfuMethod.upload.protocol=2
-GenH7.menu.upload_method.dfuMethod.upload.options=
+GenH7.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenH7.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenH7.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -7964,6 +8066,8 @@ GenL0.build.series=STM32L0xx
 GenL0.build.flash_offset=0x0
 GenL0.upload.maximum_size=0
 GenL0.upload.maximum_data_size=0
+GenL0.vid.0=0x0483
+GenL0.pid.0=0x5740
 
 # ThunderPack
 GenL0.menu.pnum.THUNDERPACK_L072=ThunderPack v1.0
@@ -9043,18 +9147,18 @@ GenL0.menu.pnum.GENERIC_L083V8TX.build.variant=STM32L0xx/L072V(8-B-Z)(I-T)_L073V
 
 # Upload menu
 GenL0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenL0.menu.upload_method.swdMethod.upload.protocol=0
+GenL0.menu.upload_method.swdMethod.upload.protocol=swd
 GenL0.menu.upload_method.swdMethod.upload.options=
 GenL0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenL0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenL0.menu.upload_method.serialMethod.upload.protocol=1
-GenL0.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenL0.menu.upload_method.serialMethod.upload.protocol=serial
+GenL0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenL0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenL0.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenL0.menu.upload_method.dfuMethod.upload.protocol=2
-GenL0.menu.upload_method.dfuMethod.upload.options=
+GenL0.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenL0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 GenL0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
@@ -9073,6 +9177,8 @@ GenL1.build.series=STM32L1xx
 GenL1.build.flash_offset=0x0
 GenL1.upload.maximum_size=0
 GenL1.upload.maximum_data_size=0
+GenL1.vid.0=0x0483
+GenL1.pid.0=0x5740
 
 # Generic L100C6Ux
 GenL1.menu.pnum.GENERIC_L100C6UX=Generic L100C6Ux
@@ -9332,18 +9438,18 @@ GenL1.menu.pnum.GENERIC_L162ZDTX.build.variant=STM32L1xx/L151ZDT_L152ZDT_L162ZDT
 
 # Upload menu
 GenL1.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenL1.menu.upload_method.swdMethod.upload.protocol=0
+GenL1.menu.upload_method.swdMethod.upload.protocol=swd
 GenL1.menu.upload_method.swdMethod.upload.options=
 GenL1.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenL1.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenL1.menu.upload_method.serialMethod.upload.protocol=1
-GenL1.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenL1.menu.upload_method.serialMethod.upload.protocol=serial
+GenL1.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenL1.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenL1.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenL1.menu.upload_method.dfuMethod.upload.protocol=2
-GenL1.menu.upload_method.dfuMethod.upload.options=
+GenL1.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenL1.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL1.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -9360,6 +9466,8 @@ GenL4.build.series=STM32L4xx
 GenL4.build.flash_offset=0x0
 GenL4.upload.maximum_size=0
 GenL4.upload.maximum_data_size=0
+GenL4.vid.0=0x0483
+GenL4.pid.0=0x5740
 
 # Leafony AP03
 GenL4.menu.pnum.LEAFONY_AP03=Leafony AP03
@@ -10012,18 +10120,18 @@ GenL4.menu.pnum.GENERIC_L4S9ZIYX.build.variant=STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y
 
 # Upload menu
 GenL4.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenL4.menu.upload_method.swdMethod.upload.protocol=0
+GenL4.menu.upload_method.swdMethod.upload.protocol=swd
 GenL4.menu.upload_method.swdMethod.upload.options=
 GenL4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenL4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenL4.menu.upload_method.serialMethod.upload.protocol=1
-GenL4.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenL4.menu.upload_method.serialMethod.upload.protocol=serial
+GenL4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenL4.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenL4.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenL4.menu.upload_method.dfuMethod.upload.protocol=2
-GenL4.menu.upload_method.dfuMethod.upload.options=
+GenL4.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenL4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10040,6 +10148,8 @@ GenL5.build.series=STM32L5xx
 GenL5.build.flash_offset=0x0
 GenL5.upload.maximum_size=0
 GenL5.upload.maximum_data_size=0
+GenL5.vid.0=0x0483
+GenL5.pid.0=0x5740
 
 # Generic L552ZCTxQ
 GenL5.menu.pnum.GENERIC_L552ZCTXQ=Generic L552ZCTxQ
@@ -10067,18 +10177,18 @@ GenL5.menu.pnum.GENERIC_L562ZETXQ.build.variant=STM32L5xx/L552Z(C-E)TxQ_L562ZETx
 
 # Upload menu
 GenL5.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenL5.menu.upload_method.swdMethod.upload.protocol=0
+GenL5.menu.upload_method.swdMethod.upload.protocol=swd
 GenL5.menu.upload_method.swdMethod.upload.options=
 GenL5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenL5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenL5.menu.upload_method.serialMethod.upload.protocol=1
-GenL5.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenL5.menu.upload_method.serialMethod.upload.protocol=serial
+GenL5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenL5.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenL5.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenL5.menu.upload_method.dfuMethod.upload.protocol=2
-GenL5.menu.upload_method.dfuMethod.upload.options=
+GenL5.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenL5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10095,6 +10205,8 @@ GenU5.build.series=STM32U5xx
 GenU5.build.flash_offset=0x0
 GenU5.upload.maximum_size=0
 GenU5.upload.maximum_data_size=0
+GenU5.vid.0=0x0483
+GenU5.pid.0=0x5740
 
 # Generic U575AGIxQ
 GenU5.menu.pnum.GENERIC_U575AGIXQ=Generic U575AGIxQ
@@ -10178,18 +10290,18 @@ GenU5.menu.pnum.GENERIC_U585ZITXQ.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITx
 
 # Upload menu
 GenU5.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenU5.menu.upload_method.swdMethod.upload.protocol=0
+GenU5.menu.upload_method.swdMethod.upload.protocol=swd
 GenU5.menu.upload_method.swdMethod.upload.options=
 GenU5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenU5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenU5.menu.upload_method.serialMethod.upload.protocol=1
-GenU5.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenU5.menu.upload_method.serialMethod.upload.protocol=serial
+GenU5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenU5.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenU5.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenU5.menu.upload_method.dfuMethod.upload.protocol=2
-GenU5.menu.upload_method.dfuMethod.upload.options=
+GenU5.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenU5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenU5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10206,6 +10318,8 @@ GenWB.build.series=STM32WBxx
 GenWB.build.flash_offset=0x0
 GenWB.upload.maximum_size=0
 GenWB.upload.maximum_data_size=0
+GenWB.vid.0=0x0483
+GenWB.pid.0=0x5740
 
 # Generic WB15CCUx
 GenWB.menu.pnum.GENERIC_WB15CCUX=Generic WB15CCUx
@@ -10273,18 +10387,18 @@ GenWB.menu.pnum.GENERIC_WB55RGVX.build.variant=STM32WBxx/WB55R(C-E-G)V
 
 # Upload menu
 GenWB.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenWB.menu.upload_method.swdMethod.upload.protocol=0
+GenWB.menu.upload_method.swdMethod.upload.protocol=swd
 GenWB.menu.upload_method.swdMethod.upload.options=
 GenWB.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenWB.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenWB.menu.upload_method.serialMethod.upload.protocol=1
-GenWB.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenWB.menu.upload_method.serialMethod.upload.protocol=serial
+GenWB.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenWB.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenWB.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenWB.menu.upload_method.dfuMethod.upload.protocol=2
-GenWB.menu.upload_method.dfuMethod.upload.options=
+GenWB.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenWB.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenWB.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10301,6 +10415,8 @@ GenWBA.build.series=STM32WBAxx
 GenWBA.build.flash_offset=0x0
 GenWBA.upload.maximum_size=0
 GenWBA.upload.maximum_data_size=0
+GenWBA.vid.0=0x0483
+GenWBA.pid.0=0x5740
 
 # Generic WBA55CEUx
 GenWBA.menu.pnum.GENERIC_WBA55CEUX=Generic WBA55CEUx
@@ -10320,13 +10436,13 @@ GenWBA.menu.pnum.GENERIC_WBA55CGUX.build.variant=STM32WBAxx/WBA55C(E-G)U
 
 # Upload menu
 GenWBA.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenWBA.menu.upload_method.swdMethod.upload.protocol=0
+GenWBA.menu.upload_method.swdMethod.upload.protocol=swd
 GenWBA.menu.upload_method.swdMethod.upload.options=
 GenWBA.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenWBA.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenWBA.menu.upload_method.serialMethod.upload.protocol=1
-GenWBA.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenWBA.menu.upload_method.serialMethod.upload.protocol=serial
+GenWBA.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenWBA.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10343,6 +10459,8 @@ GenWL.build.series=STM32WLxx
 GenWL.build.flash_offset=0x0
 GenWL.upload.maximum_size=0
 GenWL.upload.maximum_data_size=0
+GenWL.vid.0=0x0483
+GenWL.pid.0=0x5740
 
 # Generic WL54CCUx
 GenWL.menu.pnum.GENERIC_WL54CCUX=Generic WL54CCUx
@@ -10474,18 +10592,18 @@ GenWL.menu.pnum.GENERIC_WLE5JCIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8
 
 # Upload menu
 GenWL.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenWL.menu.upload_method.swdMethod.upload.protocol=0
+GenWL.menu.upload_method.swdMethod.upload.protocol=swd
 GenWL.menu.upload_method.swdMethod.upload.options=
 GenWL.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenWL.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenWL.menu.upload_method.serialMethod.upload.protocol=1
-GenWL.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenWL.menu.upload_method.serialMethod.upload.protocol=serial
+GenWL.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenWL.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenWL.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenWL.menu.upload_method.dfuMethod.upload.protocol=2
-GenWL.menu.upload_method.dfuMethod.upload.options=
+GenWL.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenWL.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10500,6 +10618,8 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.build.flash_offset=0x0
 3dprinter.upload.maximum_size=0
 3dprinter.upload.maximum_data_size=0
+3dprinter.vid.0=0x0483
+3dprinter.pid.0=0x5740
 
 # ARMED_V1 board
 3dprinter.menu.pnum.ARMED_V1=Armed V1
@@ -10677,18 +10797,18 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 # Upload menu
 3dprinter.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-3dprinter.menu.upload_method.swdMethod.upload.protocol=0
+3dprinter.menu.upload_method.swdMethod.upload.protocol=swd
 3dprinter.menu.upload_method.swdMethod.upload.options=
 3dprinter.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 3dprinter.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-3dprinter.menu.upload_method.serialMethod.upload.protocol=1
-3dprinter.menu.upload_method.serialMethod.upload.options={serial.port.file}
+3dprinter.menu.upload_method.serialMethod.upload.protocol=serial
+3dprinter.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 3dprinter.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 3dprinter.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-3dprinter.menu.upload_method.dfuMethod.upload.protocol=2
-3dprinter.menu.upload_method.dfuMethod.upload.options=
+3dprinter.menu.upload_method.dfuMethod.upload.protocol=dfu
+3dprinter.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 3dprinter.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10703,6 +10823,8 @@ BluesW.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSe
 BluesW.build.flash_offset=0x0
 BluesW.upload.maximum_size=0
 BluesW.upload.maximum_data_size=0
+BluesW.vid.0=0x0483
+BluesW.pid.0=0x5740
 
 # Swan R5 board
 BluesW.menu.pnum.SWAN_R5=Swan R5
@@ -10719,18 +10841,18 @@ BluesW.menu.pnum.SWAN_R5.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 
 # Upload menu
 BluesW.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-BluesW.menu.upload_method.swdMethod.upload.protocol=0
+BluesW.menu.upload_method.swdMethod.upload.protocol=swd
 BluesW.menu.upload_method.swdMethod.upload.options=
 BluesW.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 BluesW.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-BluesW.menu.upload_method.serialMethod.upload.protocol=1
-BluesW.menu.upload_method.serialMethod.upload.options={serial.port.file}
+BluesW.menu.upload_method.serialMethod.upload.protocol=serial
+BluesW.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 BluesW.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 BluesW.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-BluesW.menu.upload_method.dfuMethod.upload.protocol=2
-BluesW.menu.upload_method.dfuMethod.upload.options=
+BluesW.menu.upload_method.dfuMethod.upload.protocol=dfu
+BluesW.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 BluesW.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10745,6 +10867,8 @@ Elecgator.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.
 Elecgator.build.flash_offset=0x0
 Elecgator.upload.maximum_size=0
 Elecgator.upload.maximum_data_size=0
+Elecgator.vid.0=0x0483
+Elecgator.pid.0=0x5740
 
 # EtherCATduino board
 Elecgator.menu.pnum.ETHERCAT_DUINO=EtherCATduino
@@ -10761,13 +10885,13 @@ Elecgator.menu.pnum.ETHERCAT_DUINO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PIN
 
 # Upload menu
 Elecgator.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Elecgator.menu.upload_method.swdMethod.upload.protocol=0
+Elecgator.menu.upload_method.swdMethod.upload.protocol=swd
 Elecgator.menu.upload_method.swdMethod.upload.options=
 Elecgator.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Elecgator.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Elecgator.menu.upload_method.dfuMethod.upload.protocol=2
-Elecgator.menu.upload_method.dfuMethod.upload.options=
+Elecgator.menu.upload_method.dfuMethod.upload.protocol=dfu
+Elecgator.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Elecgator.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10807,18 +10931,18 @@ ESC_board.menu.pnum.STORM32_V1_31_RC.build.variant=STM32F1xx/F103R(C-D-E)T
 
 # Upload menu
 ESC_board.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-ESC_board.menu.upload_method.swdMethod.upload.protocol=0
+ESC_board.menu.upload_method.swdMethod.upload.protocol=swd
 ESC_board.menu.upload_method.swdMethod.upload.options=
 ESC_board.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 ESC_board.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-ESC_board.menu.upload_method.serialMethod.upload.protocol=1
-ESC_board.menu.upload_method.serialMethod.upload.options={serial.port.file}
+ESC_board.menu.upload_method.serialMethod.upload.protocol=serial
+ESC_board.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 ESC_board.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 ESC_board.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-ESC_board.menu.upload_method.dfuMethod.upload.protocol=2
-ESC_board.menu.upload_method.dfuMethod.upload.options=
+ESC_board.menu.upload_method.dfuMethod.upload.protocol=dfu
+ESC_board.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 ESC_board.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10833,6 +10957,8 @@ Garatronic.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build
 Garatronic.build.flash_offset=0x0
 Garatronic.upload.maximum_size=0
 Garatronic.upload.maximum_data_size=0
+Garatronic.vid.0=0x0483
+Garatronic.pid.0=0x5740
 
 # PYBSTICK26(DUINO) board with F072RB
 Garatronic.menu.pnum.PYBSTICK26_DUINO=PYBSTICK26 Duino
@@ -10886,8 +11012,8 @@ Garatronic.menu.pnum.PYBSTICK26_PRO.build.float-abi=-mfloat-abi=hard
 
 # PYBSTICK26 boards upload method
 Garatronic.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Garatronic.menu.upload_method.dfuMethod.upload.protocol=2
-Garatronic.menu.upload_method.dfuMethod.upload.options=
+Garatronic.menu.upload_method.dfuMethod.upload.protocol=dfu
+Garatronic.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Garatronic.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -10902,6 +11028,8 @@ GenFlight.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.
 GenFlight.build.flash_offset=0x0
 GenFlight.upload.maximum_size=0
 GenFlight.upload.maximum_data_size=0
+GenFlight.vid.0=0x0483
+GenFlight.pid.0=0x5740
 
 # AfroFlight Rev5
 GenFlight.menu.pnum.AFROFLIGHT_F103CB=Afro Flight Rev5 (8MHz)
@@ -10913,6 +11041,8 @@ GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.board=AFROFLIGHT_F103CB
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.product_line=STM32F103xB
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.variant=STM32F1xx/F103C8T_F103CB(T-U)
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.variant_h=variant_AFROFLIGHT_F103CB_XX.h
+GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.vid.0=0xleaf
+GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.pid.0=0x0003
 
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M=Afro Flight Rev5 (12MHz)
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.maximum_size=131072
@@ -10923,6 +11053,8 @@ GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.board=AFROFLIGHT_F103CB_12M
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.product_line=STM32F103xB
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant=STM32F1xx/F103C8T_F103CB(T-U)
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant_h=variant_AFROFLIGHT_F103CB_XX.h
+GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.vid.0=0xleaf
+GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.pid.0=0x0003
 
 # Sparky_V1 board
 GenFlight.menu.pnum.Sparky_V1=Sparky V1 F303 FC
@@ -10939,18 +11071,18 @@ GenFlight.menu.pnum.Sparky_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 
 # Upload menu
 GenFlight.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenFlight.menu.upload_method.swdMethod.upload.protocol=0
+GenFlight.menu.upload_method.swdMethod.upload.protocol=swd
 GenFlight.menu.upload_method.swdMethod.upload.options=
 GenFlight.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 GenFlight.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenFlight.menu.upload_method.serialMethod.upload.protocol=1
-GenFlight.menu.upload_method.serialMethod.upload.options={serial.port.file}
+GenFlight.menu.upload_method.serialMethod.upload.protocol=serial
+GenFlight.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenFlight.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 GenFlight.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenFlight.menu.upload_method.dfuMethod.upload.protocol=2
-GenFlight.menu.upload_method.dfuMethod.upload.options=
+GenFlight.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenFlight.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenFlight.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 GenFlight.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
@@ -10966,7 +11098,6 @@ GenFlight.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
 GenFlight.menu.upload_method.dfu2Method=Maple DFU Bootloader 2.0
 GenFlight.menu.upload_method.dfu2Method.upload.protocol=maple
 GenFlight.menu.upload_method.dfu2Method.upload.tool=maple_upload
-GenFlight.menu.upload_method.dfu2Method.upload.usbID=1EAF:0003
 GenFlight.menu.upload_method.dfu2Method.upload.altID=2
 GenFlight.menu.upload_method.dfu2Method.build.flash_offset=0x2000
 GenFlight.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF
@@ -10974,7 +11105,6 @@ GenFlight.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF
 GenFlight.menu.upload_method.dfuoMethod=Maple DFU Bootloader original
 GenFlight.menu.upload_method.dfuoMethod.upload.protocol=maple
 GenFlight.menu.upload_method.dfuoMethod.upload.tool=maple_upload
-GenFlight.menu.upload_method.dfuoMethod.upload.usbID=1EAF:0003
 GenFlight.menu.upload_method.dfuoMethod.upload.altID=1
 GenFlight.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
 GenFlight.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
@@ -10991,6 +11121,8 @@ IotContinuum.build.st_extra_flags=-D{build.product_line} {build.xSerial}
 IotContinuum.build.flash_offset=0x0
 IotContinuum.upload.maximum_size=0
 IotContinuum.upload.maximum_data_size=0
+IotContinuum.vid.0=0x0483
+IotContinuum.pid.0=0x5740
 
 # IoT continuum Dev Kit Board
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM=IoT continuum Dev Kit
@@ -11007,18 +11139,18 @@ IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.peripheral_pins=-DCUSTOM_PERIP
 
 # Upload menu
 IotContinuum.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-IotContinuum.menu.upload_method.swdMethod.upload.protocol=0
+IotContinuum.menu.upload_method.swdMethod.upload.protocol=swd
 IotContinuum.menu.upload_method.swdMethod.upload.options=
 IotContinuum.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 IotContinuum.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-IotContinuum.menu.upload_method.serialMethod.upload.protocol=1
-IotContinuum.menu.upload_method.serialMethod.upload.options={serial.port.file}
+IotContinuum.menu.upload_method.serialMethod.upload.protocol=serial
+IotContinuum.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 IotContinuum.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 IotContinuum.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-IotContinuum.menu.upload_method.dfuMethod.upload.protocol=2
-IotContinuum.menu.upload_method.dfuMethod.upload.options=
+IotContinuum.menu.upload_method.dfuMethod.upload.protocol=dfu
+IotContinuum.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 IotContinuum.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -11032,6 +11164,8 @@ LoRa.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSeri
 LoRa.build.flash_offset=0x0
 LoRa.upload.maximum_size=0
 LoRa.upload.maximum_data_size=0
+LoRa.vid.0=0x0483
+LoRa.pid.0=0x5740
 
 # ACSIP S76S board
 LoRa.menu.pnum.ACSIP_S76S=ACSIP S76S
@@ -11142,18 +11276,18 @@ LoRa.menu.pnum.ELEKTOR_F072CB.build.st_extra_flags=-D{build.product_line} {build
 
 # Upload menu
 LoRa.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-LoRa.menu.upload_method.swdMethod.upload.protocol=0
+LoRa.menu.upload_method.swdMethod.upload.protocol=swd
 LoRa.menu.upload_method.swdMethod.upload.options=
 LoRa.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 LoRa.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-LoRa.menu.upload_method.serialMethod.upload.protocol=1
-LoRa.menu.upload_method.serialMethod.upload.options={serial.port.file}
+LoRa.menu.upload_method.serialMethod.upload.protocol=serial
+LoRa.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 LoRa.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 LoRa.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-LoRa.menu.upload_method.dfuMethod.upload.protocol=2
-LoRa.menu.upload_method.dfuMethod.upload.options=
+LoRa.menu.upload_method.dfuMethod.upload.protocol=dfu
+LoRa.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -11168,6 +11302,8 @@ Midatronics.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {buil
 Midatronics.build.flash_offset=0x0
 Midatronics.upload.maximum_size=0
 Midatronics.upload.maximum_data_size=0
+Midatronics.vid.0=0x0483
+Midatronics.pid.0=0x5740
 
 # MKR_SHARKY board
 Midatronics.menu.pnum.MKR_SHARKY=MKR Sharky
@@ -11188,18 +11324,18 @@ Midatronics.menu.upload_method.MassStorage.upload.protocol=
 Midatronics.menu.upload_method.MassStorage.upload.tool=massStorageCopy
 
 Midatronics.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-Midatronics.menu.upload_method.swdMethod.upload.protocol=0
+Midatronics.menu.upload_method.swdMethod.upload.protocol=swd
 Midatronics.menu.upload_method.swdMethod.upload.options=
 Midatronics.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 Midatronics.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-Midatronics.menu.upload_method.serialMethod.upload.protocol=1
-Midatronics.menu.upload_method.serialMethod.upload.options={serial.port.file}
+Midatronics.menu.upload_method.serialMethod.upload.protocol=serial
+Midatronics.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 Midatronics.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 Midatronics.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-Midatronics.menu.upload_method.dfuMethod.upload.protocol=2
-Midatronics.menu.upload_method.dfuMethod.upload.options=
+Midatronics.menu.upload_method.dfuMethod.upload.protocol=dfu
+Midatronics.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Midatronics.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
@@ -11214,6 +11350,8 @@ SparkFun.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.x
 SparkFun.build.flash_offset=0x0
 SparkFun.upload.maximum_size=0
 SparkFun.upload.maximum_data_size=0
+SparkFun.vid.0=0x0483
+SparkFun.pid.0=0x5740
 
 # SFE_MMPB_STM32WB5MMG board
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG=SparkFun MicroMod STM32WB5MMG
@@ -11227,8 +11365,8 @@ SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.series=STM32WBxx
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.product_line=STM32WB5Mxx
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.variant=STM32WBxx/WB5MMGH
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.vid=0x1B4F
-SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.pid=0x0034
+SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.vid.0=0x1B4F
+SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.pid.0=0x0034
 
 # SparkFun MicroMod STM32F405 Board
 SparkFun.menu.pnum.MICROMOD_F405=SparkFun MicroMod STM32F405
@@ -11243,23 +11381,23 @@ SparkFun.menu.pnum.MICROMOD_F405.build.product_line=STM32F405xx
 SparkFun.menu.pnum.MICROMOD_F405.build.variant_h=variant_{build.board}.h
 SparkFun.menu.pnum.MICROMOD_F405.build.variant=STM32F4xx/F405RGT_F415RGT
 SparkFun.menu.pnum.MICROMOD_F405.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-SparkFun.menu.pnum.MICROMOD_F405.build.vid=0x1B4F
-SparkFun.menu.pnum.MICROMOD_F405.build.pid=0x0029
+SparkFun.menu.pnum.MICROMOD_F405.vid.0=0x1B4F
+SparkFun.menu.pnum.MICROMOD_F405.pid.0=0x0029
 
 # Upload menu
 SparkFun.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-SparkFun.menu.upload_method.swdMethod.upload.protocol=0
+SparkFun.menu.upload_method.swdMethod.upload.protocol=swd
 SparkFun.menu.upload_method.swdMethod.upload.options=
 SparkFun.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
 SparkFun.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-SparkFun.menu.upload_method.serialMethod.upload.protocol=1
-SparkFun.menu.upload_method.serialMethod.upload.options={serial.port.file}
+SparkFun.menu.upload_method.serialMethod.upload.protocol={serial.port.file}
+SparkFun.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 SparkFun.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
 SparkFun.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-SparkFun.menu.upload_method.dfuMethod.upload.protocol=2
-SparkFun.menu.upload_method.dfuMethod.upload.options=
+SparkFun.menu.upload_method.dfuMethod.upload.protocol=dfu
+SparkFun.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 SparkFun.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 ################################################################################
diff --git a/platform.txt b/platform.txt
index d7ed5acb0d..468f3ffec6 100644
--- a/platform.txt
+++ b/platform.txt
@@ -103,12 +103,12 @@ compiler.elf2hex.extra_flags=
 # ---------
 build.usb_flags=-DUSBCON {build.usb_speed} -DUSBD_VID={build.vid} -DUSBD_PID={build.pid} -DHAL_PCD_MODULE_ENABLED
 
-# Specify defaults for vid/pid, since an empty value is impossible to
-# detect in the preprocessor, but a 0 can be checked for vid and -1
-# for pid (can be 0).
+# Specify defaults for vid/pid
 # Boards should specify either both, or neither of these.
-build.vid=0
-build.pid=-1
+build.vid={vid.0}
+build.pid={pid.0}
+upload.vid=0x0483
+upload.pid=0xdf11
 
 # To customize the USB manufacturer or product string, must add defines
 # for them, e.g.:
@@ -199,7 +199,7 @@ tools.stm32CubeProg.path={runtime.tools.STM32Tools.path}
 tools.stm32CubeProg.cmd=stm32CubeProg.sh
 tools.stm32CubeProg.upload.params.verbose=
 tools.stm32CubeProg.upload.params.quiet=
-tools.stm32CubeProg.upload.pattern="{busybox}" sh "{path}/{cmd}" {upload.protocol} "{build.path}/{build.project_name}.bin" {build.flash_offset} {upload.options}
+tools.stm32CubeProg.upload.pattern="{busybox}" sh "{path}/{cmd}" -i {upload.protocol} -f "{build.path}/{build.project_name}.bin" -o {build.flash_offset} {upload.options}
 
 # blackmagic upload for generic STM32
 tools.bmp_upload.cmd=arm-none-eabi-gdb
@@ -222,7 +222,7 @@ tools.maple_upload.script=maple_upload.sh
 tools.maple_upload.path={runtime.tools.STM32Tools.path}
 tools.maple_upload.upload.params.verbose=-d
 tools.maple_upload.upload.params.quiet=n
-tools.maple_upload.upload.pattern="{busybox}" sh "{path}/{script}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+tools.maple_upload.upload.pattern="{busybox}" sh "{path}/{script}" {serial.port.file} {upload.altID} {upload.vid} {upload.pid} "{build.path}/{build.project_name}.dfu"
 
 # STM32MP1 self-contained shell script
 tools.remoteproc_gen.path={runtime.tools.STM32Tools.path}