Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mixer_module: use math:constrain #15349

Merged
merged 1 commit into from
Jul 16, 2020
Merged

mixer_module: use math:constrain #15349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/lib/mixer_module/mixer_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,12 +499,7 @@ int MixingOutput::controlCallback(uintptr_t handle, uint8_t control_group, uint8
input = output->_controls[control_group].control[control_index];

/* limit control input */
if (input > 1.0f) {
input = 1.0f;

} else if (input < -1.0f) {
input = -1.0f;
}
math::constrain(input, -1.f, 1.f);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MaEtUgR this is quite a severe bug: input = math::constrain(input, -1.f, 1.f);

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me fix it 😬

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking a closer look again!! #15379
I was convinced it's pass by reference 😞


/* motor spinup phase - lock throttle to zero */
if (output->_output_limit.state == OUTPUT_LIMIT_STATE_RAMP) {
Expand Down