dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2002 from PX4/rotorssim 

simulator repository was renamed
This commit is contained in:
Lorenz Meier 2015-04-11 22:51:35 +02:00
parent d4ae721bc0 747a00d70d
commit 7278952dc2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/mc_att_control_multiplatform/mc_att_control_sim.h
View File

@ -82,7 +82,7 @@ public:
*/ */
~MulticopterAttitudeControlSim(); ~MulticopterAttitudeControlSim();
/* setters and getters for interface with euroc-gazebo simulator */ /* setters and getters for interface with rotors-gazebo simulator */
void set_attitude(const Eigen::Quaternion<double> attitude); void set_attitude(const Eigen::Quaternion<double> attitude);
void set_attitude_rates(const Eigen::Vector3d &angular_rate); void set_attitude_rates(const Eigen::Vector3d &angular_rate);
void set_attitude_reference(const Eigen::Vector4d &control_attitude_thrust_reference); void set_attitude_reference(const Eigen::Vector4d &control_attitude_thrust_reference);

6
src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
View File

@ -33,7 +33,7 @@
/** /**
* @file mc_mixer.cpp * @file mc_mixer.cpp
* Dummy multicopter mixer for euroc simulator (gazebo) * Dummy multicopter mixer for rotors simulator (gazebo)
* *
* @author Roman Bapst <romanbapst@yahoo.de> * @author Roman Bapst <romanbapst@yahoo.de>
*/ */
@ -96,7 +96,7 @@ const MultirotorMixer::Rotor _config_quad_plus[] = {
{ -0.000000, -1.000000, -1.00 }, { -0.000000, -1.000000, -1.00 },
}; };
const MultirotorMixer::Rotor _config_quad_plus_euroc[] = { const MultirotorMixer::Rotor _config_quad_plus_rotorssim[] = {
{ 0.000000, 1.000000, 1.00 }, { 0.000000, 1.000000, 1.00 },
{ -0.000000, -1.000000, 1.00 }, { -0.000000, -1.000000, 1.00 },
{ 1.000000, 0.000000, -1.00 }, { 1.000000, 0.000000, -1.00 },
@ -118,7 +118,7 @@ const MultirotorMixer::Rotor _config_quad_iris[] = {
const MultirotorMixer::Rotor *_config_index[5] = { const MultirotorMixer::Rotor *_config_index[5] = {
&_config_x[0], &_config_x[0],
&_config_quad_plus[0], &_config_quad_plus[0],
&_config_quad_plus_euroc[0], &_config_quad_plus_rotorssim[0],
&_config_quad_wide[0], &_config_quad_wide[0],
&_config_quad_iris[0] &_config_quad_iris[0]
}; };