aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lorenz@px4.io>2015-02-10 14:12:23 +0100
committerLorenz Meier <lorenz@px4.io>2015-02-10 14:12:23 +0100
commit7c29a58ba61c9db63cdf0ad09ab443f4731198c2 (patch)
treea46140b6425f34515241b9754050524b40d2ca9c /src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
parent38ad35fd7729d9492aa5ae7b5186d4a4676d5df2 (diff)
parent347047bafcbe9aa4268f4fad83d8b35a8787eda8 (diff)
downloadpx4-firmware-7c29a58ba61c9db63cdf0ad09ab443f4731198c2.tar.gz
px4-firmware-7c29a58ba61c9db63cdf0ad09ab443f4731198c2.tar.bz2
px4-firmware-7c29a58ba61c9db63cdf0ad09ab443f4731198c2.zip
Merge pull request #1763 from PX4/ros_paramapi
multiplatform: improve param api
Diffstat (limited to 'src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp')
-rw-r--r--src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
index 0749c8e92..1098ec73b 100644
--- a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
+++ b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
@@ -55,8 +55,8 @@ public:
float yaw_scale;
};
- void actuatorControlsCallback(const PX4_TOPIC_T(actuator_controls_0) &msg);
- void actuatorArmedCallback(const PX4_TOPIC_T(actuator_armed) &msg);
+ void actuatorControlsCallback(const px4::actuator_controls_0 &msg);
+ void actuatorArmedCallback(const px4::actuator_armed &msg);
private:
@@ -211,7 +211,7 @@ void MultirotorMixer::mix()
}
}
-void MultirotorMixer::actuatorControlsCallback(const PX4_TOPIC_T(actuator_controls_0) &msg)
+void MultirotorMixer::actuatorControlsCallback(const px4::actuator_controls_0 &msg)
{
// read message
for (int i = 0; i < msg.NUM_ACTUATOR_CONTROLS; i++) {
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
return 0;
}
-void MultirotorMixer::actuatorArmedCallback(const PX4_TOPIC_T(actuator_armed) &msg)
+void MultirotorMixer::actuatorArmedCallback(const px4::actuator_armed &msg)
{
_armed = msg.armed;
}