aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-02-01 11:58:37 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-02-01 11:58:37 +0100
commite547176ba19da5e27b414bbff4a2ac77e6aa2903 (patch)
treeeabdb831e9c8d6c981422715b1e6b5afd0548c51 /src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
parentd74b81ba4f44db0e50e4eb491ca7941bb1aceec2 (diff)
parent84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9 (diff)
downloadpx4-firmware-e547176ba19da5e27b414bbff4a2ac77e6aa2903.tar.gz
px4-firmware-e547176ba19da5e27b414bbff4a2ac77e6aa2903.tar.bz2
px4-firmware-e547176ba19da5e27b414bbff4a2ac77e6aa2903.zip
Merge pull request #1734 from PX4/ros_messagelayer_merge_attctrl_posctrl
Ros messagelayer merge attctrl posctrl
Diffstat (limited to 'src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp')
-rw-r--r--src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp4
1 files changed, 0 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 54f5fa78b..0749c8e92 100644
--- a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
+++ b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
@@ -223,19 +223,15 @@ void MultirotorMixer::actuatorControlsCallback(const PX4_TOPIC_T(actuator_contro
_n.getParamCached("mixer", mixer_name);
if (mixer_name == "x") {
_rotors = _config_index[0];
- ROS_WARN("using x");
} else if (mixer_name == "+") {
_rotors = _config_index[1];
} else if (mixer_name == "e") {
_rotors = _config_index[2];
} else if (mixer_name == "w") {
_rotors = _config_index[3];
- ROS_WARN("using w");
} else if (mixer_name == "i") {
_rotors = _config_index[4];
- ROS_WARN("using i");
}
- ROS_WARN("mixer_name %s", mixer_name.c_str());
// mix
mix();