diff --git a/bitwig.js b/bitwig.js index 62d41d8..8000b38 100644 --- a/bitwig.js +++ b/bitwig.js @@ -36,6 +36,7 @@ oscWS.on('ready', () => { oscBW.on('ready', () => { console.log(`Povezan sem na bitwig ${bwIP}`) }) +oscWSstanje.on('error', () => console.log('napaka stanja', arguments)) const STANJE = { predvajam: 0, diff --git a/kontroler/kontroler.ino b/kontroler/kontroler.ino index 3964b98..18529b2 100644 --- a/kontroler/kontroler.ino +++ b/kontroler/kontroler.ino @@ -12,21 +12,22 @@ SLIPEncodedSerial SLIPSerial(Serial); // Change to Serial1 or Serial2 etc. for b OSCBundle bundle; byte knofi[] = { - 2, // gor (clip) - 3, // dol (clip) - 4, // levo (track) - 5, // desno (track) - 6, // quantize - 7, // duplicate - 8, // delete - 9, // play/pavza - 10,// overdub on/off - 11,// record arm on/off - 12,// record 4 beats - 13,// record 8 beats - 14 // record on/off + A1,// levo (track) + A0,// desno (track) + 2, // play / pause + 3, // overdub on/off + 4, // record arm on/off + 5, // + 6, // dol (clip) + 7, // gor (clip) + 8, // quantize + 9, // duplicate + 10,// delete + 11,// record 4 beats + 12,// record 8 beats + 13,// record on/off }; -byte KNOFI_LEN = 13; +byte KNOFI_LEN = 14; // Za stanje vrednosti byte knofi_prej[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; @@ -34,15 +35,17 @@ byte knofi_prej[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; int dvoklik_interval = 250; const char* kanali[16] = { + "/track/previous", + "/track/next", "/play", - "/overdub/launcher", - "/recarm", // rabi info o trenutno izbranem tracku - "", - "", - "", - "", - "", + "/overdub", + "/recarm", "", + "/clip/next", + "/clip/previous", + "/quantize", + "/duplicate", + "/delete", "/clip/create/4", "/clip/create/8", "/clip/record" // rabi info o trenutno izbranem clipu / tracku