Skip to content

Make number of count-in bars configurable#1305

Merged
sapphire-arches merged 1 commit into
SynthstromAudible:communityfrom
pmatila:countin
Feb 26, 2024
Merged

Make number of count-in bars configurable#1305
sapphire-arches merged 1 commit into
SynthstromAudible:communityfrom
pmatila:countin

Conversation

@pmatila

@pmatila pmatila commented Feb 23, 2024

Copy link
Copy Markdown
Contributor

First-time contributor to Deluge here (Turre on Discord), so apologies if I've missed something in the community protocol.

As for the feature: I don't know how people get by with just one bar of count-in 😳 Except for very slow songs, I need that two bars to get my hands in position and stuff. Maybe everybody else just uses a foot-switch to control 😄 Anyway, this changes the on/off toggle into an integer-with-off, allow up to four bars of count-in.

I repurposed the count-in enabled toggle for the purpose because this should be entirely backwards compatible and so adding a separate value for the number of bars seemed silly waste of a perfectly good byte to me 😄

I was a bit surprised IntergerWithOff renders the off-state with a zero, "Off" would seem more appropriate in at least this case. I can add that to the PR if that would be preferred.

For simplicity's sake I just made the countdown ticks a multiply of the bars, a fancier way could be counting down bars and ticks separately.

@pmatila pmatila force-pushed the countin branch 2 times, most recently from 29431e3 to c799757 Compare February 25, 2024 07:22
@pmatila pmatila marked this pull request as ready for review February 25, 2024 07:22
@sapphire-arches

Copy link
Copy Markdown
Collaborator

Hi! Sorry it took so long to review this.

Looks like the format check is cranky, you can run ./dbt format to run a clang-format pass that should match CI. Otherwise, this change LGTM.

@sapphire-arches sapphire-arches added the cherry-pick Commit to cherry pick to release branch label Feb 26, 2024
Repurpose the count-in on/off toggle into number of count-in bars,
allow up to four bars. This should be entirely backwards compatible
as older firmware only checks for a non-zero value for enabled/disabled
so if going backwards in firmware it counts as enabled and on update
a previous enabled state gives one bar count-in as before.
@pmatilai

Copy link
Copy Markdown

Oh, I didn't realize 'dbt format' was a thing, and a thing you're supposed to run. Maybe something to put into CONTRIBUTING.md. Anyway, formatted (one of my includes wasn't in alphabetical order) and rebased.

I actually consider this a rather speedy review, no worries on that front. Thanks for the review!

@sapphire-arches sapphire-arches added this pull request to the merge queue Feb 26, 2024
Merged via the queue into SynthstromAudible:community with commit 2a68d0e Feb 26, 2024
github-actions Bot pushed a commit that referenced this pull request Feb 26, 2024
Repurpose the count-in on/off toggle into number of count-in bars,
allow up to four bars. This should be entirely backwards compatible
as older firmware only checks for a non-zero value for enabled/disabled
so if going backwards in firmware it counts as enabled and on update
a previous enabled state gives one bar count-in as before.
sapphire-arches pushed a commit that referenced this pull request Feb 26, 2024
Repurpose the count-in on/off toggle into number of count-in bars,
allow up to four bars. This should be entirely backwards compatible
as older firmware only checks for a non-zero value for enabled/disabled
so if going backwards in firmware it counts as enabled and on update
a previous enabled state gives one bar count-in as before.
pmatila added a commit to pmatila/DelugeFirmware that referenced this pull request May 5, 2024
The configurable count-in bars change (PR SynthstromAudible#1305 commit
2a68d0e) had a changelog entry but
lacked the community features documentation part, but PR SynthstromAudible#1419 (commit
21c4a75) added a second changelog entry
along with the feature doc. Dropping my original changelog as the
latter one is more detailed.
pmatila added a commit to pmatila/DelugeFirmware that referenced this pull request May 5, 2024
The configurable count-in bars change (PR SynthstromAudible#1305 commit
2a68d0e) had a changelog entry but
lacked the community features documentation part. PR SynthstromAudible#1419 (commit
21c4a75) added a second changelog entry
along with the feature doc. Dropping my original changelog as the
latter one is more detailed.
github-merge-queue Bot pushed a commit that referenced this pull request May 5, 2024
The configurable count-in bars change (PR #1305 commit
2a68d0e) had a changelog entry but
lacked the community features documentation part. PR #1419 (commit
21c4a75) added a second changelog entry
along with the feature doc. Dropping my original changelog as the
latter one is more detailed.
github-actions Bot pushed a commit that referenced this pull request May 5, 2024
The configurable count-in bars change (PR #1305 commit
2a68d0e) had a changelog entry but
lacked the community features documentation part. PR #1419 (commit
21c4a75) added a second changelog entry
along with the feature doc. Dropping my original changelog as the
latter one is more detailed.
tastycode pushed a commit to tastycode/DelugeFirmware that referenced this pull request Jul 3, 2024
Repurpose the count-in on/off toggle into number of count-in bars,
allow up to four bars. This should be entirely backwards compatible
as older firmware only checks for a non-zero value for enabled/disabled
so if going backwards in firmware it counts as enabled and on update
a previous enabled state gives one bar count-in as before.
tastycode pushed a commit to tastycode/DelugeFirmware that referenced this pull request Jul 3, 2024
…1835)

The configurable count-in bars change (PR SynthstromAudible#1305 commit
2a68d0e) had a changelog entry but
lacked the community features documentation part. PR SynthstromAudible#1419 (commit
21c4a75) added a second changelog entry
along with the feature doc. Dropping my original changelog as the
latter one is more detailed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick Commit to cherry pick to release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants