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.

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

[BACKPORT V4.4] Adding support for new 3DR boards #12371

Merged
merged 2 commits into from
Jan 30, 2025
Merged

[BACKPORT V4.4] Adding support for new 3DR boards #12371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e524b
Hardware: Add support for 3DR Control Zero H7 OEM Rev G
TOTON95 Aug 7, 2024
523d525
Update USBBoardInfo.json to include 3DR Control Zero OEM G
TOTON95 Jan 23, 2025
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
3 changes: 2 additions & 1 deletion src/VehicleSetup/FirmwareUpgradeController.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ static QMap<int, QString> px4_board_name_map {
{1048, "holybro_kakuteh7_default"},
{1053, "holybro_kakuteh7v2_default"},
{1054, "holybro_kakuteh7mini_default"},
{1123, "siyi_n7_default"},
{1123, "siyi_n7_default"},
{1124, "3dr_ctrl-zero-h7-oem-revg_default"},
};

uint qHash(const FirmwareUpgradeController::FirmwareIdentifier& firmwareId)
Expand Down
2 changes: 2 additions & 0 deletions src/comm/USBBoardInfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
{ "vendorID": 9900, "productID": 4130, "boardClass": "Pixhawk", "name": "mRo Control Zero Classic" },
{ "vendorID": 9900, "productID": 4131, "boardClass": "Pixhawk", "name": "mRo Control Zero H7" },
{ "vendorID": 9900, "productID": 4132, "boardClass": "Pixhawk", "name": "mRo Control Zero H7 OEM" },
{ "vendorID": 9900, "productID": 4388, "boardClass": "Pixhawk", "name": "3DR Control Zero H7 OEM Rev G" },

{ "vendorID": 1027, "productID": 24597, "boardClass": "SiK Radio", "name": "SiK Radio", "comment": "3DR Radio" },
{ "vendorID": 1027, "productID": 24577, "boardClass": "SiK Radio", "name": "SiK Radio", "comment": "3DR Radio on FTDI" },
Expand Down Expand Up @@ -108,5 +109,6 @@
{ "regExp": "^Hex/ProfiCNC$", "boardClass": "Pixhawk" },
{ "regExp": "^Holybro$", "boardClass": "Pixhawk" },
{ "regExp": "^mRo$", "boardClass": "Pixhawk" }
{ "regExp": "^3DR$", "boardClass": "Pixhawk" }
]
}
Loading