aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2015-10-13 15:32:07 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2015-10-13 15:32:07 +0200
commit9f51fb84631f4b0b3eb414c26796537e7f4fae5b (patch)
tree7c3fe2d7b3562ce9fad1389c1622cea5ba1952b1
parent00c51645b36509ce4dc5385a291ebdb986bb18b1 (diff)
downloadchimaera_xrnx-9f51fb84631f4b0b3eb414c26796537e7f4fae5b.zip
chimaera_xrnx-9f51fb84631f4b0b3eb414c26796537e7f4fae5b.tar.gz
chimaera_xrnx-9f51fb84631f4b0b3eb414c26796537e7f4fae5b.tar.bz2
chimaera_xrnx-9f51fb84631f4b0b3eb414c26796537e7f4fae5b.tar.xz
update to chimaera API 0.7.0.HEADmaster
-rw-r--r--chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-custom.lua32
-rw-r--r--chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-oscmidi.lua22
2 files changed, 38 insertions, 16 deletions
diff --git a/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-custom.lua b/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-custom.lua
index f9be20e..0472c75 100644
--- a/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-custom.lua
+++ b/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-custom.lua
@@ -101,20 +101,28 @@ conf_client:send( OscMessage('/engines/enabled', { uuid(), oscarg.i(1) }) )
conf_client:send( OscMessage('/sensors/rate', { uuid(), oscarg.i(2000) }) )
conf_client:send( OscMessage('/sensors/group/reset', { uuid() }) )
-conf_client:send( OscMessage('/sensors/group/attributes/0', { uuid(), oscarg.f(0.0), oscarg.f(1.0), oscarg.i(0), oscarg.i(1), oscarg.i(0) }) )
-conf_client:send( OscMessage('/sensors/group/attributes/1', { uuid(), oscarg.f(0.0), oscarg.f(1.0), oscarg.i(1), oscarg.i(0), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/min", { uuid(), oscarg.f(0.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/max", { uuid(), oscarg.f(1.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/north", { uuid(), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/south", { uuid(), oscarg.i(1) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/scale", { uuid(), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/min", { uuid(), oscarg.f(0.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/max", { uuid(), oscarg.f(1.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/north", { uuid(), oscarg.i(1) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/south", { uuid(), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/scale", { uuid(), oscarg.i(0) }) )
conf_client:send( OscMessage('/sensors/number', { uuid() }) )
dest = oscarg.s('/renoise/trigger/midi')
conf_client:send( OscMessage('/engines/custom/enabled', { uuid(), oscarg.i(1) }) )
conf_client:send( OscMessage('/engines/custom/reset', { uuid() }) )
-conf_client:send( OscMessage('/engines/custom/append', { uuid(), oscarg.s('on'), dest,
- oscarg.s('i(0x7f0090 $g| 35.5 $n 18% 6/- $n 3/ $x @@ $g[*+ 8<<|)') }) );
-conf_client:send( OscMessage('/engines/custom/append', { uuid(), oscarg.s('off'), dest,
- oscarg.s('i(0x7f0080 $g| 35.5 $n 18% 6/- $n 3/ $g]*+ 8<<|)') }) );
-conf_client:send( OscMessage('/engines/custom/append', { uuid(), oscarg.s('set'), dest,
- oscarg.s('i(0xe0 $g| $x $g]- 0x2000* 0x1fff+ @@ 7>> 16<< # 0x7f& 8<<| |)') }) );
-conf_client:send( OscMessage('/engines/custom/append', { uuid(), oscarg.s('set'), dest,
- oscarg.s('i(0x27b0 $g| $z 0x3fff* 0x7f& 16<<|)') }) );
-conf_client:send( OscMessage('/engines/custom/append', { uuid(), oscarg.s('set'), dest,
- oscarg.s('i(0x07b0 $g| $z 0x3fff* 7>> 16<<|)') }) );
+conf_client:send( OscMessage('/engines/custom/append/on', { uuid(),
+ oscarg.s(dest .. ' i(0x7f0090 $g| 35.5 $n 18% 6/- $n 3/ $x @@ $g[*+ 8<<|)') }) );
+conf_client:send( OscMessage('/engines/custom/append/off', { uuid(),
+ oscarg.s(dest .. ' i(0x7f0080 $g| 35.5 $n 18% 6/- $n 3/ $g]*+ 8<<|)') }) );
+conf_client:send( OscMessage('/engines/custom/append/set', { uuid(),
+ oscarg.s(dest .. ' i(0xe0 $g| $x $g]- 0x2000* 0x1fff+ @@ 7>> 16<< # 0x7f& 8<<| |)') }) );
+conf_client:send( OscMessage('/engines/custom/append/set', { uuid(),
+ oscarg.s(dest .. ' i(0x27b0 $g| $z 0x3fff* 0x7f& 16<<|)') }) );
+conf_client:send( OscMessage('/engines/custom/append/set', { uuid(),
+ oscarg.s(dest .. ' i(0x07b0 $g| $z 0x3fff* 7>> 16<<|)') }) );
diff --git a/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-oscmidi.lua b/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-oscmidi.lua
index 5e64da0..de817bd 100644
--- a/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-oscmidi.lua
+++ b/chimaera_osc-midi_bridge/chimaera_osc-midi_bridge-oscmidi.lua
@@ -108,8 +108,16 @@ conf_client:send( OscMessage('/engines/enabled', { uuid(), osc_true }) )
conf_client:send( OscMessage('/sensors/rate', { uuid(), oscarg.i(2000) }) )
conf_client:send( OscMessage('/sensors/group/reset', { uuid() }) )
-conf_client:send( OscMessage('/sensors/group/attributes/0', { uuid(), oscarg.f(0.0), oscarg.f(1.0), oscarg.i(0), oscarg.i(1), oscarg.i(0) }) )
-conf_client:send( OscMessage('/sensors/group/attributes/1', { uuid(), oscarg.f(0.0), oscarg.f(1.0), oscarg.i(1), oscarg.i(0), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/min", { uuid(), oscarg.f(0.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/max", { uuid(), oscarg.f(1.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/north", { uuid(), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/south", { uuid(), oscarg.i(1) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/0/scale", { uuid(), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/min", { uuid(), oscarg.f(0.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/max", { uuid(), oscarg.f(1.0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/north", { uuid(), oscarg.i(1) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/south", { uuid(), oscarg.i(0) }) )
+conf_client:send( OscMessage("/sensors/group/attributes/1/scale", { uuid(), oscarg.i(0) }) )
conf_client:send( OscMessage('/sensors/number', { uuid() }) )
conf_client:send( OscMessage('/engines/oscmidi/enabled', { uuid(), osc_true }) )
@@ -117,5 +125,11 @@ conf_client:send( OscMessage('/engines/oscmidi/multi', { uuid(), osc_false }) )
conf_client:send( OscMessage('/engines/oscmidi/path', { uuid(), oscarg.s('/renoise/trigger/midi') }) )
conf_client:send( OscMessage('/engines/oscmidi/format', { uuid(), oscarg.s('int32') }) )
conf_client:send( OscMessage('/engines/oscmidi/reset', { uuid() }) )
-conf_client:send( OscMessage('/engines/oscmidi/attributes/0', { uuid(), oscarg.s('control_change'), oscarg.f(offset), oscarg.f(range), oscarg.i(0x07) }) )
-conf_client:send( OscMessage('/engines/oscmidi/attributes/1', { uuid(), oscarg.s('note_pressure'), oscarg.f(offset), oscarg.f(range), oscarg.i(0x07) }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/0/mapping', { uuid(), oscarg.s('control_change') }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/0/offset', { uuid(), oscarg.f(offset) }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/0/range', { uuid(), oscarg.f(range) }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/0/controller', { uuid(), oscarg.i(0x07) }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/1/mapping', { uuid(), oscarg.s('control_change') }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/1/offset', { uuid(), oscarg.f(offset) }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/1/range', { uuid(), oscarg.f(range) }) )
+conf_client:send( OscMessage('/engines/oscmidi/attributes/1/controller', { uuid(), oscarg.i(0x07) }) )