Skip to content

Vivid ring colors that keep the hue, with a Vivid / Exact switch - #156

Merged
Skeyelab merged 7 commits into
mainfrom
vivid-ring
Nov 16, 2026
Merged

Skeyelab merged 7 commits into
mainfrom
vivid-ring

Conversation

@Skeyelab

@Skeyelab Skeyelab commented Nov 16, 2026 •

Copy link
Copy Markdown
Member

The user said the jog ring's colors looked "a little washed out" on the real LC6000. This adds a vivid, hue-preserving mapping for the ring and a held pad, with a Settings switch (default Vivid).

Part of #151 (it stays open for the user's hardware check).

Why it washed out

The exact rgb222 mapping rounds each channel on its own (round(c / 255 · 3)), so a color's weaker channels land on level 1–2 and add white. Syndicate's yellow #ECCF65 lit as (3, 2, 1).

Vivid mapping (vividVelocity, MIDIValues)

  1. Take out the white: subtract the smallest channel.
  2. Scale so the strongest channel is level 3.
  3. Drop any channel under 30 % of the strongest to 0 (it was 35 %, lowered so orange never turns red).
  4. Quantize.

A near-gray (saturation under 20 %) has no hue to keep and uses the exact mapping, so deck 1's gray #6C7277 stays gray (21) instead of turning blue.

Color Exact Vivid
red (255, 0, 0) 48 48
purple (128, 0, 255) 35 35 = (2, 0, 3): 50 % ≥ 30 %
orange (255, 140, 0) 56 56 = (3, 2, 0), never red
teal-ish (0, 200, 180) 15 15 = (0, 3, 3)
pastel (255, 180, 180) 58 48 = (3, 0, 0): the white comes out
#6C7277 (near gray) 21 21, exact
default deck 2 #ECCF65 57 56 = (3, 2, 0)
default deck 3 #C5754E 37 52 = (3, 1, 0): green is 33 % of red, so it stays orange
default deck 4 #62929E 26 11 = (0, 2, 3)

The pastel literal is why the white comes out first. Scaling plus the threshold alone gives (3, 2, 2) = 58 for it.

Where it's used

  • The platter ring, and a held hot-cue pad's brightest variant. Unheld pad cue colors stay exact.
  • Settings › Decks › Ring colors: Vivid / Exact, saved as BridgeSettings.ringColors:
    • old settings load as Vivid
    • it round-trips, with a rebased pick
    • it reaches the Coordinator through a new .setRingColors pipe event, and the ring and pads repaint at once
  • The LC6000 preview swatch follows the mode (DeckColors.ledPreview(_:mode:)).

Tests

  • The vivid literals, through the ring at the Coordinator seam.
  • A held pad: pastel is 58 unheld (exact) and 48 held (vivid).
  • Switching to Exact and back repaints deck 2's ring: 56 → 57 → 56.
  • The setting round-trips, defaults to Vivid, and survives a rebase. The preview follows the mode.
  • Existing ring tests from Jog ring color follows the active deck's badge color #122 move to the vivid literals: decks 2/3/4 are now 56/52/11, and the layer ring tests are now 56.
  • 81 Presentation + 364 Core tests pass. The Release build succeeds.
  • The settings snapshot shows the switch and the vivid swatches.

For the user, on hardware: after the rebuild, compare Vivid and Exact under Settings › Decks › Ring colors.

🤖 Generated with Claude Code

https://claude.ai/code/session_01VCgWWsrZ4EvHNNNTAe7RC1

@Skeyelab Skeyelab added this to the v1.0: native Mac app milestone Nov 16, 2026
@Skeyelab
Skeyelab enabled auto-merge November 16, 2026 05:02
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VCgWWsrZ4EvHNNNTAe7RC1
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VCgWWsrZ4EvHNNNTAe7RC1
@Skeyelab
Skeyelab merged commit a580c79 into main Nov 16, 2026
3 checks passed
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.

1 participant