diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-11-01 11:09:07 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-11-01 11:09:07 +0100 |
| commit | 0c762b6d1b8f99324fb37ac65631bf6f73be5672 (patch) | |
| tree | 29baa81b03afe09220e7055d136e1c44506be960 /src/drivers/hil/hil.cpp | |
| parent | a06b3e50ab4d4c73fd400ec2891b1ab7a9eb8451 (diff) | |
| parent | 5781b58640a7bb3937f9eff979f99535ab1169e3 (diff) | |
| download | px4-firmware-0c762b6d1b8f99324fb37ac65631bf6f73be5672.tar.gz px4-firmware-0c762b6d1b8f99324fb37ac65631bf6f73be5672.tar.bz2 px4-firmware-0c762b6d1b8f99324fb37ac65631bf6f73be5672.zip | |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src/drivers/hil/hil.cpp')
| -rw-r--r-- | src/drivers/hil/hil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/hil/hil.cpp b/src/drivers/hil/hil.cpp index 3e30e3292..c1d73dd87 100644 --- a/src/drivers/hil/hil.cpp +++ b/src/drivers/hil/hil.cpp @@ -404,7 +404,7 @@ HIL::task_main() for (unsigned i = 0; i < num_outputs; i++) { /* last resort: catch NaN, INF and out-of-band errors */ - if (i < (unsigned)outputs.noutputs && + if (i < outputs.noutputs && isfinite(outputs.output[i]) && outputs.output[i] >= -1.0f && outputs.output[i] <= 1.0f) { @@ -517,7 +517,7 @@ HIL::pwm_ioctl(file *filp, int cmd, unsigned long arg) g_hil->set_pwm_rate(arg); break; - case PWM_SERVO_SELECT_UPDATE_RATE: + case PWM_SERVO_SET_SELECT_UPDATE_RATE: // HIL always outputs at the alternate (usually faster) rate break; |