mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-30 21:43:34 +08:00
trivial code style cleanup round 2
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user