Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 19:07:45 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Roman Bapst
2014-12-30 11:41:28 +01:00
parent fa1f09b850
commit bfc3984426
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
+1 -9
View File
@@ -51,10 +51,8 @@ public:
float roll_scale; float roll_scale;
float pitch_scale; float pitch_scale;
float yaw_scale; float yaw_scale;
}; };
void mix();
void actuatorControlsCallback(const PX4_TOPIC_T(actuator_controls_0) &msg); void actuatorControlsCallback(const PX4_TOPIC_T(actuator_controls_0) &msg);
private: private:
@@ -75,12 +73,10 @@ private:
float control[6]; float control[6];
}outputs; }outputs;
void mix();
}; };
const MultirotorMixer::Rotor _config_x[] = { const MultirotorMixer::Rotor _config_x[] = {
{ 0.000000, -1.000000, -1.00 }, { 0.000000, -1.000000, -1.00 },
{ -0.000000, 1.000000, -1.00 }, { -0.000000, 1.000000, -1.00 },
@@ -89,7 +85,6 @@ const MultirotorMixer::Rotor _config_x[] = {
}; };
const MultirotorMixer::Rotor *_config_index = { &_config_x[0] const MultirotorMixer::Rotor *_config_index = { &_config_x[0]
}; };
MultirotorMixer::MultirotorMixer(): MultirotorMixer::MultirotorMixer():
@@ -100,7 +95,6 @@ MultirotorMixer::MultirotorMixer():
_pub = _n.advertise<mav_msgs::MotorSpeed>("mixed_motor_commands",10); _pub = _n.advertise<mav_msgs::MotorSpeed>("mixed_motor_commands",10);
} }
void MultirotorMixer::mix() { void MultirotorMixer::mix() {
float roll = math::constrain(inputs.control[0], -1.0f, 1.0f); float roll = math::constrain(inputs.control[0], -1.0f, 1.0f);
float pitch = math::constrain(inputs.control[1], -1.0f, 1.0f); float pitch = math::constrain(inputs.control[1], -1.0f, 1.0f);
@@ -178,14 +172,12 @@ void MultirotorMixer::mix() {
rotor_vel_msg.motor_speed.push_back(outputs.control[i]); rotor_vel_msg.motor_speed.push_back(outputs.control[i]);
} }
_pub.publish(rotor_vel_msg); _pub.publish(rotor_vel_msg);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
ros::init(argc, argv, "mc_mixer"); ros::init(argc, argv, "mc_mixer");
MultirotorMixer mixer; MultirotorMixer mixer;
ros::spin(); ros::spin();
return 0; return 0;