fix(platform.txt): add default vid/pid definition

this avoids to add them to boards.txt if not needed.

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

boards.txt

@@ -23,10 +23,8 @@ 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.vid.1=0x0483
 Nucleo_144.pid.1=0x3744
 Nucleo_144.vid.2=0x0483
 Nucleo_144.pid.2=0x3748
@@ -394,9 +392,8 @@ 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.vid.1=0x0483
 Nucleo_64.pid.1=0x3744
 Nucleo_64.vid.2=0x0483
 Nucleo_64.pid.2=0x3748
@@ -873,9 +870,8 @@ 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.vid.1=0x0483
 Nucleo_32.pid.1=0x3744
 Nucleo_32.vid.2=0x0483
 Nucleo_32.pid.2=0x3748
@@ -1035,9 +1031,8 @@ 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.vid.1=0x0483
 Disco.pid.1=0x3744
 Disco.vid.2=0x0483
 Disco.pid.2=0x3748
@@ -1355,9 +1350,8 @@ 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.vid.1=0x0483
 Eval.pid.1=0x3744
 Eval.vid.2=0x0483
 Eval.pid.2=0x3748
@@ -1420,8 +1414,6 @@ STM32MP1.name=STM32MP1 series coprocessor
 STM32MP1.build.flash_offset=0x0
 STM32MP1.upload.maximum_size=0
 STM32MP1.upload.maximum_data_size=0
-STM32MP1.vid.0=0x0483
-STM32MP1.pid.0=0x5740
 
 STM32MP1.build.core=arduino
 STM32MP1.build.board=STM32MP1
@@ -1469,8 +1461,6 @@ GenC0.build.flash_offset=0x0
 GenC0.upload.maximum_size=0
 GenC0.upload.maximum_data_size=0
 GenC0.debug.server.openocd.scripts.2=target/stm32c0x.cfg
-GenC0.vid.0=0x0483
-GenC0.pid.0=0x5740
 
 # Generic C011D6Yx
 GenC0.menu.pnum.GENERIC_C011D6YX=Generic C011D6Yx
@@ -1613,8 +1603,6 @@ GenF0.build.flash_offset=0x0
 GenF0.upload.maximum_size=0
 GenF0.upload.maximum_data_size=0
 GenF0.debug.server.openocd.scripts.2=target/stm32f0x.cfg
-GenF0.vid.0=0x0483
-GenF0.pid.0=0x5740
 
 # DEMO_F030F4 board
 GenF0.menu.pnum.DEMO_F030F4=STM32F030F4 Demo board (HSE 8Mhz)
@@ -2521,8 +2509,6 @@ GenF1.build.flash_offset=0x0
 GenF1.upload.maximum_size=0
 GenF1.upload.maximum_data_size=0
 GenF1.debug.server.openocd.scripts.2=target/stm32f1x.cfg
-GenF1.vid.0=0x0483
-GenF1.pid.0=0x5740
 # DFU mode on built-in bootloader not available, assuming using STM32duino-bootloader
 GenF1.upload.vid.0=0x1eaf
 GenF1.upload.pid.0=0x0003
@@ -3365,8 +3351,6 @@ GenF2.build.flash_offset=0x0
 GenF2.upload.maximum_size=0
 GenF2.upload.maximum_data_size=0
 GenF2.debug.server.openocd.scripts.2=target/stm32f2x.cfg
-GenF2.vid.0=0x0483
-GenF2.pid.0=0x5740
 
 # Generic F205RBTx
 GenF2.menu.pnum.GENERIC_F205RBTX=Generic F205RBTx
@@ -3823,8 +3807,6 @@ GenF3.build.flash_offset=0x0
 GenF3.upload.maximum_size=0
 GenF3.upload.maximum_data_size=0
 GenF3.debug.server.openocd.scripts.2=target/stm32f3x.cfg
-GenF3.vid.0=0x0483
-GenF3.pid.0=0x5740
 
 # BLACKPILL_F303CC
 GenF3.menu.pnum.BLACKPILL_F303CC=RobotDyn BlackPill F303CC
