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

Merge commit 'b41a086ede24c213a8264588f36a4403a87b3efa' into ros_drones_ws 

Conflicts:
	src/rosbuzz/src/roscontroller.cpp
This commit is contained in:
David St-Onge 2017-09-07 18:46:45 -04:00
parent 031266fd7f b41a086ede
commit 663bd5e4ed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/roscontroller.cpp
View File

@ -197,7 +197,7 @@ void roscontroller::RosControllerRun()
std::string standby_bo = Compile_bzz(stand_by) + ".bo"; std::string standby_bo = Compile_bzz(stand_by) + ".bo";
//init_update_monitor(bcfname.c_str(), standby_bo.c_str()); //init_update_monitor(bcfname.c_str(), standby_bo.c_str());
/*loop rate of ros*/ /*loop rate of ros*/
ros::Rate loop_rate(50); ros::Rate loop_rate(BUZZRATE);
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
// MAIN LOOP // MAIN LOOP
////////////////////////////////////////////////////// //////////////////////////////////////////////////////