diff --git a/padcontroller/layer.py b/padcontroller/layer.py
index 1c73a4d..1a1c20b 100644
--- a/padcontroller/layer.py
+++ b/padcontroller/layer.py
@@ -9,6 +9,11 @@ With lock_knobs, knobs 1–5 (CC 30–34) drive colour 1's sliders and knobs 6
with Play held) has been pressed. Pressing any other bank 2 pad locks them
again, and its sliders are sent back to zero so their scenes stop.
Locked knob turns are dropped.
+
+The Sound pad (note 36) toggles QLC+'s audio triggers, which pump the cans'
+Sound submaster in the Dimmers frame. Every press and release also sends CC 100
+at full, so switching sound off leaves the cans at full rather than wherever
+the music left them.
"""
from __future__ import annotations
@@ -20,6 +25,8 @@ SHIFT = 16
CUSTOM_NOTE = 67
KNOB_FIRST_CC = 30
KNOBS_PER_LAYER = 5
+SOUND_NOTE = 36
+SUBMASTER_CC = 100
class PlayLayer:
@@ -56,6 +63,9 @@ class PlayLayer:
self.unlocked.discard(layer)
first = KNOB_FIRST_CC + layer * KNOBS_PER_LAYER
extra = [[0xB0, first + n, 0] for n in range(KNOBS_PER_LAYER)]
+ if note == SOUND_NOTE:
+ # Again on release, after any spectrum frame QLC+ still had queued
+ extra = [[0xB0, SUBMASTER_CC, 127]]
if is_on:
out = note + SHIFT if self.held and FIRST_NOTE <= note <= LAST_NOTE else note
self.sent[key] = out
diff --git a/padcontroller/midi.py b/padcontroller/midi.py
index 199df1b..6e5312c 100644
--- a/padcontroller/midi.py
+++ b/padcontroller/midi.py
@@ -38,7 +38,7 @@ for p in glob.glob(str(ROOT / ".venv" / "lib" / "python*" / "site-packages")):
sys.path.insert(0, p)
import rtmidi
-from padcontroller.layer import PlayLayer # noqa: E402
+from padcontroller.layer import SUBMASTER_CC, 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"))
@@ -205,7 +205,7 @@ def main() -> None:
continue
for out in layer.handle(list(data)):
cmd = out[0] & 0xF0
- if cmd == 0xB0 and len(out) >= 3:
+ if cmd == 0xB0 and len(out) >= 3 and out[1] != SUBMASTER_CC:
# Control Change → smooth
key = (out[0] & 0x0F, out[1])
target[key] = float(out[2])
@@ -213,7 +213,7 @@ def main() -> None:
current[key] = float(out[2])
last_sent[key] = -1
else:
- # Notes, aftertouch, PC, etc. → immediate
+ # Notes, aftertouch, PC, the Sound reset (always resent), etc. → immediate
midiout.send_message(out)
# Ease CC toward targets and emit when quantized value moves
diff --git a/shows/test.qxw b/shows/test.qxw
index 7305bbd..b825d29 100644
--- a/shows/test.qxw
+++ b/shows/test.qxw
@@ -30,6 +30,8 @@
0
87
8
+ 1
+ 2,3,4,5
beamZ
@@ -40,6 +42,8 @@
0
95
8
+ 1
+ 2,3,4,5
beamZ
@@ -50,6 +54,7 @@
0
103
8
+ 1
beamZ
@@ -60,6 +65,7 @@
0
111
8
+ 1
beamZ
@@ -70,6 +76,7 @@
0
119
8
+ 1
beamZ
@@ -80,6 +87,7 @@
0
127
8
+ 1
beamZ
@@ -90,6 +98,8 @@
0
135
8
+ 1
+ 2,3,4,5
beamZ
@@ -100,6 +110,8 @@
0
143
8
+ 1
+ 2,3,4,5
Small Eye 7
@@ -130,6 +142,8 @@
0
151
8
+ 1
+ 2,3,4,5
beamZ
@@ -140,6 +154,8 @@
0
159
8
+ 1
+ 2,3,4,5
beamZ
@@ -150,6 +166,8 @@
0
167
8
+ 1
+ 2,3,4,5
beamZ
@@ -160,6 +178,8 @@
0
175
8
+ 1
+ 2,3,4,5
beamZ
@@ -170,6 +190,8 @@
0
183
8
+ 1
+ 2,3,4,5
beamZ
@@ -180,6 +202,7 @@
0
191
8
+ 1
beamZ
@@ -190,6 +213,8 @@
0
199
8
+ 1
+ 2,3,4,5
Small Eye 7
@@ -238,275 +263,317 @@
0
0
+
+ Sides
+
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ Sides zigzag
+
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ Sides opposing
+
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
- 0,255,2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
+ 2,255,3,0,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
- 0,255,2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
+ 2,255,3,127,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
- 0,255,2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
+ 2,255,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
- 0,255,2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
+ 2,127,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
+ 2,0,3,255,4,0,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
+ 2,0,3,255,4,127,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
- 0,255,2,0,3,255,4,255,5,0
+ 3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
+ 2,0,3,255,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
- 0,255,2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
+ 2,0,3,127,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
- 0,255,2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
+ 2,0,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
- 0,255,2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
+ 2,127,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
- 0,255,2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
+ 2,255,3,0,4,255,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
- 0,255,2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
+ 2,255,3,40,4,120,5,0
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
- 0,255,2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
+ 2,255,3,120,4,40,5,120
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
- 0,255,2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
+ 2,0,3,0,4,0,5,255
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
- 0,255,2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
+ 2,80,3,120,4,255,5,120
@@ -545,7 +612,7 @@
0,255
-
+
2,255
2,255
2,255
@@ -563,7 +630,7 @@
2,255
-
+
3,255
3,255
3,255
@@ -581,7 +648,7 @@
3,255
-
+
4,255
4,255
4,255
@@ -599,7 +666,7 @@
4,255
-
+
5,255
5,255
5,255
@@ -618,108 +685,108 @@
- 8,255,9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
- 8,255,9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
- 8,255,9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
- 8,255,9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
+ 9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
+ 9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
+ 9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
+ 9,0,10,255,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0
- 8,255,9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
- 8,255,9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
- 8,255,9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
- 8,255,9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
+ 9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
+ 9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
+ 9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
+ 9,0,10,255,11,127,12,0,13,0,14,255,15,127,16,0,17,0,18,255,19,127,20,0,21,0,22,255,23,127,24,0,25,0,26,255,27,127,28,0,29,0,30,255,31,127,32,0,33,0,34,255,35,127,36,0,37,0
- 8,255,9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
- 8,255,9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
- 8,255,9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
- 8,255,9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
+ 9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
+ 9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
+ 9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
+ 9,0,10,255,11,255,12,0,13,0,14,255,15,255,16,0,17,0,18,255,19,255,20,0,21,0,22,255,23,255,24,0,25,0,26,255,27,255,28,0,29,0,30,255,31,255,32,0,33,0,34,255,35,255,36,0,37,0
- 8,255,9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
- 8,255,9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
- 8,255,9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
- 8,255,9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
+ 9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
+ 9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
+ 9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
+ 9,0,10,127,11,255,12,0,13,0,14,127,15,255,16,0,17,0,18,127,19,255,20,0,21,0,22,127,23,255,24,0,25,0,26,127,27,255,28,0,29,0,30,127,31,255,32,0,33,0,34,127,35,255,36,0,37,0
- 8,255,9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
- 8,255,9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
- 8,255,9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
- 8,255,9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
+ 9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
+ 9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
+ 9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
+ 9,0,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0
- 8,255,9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
- 8,255,9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
- 8,255,9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
- 8,255,9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
+ 9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
+ 9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
+ 9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
+ 9,0,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0
- 8,255,9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
- 8,255,9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
- 8,255,9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
- 8,255,9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
+ 9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
+ 9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
+ 9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
+ 9,0,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0
- 8,255,9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
- 8,255,9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
- 8,255,9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
- 8,255,9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
+ 9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
+ 9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
+ 9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
+ 9,0,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0
- 8,255,9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
- 8,255,9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
- 8,255,9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
- 8,255,9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
+ 9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
+ 9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
+ 9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
+ 9,0,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0
- 8,255,9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
- 8,255,9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
- 8,255,9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
- 8,255,9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
+ 9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
+ 9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
+ 9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
+ 9,0,10,127,11,0,12,255,13,0,14,127,15,0,16,255,17,0,18,127,19,0,20,255,21,0,22,127,23,0,24,255,25,0,26,127,27,0,28,255,29,0,30,127,31,0,32,255,33,0,34,127,35,0,36,255,37,0
- 8,255,9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
- 8,255,9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
- 8,255,9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
- 8,255,9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
+ 9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
+ 9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
+ 9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
+ 9,0,10,255,11,0,12,255,13,0,14,255,15,0,16,255,17,0,18,255,19,0,20,255,21,0,22,255,23,0,24,255,25,0,26,255,27,0,28,255,29,0,30,255,31,0,32,255,33,0,34,255,35,0,36,255,37,0
- 8,255,9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
- 8,255,9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
- 8,255,9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
- 8,255,9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
+ 9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
+ 9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
+ 9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
+ 9,0,10,255,11,40,12,120,13,0,14,255,15,40,16,120,17,0,18,255,19,40,20,120,21,0,22,255,23,40,24,120,25,0,26,255,27,40,28,120,29,0,30,255,31,40,32,120,33,0,34,255,35,40,36,120,37,0
- 8,255,9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
- 8,255,9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
- 8,255,9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
- 8,255,9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
+ 9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
+ 9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
+ 9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
+ 9,0,10,255,11,120,12,40,13,120,14,255,15,120,16,40,17,120,18,255,19,120,20,40,21,120,22,255,23,120,24,40,25,120,26,255,27,120,28,40,29,120,30,255,31,120,32,40,33,120,34,255,35,120,36,40,37,120
- 8,255,9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
- 8,255,9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
- 8,255,9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
- 8,255,9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
+ 9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
+ 9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
+ 9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
+ 9,0,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255
- 8,255,9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
- 8,255,9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
- 8,255,9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
- 8,255,9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
+ 9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
+ 9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
+ 9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
+ 9,0,10,80,11,120,12,255,13,120,14,80,15,120,16,255,17,120,18,80,19,120,20,255,21,120,22,80,23,120,24,255,25,120,26,80,27,120,28,255,29,120,30,80,31,120,32,255,33,120,34,80,35,120,36,255,37,120
@@ -763,6 +830,107 @@
13,255,17,255,21,255,25,255,29,255,33,255,37,255
13,255,17,255,21,255,25,255,29,255,33,255,37,255
+
+
+ Forward
+ SingleShot
+ Stripes
+ 4278190335
+ RGB
+ 2
+
+
+
+
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+ 0,255,5,0
+
+
+
+ Forward
+ SingleShot
+
+ 44
+
+
+ 43
+ 45
+
+
+
+ Backward
+ SingleShot
+ Stripes
+ 4278190335
+ RGB
+ 2
+
+
+
+ 47
+ 45
+
+
+
+ Forward
+ SingleShot
+ Stripes
+ 4278190335
+ RGB
+ 3
+
+
+
+
+ Forward
+ SingleShot
+
+ 44
+
+
+ 49
+ 50
+
+
+
+ Forward
+ SingleShot
+ Stripes
+ 4278190335
+ RGB
+ 4
+
+
+
+ 52
+ 45
+
+
+
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+ 1,230
+
@@ -787,6 +955,8 @@
True
False
False
+ False
+ False
@@ -1020,15 +1190,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
16
-
@@ -1039,15 +1205,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
17
-
@@ -1058,15 +1220,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
18
-
@@ -1077,15 +1235,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
19
-
@@ -1096,15 +1250,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
20
-
@@ -1121,6 +1271,8 @@
True
False
False
+ False
+ False
@@ -1354,15 +1506,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
37
-
@@ -1373,15 +1521,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
38
-
@@ -1392,15 +1536,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
39
-
@@ -1411,15 +1551,11 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
40
-
@@ -1430,20 +1566,749 @@
None
Default
- Playback
-
-
-
-
+ Playback
+
41
-
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ False
+ False
+ False
+ True
+ False
+ False
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Flash
+ 100
+
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ Toggle
+ 100
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ Submaster
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ True
+ True
+ True
+ False
+ False
+ False
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ Level
+
+ 8
+ 8
+ 8
+ 8
+
+
+ 4294967295
+
+
+
+
+ None
+ Default
+ Default
+ None
+ Default
+
+
+ True
+ True
+ False
+ False
+ False
+ False
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ Level
+
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 4294967295
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ Level
+
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 4294967295
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ Submaster
+
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ True
+ True
+ True
+ False
+ True
+ False
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ 6
+
+ StartColor
+ #ff0000
+
+
+
+ StartColor
+ #ff7f00
+
+
+
+ StartColor
+ #ffff00
+
+
+
+ StartColor
+ #7fff00
+
+
+
+ StartColor
+ #00ff00
+
+
+
+ StartColor
+ #00ff7f
+
+
+
+ StartColor
+ #00ffff
+
+
+
+ StartColor
+ #007fff
+
+
+
+ StartColor
+ #0000ff
+
+
+
+ StartColor
+ #7f00ff
+
+
+
+ StartColor
+ #ff00ff
+
+
+
+ StartColor
+ #ff2878
+
+
+
+ StartColor
+ #ff7828
+
+
+
+ StartColor
+ #ffffff
+
+
+
+ StartColor
+ #5078ff
+
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ 6
+
+ StartColor
+ #ff0000
+
+
+
+ StartColor
+ #ff7f00
+
+
+
+ StartColor
+ #ffff00
+
+
+
+ StartColor
+ #7fff00
+
+
+
+ StartColor
+ #00ff00
+
+
+
+ StartColor
+ #00ff7f
+
+
+
+ StartColor
+ #00ffff
+
+
+
+ StartColor
+ #007fff
+
+
+
+ StartColor
+ #0000ff
+
+
+
+ StartColor
+ #7f00ff
+
+
+
+ StartColor
+ #ff00ff
+
+
+
+ StartColor
+ #ff2878
+
+
+
+ StartColor
+ #ff7828
+
+
+
+ StartColor
+ #ffffff
+
+
+
+ StartColor
+ #5078ff
+
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ 6
+
+ StartColor
+ #ff0000
+
+
+
+ StartColor
+ #ff7f00
+
+
+
+ StartColor
+ #ffff00
+
+
+
+ StartColor
+ #7fff00
+
+
+
+ StartColor
+ #00ff00
+
+
+
+ StartColor
+ #00ff7f
+
+
+
+ StartColor
+ #00ffff
+
+
+
+ StartColor
+ #007fff
+
+
+
+ StartColor
+ #0000ff
+
+
+
+ StartColor
+ #7f00ff
+
+
+
+ StartColor
+ #ff00ff
+
+
+
+ StartColor
+ #ff2878
+
+
+
+ StartColor
+ #ff7828
+
+
+
+ StartColor
+ #ffffff
+
+
+
+ StartColor
+ #5078ff
+
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+ 6
+
+ StartColor
+ #ff0000
+
+
+
+ StartColor
+ #ff7f00
+
+
+
+ StartColor
+ #ffff00
+
+
+
+ StartColor
+ #7fff00
+
+
+
+ StartColor
+ #00ff00
+
+
+
+ StartColor
+ #00ff7f
+
+
+
+ StartColor
+ #00ffff
+
+
+
+ StartColor
+ #007fff
+
+
+
+ StartColor
+ #0000ff
+
+
+
+ StartColor
+ #7f00ff
+
+
+
+ StartColor
+ #ff00ff
+
+
+
+ StartColor
+ #ff2878
+
+
+
+ StartColor
+ #ff7828
+
+
+
+ StartColor
+ #ffffff
+
+
+
+ StartColor
+ #5078ff
+
+
+
+
+
+
+
+ Sunken
+ Default
+ Default
+ None
+ Default
+
+
+
+
-
+
diff --git a/tests/test_pad_layer.py b/tests/test_pad_layer.py
index 2b29d52..8b1b7c5 100644
--- a/tests/test_pad_layer.py
+++ b/tests/test_pad_layer.py
@@ -44,6 +44,12 @@ class PlayLayerTest(unittest.TestCase):
layer.handle(PLAY_DOWN)
self.assertEqual(layer.handle([0x99, 55, 0]), [[0x99, 55, 0]])
+ def test_sound_pad_puts_the_submaster_back_to_full(self):
+ layer = PlayLayer()
+ self.assertEqual(layer.handle([0x99, 36, 100]), [[0x99, 36, 100], [0xB0, 100, 127]])
+ self.assertEqual(layer.handle([0x89, 36, 0]), [[0x89, 36, 0], [0xB0, 100, 127]])
+ self.assertEqual(layer.handle([0x99, 37, 100]), [[0x99, 37, 100]])
+
if __name__ == "__main__":
unittest.main()