diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-03-11 21:46:26 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-03-11 21:46:26 +0100 |
| commit | 6b947a67d07eadc7dc882edf4505377085979784 (patch) | |
| tree | ec2b8f1870121cbaa66127d958495d5f0fd06d62 /apps | |
| parent | 424923271e5b8e802a3c082841eccea450326277 (diff) | |
| parent | 1d444f80a3b9b575681e41b7a3a9b26a4b3d606d (diff) | |
| download | px4-firmware-6b947a67d07eadc7dc882edf4505377085979784.tar.gz px4-firmware-6b947a67d07eadc7dc882edf4505377085979784.tar.bz2 px4-firmware-6b947a67d07eadc7dc882edf4505377085979784.zip | |
Merge branch 'master' of github.com:PX4/Firmwarefixedwing_0.1
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index 791964087..27c885ed7 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -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 |