diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:58:55 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:58:55 +0200 |
| commit | 01a54390e9ac1daa3af8c51ae3c35e39bf99cec6 (patch) | |
| tree | 5bdb086ac86053baa69e9bb97f0472727d3e1e6d /src/drivers/mkblctrl/mkblctrl.cpp | |
| parent | d1bd4b0a45ec0f6f081560fbadf675e21ce53d83 (diff) | |
| parent | 3f4c264050774e79add989cb85a80623038478c0 (diff) | |
| download | px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.tar.gz px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.tar.bz2 px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.zip | |
Merge remote-tracking branch 'upstream/master' into qu4d
Diffstat (limited to 'src/drivers/mkblctrl/mkblctrl.cpp')
| -rw-r--r-- | src/drivers/mkblctrl/mkblctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/mkblctrl/mkblctrl.cpp b/src/drivers/mkblctrl/mkblctrl.cpp index 705e98eea..0915c122b 100644 --- a/src/drivers/mkblctrl/mkblctrl.cpp +++ b/src/drivers/mkblctrl/mkblctrl.cpp @@ -155,7 +155,7 @@ private: actuator_controls_s _controls; static void task_main_trampoline(int argc, char *argv[]); - void task_main() __attribute__((noreturn)); + void task_main(); static int control_callback(uintptr_t handle, uint8_t control_group, @@ -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; |