Remove the sound-reactive cans from the test show.
The Sound and Threshold audio triggers go, with the Sound submaster beside the cans' Front and Back sliders (CC 100) and the Sound peak frame with its Peak submaster and Hit button and the Cans hit functions only Hit ran. Pads 1 and 2 are plain spare buttons again (scripts/shows/drop_sound.py). The pads frame's own Peak (knob 6) stays: it is the chases' peak. The pad controller drops its side of it: the Pump and Threshold modes, the CC 100 resets, holding the side knobs at the peak and the pad lamps that showed which mode was on. Pads 1 and 2 and knobs 5, 6 and 8 pass straight through. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
3b38df3dd0
commit
e7e1cf656b
6 files changed
+92
-349
No files matched your search
+4
-39
@@ -6,7 +6,6 @@ immediately, and eases Control Change values toward their targets at
|
||||
|
||||
On start it also sets the pad lamps over USB (scripts/pad/pad_lamps.py): bank 1 off and
|
||||
bank 2 in the colours from shows/test.qxw. On Bluetooth it says so and carries on.
|
||||
While it runs, the Pump and Threshold pads (notes 36 and 37) light while their mode is on.
|
||||
While Play is held, bank 2 notes 52–67 go out as 68–83 (see padcontroller/layer.py).
|
||||
|
||||
Point QLC+ MIDI input at that virtual port (midi.qxw does this via
|
||||
@@ -39,7 +38,6 @@ import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
@@ -52,11 +50,11 @@ for p in glob.glob(str(ROOT / ".venv" / "lib" / "python*" / "site-packages")):
|
||||
sys.path.insert(0, p)
|
||||
import rtmidi
|
||||
|
||||
from padcontroller.layer import SUBMASTER_CC, PlayLayer # noqa: E402
|
||||
from padcontroller.layer import PlayLayer # noqa: E402
|
||||
|
||||
# The lamp colours come from the show scripts, which are not part of this package.
|
||||
sys.path.insert(0, str(ROOT / "scripts" / "pad"))
|
||||
from pad_lamps import set_lamps, set_sound_lamps # noqa: E402
|
||||
from pad_lamps import set_lamps # noqa: E402
|
||||
|
||||
VIRTUAL_NAME = "padcontroller"
|
||||
COLOURS_FILE = Path(os.environ.get("XDG_STATE_HOME", Path.home() / ".local" / "state")) / "padcontroller" / "colours.json"
|
||||
@@ -172,33 +170,6 @@ def save_colours(layer: PlayLayer) -> None:
|
||||
print(f"Colours not saved: {exc}", flush=True)
|
||||
|
||||
|
||||
class SoundLamps:
|
||||
"""Show which sound pad is on, off the MIDI loop: each write takes ~60 ms."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.wanted: tuple[bool, bool] | None = None
|
||||
self.wake = threading.Event()
|
||||
threading.Thread(target=self._run, daemon=True).start()
|
||||
|
||||
def show(self, pump: bool, threshold: bool) -> None:
|
||||
self.wanted = (pump, threshold)
|
||||
self.wake.set()
|
||||
|
||||
def _run(self) -> None:
|
||||
shown = None
|
||||
while True:
|
||||
self.wake.wait()
|
||||
self.wake.clear()
|
||||
wanted = self.wanted
|
||||
if wanted is None or wanted == shown:
|
||||
continue
|
||||
try:
|
||||
set_sound_lamps(*wanted)
|
||||
shown = wanted
|
||||
except (SystemExit, Exception) as exc: # no Private port on Bluetooth
|
||||
print(f"Sound lamps not set: {exc}", flush=True)
|
||||
|
||||
|
||||
def main() -> None:
|
||||
ap = argparse.ArgumentParser(description=__doc__)
|
||||
ap.add_argument(
|
||||
@@ -237,10 +208,8 @@ def main() -> None:
|
||||
print(f"Virtual: {VIRTUAL_NAME} (tau={args.tau}s @ {args.rate} Hz)", flush=True)
|
||||
print("Pass notes through (Play held shifts bank 2 up 16); smooth CC. Ctrl+C to stop.", flush=True)
|
||||
ensure_links(src_name)
|
||||
sound_lamps = None
|
||||
if not args.no_lamps:
|
||||
set_lamps()
|
||||
sound_lamps = SoundLamps()
|
||||
|
||||
dt = 1.0 / args.rate
|
||||
alpha = 1.0 - math.exp(-dt / max(args.tau, 1e-4))
|
||||
@@ -272,8 +241,6 @@ def main() -> None:
|
||||
for out in taps:
|
||||
midiout.send_message(out)
|
||||
print(f"QLC+ reopened: pressed {sum(out[0] & 0xF0 == 0x90 for out in taps)} colour pad(s) again", flush=True)
|
||||
if sound_lamps:
|
||||
sound_lamps.show(layer.pump, layer.threshold)
|
||||
|
||||
# Drain inbound
|
||||
while True:
|
||||
@@ -285,7 +252,7 @@ def main() -> None:
|
||||
continue
|
||||
for out in layer.handle(list(data)):
|
||||
cmd = out[0] & 0xF0
|
||||
if cmd == 0xB0 and len(out) >= 3 and out[1] != SUBMASTER_CC:
|
||||
if cmd == 0xB0 and len(out) >= 3:
|
||||
# Control Change → smooth
|
||||
key = (out[0] & 0x0F, out[1])
|
||||
target[key] = float(out[2])
|
||||
@@ -293,10 +260,8 @@ def main() -> None:
|
||||
current[key] = float(out[2])
|
||||
last_sent[key] = -1
|
||||
else:
|
||||
# Notes, aftertouch, PC, the Sound reset (always resent), etc. → immediate
|
||||
# Notes, aftertouch, PC, etc. → immediate
|
||||
midiout.send_message(out)
|
||||
if sound_lamps:
|
||||
sound_lamps.show(layer.pump, layer.threshold)
|
||||
if layer.settle:
|
||||
layer.settle = False
|
||||
later += [(now + SETTLE_DELAY, layer.nudge), (now + 2 * SETTLE_DELAY, layer.positions)]
|
||||
|
||||
Reference in new issue
Block a user