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.

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

Fix latched velocity and modwheel when changing sidebar column mode #2116

Merged

Conversation

soymonitus
Copy link
Contributor

Fixes #2064
For nightly branch.

Copy link
Contributor

github-actions bot commented Jun 11, 2024

Test Results

44 tests  ±0   44 ✅ ±0   0s ⏱️ ±0s
 8 suites ±0    0 💤 ±0 
 8 files   ±0    0 ❌ ±0 

Results for commit b8606df. ± Comparison against base commit 43aa651.

♻️ This comment has been updated with latest results.

@@ -57,6 +57,15 @@ bool VelocityColumn::handleVerticalEncoder(int8_t pad, int32_t offset) {
return false;
};

void VelocityColumn::handleLeavingColumn(ModelStackWithTimelineCounter* modelStackWithTimelineCounter,
KeyboardLayout* layout) {
if (!FlashStorage::keyboardFunctionsVelocityGlide) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we always want to reset to the held value, though I'm open to arguments in favor of this behavior.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If the Glide is enabled there is no coming back to old value. Regardless of if you short press or long press the value is replaced. But if glide is disabled it must jump to the last short pressed pad

Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there any way to grab the previous value when glide is enabled? If not we should add one even if just for the purpose of holding the top pad to change columns

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ohh I know what you mean now. I think that if i remove the if condition here it will work as you want. I am going to test it...

Copy link
Contributor Author

@soymonitus soymonitus Jun 11, 2024

Choose a reason for hiding this comment

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

@m-m-adams @sapphire-arches I made a change to remove the logic that was there to send the pad release event to the previous column that was there before changing the column type. And now the pad release is "forced" at the exact moment you change columns. Also removed the IF condition in velocity and modwheel so it also respect the last set velocity and modwheel in glide mode (Momentary - Disabled in menu) when you leave those columns. That way, even in glide mode, you can set a lower velocity for example, hold the top pad to change the column type, and still have that low velocity set and not replaced by 127 because you held the top pad.
Note: applied the same changes to the other PR to release/1.1

…switching columns, and instead reset back to prev pad in the moment of switching

# Conflicts:
#	src/deluge/gui/ui/keyboard/layout/column_controls.h
@m-m-adams m-m-adams added this pull request to the merge queue Jun 12, 2024
Merged via the queue into SynthstromAudible:community with commit 548f470 Jun 12, 2024
6 checks passed
@soymonitus soymonitus deleted the monitus/fix_latched_sidebars branch June 14, 2024 14:24
tastycode pushed a commit to tastycode/DelugeFirmware that referenced this pull request Jul 3, 2024
…ynthstromAudible#2116)

* Fix latched velocity and modwheel when changing sidebar column mode

* Remove the logic to preserve the presses of the previous column when switching columns, and instead reset back to prev pad in the moment of switching

# Conflicts:
#	src/deluge/gui/ui/keyboard/layout/column_controls.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Holding top sidebar value then switching sidebar mode should not cause latching.
3 participants