diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-10 21:26:56 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-10 21:26:56 +0100 |
| commit | f2b2c55afdc2fd5ecdfa213ed5181f44abad0934 (patch) | |
| tree | 13d9c174b2aabd9925c099fa90780970b342e3a5 /src | |
| parent | 1837440e4336fda1462de24d622d200d67471ac5 (diff) | |
| parent | b311f7302b508d1ed7fd3cfecd0bfbe47b324bde (diff) | |
| download | px4-firmware-f2b2c55afdc2fd5ecdfa213ed5181f44abad0934.tar.gz px4-firmware-f2b2c55afdc2fd5ecdfa213ed5181f44abad0934.tar.bz2 px4-firmware-f2b2c55afdc2fd5ecdfa213ed5181f44abad0934.zip | |
Merge pull request #1853 from PX4/ros_mavlink_rotorssimulatorupdate
update ros launch files and nodes for update of rotors_simulator
Diffstat (limited to 'src')
| -rw-r--r-- | src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp index 1098ec73b..9b48294b6 100644 --- a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp +++ b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp @@ -40,7 +40,7 @@ #include <ros/ros.h> #include <px4.h> #include <lib/mathlib/mathlib.h> -#include <mav_msgs/MotorSpeed.h> +#include <mav_msgs/CommandMotorSpeed.h> #include <string> class MultirotorMixer @@ -129,7 +129,7 @@ MultirotorMixer::MultirotorMixer(): _rotors(_config_index[0]) { _sub = _n.subscribe("actuator_controls_0", 1, &MultirotorMixer::actuatorControlsCallback, this); - _pub = _n.advertise<mav_msgs::MotorSpeed>("/mixed_motor_commands", 10); + _pub = _n.advertise<mav_msgs::CommandMotorSpeed>("command/motor_speed", 10); if (!_n.hasParam("motor_scaling_radps")) { _n.setParam("motor_scaling_radps", 150.0); @@ -237,7 +237,7 @@ void MultirotorMixer::actuatorControlsCallback(const px4::actuator_controls_0 &m mix(); // publish message - mav_msgs::MotorSpeed rotor_vel_msg; + mav_msgs::CommandMotorSpeed rotor_vel_msg; double scaling; double offset; _n.getParamCached("motor_scaling_radps", scaling); |