fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-06 00:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

mixer node: do not use macros

Browse Source 
This is not a portable module (ros only). Hence use the native ros
types.
This commit is contained in:
Thomas Gubler
2015-02-08 17:45:29 +01:00
parent 27f2eb8a16
commit d1e14741cd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
+4 -4
View File
@@ -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;
}