Skip to content

Commit 79f6164

Browse files
nbwnbw
authored
Merge release/1.0.1
Release/1.0.1 - Minify - Missing dial kill notes
2 parents 5c7e0e2 + cd30676 commit 79f6164

File tree

7 files changed

+82
-45
lines changed

7 files changed

+82
-45
lines changed

‎README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,26 @@ glean that it was a kick).
114114
* +/- octave shift
115115
* project, mixer, tempo, screen
116116

117+
#### Dial kill (stop button)
118+
119+
When the OP-Z is playing and the stop key is pressed [a series of midi notes](https://github.com/nbw/opz/issues/1) are sent to quiet the dials. As it's unclear
120+
which page (or color) these messages apply to, they've been labeled as "kill".
121+
122+
Example:
123+
```js
124+
{
125+
track: "kick",
126+
action: "dial",
127+
velocity: 0,
128+
value: {
129+
dial: 2
130+
dialColor: "kill"
131+
page: 30
132+
pageColor: "kill"
133+
}
134+
}
135+
```
136+
117137
## Usage
118138
### OP-Z Setup
119139

‎dist/opz.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ module.exports={
325325
"14": "blue",
326326
"15": "yellow",
327327
"16": "red",
328-
"123": "kill"
328+
"23": "kill"
329329
},
330330
"page": {
331331
"kick": {
@@ -345,7 +345,7 @@ module.exports={
345345
"14": "yellow",
346346
"15": "yellow",
347347
"16": "yellow",
348-
"123": "kill"
348+
"23": "kill"
349349
},
350350
"snare": {
351351
"1": "white",
@@ -364,7 +364,7 @@ module.exports={
364364
"14": "yellow",
365365
"15": "yellow",
366366
"16": "yellow",
367-
"123": "kill"
367+
"23": "kill"
368368
},
369369
"perc": {
370370
"1": "white",
@@ -383,7 +383,7 @@ module.exports={
383383
"14": "yellow",
384384
"15": "yellow",
385385
"16": "yellow",
386-
"123": "kill"
386+
"23": "kill"
387387
},
388388
"sample": {
389389
"1": "white",
@@ -402,7 +402,7 @@ module.exports={
402402
"14": "yellow",
403403
"15": "yellow",
404404
"16": "yellow",
405-
"123": "kill"
405+
"23": "kill"
406406
},
407407
"bass": {
408408
"1": "white",
@@ -421,7 +421,7 @@ module.exports={
421421
"14": "yellow",
422422
"15": "yellow",
423423
"16": "yellow",
424-
"123": "kill"
424+
"23": "kill"
425425
},
426426
"lead": {
427427
"1": "white",
@@ -440,7 +440,7 @@ module.exports={
440440
"14": "yellow",
441441
"15": "yellow",
442442
"16": "yellow",
443-
"123": "kill"
443+
"23": "kill"
444444
},
445445
"arp": {
446446
"1": "white",
@@ -459,7 +459,7 @@ module.exports={
459459
"14": "yellow",
460460
"15": "yellow",
461461
"16": "yellow",
462-
"123": "kill"
462+
"23": "kill"
463463
},
464464
"chord": {
465465
"1": "white",
@@ -478,7 +478,7 @@ module.exports={
478478
"14": "yellow",
479479
"15": "yellow",
480480
"16": "yellow",
481-
"123": "kill"
481+
"23": "kill"
482482
},
483483
"fx1": {
484484
"1": "white",
@@ -497,7 +497,7 @@ module.exports={
497497
"14": "yellow",
498498
"15": "yellow",
499499
"16": "yellow",
500-
"123": "kill"
500+
"23": "kill"
501501
},
502502
"fx2": {
503503
"1": "white",
@@ -516,7 +516,7 @@ module.exports={
516516
"14": "yellow",
517517
"15": "yellow",
518518
"16": "yellow",
519-
"123": "kill"
519+
"23": "kill"
520520
},
521521
"tape": {
522522
"1": "white",
@@ -535,7 +535,7 @@ module.exports={
535535
"14": "yellow",
536536
"15": "yellow",
537537
"16": "yellow",
538-
"123": "kill"
538+
"23": "kill"
539539
},
540540
"master": {
541541
"1": "white",
@@ -554,7 +554,7 @@ module.exports={
554554
"14": "yellow",
555555
"15": "yellow",
556556
"16": "yellow",
557-
"123": "kill"
557+
"23": "kill"
558558
},
559559
"perform": {
560560
"1": "white",
@@ -573,7 +573,7 @@ module.exports={
573573
"14": "yellow",
574574
"15": "yellow",
575575
"16": "yellow",
576-
"123": "kill"
576+
"23": "kill"
577577
},
578578
"module": {
579579
"1": "white",
@@ -592,7 +592,7 @@ module.exports={
592592
"14": "yellow",
593593
"15": "yellow",
594594
"16": "yellow",
595-
"123": "kill"
595+
"23": "kill"
596596
},
597597
"lights": {
598598
"1": "white",
@@ -611,7 +611,7 @@ module.exports={
611611
"14": "yellow",
612612
"15": "yellow",
613613
"16": "yellow",
614-
"123": "kill"
614+
"23": "kill"
615615
},
616616
"motion": {
617617
"1": "white",
@@ -630,7 +630,7 @@ module.exports={
630630
"14": "yellow",
631631
"15": "yellow",
632632
"16": "yellow",
633-
"123": "kill"
633+
"23": "kill"
634634
}
635635
}
636636
}

‎dist/opz.min.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/opz.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
"14": "blue",
206206
"15": "yellow",
207207
"16": "red",
208-
"123": "kill"
208+
"23": "kill"
209209
},
210210
"page": {
211211
"kick": {
@@ -225,7 +225,7 @@
225225
"14": "yellow",
226226
"15": "yellow",
227227
"16": "yellow",
228-
"123": "kill"
228+
"23": "kill"
229229
},
230230
"snare": {
231231
"1": "white",
@@ -244,7 +244,7 @@
244244
"14": "yellow",
245245
"15": "yellow",
246246
"16": "yellow",
247-
"123": "kill"
247+
"23": "kill"
248248
},
249249
"perc": {
250250
"1": "white",
@@ -263,7 +263,7 @@
263263
"14": "yellow",
264264
"15": "yellow",
265265
"16": "yellow",
266-
"123": "kill"
266+
"23": "kill"
267267
},
268268
"sample": {
269269
"1": "white",
@@ -282,7 +282,7 @@
282282
"14": "yellow",
283283
"15": "yellow",
284284
"16": "yellow",
285-
"123": "kill"
285+
"23": "kill"
286286
},
287287
"bass": {
288288
"1": "white",
@@ -301,7 +301,7 @@
301301
"14": "yellow",
302302
"15": "yellow",
303303
"16": "yellow",
304-
"123": "kill"
304+
"23": "kill"
305305
},
306306
"lead": {
307307
"1": "white",
@@ -320,7 +320,7 @@
320320
"14": "yellow",
321321
"15": "yellow",
322322
"16": "yellow",
323-
"123": "kill"
323+
"23": "kill"
324324
},
325325
"arp": {
326326
"1": "white",
@@ -339,7 +339,7 @@
339339
"14": "yellow",
340340
"15": "yellow",
341341
"16": "yellow",
342-
"123": "kill"
342+
"23": "kill"
343343
},
344344
"chord": {
345345
"1": "white",
@@ -358,7 +358,7 @@
358358
"14": "yellow",
359359
"15": "yellow",
360360
"16": "yellow",
361-
"123": "kill"
361+
"23": "kill"
362362
},
363363
"fx1": {
364364
"1": "white",
@@ -377,7 +377,7 @@
377377
"14": "yellow",
378378
"15": "yellow",
379379
"16": "yellow",
380-
"123": "kill"
380+
"23": "kill"
381381
},
382382
"fx2": {
383383
"1": "white",
@@ -396,7 +396,7 @@
396396
"14": "yellow",
397397
"15": "yellow",
398398
"16": "yellow",
399-
"123": "kill"
399+
"23": "kill"
400400
},
401401
"tape": {
402402
"1": "white",
@@ -415,7 +415,7 @@
415415
"14": "yellow",
416416
"15": "yellow",
417417
"16": "yellow",
418-
"123": "kill"
418+
"23": "kill"
419419
},
420420
"master": {
421421
"1": "white",
@@ -434,7 +434,7 @@
434434
"14": "yellow",
435435
"15": "yellow",
436436
"16": "yellow",
437-
"123": "kill"
437+
"23": "kill"
438438
},
439439
"perform": {
440440
"1": "white",
@@ -453,7 +453,7 @@
453453
"14": "yellow",
454454
"15": "yellow",
455455
"16": "yellow",
456-
"123": "kill"
456+
"23": "kill"
457457
},
458458
"module": {
459459
"1": "white",
@@ -472,7 +472,7 @@
472472
"14": "yellow",
473473
"15": "yellow",
474474
"16": "yellow",
475-
"123": "kill"
475+
"23": "kill"
476476
},
477477
"lights": {
478478
"1": "white",
@@ -491,7 +491,7 @@
491491
"14": "yellow",
492492
"15": "yellow",
493493
"16": "yellow",
494-
"123": "kill"
494+
"23": "kill"
495495
},
496496
"motion": {
497497
"1": "white",
@@ -510,7 +510,7 @@
510510
"14": "yellow",
511511
"15": "yellow",
512512
"16": "yellow",
513-
"123": "kill"
513+
"23": "kill"
514514
}
515515
}
516516
}

‎opz.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ dial:
202202
14: *blue
203203
15: *yellow
204204
16: *red
205-
123: *kill
205+
23: *kill
206206
page:
207207
kick: &page_defaults
208208
1: *white
@@ -221,7 +221,7 @@ dial:
221221
14: *yellow
222222
15: *yellow
223223
16: *yellow
224-
123: *kill
224+
23: *kill
225225
snare:
226226
<<: *page_defaults
227227
perc:

‎package-lock.json‎

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)