Skip to content

fix(boards): Remove duplicate VID/PID from boards.txt and add default CDC/JTAG board #9717

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
May 29, 2024
Merged

fix(boards): Remove duplicate VID/PID from boards.txt and add default CDC/JTAG board #9717

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
457070b
fix(boards): boards must define unique VID/PID
me-no-dev May 29, 2024
11659aa
fix(boards): Skip test for the generic board
me-no-dev May 29, 2024
9dc6063
Trigger board test
me-no-dev May 29, 2024
a47166b
fix(boards): Make discovery work on IDE2
me-no-dev May 29, 2024
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: 6 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ esp32_family.name=ESP32 Family Device
esp32_family.hide=true
esp32_family.vid.0=0x303a
esp32_family.pid.0=0x1001
esp32_family.upload_port.0.vid=0x303a
esp32_family.upload_port.0.pid=0x1001
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ladyada in order for discovery to work properly with IDE2 and CLI, it is necessary to add the .upload_port lines. Maybe someone there can update your board definitions?

cc: @UnexpectedMaker

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks
@hathach can you add to your ToDo list :)
@me-no-dev is there a date you need this by?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ladyada we plan on pushing bugfix releases fairly often, so it's not a hurry.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ladyada sure, I will follow this up


##############################################################

Expand Down Expand Up @@ -938,6 +940,8 @@ esp32c3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_co
esp32s2.name=ESP32S2 Dev Module
esp32s2.vid.0=0x303a
esp32s2.pid.0=0x0002
esp32s2.upload_port.vid.0=0x303a
esp32s2.upload_port.pid.0=0x0002

esp32s2.bootloader.tool=esptool_py
esp32s2.bootloader.tool.default=esptool_py
Expand Down Expand Up @@ -2235,6 +2239,8 @@ esp32s3camlcd.menu.EraseFlash.all.upload.erase_cmd=-e
esp32s2usb.name=ESP32S2 Native USB
esp32s2usb.vid.0=0x303a
esp32s2usb.pid.0=0x0003
esp32s2usb.upload_port.vid.0=0x303a
esp32s2usb.upload_port.pid.0=0x0003

esp32s2usb.bootloader.tool=esptool_py
esp32s2usb.bootloader.tool.default=esptool_py
Expand Down