trivial code style cleanup round 2

This commit is contained in:
Daniel Agar
2015-03-27 23:38:58 -04:00
parent 5cc1a5dfda
commit 8aae66b893
56 changed files with 132 additions and 104 deletions
+3 -3
View File
@@ -39,7 +39,7 @@
#pragma once
#if defined(__PX4_ROS)
typedef const char* PX4TopicHandle;
typedef const char *PX4TopicHandle;
#else
#include <uORB/uORB.h>
typedef orb_id_t PX4TopicHandle;
@@ -68,8 +68,8 @@ public:
virtual ~PX4Message() {};
virtual M& data() {return _data;}
virtual const M& data() const {return _data;}
virtual M &data() {return _data;}
virtual const M &data() const {return _data;}
private:
M _data;
};
@@ -68,14 +68,14 @@ protected:
* Set control mode flags based on stick positions (equiv to code in px4 commander)
*/
void EvalSwitches(const px4::manual_control_setpointConstPtr &msg,
px4::vehicle_status &msg_vehicle_status,
px4::vehicle_control_mode &msg_vehicle_control_mode);
px4::vehicle_status &msg_vehicle_status,
px4::vehicle_control_mode &msg_vehicle_control_mode);
/**
* Sets offboard controll flags in msg_vehicle_control_mode
*/
void SetOffboardControl(const px4::offboard_control_mode &msg_offboard_control_mode,
px4::vehicle_control_mode &msg_vehicle_control_mode);
px4::vehicle_control_mode &msg_vehicle_control_mode);
ros::NodeHandle _n;
ros::Subscriber _man_ctrl_sp_sub;
@@ -64,14 +64,16 @@ void PositionEstimator::ModelStatesCallback(const gazebo_msgs::ModelStatesConstP
/* Fill px4 position topic with contents from modelstates topic */
int index = 0;
//XXX: maybe a more clever approach would be to do this not on every loop, need to check if and when
//gazebo rearranges indexes.
for(std::vector<std::string>::const_iterator it = msg->name.begin(); it != msg->name.end(); ++it) {
for (std::vector<std::string>::const_iterator it = msg->name.begin(); it != msg->name.end(); ++it) {
if (*it == "iris" || *it == "ardrone") {
index = it - msg->name.begin();
break;
}
}
msg_v_l_pos.xy_valid = true;
msg_v_l_pos.z_valid = true;
msg_v_l_pos.v_xy_valid = true;