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

[Backport v4.4] Added board ids #12298

Open
wants to merge 2 commits into
base: Stable_V4.4
Choose a base branch
from
Open
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
25 changes: 16 additions & 9 deletions .github/workflows/macos_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,28 @@ jobs:
do sudo installer -verbose -pkg "$package" -target /
done

# Create proper framework structure with symlinks
sudo rm -rf /Library/lib/GStreamer.framework # Clean up any existing framework
sudo mkdir -p /Library/lib
# Clean up and recreate directory structure
sudo rm -rf /Library/lib/GStreamer.framework
sudo mkdir -p /Library/lib/GStreamer.framework/Versions/1.0
cd /Library/lib/GStreamer.framework/Versions
sudo ln -sf 1.0 Current

# Create all necessary symlinks
sudo ln -sf /Library/Frameworks/GStreamer.framework/Versions/1.0/lib /Library/lib/GStreamer.framework/Versions/1.0/lib
sudo ln -sf /Library/Frameworks/GStreamer.framework/Versions/1.0/Headers /Library/lib/GStreamer.framework/Versions/1.0/Headers
sudo ln -sf /Library/Frameworks/GStreamer.framework/Versions/1.0/Resources /Library/lib/GStreamer.framework/Versions/1.0/Resources
sudo ln -sf /Library/Frameworks/GStreamer.framework/Versions/1.0/GStreamer /Library/lib/GStreamer.framework/Versions/1.0/GStreamer

# Set Current version symlink
sudo ln -sf 1.0 /Library/lib/GStreamer.framework/Versions/Current

# Create top-level symlinks
cd /Library/lib/GStreamer.framework
sudo ln -sf Versions/Current/lib lib
sudo ln -sf Versions/Current/Headers Headers
sudo ln -sf Versions/Current/Resources Resources
sudo ln -sf Versions/Current/GStreamer GStreamer

# Create the main symlink for the whole framework
sudo ln -sf /Library/Frameworks/GStreamer.framework /Library/lib/GStreamer.framework

# Verify the links
# Verify the structure
echo "Verifying framework structure:"
ls -la /Library/lib/GStreamer.framework/Versions/1.0/

- name: Install ccache
Expand Down
5 changes: 5 additions & 0 deletions src/VehicleSetup/FirmwareUpgradeController.cc
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ static QMap<int, QString> px4_board_name_map {
{1048, "holybro_kakuteh7_default"},
{1053, "holybro_kakuteh7v2_default"},
{1054, "holybro_kakuteh7mini_default"},
{1058, "holybro_kakuteh7mini_default"},
{1110, "jfb_jfb110_default"},
{1123, "siyi_n7_default"},
{1124, "3dr_ctrl-zero-h7-oem-revg_default"},
{5600, "zeroone_x6_default"},
{7000, "cuav_7-nano_default"},
};

uint qHash(const FirmwareUpgradeController::FirmwareIdentifier& firmwareId)
Expand Down