Merge branch 'master' of github.com:PX4/Firmware

This commit is contained in:
Lorenz Meier
2013-03-11 21:46:26 +01:00
+1 -1
View File
@@ -122,7 +122,7 @@ private:
uint16_t _alarms;
/* subscribed topics */
int _t_actuators; ///< actuator output topic
int _t_actuators; ///< actuator controls topic
int _t_armed; ///< system armed control topic
int _t_vstatus; ///< system / vehicle status
int _t_param; ///< parameter update topic