aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-04-09 20:06:13 +0200
committerThomas Gubler <thomasgubler@gmail.com>2015-04-09 20:08:11 +0200
commit747a00d70de7cfdc90120b51794582e49225440a (patch)
tree2c8eadeba3ffe4007bd968c0902b6f82e09f7435
parent79f645974088aaf73b1d76266cac55346295f5b6 (diff)
downloadpx4-firmware-747a00d70de7cfdc90120b51794582e49225440a.tar.gz
px4-firmware-747a00d70de7cfdc90120b51794582e49225440a.tar.bz2
px4-firmware-747a00d70de7cfdc90120b51794582e49225440a.zip
simulator repository was renamed
-rw-r--r--src/modules/mc_att_control_multiplatform/mc_att_control_sim.h2
-rw-r--r--src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mc_att_control_multiplatform/mc_att_control_sim.h b/src/modules/mc_att_control_multiplatform/mc_att_control_sim.h
index a1bf44fc9..1d76afb82 100644
--- a/src/modules/mc_att_control_multiplatform/mc_att_control_sim.h
+++ b/src/modules/mc_att_control_multiplatform/mc_att_control_sim.h
@@ -82,7 +82,7 @@ public:
*/
~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_rates(const Eigen::Vector3d &angular_rate);
void set_attitude_reference(const Eigen::Vector4d &control_attitude_thrust_reference);
diff --git a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
index 9b48294b6..002a112b6 100644
--- a/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
+++ b/src/platforms/ros/nodes/mc_mixer/mc_mixer.cpp
@@ -33,7 +33,7 @@
/**
* @file mc_mixer.cpp
- * Dummy multicopter mixer for euroc simulator (gazebo)
+ * Dummy multicopter mixer for rotors simulator (gazebo)
*
* @author Roman Bapst <romanbapst@yahoo.de>
*/
@@ -96,7 +96,7 @@ const MultirotorMixer::Rotor _config_quad_plus[] = {
{ -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 },
{ 1.000000, 0.000000, -1.00 },
@@ -118,7 +118,7 @@ const MultirotorMixer::Rotor _config_quad_iris[] = {
const MultirotorMixer::Rotor *_config_index[5] = {
&_config_x[0],
&_config_quad_plus[0],
- &_config_quad_plus_euroc[0],
+ &_config_quad_plus_rotorssim[0],
&_config_quad_wide[0],
&_config_quad_iris[0]
};