Merge branch 'master' into asia_ws_aug2020

This commit is contained in:
Alexey Rogachevskiy
2020-08-10 19:02:08 +03:00
4 changed files with 5 additions and 5 deletions

View File

@@ -3,7 +3,7 @@ Version=1.0
Type=Application
Name=Gazebo PX4
Comment=Fully-featured Gazebo simulation with default PX4 settings
Exec=/bin/bash -c 'source /home/clever/catkin_ws/devel/setup.bash; roslaunch clover_simulation simulator.launch'
Exec=/bin/bash -c 'source /home/clover/catkin_ws/devel/setup.bash; roslaunch clover_simulation simulator.launch'
Icon=gazebo
Path=
Terminal=true

View File

@@ -2,7 +2,7 @@
Name=VS Code + ROS
Comment=Code Editing. Redefined.
GenericName=Text Editor
Exec=/bin/bash -c "source /home/clever/catkin_ws/devel/setup.bash; /usr/share/code/code --no-sandbox --unity-launch %F"
Exec=/bin/bash -c "source /home/clover/catkin_ws/devel/setup.bash; /usr/share/code/code --no-sandbox --unity-launch %F"
Icon=/usr/share/pixmaps/com.visualstudio.code.png
Type=Application
StartupNotify=false

View File

@@ -3,7 +3,7 @@ Type=Application
Name=QGroundControl
GenericName=Ground Control Station
Comment=UAS ground control station
Icon=/home/clever/Pictures/qgroundcontrol.png
Exec=/home/clever/QGroundControl.AppImage
Icon=/home/clover/Pictures/qgroundcontrol.png
Exec=/home/clover/QGroundControl.AppImage
Terminal=false
Categories=Utility;

View File

@@ -61,7 +61,7 @@ echo "--- Installing pylint"
/usr/bin/python2.7 -m pip install -U "pylint<2.0.0" --user
/usr/bin/python3.6 -m pip install -U pylint --user
echo "--- Cloning and installing Clever packages"
echo "--- Cloning and installing Clover packages"
mkdir -p ${HOME}/catkin_ws/src
git clone -b clover_description https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover
git clone https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led