Merge branch 'master' of github.com:PX4/Firmware into px4io-adc-integration-battery-msg

This commit is contained in:
Lorenz Meier
2013-01-06 00:50:51 +01:00
3 changed files with 42 additions and 3 deletions
+1 -1
View File
@@ -500,7 +500,7 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg)
/* FALLTHROUGH */
case PWM_SERVO_GET(0):
case PWM_SERVO_GET(1): {
channel = cmd - PWM_SERVO_SET(0);
channel = cmd - PWM_SERVO_GET(0);
*(servo_position_t *)arg = up_pwm_servo_get(channel);
break;
}