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

merge onbaord

This commit is contained in:
David St-Onge 2017-09-06 19:25:47 -04:00
parent 796bb78dd8 7284565504
commit 7b041dcf1b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buzz_scripts/include/barrier.bzz
View File

@ -30,7 +30,7 @@ function barrier_create() {
function barrier_set(threshold, transf, resumef, bdt) { function barrier_set(threshold, transf, resumef, bdt) {
statef = function() { statef = function() {
barrier_wait(threshold, transf, resumef); barrier_wait(threshold, transf, resumef, bdt);
} }
UAVSTATE = "BARRIERWAIT" UAVSTATE = "BARRIERWAIT"
barrier_create() barrier_create()

2
src/buzzuav_closures.cpp
View File

@ -356,7 +356,7 @@ namespace buzzuav_closures{
if(fabs(rb[0])<150.0) if(fabs(rb[0])<150.0)
rc_set_goto((int)buzz_utility::get_robotid(), goal[0], goal[1], goal[2]); rc_set_goto((int)buzz_utility::get_robotid(), goal[0], goal[1], goal[2]);
ROS_WARN("DEBUG ---- %f %f %f (%f %f) %f %f",goal[0],goal[1],goal[2],cur_pos[0],cur_pos[1],rb[0],rb[1]); ROS_WARN("Set RC_GOTO ---- %f %f %f (%f %f, %f %f)",goal[0],goal[1],goal[2],cur_pos[0],cur_pos[1],rb[0],rb[1]);
return buzzvm_ret0(vm); return buzzvm_ret0(vm);
} }