Skip to content

revert to old px4 firmware #2

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

Open
macekj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

revert to old px4 firmware #2

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
f026f52
revert to pulling px4 firmware from github, add temporary command to …
macekj Sep 29, 2019
f4d3265
fixed gazebo build setup, add x window support for linux
macekj Oct 6, 2019
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
13 changes: 12 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,15 @@ services:
- ./software:/software
- ${PWD}/Makefile:/Makefile
container_name: maav-run
command: "make ${ACTION}"
command: "make ${ACTION}"
gazebo:
image: maav-software
volumes:
- ./software:/software
- ${PWD}/Makefile:/Makefile
- $HOME/.Xauthority:/root/.Xauthority:rw
environment:
- DISPLAY
network_mode: "host"
container_name: gazebo-run
command: "gazebo"
8 changes: 8 additions & 0 deletions scripts/build_gazebo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

# Run this command from the container only to build the PX4 firmware.
# This will launch a PX4 shell, so once the command stops running you can
# CTRL+C or exit. To save the build files, docker commit your container
cd /PX4Firmware
num_procs_avail=$(($(grep -c ^processor /proc/cpuinfo)-1))
make posix_sitl_default gazebo -j$((num_procs_avail > 1 ? num_procs_avail : 1))
7 changes: 2 additions & 5 deletions scripts/setup_sim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ curl -sSL http://get.gazebosim.org | sh

# Install PX4 firmware
echo "Installing PX4 firmware"
wget https://github.com/PX4/Firmware/archive/v1.9.2.zip -O Firmware.zip
unzip Firmware.zip
rm Firmware.zip
mv Firmware-1.9.2 PX4Firmware
git clone --single-branch --branch v1.8.2 https://github.com/PX4/Firmware/ PX4Firmware

# Ubuntu Config
echo "We must first remove modemmanager"
Expand Down Expand Up @@ -57,4 +54,4 @@ if [ ! -f exe/QGroundControl.AppImage ]; then
echo "Downloading QGroundControl"
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/builds/master/QGroundControl.AppImage -P /bin
chmod a+x /bin/QGroundControl.AppImage
fi
fi