diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-27 15:45:33 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-27 15:45:33 +0200 |
| commit | c74248c8b15af0330e0b76ff0366321bfddda34b (patch) | |
| tree | 7de37dc94e44678a852a4112671d0c07f7edbac0 /src/drivers | |
| parent | 84943644d77ce21e91fa60a326ab333069333e74 (diff) | |
| parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
| download | px4-firmware-c74248c8b15af0330e0b76ff0366321bfddda34b.tar.gz px4-firmware-c74248c8b15af0330e0b76ff0366321bfddda34b.tar.bz2 px4-firmware-c74248c8b15af0330e0b76ff0366321bfddda34b.zip | |
Merged mpc_rc with master
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; |