Skip to content

Commit 0da6556

Browse files
author
maurinElectroTextile
committed
Added THROUGH_MODE & cleanUp
1 parent 7a87662 commit 0da6556

12 files changed

Lines changed: 203 additions & 147 deletions

File tree

‎docs/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ <h5 id="NAME" class="card-subtitle"></h5>
8686

8787
<div class="btn-group input-group" role="group">
8888
<button id="EDIT_MODE" class="e256_setMode btn btn-outline-primary" type="button">EDIT</button>
89+
<button id="THROUGH_MODE" class="e256_setMode btn btn-outline-primary" type="button">THROUGH</button>
8990
<button id="PLAY_MODE" class="e256_setMode btn btn-outline-primary" type="button">PLAY</button>
9091
</div>
9192

‎docs/js/e256_blobs.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ function blob_factory() {
2323

2424
create: function (sysExMsg) {
2525

26+
paper.project.layers['blob'].activate();
27+
paper.project.layers['blob'].bringToFront();
28+
2629
this.UID = sysExMsg[BLOB_UID_INDEX];
2730

2831
let _blob_group = new paper.Group({
@@ -133,7 +136,6 @@ function blob_factory() {
133136
};
134137

135138
function blobs_factory() {
136-
//var blobs_array = [];
137139

138140
var _blobs_array = new paper.Group({
139141
"blobs_array": [],
@@ -148,22 +150,22 @@ function blobs_factory() {
148150
new_blob.create(sysExMsg);
149151
new_blob.present();
150152
this.blobs_array.push(new_blob);
151-
console.log("BLOB_NEW: " + sysExMsg[BLOB_UID_INDEX]);
153+
//console.log("BLOB_NEW: " + sysExMsg[BLOB_UID_INDEX]);
152154
}
153155
}
154156
else {
155157
if (sysExMsg[BLOB_STATUS_INDEX] === BLOB_MISSING && sysExMsg[BLOB_LAST_STATUS_INDEX] === BLOB_PRESENT) {
156158
this.blobs_array[index].missing();
157-
console.log("BLOB_IS_MISSING: " + sysExMsg[BLOB_UID_INDEX]);
159+
//console.log("BLOB_IS_MISSING: " + sysExMsg[BLOB_UID_INDEX]);
158160
}
159161
else if (sysExMsg[BLOB_STATUS_INDEX] === BLOB_PRESENT && sysExMsg[BLOB_LAST_STATUS_INDEX] === BLOB_MISSING) {
160162
this.blobs_array[index].present();
161-
console.log("BLOB_IS_BACK: " + sysExMsg[BLOB_UID_INDEX]);
163+
//console.log("BLOB_IS_BACK: " + sysExMsg[BLOB_UID_INDEX]);
162164
}
163165
else if (sysExMsg[BLOB_STATUS_INDEX] === BLOB_FREE) {
164166
this.blobs_array[index].relesed();
165167
this.blobs_array.splice(index, 1);
166-
console.log("BLOB_SI_FREE: " + sysExMsg[BLOB_UID_INDEX]);
168+
//console.log("BLOB_SI_FREE: " + sysExMsg[BLOB_UID_INDEX]);
167169
}
168170
else {
169171
this.blobs_array[index].update(sysExMsg);

‎docs/js/e256_config.js‎

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ const SIG_OUT = 2; // E256-LEDs: | 0 | 1 |
5050
const LINE_OUT = 3; // E256-LEDs: | 0 | 0 |
5151

5252
// E256 MIDI TYPES CONSTANTS
53-
const NOTE_OFF = 0x80; // NOTE_OFF // 1 0 0 0 // OFF to ON = OFF | ON
54-
const NOTE_ON = 0x90; // NOTE_ON // 1 0 0 1 // ON to OFF = ON & OFF
55-
const P_AFTERTOUCH = 0xA0; // POLYPHONIC_AFTERTOUCH
56-
const C_CHANGE = 0xB0; // CONTROL_CHANGE
57-
const P_CHANGE = 0xC0; // PROGRAM_CHANGE
58-
const C_AFTERTOUCH = 0xD0; // CHANNEL_AFTERTOUCH
59-
const P_BEND = 0xE0; // PITCH_BEND
60-
const SYS_EX = 0xF0; // SYSTEM_EXCLUSIVE
53+
const NOTE_OFF = 0x80; // NOTE_OFF // 1 0 0 0 // OFF to ON = OFF | ON
54+
const NOTE_ON = 0x90; // NOTE_ON // 1 0 0 1 // ON to OFF = ON & OFF
55+
const AFTERTOUCH_POLY = 0xA0; // POLYPHONIC_AFTERTOUCH
56+
const C_CHANGE = 0xB0; // CONTROL_CHANGE
57+
const P_CHANGE = 0xC0; // PROGRAM_CHANGE
58+
const AFTERTOUCH_CHANNEL = 0xD0; // CHANNEL_AFTERTOUCH
59+
const P_BEND = 0xE0; // PITCH_BEND
60+
const SYS_EX = 0xF0; // SYSTEM_EXCLUSIVE
6161

6262
// const TIMECODEQUARTERFRAME = 0xF1;
6363
// const SONGPOSITION = 0xF2;
@@ -77,24 +77,24 @@ const SYSEX_END = 0xF7; // DEC: 247
7777
const SYSEX_DEVICE_ID = 0x7D; // DEC: 253 http://midi.teragonaudio.com/tech/midispec/id.html
7878

7979
const SYSEX_CONF = 0x7C; // DEC: 124
80-
const SYSEX_SOUND = 0x6C; // DEC: 108
81-
//...
80+
//const SYSEX_SOUND = 0x6C; // DEC: 108
81+
//const SYSEX_VOLUMES = ; //
8282

8383
const MIDI_TYPES = {
84-
0x80: "NOTE_OFF", // NOTE_OFF
85-
0x90: "NOTE_ON", // NOTE_ON
86-
0xA0: "P_AFTERTOUCH", // POLYPHONIC_AFTERTOUCH
87-
0xB0: "C_CHANGE", // CONTROL_CHANGE
88-
0xC0: "P_CHANGE", // PROGRAM_CHANGE
89-
0xD0: "C_AFTERTOUCH", // CHANNEL_AFTERTOUCH
90-
0xE0: "P_BEND", // PITCH_BEND
91-
0xF0: "SYS_EX" // SYSTEM_EXCLUSIVE
84+
0x80: "NOTE_OFF", // NOTE_OFF
85+
0x90: "NOTE_ON", // NOTE_ON
86+
0xA0: "AFTERTOUCH_POLY", // POLYPHONIC_AFTERTOUCH
87+
0xB0: "C_CHANGE", // CONTROL_CHANGE
88+
0xC0: "P_CHANGE", // PROGRAM_CHANGE
89+
0xD0: "AFTERTOUCH_CHANNEL", // CHANNEL_AFTERTOUCH
90+
0xE0: "P_BEND", // PITCH_BEND
91+
0xF0: "SYS_EX" // SYSTEM_EXCLUSIVE
9292
};
9393

9494
const DATA1 = {
9595
0x80: "note",
9696
0x90: "note",
97-
0xA0: "press",
97+
0xA0: "note",
9898
0xB0: "cc",
9999
0xC0: "pgm",
100100
0xD0: "lsb",
@@ -105,7 +105,7 @@ const DATA1 = {
105105
const DATA2 = {
106106
0x80: "velo",
107107
0x90: "velo",
108-
0xA0: null,
108+
0xA0: "ctr", // TESTING
109109
0xB0: null,
110110
0xC0: null,
111111
0xD0: "msb",
@@ -120,15 +120,16 @@ const CALIBRATE_MODE = 2; //
120120
const MATRIX_MODE = 3; // Get matrix analog sensor values (16x16) over USB using MIDI format
121121
const MAPPING_MODE = 4; //
122122
const EDIT_MODE = 5; // Get all blobs values over USB using MIDI format
123-
const PLAY_MODE = 6; // Get mappings values over USB using MIDI format
124-
const ALLOCATE_MODE = 7; //
125-
const UPLOAD_MODE = 8; //
126-
const APPLY_MODE = 9; //
127-
const WRITE_MODE = 10; //
128-
const LOAD_MODE = 11; //
129-
const FETCH_MODE = 12; // Request mapping config file
130-
const STANDALONE_MODE = 13; // e256 synth is sending mappings values over MIDI hardware (DEFAULT MODE)
131-
const ERROR_MODE = 14; // Unexpected behaviour
123+
const THROUGH_MODE = 6; //
124+
const PLAY_MODE = 7; // Get mappings values over USB using MIDI format
125+
const ALLOCATE_MODE = 8; //
126+
const UPLOAD_MODE = 9; //
127+
const APPLY_MODE = 10; //
128+
const WRITE_MODE = 11; //
129+
const LOAD_MODE = 12; //
130+
const FETCH_MODE = 13; // Request mapping config file
131+
const STANDALONE_MODE = 14; // e256 synth is sending mappings values over MIDI hardware (DEFAULT MODE)
132+
const ERROR_MODE = 15; // Unexpected behaviour
132133

133134
// VERBOSITY MODES CONSTANTS
134135
const MODE_CODES = {
@@ -138,15 +139,16 @@ const MODE_CODES = {
138139
3: "MATRIX_MODE",
139140
4: "MAPPING_MODE",
140141
5: "EDIT_MODE",
141-
6: "PLAY_MODE",
142-
7: "ALLOCATE_MODE",
143-
8: "UPLOAD_MODE",
144-
9: "APPLY_MODE",
145-
10: "WRITE_MODE",
146-
11: "LOAD_MODE",
147-
12: "FETCH_MODE",
148-
13: "STANDALONE_MODE",
149-
14: "ERROR_MODE"
142+
6: "THROUGH_MODE",
143+
7: "PLAY_MODE",
144+
8: "ALLOCATE_MODE",
145+
9: "UPLOAD_MODE",
146+
10: "APPLY_MODE",
147+
11: "WRITE_MODE",
148+
12: "LOAD_MODE",
149+
13: "FETCH_MODE",
150+
14: "STANDALONE_MODE",
151+
15: "ERROR_MODE"
150152
};
151153

152154
// VERBOSITY CODES CONSTANTS
@@ -156,17 +158,18 @@ const CALIBRATE_MODE_DONE = 2;
156158
const MATRIX_MODE_DONE = 3;
157159
const MAPPING_MODE_DONE = 4
158160
const EDIT_MODE_DONE = 5;
159-
const PLAY_MODE_DONE = 6;
160-
const ALLOCATE_MODE_DONE = 7;
161-
const ALLOCATE_DONE = 8;
162-
const UPLOAD_MODE_DONE = 9;
163-
const UPLOAD_DONE = 10;
164-
const APPLY_MODE_DONE = 11;
165-
const WRITE_MODE_DONE = 12;
166-
const LOAD_MODE_DONE = 13;
167-
const FETCH_MODE_DONE = 14;
168-
const STANDALONE_MODE_DONE = 15;
169-
const DONE_ACTION = 16;
161+
const THROUGH_MODE_DONE = 6;
162+
const PLAY_MODE_DONE = 7;
163+
const ALLOCATE_MODE_DONE = 8;
164+
const ALLOCATE_DONE = 9;
165+
const UPLOAD_MODE_DONE = 10;
166+
const UPLOAD_DONE = 11;
167+
const APPLY_MODE_DONE = 12;
168+
const WRITE_MODE_DONE = 13;
169+
const LOAD_MODE_DONE = 14;
170+
const FETCH_MODE_DONE = 15;
171+
const STANDALONE_MODE_DONE = 16;
172+
const DONE_ACTION = 17;
170173

171174
const VERBOSITY_CODES = {
172175
0: "PENDING_MODE_DONE",
@@ -175,17 +178,18 @@ const VERBOSITY_CODES = {
175178
3: "MATRIX_MODE_DONE",
176179
4: "MAPPING_MODE_DONE",
177180
5: "EDIT_MODE_DONE",
178-
6: "PLAY_MODE_DONE",
179-
7: "ALLOCATE_MODE_DONE",
180-
8: "ALLOCATE_DONE",
181-
9: "UPLOAD_MODE_DONE",
182-
10: "UPLOAD_DONE",
183-
11: "APPLY_MODE_DONE",
184-
12: "WRITE_MODE_DONE",
185-
13: "LOAD_MODE_DONE",
186-
14: "FETCH_MODE_DONE",
187-
15: "STANDALONE_MODE_DONE",
188-
16: "DONE_ACTION"
181+
6: "THROUGH_MODE_DONE",
182+
7: "PLAY_MODE_DONE",
183+
8: "ALLOCATE_MODE_DONE",
184+
9: "ALLOCATE_DONE",
185+
10: "UPLOAD_MODE_DONE",
186+
11: "UPLOAD_DONE",
187+
12: "APPLY_MODE_DONE",
188+
13: "WRITE_MODE_DONE",
189+
14: "LOAD_MODE_DONE",
190+
15: "FETCH_MODE_DONE",
191+
16: "STANDALONE_MODE_DONE",
192+
17: "DONE_ACTION"
189193
};
190194

191195
// ERROR CODES CONSTANTS

‎docs/js/e256_mappings/grid.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
function grid_factory() {
99
const DEFAULT_GRID_WIDTH = 400;
1010
const DEFAULT_GRID_HEIGHT = 400;
11-
const DEFAULT_GRID_COLS = 8;
12-
const DEFAULT_GRID_ROWS = 8;
11+
const DEFAULT_GRID_COLS = 4;
12+
const DEFAULT_GRID_ROWS = 4;
1313
const DEFAULT_GRID_MODE_Z = NOTE_ON;
1414
const GRID_MIN_SIZE = 30;
1515

@@ -29,7 +29,7 @@ function grid_factory() {
2929
"modes": {
3030
0: "NOTE_ON", // TRIGGER WITH VELOCITY
3131
1: "C_CHANGE", // PRESSURE ONLY
32-
2: "P_AFTERTOUCH" // TRIGGER AND PRESSURE
32+
2: "AFTERTOUCH_POLY" // TRIGGER AND PRESSURE
3333
},
3434
"data": {
3535
"from": null,
@@ -161,7 +161,7 @@ function grid_factory() {
161161
break;
162162
case PLAY_MODE:
163163
// Set midi_msg status to NOTE_ON
164-
_key_group.msg.press.midi.status = _key_group.msg.press.midi.status | NOTE_ON ;
164+
_key_group.msg.press.midi.status = _key_group.msg.press.midi.status | NOTE_ON;
165165
_key_group.msg.press.midi.data2 = 127;
166166
send_midi_msg(_key_group.msg.press.midi);
167167
break;
@@ -175,7 +175,7 @@ function grid_factory() {
175175
break;
176176
case PLAY_MODE:
177177
// Set midi_msg status to NOTE_OFF
178-
_key_group.msg.press.midi.status = _key_group.msg.press.midi.status & NOTE_OFF ;
178+
_key_group.msg.press.midi.status = _key_group.msg.press.midi.status & NOTE_OFF;
179179
_key_group.msg.press.midi.data2 = 0;
180180
send_midi_msg(_key_group.msg.press.midi);
181181
break;
@@ -354,7 +354,7 @@ function grid_factory() {
354354
console.log("PART_NOT_USE: " + current_part.name);
355355
break;
356356
}
357-
update_menu_1st_level(_grid_group.parent);
357+
update_item_main_params(_grid_group.parent);
358358
}
359359
break;
360360
case PLAY_MODE:
@@ -372,7 +372,7 @@ function grid_factory() {
372372
case EDIT_MODE:
373373
if (current_part.type === "fill") {
374374
move_item(this, mouseEvent);
375-
update_menu_1st_level(this);
375+
update_item_main_params(this);
376376
}
377377
break;
378378
case PLAY_MODE:

‎docs/js/e256_mappings/knob.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function knob_factory() {
2222
"modes": {
2323
0: "NOTE_ON", // TRIGGER WITH VELOCITY
2424
1: "C_CHANGE", // PRESSURE ONLY
25-
2: "P_AFTERTOUCH" // TRIGGER AND PRESSURE
25+
2: "AFTERTOUCH_POLY" // TRIGGER AND PRESSURE
2626
},
2727
"data": {
2828
"touchs": null,
@@ -174,7 +174,7 @@ function knob_factory() {
174174
break;
175175
case PLAY_MODE:
176176
// Set midi_msg status to NOTE_ON
177-
_touch_group.msg.press.midi.status = _touch_group.msg.press.midi.status | NOTE_ON ;
177+
_touch_group.msg.press.midi.status = _touch_group.msg.press.midi.status | NOTE_ON;
178178
_touch_group.msg.press.midi.data2 = 127;
179179
send_midi_msg(_touch_group.msg.press.midi);
180180
break;
@@ -183,7 +183,7 @@ function knob_factory() {
183183

184184
_knob_touch.onMouseUp = function () {
185185
// Set midi_msg status to NOTE_OFF
186-
_touch_group.msg.press.midi.status = _touch_group.msg.press.midi.status & NOTE_OFF ;
186+
_touch_group.msg.press.midi.status = _touch_group.msg.press.midi.status & NOTE_OFF;
187187
_touch_group.msg.press.midi.data2 = 0;
188188
send_midi_msg(_touch_group.msg.press.midi);
189189
}
@@ -287,7 +287,7 @@ function knob_factory() {
287287
if (current_part.type === "fill") {
288288
move_item(_knob_group.parent, mouseEvent);
289289
_knob_group.center = this.position;
290-
update_menu_1st_level(_knob_group.parent);
290+
update_item_main_params(_knob_group.parent);
291291
}
292292
break;
293293
case PLAY_MODE:
@@ -323,7 +323,7 @@ function knob_factory() {
323323
);
324324

325325
_knob_group.data.offset = rad_to_deg(_knob_group.theta);
326-
update_menu_1st_level(_knob_group.parent);
326+
update_item_main_params(_knob_group.parent);
327327
break;
328328
case PLAY_MODE:
329329
// NA
@@ -520,7 +520,7 @@ function knob_factory() {
520520
//console.log("PART_NOT_USE: " + current_part.name);
521521
break;
522522
}
523-
update_menu_1st_level(_knob_group.parent);
523+
update_item_main_params(_knob_group.parent);
524524
}
525525
break;
526526
case PLAY_MODE:

‎docs/js/e256_mappings/path.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function path_factory() {
8080
break;
8181
case PLAY_MODE:
8282
// Set midi_msg status to NOTE_ON
83-
_touch_group.msg.press.midi.status = _touch_group.msg.press.midi.status | NOTE_ON ;
83+
_touch_group.msg.press.midi.status = _touch_group.msg.press.midi.status | NOTE_ON;
8484
_touch_group.msg.press.midi.data2 = 127;
8585
send_midi_msg(_touch_group.msg.press.midi);
8686
break;
@@ -209,7 +209,7 @@ function path_factory() {
209209
let _path_graduation_interval = this.children["path-group"].children["path-curve"].length / (_touch.data.midi.position.max - _touch.data.midi.position.min);
210210
_touch.children["path-graduations"].dashArray = [1, _path_graduation_interval];
211211
}
212-
update_menu_1st_level(_path_group.parent);
212+
update_item_main_params(_path_group.parent);
213213
}
214214
break;
215215
case PLAY_MODE:

0 commit comments

Comments
 (0)