diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-26 15:19:21 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-26 15:19:21 +0200 |
commit | 5ad3ff95bf0ebf67c2054f02ee534ef4c8e03b0a (patch) | |
tree | 301db980a61f6536339b6a1d699fc43b57aaa84b /src/drivers | |
parent | ad1be765bf36a6068fda25e3c62c92e275aebc6b (diff) | |
parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
download | px4-firmware-5ad3ff95bf0ebf67c2054f02ee534ef4c8e03b0a.tar.gz px4-firmware-5ad3ff95bf0ebf67c2054f02ee534ef4c8e03b0a.tar.bz2 px4-firmware-5ad3ff95bf0ebf67c2054f02ee534ef4c8e03b0a.zip |
Merged master into ekf_params
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/mkblctrl/mkblctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/mkblctrl/mkblctrl.cpp b/src/drivers/mkblctrl/mkblctrl.cpp index 705e98eea..3cb9abc49 100644 --- a/src/drivers/mkblctrl/mkblctrl.cpp +++ b/src/drivers/mkblctrl/mkblctrl.cpp @@ -1015,7 +1015,7 @@ MK::pwm_ioctl(file *filp, int cmd, unsigned long arg) case PWM_SERVO_GET(0) ... PWM_SERVO_GET(_max_actuators - 1): /* copy the current output value from the channel */ - *(servo_position_t *)arg = Motor[cmd - PWM_SERVO_SET(0)].RawPwmValue; + *(servo_position_t *)arg = Motor[cmd - PWM_SERVO_GET(0)].RawPwmValue; break; |