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

fix test bzz

This commit is contained in:
David St-Onge 2017-05-03 15:07:36 -04:00
parent 52bed0536f
commit 817b2951d6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/roscontroller.cpp
View File

@ -150,7 +150,8 @@ namespace rosbzz_node{
if(!xbeeplugged){ if(!xbeeplugged){
if(n_c.getParam("name", robot_name)); if(n_c.getParam("name", robot_name));
else {ROS_ERROR("Provide the xbee plugged boolean in Launch file"); system("rosnode kill rosbuzz_node");} else {ROS_ERROR("Provide the xbee plugged boolean in Launch file"); system("rosnode kill rosbuzz_node");}
} }else
n_c.getParam("xbee_status_srv", xbeesrv_name);
GetSubscriptionParameters(n_c); GetSubscriptionParameters(n_c);
// initialize topics to null? // initialize topics to null?

16
src/testflockfev.bzz
View File

@ -43,15 +43,15 @@ function hexagon() {
math.vec2.scale(accum, 1.0 / neighbors.count()) math.vec2.scale(accum, 1.0 / neighbors.count())
# Move according to vector # Move according to vector
#print("Robot ", id, "must push ",accum.length, "; ", accum.angle) #print("Robot ", id, "must push ",accum.length, "; ", accum.angle)
# uav_moveto(accum.x,accum.y) uav_moveto(accum.x,accum.y)
if(timeW>=WAIT_TIMEOUT) { #FOR MOVETO TESTS # if(timeW>=WAIT_TIMEOUT) { #FOR MOVETO TESTS
timeW =0 # timeW =0
statef=land # statef=land
} else { # } else {
timeW = timeW+1 # timeW = timeW+1
uav_moveto(0.0,0.0) # uav_moveto(0.0,0.0)
} # }
} }
######################################## ########################################