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

Changes to be committed: change logging 

modified:   src/rosbuzz/src/roscontroller.cpp
This commit is contained in:
Fang Wu 2018-09-18 15:38:44 -04:00
parent 4523de48a2
commit d63bc3686b
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/roscontroller.cpp
View File

@ -164,39 +164,38 @@ void roscontroller::RosControllerRun()
// log data // log data
// hardware time now // hardware time now
log<<ros::Time::now().toNSec()<<","; log << ros::Time::now().toNSec() << ",";
get_logical_time(); get_logical_time();
// logical time now // logical time now
//log<<logical_clock.toNSec()<<","; //log<<logical_clock.toNSec()<<",";
//log<<buzz_utility::get_timesync_itr()<<","; //log<<buzz_utility::get_timesync_itr()<<",";
//log<<buzz_utility::get_timesync_state()<<","; //log<<buzz_utility::get_timesync_state()<<",";
log<<cur_pos.latitude * 100000 << "," << cur_pos.longitude * 100000 << ","
<< cur_pos.altitude * 100000 << ",";
log << (int)no_of_robots<<",";
log << neighbours_pos_map.size()<< ",";
map<int, buzz_utility::Pos_struct>::iterator it =
neighbours_pos_map.begin();
log<<(int)inmsgdata.size()<<","<< message_number<<",";
log<< out_msg_time<<",";
log <<buzz_utility::get_bvmstate()<<",";
log << cur_pos.latitude * 100000 << "," << cur_pos.longitude * 100000 << ","
<< cur_pos.altitude * 100000 << ",";
log << (int)no_of_robots << ",";
log << neighbours_pos_map.size() << ",";
log << (int)inmsgdata.size() << "," << message_number << ",";
log << out_msg_time <<",";
log << buzz_utility::get_bvmstate();
map<int, buzz_utility::Pos_struct>::iterator it =
neighbours_pos_map.begin();
for (; it != neighbours_pos_map.end(); ++it) for (; it != neighbours_pos_map.end(); ++it)
{ {
log<< it->first<<","; log << "," << it->first << ",";
log<< (double)it->second.x << "," << (double)it->second.y log << (double)it->second.x << "," << (double)it->second.y
<< "," << (double)it->second.z <<","; << "," << (double)it->second.z;
} }
for (std::vector<msg_data>::iterator it = inmsgdata.begin() ; it != inmsgdata.end(); ++it){ for (std::vector<msg_data>::iterator it = inmsgdata.begin() ; it != inmsgdata.end(); ++it)
log<<(int)it->nid <<","<<(int)it->msgid<<","<<(int)it->size<<","<<it->sent_time {
<<","<<it->received_time <<","; log << "," << (int)it->nid << "," << (int)it->msgid << "," << (int)it->size << "," <<
it->sent_time << "," << it->received_time;
} }
log << std::endl ;
inmsgdata.clear(); inmsgdata.clear();
log << std::endl;
log <<buzz_utility::get_bvmstate()<<std::endl; // time_sync_step();
// time_sync_step();
// if(debug) // if(debug)
// ROS_INFO("[Debug : %i ] logical Time %f , har time %f",robot_id, logical_clock.toSec(), ros::Time::now().toSec()); // ROS_INFO("[Debug : %i ] logical Time %f , har time %f",robot_id, logical_clock.toSec(), ros::Time::now().toSec());
// Call Step from buzz script // Call Step from buzz script