aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-29 13:36:53 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-29 13:36:53 +0100
commit5b5a4b73864bb3331830d232fc3bb1bf7372d844 (patch)
tree4ad6ff07ed45a151b4f4b5db8a7048eb6283c357
parent9a5ea31784bacb57b9a86134fb612119609fc08c (diff)
downloadpx4-firmware-5b5a4b73864bb3331830d232fc3bb1bf7372d844.tar.gz
px4-firmware-5b5a4b73864bb3331830d232fc3bb1bf7372d844.tar.bz2
px4-firmware-5b5a4b73864bb3331830d232fc3bb1bf7372d844.zip
function rename
-rw-r--r--src/platforms/ros/nodes/position_estimator/position_estimator.cpp4
-rw-r--r--src/platforms/ros/nodes/position_estimator/position_estimator.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/platforms/ros/nodes/position_estimator/position_estimator.cpp b/src/platforms/ros/nodes/position_estimator/position_estimator.cpp
index 231e9763a..fae304bf4 100644
--- a/src/platforms/ros/nodes/position_estimator/position_estimator.cpp
+++ b/src/platforms/ros/nodes/position_estimator/position_estimator.cpp
@@ -50,13 +50,13 @@
PositionEstimator::PositionEstimator() :
_n(),
- _sub_modelstates(_n.subscribe("/gazebo/model_states", 1, &PositionEstimator::model_states_callback, this)),
+ _sub_modelstates(_n.subscribe("/gazebo/model_states", 1, &PositionEstimator::ModelStatesCallback, this)),
_vehicle_position_pub(_n.advertise<px4::vehicle_local_position>("vehicle_local_position", 1)),
_startup_time(px4::get_time_micros())
{
}
-void PositionEstimator::model_states_callback(const gazebo_msgs::ModelStatesConstPtr &msg)
+void PositionEstimator::ModelStatesCallback(const gazebo_msgs::ModelStatesConstPtr &msg)
{
//XXX: use a proper sensor topic
diff --git a/src/platforms/ros/nodes/position_estimator/position_estimator.h b/src/platforms/ros/nodes/position_estimator/position_estimator.h
index 40c4baa23..4d396f39a 100644
--- a/src/platforms/ros/nodes/position_estimator/position_estimator.h
+++ b/src/platforms/ros/nodes/position_estimator/position_estimator.h
@@ -50,7 +50,7 @@ public:
~PositionEstimator() {}
protected:
- void model_states_callback(const gazebo_msgs::ModelStatesConstPtr &msg);
+ void ModelStatesCallback(const gazebo_msgs::ModelStatesConstPtr &msg);
ros::NodeHandle _n;
ros::Subscriber _sub_modelstates;