diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-03 13:26:59 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-03 13:26:59 +0200 |
| commit | 73d7c8e3833211d49ecec0ae9e9fd4d0307d5184 (patch) | |
| tree | 1cc84659bb2265d6df338ecf325e7c0892dae60b /src/drivers/px4fmu/fmu.cpp | |
| parent | 628477ee2c75d16758688f53c0f8d9f29457f831 (diff) | |
| parent | 2a7954b6cf068e36c16dc9170a86970ed46856a9 (diff) | |
| download | px4-firmware-73d7c8e3833211d49ecec0ae9e9fd4d0307d5184.tar.gz px4-firmware-73d7c8e3833211d49ecec0ae9e9fd4d0307d5184.tar.bz2 px4-firmware-73d7c8e3833211d49ecec0ae9e9fd4d0307d5184.zip | |
Merge branch 'master' of github.com:PX4/Firmware into simon_test
Diffstat (limited to 'src/drivers/px4fmu/fmu.cpp')
| -rw-r--r-- | src/drivers/px4fmu/fmu.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index 8a4bfa18c..0a4635728 100644 --- a/src/drivers/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp @@ -240,8 +240,6 @@ PX4FMU::PX4FMU() : _pwm_alt_rate_channels(0), _current_update_rate(0), _task(-1), - _control_subs({-1}), - _poll_fds_num(0), _armed_sub(-1), _outputs_pub(-1), _num_outputs(0), @@ -252,10 +250,12 @@ PX4FMU::PX4FMU() : _mixers(nullptr), _groups_required(0), _groups_subscribed(0), - _failsafe_pwm({0}), - _disarmed_pwm({0}), - _num_failsafe_set(0), - _num_disarmed_set(0) + _control_subs{-1}, + _poll_fds_num(0), + _failsafe_pwm{0}, + _disarmed_pwm{0}, + _num_failsafe_set(0), + _num_disarmed_set(0) { for (unsigned i = 0; i < _max_actuators; i++) { _min_pwm[i] = PWM_DEFAULT_MIN; @@ -741,7 +741,7 @@ PX4FMU::task_main() } for (unsigned i = 0; i < NUM_ACTUATOR_CONTROL_GROUPS; i++) { - if (_control_subs > 0) { + if (_control_subs[i] > 0) { ::close(_control_subs[i]); _control_subs[i] = -1; } |