@@ -4278,8 +4260,6 @@ GenF4.build.flash_offset=0x0
 GenF4.upload.maximum_size=0
 GenF4.upload.maximum_data_size=0
 GenF4.debug.server.openocd.scripts.2=target/stm32f4x.cfg
-GenF4.vid.0=0x0483
-GenF4.pid.0=0x5740
 
 # Black F407VE
 # https://github.com/mcauser/BLACK_F407VEZ
@@ -5293,8 +5273,6 @@ GenF7.build.flash_offset=0x0
 GenF7.upload.maximum_size=0
 GenF7.upload.maximum_data_size=0
 GenF7.debug.server.openocd.scripts.2=target/stm32f7x.cfg
-GenF7.vid.0=0x0483
-GenF7.pid.0=0x5740
 
 # Generic F722RCTx
 GenF7.menu.pnum.GENERIC_F722RCTX=Generic F722RCTx
@@ -5820,8 +5798,6 @@ GenG0.build.flash_offset=0x0
 GenG0.upload.maximum_size=0
 GenG0.upload.maximum_data_size=0
 GenG0.debug.server.openocd.scripts.2=target/stm32g0x.cfg
-GenG0.vid.0=0x0483
-GenG0.pid.0=0x5740
 
 # AGAFIA SG0
 GenG0.menu.pnum.AGAFIA_SG0=AGAFIA SG0
@@ -7233,8 +7209,6 @@ GenG4.build.flash_offset=0x0
 GenG4.upload.maximum_size=0
 GenG4.upload.maximum_data_size=0
 GenG4.debug.server.openocd.scripts.2=target/stm32g4x.cfg
-GenG4.vid.0=0x0483
-GenG4.pid.0=0x5740
 
 # Generic G431C6Tx
 GenG4.menu.pnum.GENERIC_G431C6TX=Generic G431C6Tx
@@ -8402,8 +8376,6 @@ GenH5.upload.maximum_size=0
 GenH5.upload.maximum_data_size=0
 # Current openocd version does not support H5
 # GenH5.debug.server.openocd.scripts.2=target/stm32h5x.cfg
-GenH5.vid.0=0x0483
-GenH5.pid.0=0x5740
 
 # Generic H503KBUx
 GenH5.menu.pnum.GENERIC_H503KBUX=Generic H503KBUx
@@ -8526,8 +8498,6 @@ GenH7.build.flash_offset=0x0
 GenH7.upload.maximum_size=0
 GenH7.upload.maximum_data_size=0
 GenH7.debug.server.openocd.scripts.2=target/stm32h7x.cfg
-GenH7.vid.0=0x0483
-GenH7.pid.0=0x5740
 
 # Daisy Seed board
 GenH7.menu.pnum.DAISY_SEED=Daisy Seed
@@ -9160,8 +9130,6 @@ GenL0.build.flash_offset=0x0
 GenL0.upload.maximum_size=0
 GenL0.upload.maximum_data_size=0
 GenL0.debug.server.openocd.scripts.2=target/stm32l0x.cfg
-GenL0.vid.0=0x0483
-GenL0.pid.0=0x5740
 
 # ThunderPack
 GenL0.menu.pnum.THUNDERPACK_L072=ThunderPack v1.0
@@ -10442,8 +10410,6 @@ GenL1.build.flash_offset=0x0
 GenL1.upload.maximum_size=0
 GenL1.upload.maximum_data_size=0
 GenL1.debug.server.openocd.scripts.2=target/stm32l1x.cfg
-GenL1.vid.0=0x0483
-GenL1.pid.0=0x5740
 
 # Generic L100C6Ux
 GenL1.menu.pnum.GENERIC_L100C6UX=Generic L100C6Ux
@@ -10764,8 +10730,6 @@ GenL4.build.flash_offset=0x0
 GenL4.upload.maximum_size=0
 GenL4.upload.maximum_data_size=0
 GenL4.debug.server.openocd.scripts.2=target/stm32l4x.cfg
-GenL4.vid.0=0x0483
-GenL4.pid.0=0x5740
 
 # Leafony AP03
 GenL4.menu.pnum.LEAFONY_AP03=Leafony AP03
