diff options
| author | Roman Bapst <romanbapst@yahoo.de> | 2015-04-10 17:34:38 +0200 |
|---|---|---|
| committer | tumbili <bapstr@ethz.ch> | 2015-04-10 20:26:38 +0200 |
| commit | 555e96a37a79a381dd6aeacf0e99cf6621df1018 (patch) | |
| tree | 8e94e8d1e309254301f2a374ce4af48422105e68 /src/modules/px4iofirmware/mixer.cpp | |
| parent | 2d985dbed315ad621f5c586adca47a4c6f19d016 (diff) | |
| download | px4-firmware-555e96a37a79a381dd6aeacf0e99cf6621df1018.tar.gz px4-firmware-555e96a37a79a381dd6aeacf0e99cf6621df1018.tar.bz2 px4-firmware-555e96a37a79a381dd6aeacf0e99cf6621df1018.zip | |
fixed publication of mixer limit flags
Diffstat (limited to 'src/modules/px4iofirmware/mixer.cpp')
| -rw-r--r-- | src/modules/px4iofirmware/mixer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index 835dfc0f5..6fa26d4ff 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -230,7 +230,7 @@ mixer_tick(void) /* poor mans mutex */ in_mixer = true; - mixed = mixer_group.mix(&outputs[0], PX4IO_SERVO_COUNT); + mixed = mixer_group.mix(&outputs[0], PX4IO_SERVO_COUNT, &r_mixer_limits); in_mixer = false; /* the pwm limit call takes care of out of band errors */ @@ -453,7 +453,7 @@ mixer_set_failsafe() unsigned mixed; /* mix */ - mixed = mixer_group.mix(&outputs[0], PX4IO_SERVO_COUNT); + mixed = mixer_group.mix(&outputs[0], PX4IO_SERVO_COUNT, &r_mixer_limits); /* scale to PWM and update the servo outputs as required */ for (unsigned i = 0; i < mixed; i++) { |