aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/ros
diff options
context:
space:
mode:
authorLorenz Meier <lorenz@px4.io>2015-03-28 11:20:55 -0700
committerLorenz Meier <lorenz@px4.io>2015-03-28 11:20:55 -0700
commitb24af0f402ed5512d078c7afc0aa92e7ce1c166b (patch)
tree893833e818d8138360f8fa0bf5554dc6b036f369 /src/platforms/ros
parent898bf51047c0331798e6446025de6cdd8f0ae878 (diff)
parent8aae66b893444c74a22ad7beb89e3828e0444108 (diff)
downloadpx4-firmware-b24af0f402ed5512d078c7afc0aa92e7ce1c166b.tar.gz
px4-firmware-b24af0f402ed5512d078c7afc0aa92e7ce1c166b.tar.bz2
px4-firmware-b24af0f402ed5512d078c7afc0aa92e7ce1c166b.zip
Merge pull request #1960 from dagar/format
Trivial code style cleanup round 2
Diffstat (limited to 'src/platforms/ros')
-rw-r--r--src/platforms/ros/nodes/commander/commander.h6
-rw-r--r--src/platforms/ros/nodes/position_estimator/position_estimator.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/platforms/ros/nodes/commander/commander.h b/src/platforms/ros/nodes/commander/commander.h
index c537c8419..fc88260ba 100644
--- a/src/platforms/ros/nodes/commander/commander.h
+++ b/src/platforms/ros/nodes/commander/commander.h
@@ -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;
diff --git a/src/platforms/ros/nodes/position_estimator/position_estimator.cpp b/src/platforms/ros/nodes/position_estimator/position_estimator.cpp
index ed3a4efa5..e4273687e 100644
--- a/src/platforms/ros/nodes/position_estimator/position_estimator.cpp
+++ b/src/platforms/ros/nodes/position_estimator/position_estimator.cpp
@@ -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;