Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(upload_vid): wrong definitions #2440

Merged
merged 2 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,7 @@ 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=0xleaf
GenF1.upload.vid.0=0x1eaf
GenF1.upload.pid.0=0x0003

# BLUEPILL_F103C6 board
Expand Down Expand Up @@ -12560,7 +12560,7 @@ 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.vid.0=0x1eaf
GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.pid.0=0x0003
GenFlight.menu.pnum.AFROFLIGHT_F103CB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
GenFlight.menu.pnum.AFROFLIGHT_F103CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
Expand All @@ -12574,7 +12574,7 @@ 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.vid.0=0x1eaf
GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.pid.0=0x0003
GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.debug.server.openocd.scripts.2=target/stm32f1x.cfg
GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
Expand Down
6 changes: 4 additions & 2 deletions platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@ build.usb_flags=-DUSBCON {build.usb_speed} -DUSBD_VID={build.vid} -DUSBD_PID={bu
# Boards should specify either both, or neither of these.
build.vid={vid.0}
build.pid={pid.0}
upload.vid=0x0483
upload.pid=0xdf11
upload.vid.0=0x0483
upload.pid.0=0xdf11
upload.vid={upload.vid.0}
upload.pid={upload.pid.0}

# To customize the USB manufacturer or product string, must add defines
# for them, e.g.:
Expand Down
Loading