aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-02-08 17:45:29 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-02-08 17:53:26 +0100
commitd1e14741cd61abcb6c69b35d73a6510513a20cab (patch)
tree11f3c93658ab47f80c7b8955759b1e0a364635cc /src
parent27f2eb8a16fc6915783276298ecf676b8649c1f8 (diff)
downloadpx4-firmware-d1e14741cd61abcb6c69b35d73a6510513a20cab.tar.gz
px4-firmware-d1e14741cd61abcb6c69b35d73a6510513a20cab.tar.bz2
px4-firmware-d1e14741cd61abcb6c69b35d73a6510513a20cab.zip
mixer node: do not use macros
This is not a portable module (ros only). Hence use the native ros types.
Diffstat (limited to 'src')
-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;
}