Commit 6b947a67 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

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

parents 42492327 1d444f80
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment