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

Merge commit 'a9204ad0b04dc4eac8f50541c5ed09fd34fa93b9' into sim

This commit is contained in:
vivek-shankar 2017-12-19 12:51:50 -05:00
parent a243d5fa1a a9204ad0b0
commit 2cb4c2c29e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/cmdlinectr.sh
View File

@ -31,7 +31,7 @@ function stoprobot {
} }
function updaterobot { function updaterobot {
# rosrun robot_upstart install --logdir ~/ROS_WS/log/ robot_upstart/launch/m100buzzynocam.launch # rosrun robot_upstart install --logdir ~/ROS_WS/log/ robot_upstart/launch/m100buzzynocam.launch
rosrun robot_upstart install --logdir ~/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100buzzy.launch rosrun robot_upstart install --logdir /media/key/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100buzzy.launch
# rosrun robot_upstart install --logdir ~/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100TXbuzzy.launch # rosrun robot_upstart install --logdir ~/ROS_WS/log/ dji_sdk_mistlab/launch_robot/m100TXbuzzy.launch
} }
function uavstate { function uavstate {

2
src/roscontroller.cpp
View File

@ -82,7 +82,7 @@ void roscontroller::GetRobotId()
while (!xbeestatus_srv.call(robot_id_srv_request, robot_id_srv_response)) while (!xbeestatus_srv.call(robot_id_srv_request, robot_id_srv_response))
{ {
ros::Duration(0.1).sleep(); ros::Duration(0.1).sleep();
ROS_ERROR("Waiting for Xbee to respond to get device ID"); ROS_WARN("ROSBUZZ is waiting for Xbee device ID");
} }
robot_id = robot_id_srv_response.value.integer; robot_id = robot_id_srv_response.value.integer;