From d1e14741cd61abcb6c69b35d73a6510513a20cab Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Sun, 8 Feb 2015 17:45:29 +0100 Subject: mixer node: do not use macros This is not a portable module (ros only). Hence use the native ros types. --- src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3