Skip to content

Commit

Permalink
Merge release/1.0.1
Browse files Browse the repository at this point in the history
Release/1.0.1

- Minify
- Missing dial kill notes
  • Loading branch information
nbw authored Nov 25, 2020
2 parents 5c7e0e2 + cd30676 commit 79f6164
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 45 deletions.
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,26 @@ glean that it was a kick).
* +/- octave shift
* project, mixer, tempo, screen

#### Dial kill (stop button)

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
which page (or color) these messages apply to, they've been labeled as "kill".

Example:
```js
{
track: "kick",
action: "dial",
velocity: 0,
value: {
dial: 2
dialColor: "kill"
page: 30
pageColor: "kill"
}
}
```

## Usage
### OP-Z Setup

Expand Down
34 changes: 17 additions & 17 deletions dist/opz.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ module.exports={
"14": "blue",
"15": "yellow",
"16": "red",
"123": "kill"
"23": "kill"
},
"page": {
"kick": {
Expand All @@ -345,7 +345,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"snare": {
"1": "white",
Expand All @@ -364,7 +364,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"perc": {
"1": "white",
Expand All @@ -383,7 +383,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"sample": {
"1": "white",
Expand All @@ -402,7 +402,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"bass": {
"1": "white",
Expand All @@ -421,7 +421,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"lead": {
"1": "white",
Expand All @@ -440,7 +440,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"arp": {
"1": "white",
Expand All @@ -459,7 +459,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"chord": {
"1": "white",
Expand All @@ -478,7 +478,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"fx1": {
"1": "white",
Expand All @@ -497,7 +497,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"fx2": {
"1": "white",
Expand All @@ -516,7 +516,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"tape": {
"1": "white",
Expand All @@ -535,7 +535,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"master": {
"1": "white",
Expand All @@ -554,7 +554,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"perform": {
"1": "white",
Expand All @@ -573,7 +573,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"module": {
"1": "white",
Expand All @@ -592,7 +592,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"lights": {
"1": "white",
Expand All @@ -611,7 +611,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"motion": {
"1": "white",
Expand All @@ -630,7 +630,7 @@ module.exports={
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions dist/opz.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions lib/opz.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"14": "blue",
"15": "yellow",
"16": "red",
"123": "kill"
"23": "kill"
},
"page": {
"kick": {
Expand All @@ -225,7 +225,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"snare": {
"1": "white",
Expand All @@ -244,7 +244,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"perc": {
"1": "white",
Expand All @@ -263,7 +263,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"sample": {
"1": "white",
Expand All @@ -282,7 +282,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"bass": {
"1": "white",
Expand All @@ -301,7 +301,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"lead": {
"1": "white",
Expand All @@ -320,7 +320,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"arp": {
"1": "white",
Expand All @@ -339,7 +339,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"chord": {
"1": "white",
Expand All @@ -358,7 +358,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"fx1": {
"1": "white",
Expand All @@ -377,7 +377,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"fx2": {
"1": "white",
Expand All @@ -396,7 +396,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"tape": {
"1": "white",
Expand All @@ -415,7 +415,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"master": {
"1": "white",
Expand All @@ -434,7 +434,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"perform": {
"1": "white",
Expand All @@ -453,7 +453,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"module": {
"1": "white",
Expand All @@ -472,7 +472,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"lights": {
"1": "white",
Expand All @@ -491,7 +491,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
},
"motion": {
"1": "white",
Expand All @@ -510,7 +510,7 @@
"14": "yellow",
"15": "yellow",
"16": "yellow",
"123": "kill"
"23": "kill"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions opz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ dial:
14: *blue
15: *yellow
16: *red
123: *kill
23: *kill
page:
kick: &page_defaults
1: *white
Expand All @@ -221,7 +221,7 @@ dial:
14: *yellow
15: *yellow
16: *yellow
123: *kill
23: *kill
snare:
<<: *page_defaults
perc:
Expand Down
9 changes: 7 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 79f6164

Please sign in to comment.