Spiri
/
ROSBuzz_MISTLab
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '2372149b8371027c9e9241c5dc2849e4082cca10' into sim

This commit is contained in:
vivek-shankar 2018-09-26 12:15:39 -04:00
parent c5f1135e6e 2372149b83
commit f4f637b9b4
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buzz_scripts/include/utils/takeoff_heights.bzz
View File

@ -6,5 +6,8 @@ takeoff_heights ={
.6 = 3.0, .6 = 3.0,
.9 = 15.0, .9 = 15.0,
.11 = 6.0, .11 = 6.0,
.16 = 9.0 .16 = 9.0,
.17 = 3.0,
.18 = 6.0,
.19 = 9.0
} }

11
misc/cmdlinectr.sh
View File

@ -39,7 +39,7 @@ function updaterobot {
echo "Installing launch file for TX-ubuntu16 with usb2serial" echo "Installing launch file for TX-ubuntu16 with usb2serial"
echo "With xbeemav" echo "With xbeemav"
rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100TX16US.launch rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100TX16US.launch
elif [ "$1" = 1 ] && [ "$2" = "X" ] elif [ "$1" = 1 ] && [ "$2" = "X" ]
then then
echo "Installing launch file for TX-ubuntu16" echo "Installing launch file for TX-ubuntu16"
echo "With xbeemav" echo "With xbeemav"
@ -54,12 +54,17 @@ function updaterobot {
echo "Installing launch file for Solo" echo "Installing launch file for Solo"
echo "With xbeemav" echo "With xbeemav"
rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/solo.launch rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/solo.launch
elif [ "$1" = 0 ] && [ "$2" = "H" ] elif [ "$1" = 4 ] && [ "$2" = "X" ]
then
echo "Installing launch file for Spiris"
echo "With xbeemav"
rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/spiri.launch
elif [ "$1" = 0 ] && [ "$2" = "H" ]
then then
echo "Installing launch file for TX-ubuntu16 with usb2serial" echo "Installing launch file for TX-ubuntu16 with usb2serial"
echo "With heavenmav" echo "With heavenmav"
rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100TX16USHeaven.launch rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100TX16USHeaven.launch
elif [ "$1" = 1 ] && [ "$2" = "H" ] elif [ "$1" = 1 ] && [ "$2" = "H" ]
then then
echo "Installing launch file for TX-ubuntu16" echo "Installing launch file for TX-ubuntu16"
echo "With heavenmav" echo "With heavenmav"

2
src/roscontroller.cpp
View File

@ -44,7 +44,7 @@ logical_clock(ros::Time()), previous_step_time(ros::Time())
SetStreamRate(0, 10, 1); SetStreamRate(0, 10, 1);
// Get Home position - wait for none-zero value // Get Home position - wait for none-zero value
while (cur_pos.latitude == 0.0f) while ((cur_pos.latitude == 0.0f) || (cur_pos.altitude < -1000.0))
{ {
ROS_INFO("Waiting for GPS. "); ROS_INFO("Waiting for GPS. ");
ros::Duration(0.5).sleep(); ros::Duration(0.5).sleep();