@@ -11564,8 +11528,6 @@ GenL5.build.flash_offset=0x0
 GenL5.upload.maximum_size=0
 GenL5.upload.maximum_data_size=0
 GenL5.debug.server.openocd.scripts.2=target/stm32l5x.cfg
-GenL5.vid.0=0x0483
-GenL5.pid.0=0x5740
 
 # Generic L552ZCTxQ
 GenL5.menu.pnum.GENERIC_L552ZCTXQ=Generic L552ZCTxQ
@@ -11625,8 +11587,6 @@ GenU5.build.flash_offset=0x0
 GenU5.upload.maximum_size=0
 GenU5.upload.maximum_data_size=0
 GenU5.debug.server.openocd.scripts.2=target/stm32u5x.cfg
-GenU5.vid.0=0x0483
-GenU5.pid.0=0x5740
 
 # Generic U575AGIxQ
 GenU5.menu.pnum.GENERIC_U575AGIXQ=Generic U575AGIxQ
@@ -11749,8 +11709,6 @@ GenWB.build.flash_offset=0x0
 GenWB.upload.maximum_size=0
 GenWB.upload.maximum_data_size=0
 GenWB.debug.server.openocd.scripts.2=target/stm32wbx.cfg
-GenWB.vid.0=0x0483
-GenWB.pid.0=0x5740
 
 # Generic WB15CCUx
 GenWB.menu.pnum.GENERIC_WB15CCUX=Generic WB15CCUx
@@ -11855,8 +11813,6 @@ GenWBA.build.flash_offset=0x0
 GenWBA.upload.maximum_size=0
 GenWBA.upload.maximum_data_size=0
 GenWBA.debug.server.openocd.scripts.2=target/stm32wbax.cfg
-GenWBA.vid.0=0x0483
-GenWBA.pid.0=0x5740
 
 # Generic WBA55CEUx
 GenWBA.menu.pnum.GENERIC_WBA55CEUX=Generic WBA55CEUx
@@ -11902,8 +11858,6 @@ GenWL.build.flash_offset=0x0
 GenWL.upload.maximum_size=0
 GenWL.upload.maximum_data_size=0
 GenWL.debug.server.openocd.scripts.2=target/stm32wlx.cfg
-GenWL.vid.0=0x0483
-GenWL.pid.0=0x5740
 
 # Generic WL54CCUx
 GenWL.menu.pnum.GENERIC_WL54CCUX=Generic WL54CCUx
@@ -12077,8 +12031,6 @@ 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
@@ -12370,8 +12322,6 @@ 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
@@ -12411,8 +12361,6 @@ ESC_board.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.
 ESC_board.build.flash_offset=0x0
 ESC_board.upload.maximum_size=0
 ESC_board.upload.maximum_data_size=0
-ESC_board.vid.0=0x0483
-ESC_board.pid.0=0x5740
 
 # WRAITH32_V1 board
 ESC_board.menu.pnum.WRAITH32_V1=Wraith V1 ESC
@@ -12468,8 +12416,6 @@ 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
@@ -12547,8 +12493,6 @@ 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)
@@ -12646,8 +12590,6 @@ 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
@@ -12691,8 +12633,6 @@ 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
@@ -12859,8 +12799,6 @@ 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
@@ -12909,8 +12847,6 @@ 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
@@ -12972,8 +12908,6 @@ ELV_Modular_System.build.board=ELV_Modular_System
 ELV_Modular_System.build.variant_h=variant_{build.board}.h
 ELV_Modular_System.upload.maximum_size=0
 ELV_Modular_System.upload.maximum_data_size=0
-ELV_Modular_System.vid.0=0x0483
-ELV_Modular_System.pid.0=0x5740
 
 # ELV-BM-TRX1 board
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1=ELV-LW-Base ELV_BM_TRX1

platform.txt

@@ -109,6 +109,8 @@ build.usb_flags=-DUSBCON {build.usb_speed} -DUSBD_VID={build.vid} -DUSBD_PID={bu
 
 # Specify defaults for vid/pid
 # Boards should specify either both, or neither of these.
+vid.0=0x0483
+pid.0=0x5740
 build.vid={vid.0}
 build.pid={pid.0}
 upload.vid.0=0x0483