diff --git a/chataigne/show.template.js b/chataigne/show.template.js index 7a37f5d..a8859ca 100644 --- a/chataigne/show.template.js +++ b/chataigne/show.template.js @@ -1,4 +1,4 @@ -// Pads pick colours, sliders mix a custom colour, like the QLC+ virtual console. +// Pads pick colours and sliders set levels, like the QLC+ virtual console. // It reads the pad directly: Play shifts bank 2 here, as padcontroller/layer.py does // when QLC+ is used. // Generated by scripts/shows/make_chataigne.py: edit this template, not the output. @@ -40,7 +40,7 @@ function init() for (var p = 0; p < group.pads.length; p++) mark(touched, group.pads[p].levels); for (var s = 0; s < group.sliders.length; s++) mark(touched, group.sliders[s].levels); var mix = []; - for (var m = 0; m < group.sliders.length; m++) mix[m] = 0; + for (var m = 0; m < group.sliders.length; m++) mix[m] = group.sliders[m].value; states[g] = {active: -1, elapsed: 0, duration: 0, level: level, from: from, to: to, touched: touched, mix: mix}; // Controls on the script's Params, for the dashboard to show. @@ -54,7 +54,7 @@ function init() } for (var r = 0; r < group.sliders.length; r++) { - sliderParams[g][r] = script.addFloatParameter(group.sliders[r].id, group.name + " " + group.sliders[r].name, 0, 0, 1); + sliderParams[g][r] = script.addFloatParameter(group.sliders[r].id, group.name + " " + group.sliders[r].name, group.sliders[r].value, 0, 1); lookup[group.sliders[r].id] = {g: g, p: -1, s: r}; } nowParams[g] = script.addStringParameter(group.now, group.name + " scene", ""); diff --git a/chataigne/test/test.js b/chataigne/test/test.js index c5531b7..23f09d2 100644 --- a/chataigne/test/test.js +++ b/chataigne/test/test.js @@ -1,4 +1,4 @@ -// Pads pick colours, sliders mix a custom colour, like the QLC+ virtual console. +// Pads pick colours and sliders set levels, like the QLC+ virtual console. // It reads the pad directly: Play shifts bank 2 here, as padcontroller/layer.py does // when QLC+ is used. // Generated by scripts/shows/make_chataigne.py: edit this template, not the output. @@ -11,58 +11,60 @@ var GROUPS = [ name: "Colour 1", now: "now1", pads: [ - {id: "c1Red", rgb: [1.0, 0.0, 0.0], note: 52, name: "Red", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,255,91,0,92,0,93,0,96,255,98,255,99,0,100,0,101,0,104,255,106,255,107,0,108,0,109,0,112,255,114,255,115,0,116,0,117,0,120,255,122,255,123,0,124,0,125,0,128,255,130,255,131,0,132,0,133,0,136,255,138,255,139,0,140,0,141,0,144,255,146,255,147,0,148,0,149,0,152,255,154,255,155,0,156,0,157,0,160,255,162,255,163,0,164,0,165,0,168,255,170,255,171,0,172,0,173,0,176,255,178,255,179,0,180,0,181,0,184,255,186,255,187,0,188,0,189,0,192,255,194,255,195,0,196,0,197,0,200,255,202,255,203,0,204,0,205,0]}, - {id: "c1Orange", rgb: [1.0, 0.498, 0.0], note: 53, name: "Orange", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,255,91,127,92,0,93,0,96,255,98,255,99,127,100,0,101,0,104,255,106,255,107,127,108,0,109,0,112,255,114,255,115,127,116,0,117,0,120,255,122,255,123,127,124,0,125,0,128,255,130,255,131,127,132,0,133,0,136,255,138,255,139,127,140,0,141,0,144,255,146,255,147,127,148,0,149,0,152,255,154,255,155,127,156,0,157,0,160,255,162,255,163,127,164,0,165,0,168,255,170,255,171,127,172,0,173,0,176,255,178,255,179,127,180,0,181,0,184,255,186,255,187,127,188,0,189,0,192,255,194,255,195,127,196,0,197,0,200,255,202,255,203,127,204,0,205,0]}, - {id: "c1Yellow", rgb: [1.0, 1.0, 0.0], note: 54, name: "Yellow", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,255,91,255,92,0,93,0,96,255,98,255,99,255,100,0,101,0,104,255,106,255,107,255,108,0,109,0,112,255,114,255,115,255,116,0,117,0,120,255,122,255,123,255,124,0,125,0,128,255,130,255,131,255,132,0,133,0,136,255,138,255,139,255,140,0,141,0,144,255,146,255,147,255,148,0,149,0,152,255,154,255,155,255,156,0,157,0,160,255,162,255,163,255,164,0,165,0,168,255,170,255,171,255,172,0,173,0,176,255,178,255,179,255,180,0,181,0,184,255,186,255,187,255,188,0,189,0,192,255,194,255,195,255,196,0,197,0,200,255,202,255,203,255,204,0,205,0]}, - {id: "c1Lime", rgb: [0.498, 1.0, 0.0], note: 55, name: "Lime", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,127,91,255,92,0,93,0,96,255,98,127,99,255,100,0,101,0,104,255,106,127,107,255,108,0,109,0,112,255,114,127,115,255,116,0,117,0,120,255,122,127,123,255,124,0,125,0,128,255,130,127,131,255,132,0,133,0,136,255,138,127,139,255,140,0,141,0,144,255,146,127,147,255,148,0,149,0,152,255,154,127,155,255,156,0,157,0,160,255,162,127,163,255,164,0,165,0,168,255,170,127,171,255,172,0,173,0,176,255,178,127,179,255,180,0,181,0,184,255,186,127,187,255,188,0,189,0,192,255,194,127,195,255,196,0,197,0,200,255,202,127,203,255,204,0,205,0]}, - {id: "c1Green", rgb: [0.0, 1.0, 0.0], note: 56, name: "Green", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,0,91,255,92,0,93,0,96,255,98,0,99,255,100,0,101,0,104,255,106,0,107,255,108,0,109,0,112,255,114,0,115,255,116,0,117,0,120,255,122,0,123,255,124,0,125,0,128,255,130,0,131,255,132,0,133,0,136,255,138,0,139,255,140,0,141,0,144,255,146,0,147,255,148,0,149,0,152,255,154,0,155,255,156,0,157,0,160,255,162,0,163,255,164,0,165,0,168,255,170,0,171,255,172,0,173,0,176,255,178,0,179,255,180,0,181,0,184,255,186,0,187,255,188,0,189,0,192,255,194,0,195,255,196,0,197,0,200,255,202,0,203,255,204,0,205,0]}, - {id: "c1Spring", rgb: [0.0, 1.0, 0.498], note: 57, name: "Spring", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,0,91,255,92,127,93,0,96,255,98,0,99,255,100,127,101,0,104,255,106,0,107,255,108,127,109,0,112,255,114,0,115,255,116,127,117,0,120,255,122,0,123,255,124,127,125,0,128,255,130,0,131,255,132,127,133,0,136,255,138,0,139,255,140,127,141,0,144,255,146,0,147,255,148,127,149,0,152,255,154,0,155,255,156,127,157,0,160,255,162,0,163,255,164,127,165,0,168,255,170,0,171,255,172,127,173,0,176,255,178,0,179,255,180,127,181,0,184,255,186,0,187,255,188,127,189,0,192,255,194,0,195,255,196,127,197,0,200,255,202,0,203,255,204,127,205,0]}, - {id: "c1Cyan", rgb: [0.0, 1.0, 1.0], note: 58, name: "Cyan", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,0,91,255,92,255,93,0,96,255,98,0,99,255,100,255,101,0,104,255,106,0,107,255,108,255,109,0,112,255,114,0,115,255,116,255,117,0,120,255,122,0,123,255,124,255,125,0,128,255,130,0,131,255,132,255,133,0,136,255,138,0,139,255,140,255,141,0,144,255,146,0,147,255,148,255,149,0,152,255,154,0,155,255,156,255,157,0,160,255,162,0,163,255,164,255,165,0,168,255,170,0,171,255,172,255,173,0,176,255,178,0,179,255,180,255,181,0,184,255,186,0,187,255,188,255,189,0,192,255,194,0,195,255,196,255,197,0,200,255,202,0,203,255,204,255,205,0]}, - {id: "c1Azure", rgb: [0.0, 0.498, 1.0], note: 59, name: "Azure", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,0,91,127,92,255,93,0,96,255,98,0,99,127,100,255,101,0,104,255,106,0,107,127,108,255,109,0,112,255,114,0,115,127,116,255,117,0,120,255,122,0,123,127,124,255,125,0,128,255,130,0,131,127,132,255,133,0,136,255,138,0,139,127,140,255,141,0,144,255,146,0,147,127,148,255,149,0,152,255,154,0,155,127,156,255,157,0,160,255,162,0,163,127,164,255,165,0,168,255,170,0,171,127,172,255,173,0,176,255,178,0,179,127,180,255,181,0,184,255,186,0,187,127,188,255,189,0,192,255,194,0,195,127,196,255,197,0,200,255,202,0,203,127,204,255,205,0]}, - {id: "c1Blue", rgb: [0.0, 0.0, 1.0], note: 60, name: "Blue", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,0,91,0,92,255,93,0,96,255,98,0,99,0,100,255,101,0,104,255,106,0,107,0,108,255,109,0,112,255,114,0,115,0,116,255,117,0,120,255,122,0,123,0,124,255,125,0,128,255,130,0,131,0,132,255,133,0,136,255,138,0,139,0,140,255,141,0,144,255,146,0,147,0,148,255,149,0,152,255,154,0,155,0,156,255,157,0,160,255,162,0,163,0,164,255,165,0,168,255,170,0,171,0,172,255,173,0,176,255,178,0,179,0,180,255,181,0,184,255,186,0,187,0,188,255,189,0,192,255,194,0,195,0,196,255,197,0,200,255,202,0,203,0,204,255,205,0]}, - {id: "c1Violet", rgb: [0.498, 0.0, 1.0], note: 61, name: "Violet", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,127,91,0,92,255,93,0,96,255,98,127,99,0,100,255,101,0,104,255,106,127,107,0,108,255,109,0,112,255,114,127,115,0,116,255,117,0,120,255,122,127,123,0,124,255,125,0,128,255,130,127,131,0,132,255,133,0,136,255,138,127,139,0,140,255,141,0,144,255,146,127,147,0,148,255,149,0,152,255,154,127,155,0,156,255,157,0,160,255,162,127,163,0,164,255,165,0,168,255,170,127,171,0,172,255,173,0,176,255,178,127,179,0,180,255,181,0,184,255,186,127,187,0,188,255,189,0,192,255,194,127,195,0,196,255,197,0,200,255,202,127,203,0,204,255,205,0]}, - {id: "c1Magenta", rgb: [1.0, 0.0, 1.0], note: 62, name: "Magenta", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,255,91,0,92,255,93,0,96,255,98,255,99,0,100,255,101,0,104,255,106,255,107,0,108,255,109,0,112,255,114,255,115,0,116,255,117,0,120,255,122,255,123,0,124,255,125,0,128,255,130,255,131,0,132,255,133,0,136,255,138,255,139,0,140,255,141,0,144,255,146,255,147,0,148,255,149,0,152,255,154,255,155,0,156,255,157,0,160,255,162,255,163,0,164,255,165,0,168,255,170,255,171,0,172,255,173,0,176,255,178,255,179,0,180,255,181,0,184,255,186,255,187,0,188,255,189,0,192,255,194,255,195,0,196,255,197,0,200,255,202,255,203,0,204,255,205,0]}, - {id: "c1Pink", rgb: [1.0, 0.157, 0.471], note: 63, name: "Pink", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,255,91,40,92,120,93,0,96,255,98,255,99,40,100,120,101,0,104,255,106,255,107,40,108,120,109,0,112,255,114,255,115,40,116,120,117,0,120,255,122,255,123,40,124,120,125,0,128,255,130,255,131,40,132,120,133,0,136,255,138,255,139,40,140,120,141,0,144,255,146,255,147,40,148,120,149,0,152,255,154,255,155,40,156,120,157,0,160,255,162,255,163,40,164,120,165,0,168,255,170,255,171,40,172,120,173,0,176,255,178,255,179,40,180,120,181,0,184,255,186,255,187,40,188,120,189,0,192,255,194,255,195,40,196,120,197,0,200,255,202,255,203,40,204,120,205,0]}, - {id: "c1Warm", rgb: [1.0, 0.941, 0.627], note: 64, name: "Warm", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,255,91,120,92,40,93,120,96,255,98,255,99,120,100,40,101,120,104,255,106,255,107,120,108,40,109,120,112,255,114,255,115,120,116,40,117,120,120,255,122,255,123,120,124,40,125,120,128,255,130,255,131,120,132,40,133,120,136,255,138,255,139,120,140,40,141,120,144,255,146,255,147,120,148,40,149,120,152,255,154,255,155,120,156,40,157,120,160,255,162,255,163,120,164,40,165,120,168,255,170,255,171,120,172,40,173,120,176,255,178,255,179,120,180,40,181,120,184,255,186,255,187,120,188,40,189,120,192,255,194,255,195,120,196,40,197,120,200,255,202,255,203,120,204,40,205,120]}, - {id: "c1White", rgb: [1.0, 1.0, 1.0], note: 65, name: "White", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,0,91,0,92,0,93,255,96,255,98,0,99,0,100,0,101,255,104,255,106,0,107,0,108,0,109,255,112,255,114,0,115,0,116,0,117,255,120,255,122,0,123,0,124,0,125,255,128,255,130,0,131,0,132,0,133,255,136,255,138,0,139,0,140,0,141,255,144,255,146,0,147,0,148,0,149,255,152,255,154,0,155,0,156,0,157,255,160,255,162,0,163,0,164,0,165,255,168,255,170,0,171,0,172,0,173,255,176,255,178,0,179,0,180,0,181,255,184,255,186,0,187,0,188,0,189,255,192,255,194,0,195,0,196,0,197,255,200,255,202,0,203,0,204,0,205,255]}, - {id: "c1Cool", rgb: [0.784, 0.941, 1.0], note: 66, name: "Cool", fadeIn: 1000, fadeOut: 1000, levels: [88,255,90,80,91,120,92,255,93,120,96,255,98,80,99,120,100,255,101,120,104,255,106,80,107,120,108,255,109,120,112,255,114,80,115,120,116,255,117,120,120,255,122,80,123,120,124,255,125,120,128,255,130,80,131,120,132,255,133,120,136,255,138,80,139,120,140,255,141,120,144,255,146,80,147,120,148,255,149,120,152,255,154,80,155,120,156,255,157,120,160,255,162,80,163,120,164,255,165,120,168,255,170,80,171,120,172,255,173,120,176,255,178,80,179,120,180,255,181,120,184,255,186,80,187,120,188,255,189,120,192,255,194,80,195,120,196,255,197,120,200,255,202,80,203,120,204,255,205,120]}, - {id: "c1Custom", rgb: [1.0, 0.235, 0.0], note: 67, name: "Custom", fadeIn: 1000, fadeOut: 1000, levels: [88,0,96,0,104,0,112,0,120,0,128,0,136,0,144,0,152,0,160,0,168,0,176,0,184,0,192,0,200,0]}, + {id: "c1Red", rgb: [1.0, 0.0, 0.0], note: 52, name: "Red", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,0,92,0,93,0,98,255,99,0,100,0,101,0,106,255,107,0,108,0,109,0,114,255,115,0,116,0,117,0,122,255,123,0,124,0,125,0,130,255,131,0,132,0,133,0,138,255,139,0,140,0,141,0,146,255,147,0,148,0,149,0,154,255,155,0,156,0,157,0,162,255,163,0,164,0,165,0,170,255,171,0,172,0,173,0,178,255,179,0,180,0,181,0,186,255,187,0,188,0,189,0,194,255,195,0,196,0,197,0,202,255,203,0,204,0,205,0]}, + {id: "c1Orange", rgb: [1.0, 0.498, 0.0], note: 53, name: "Orange", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,127,92,0,93,0,98,255,99,127,100,0,101,0,106,255,107,127,108,0,109,0,114,255,115,127,116,0,117,0,122,255,123,127,124,0,125,0,130,255,131,127,132,0,133,0,138,255,139,127,140,0,141,0,146,255,147,127,148,0,149,0,154,255,155,127,156,0,157,0,162,255,163,127,164,0,165,0,170,255,171,127,172,0,173,0,178,255,179,127,180,0,181,0,186,255,187,127,188,0,189,0,194,255,195,127,196,0,197,0,202,255,203,127,204,0,205,0]}, + {id: "c1Amber", rgb: [1.0, 0.749, 0.0], note: 54, name: "Amber", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,191,92,0,93,0,98,255,99,191,100,0,101,0,106,255,107,191,108,0,109,0,114,255,115,191,116,0,117,0,122,255,123,191,124,0,125,0,130,255,131,191,132,0,133,0,138,255,139,191,140,0,141,0,146,255,147,191,148,0,149,0,154,255,155,191,156,0,157,0,162,255,163,191,164,0,165,0,170,255,171,191,172,0,173,0,178,255,179,191,180,0,181,0,186,255,187,191,188,0,189,0,194,255,195,191,196,0,197,0,202,255,203,191,204,0,205,0]}, + {id: "c1Yellow", rgb: [1.0, 1.0, 0.0], note: 55, name: "Yellow", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,255,92,0,93,0,98,255,99,255,100,0,101,0,106,255,107,255,108,0,109,0,114,255,115,255,116,0,117,0,122,255,123,255,124,0,125,0,130,255,131,255,132,0,133,0,138,255,139,255,140,0,141,0,146,255,147,255,148,0,149,0,154,255,155,255,156,0,157,0,162,255,163,255,164,0,165,0,170,255,171,255,172,0,173,0,178,255,179,255,180,0,181,0,186,255,187,255,188,0,189,0,194,255,195,255,196,0,197,0,202,255,203,255,204,0,205,0]}, + {id: "c1Lime", rgb: [0.498, 1.0, 0.0], note: 56, name: "Lime", fadeIn: 1000, fadeOut: 1000, levels: [90,127,91,255,92,0,93,0,98,127,99,255,100,0,101,0,106,127,107,255,108,0,109,0,114,127,115,255,116,0,117,0,122,127,123,255,124,0,125,0,130,127,131,255,132,0,133,0,138,127,139,255,140,0,141,0,146,127,147,255,148,0,149,0,154,127,155,255,156,0,157,0,162,127,163,255,164,0,165,0,170,127,171,255,172,0,173,0,178,127,179,255,180,0,181,0,186,127,187,255,188,0,189,0,194,127,195,255,196,0,197,0,202,127,203,255,204,0,205,0]}, + {id: "c1Green", rgb: [0.0, 1.0, 0.0], note: 57, name: "Green", fadeIn: 1000, fadeOut: 1000, levels: [90,0,91,255,92,0,93,0,98,0,99,255,100,0,101,0,106,0,107,255,108,0,109,0,114,0,115,255,116,0,117,0,122,0,123,255,124,0,125,0,130,0,131,255,132,0,133,0,138,0,139,255,140,0,141,0,146,0,147,255,148,0,149,0,154,0,155,255,156,0,157,0,162,0,163,255,164,0,165,0,170,0,171,255,172,0,173,0,178,0,179,255,180,0,181,0,186,0,187,255,188,0,189,0,194,0,195,255,196,0,197,0,202,0,203,255,204,0,205,0]}, + {id: "c1Spring", rgb: [0.0, 1.0, 0.498], note: 58, name: "Spring", fadeIn: 1000, fadeOut: 1000, levels: [90,0,91,255,92,127,93,0,98,0,99,255,100,127,101,0,106,0,107,255,108,127,109,0,114,0,115,255,116,127,117,0,122,0,123,255,124,127,125,0,130,0,131,255,132,127,133,0,138,0,139,255,140,127,141,0,146,0,147,255,148,127,149,0,154,0,155,255,156,127,157,0,162,0,163,255,164,127,165,0,170,0,171,255,172,127,173,0,178,0,179,255,180,127,181,0,186,0,187,255,188,127,189,0,194,0,195,255,196,127,197,0,202,0,203,255,204,127,205,0]}, + {id: "c1Cyan", rgb: [0.0, 1.0, 1.0], note: 59, name: "Cyan", fadeIn: 1000, fadeOut: 1000, levels: [90,0,91,255,92,255,93,0,98,0,99,255,100,255,101,0,106,0,107,255,108,255,109,0,114,0,115,255,116,255,117,0,122,0,123,255,124,255,125,0,130,0,131,255,132,255,133,0,138,0,139,255,140,255,141,0,146,0,147,255,148,255,149,0,154,0,155,255,156,255,157,0,162,0,163,255,164,255,165,0,170,0,171,255,172,255,173,0,178,0,179,255,180,255,181,0,186,0,187,255,188,255,189,0,194,0,195,255,196,255,197,0,202,0,203,255,204,255,205,0]}, + {id: "c1Azure", rgb: [0.0, 0.498, 1.0], note: 60, name: "Azure", fadeIn: 1000, fadeOut: 1000, levels: [90,0,91,127,92,255,93,0,98,0,99,127,100,255,101,0,106,0,107,127,108,255,109,0,114,0,115,127,116,255,117,0,122,0,123,127,124,255,125,0,130,0,131,127,132,255,133,0,138,0,139,127,140,255,141,0,146,0,147,127,148,255,149,0,154,0,155,127,156,255,157,0,162,0,163,127,164,255,165,0,170,0,171,127,172,255,173,0,178,0,179,127,180,255,181,0,186,0,187,127,188,255,189,0,194,0,195,127,196,255,197,0,202,0,203,127,204,255,205,0]}, + {id: "c1Blue", rgb: [0.0, 0.0, 1.0], note: 61, name: "Blue", fadeIn: 1000, fadeOut: 1000, levels: [90,0,91,0,92,255,93,0,98,0,99,0,100,255,101,0,106,0,107,0,108,255,109,0,114,0,115,0,116,255,117,0,122,0,123,0,124,255,125,0,130,0,131,0,132,255,133,0,138,0,139,0,140,255,141,0,146,0,147,0,148,255,149,0,154,0,155,0,156,255,157,0,162,0,163,0,164,255,165,0,170,0,171,0,172,255,173,0,178,0,179,0,180,255,181,0,186,0,187,0,188,255,189,0,194,0,195,0,196,255,197,0,202,0,203,0,204,255,205,0]}, + {id: "c1Violet", rgb: [0.498, 0.0, 1.0], note: 62, name: "Violet", fadeIn: 1000, fadeOut: 1000, levels: [90,127,91,0,92,255,93,0,98,127,99,0,100,255,101,0,106,127,107,0,108,255,109,0,114,127,115,0,116,255,117,0,122,127,123,0,124,255,125,0,130,127,131,0,132,255,133,0,138,127,139,0,140,255,141,0,146,127,147,0,148,255,149,0,154,127,155,0,156,255,157,0,162,127,163,0,164,255,165,0,170,127,171,0,172,255,173,0,178,127,179,0,180,255,181,0,186,127,187,0,188,255,189,0,194,127,195,0,196,255,197,0,202,127,203,0,204,255,205,0]}, + {id: "c1Magenta", rgb: [1.0, 0.0, 1.0], note: 63, name: "Magenta", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,0,92,255,93,0,98,255,99,0,100,255,101,0,106,255,107,0,108,255,109,0,114,255,115,0,116,255,117,0,122,255,123,0,124,255,125,0,130,255,131,0,132,255,133,0,138,255,139,0,140,255,141,0,146,255,147,0,148,255,149,0,154,255,155,0,156,255,157,0,162,255,163,0,164,255,165,0,170,255,171,0,172,255,173,0,178,255,179,0,180,255,181,0,186,255,187,0,188,255,189,0,194,255,195,0,196,255,197,0,202,255,203,0,204,255,205,0]}, + {id: "c1Pink", rgb: [1.0, 0.157, 0.471], note: 64, name: "Pink", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,40,92,120,93,0,98,255,99,40,100,120,101,0,106,255,107,40,108,120,109,0,114,255,115,40,116,120,117,0,122,255,123,40,124,120,125,0,130,255,131,40,132,120,133,0,138,255,139,40,140,120,141,0,146,255,147,40,148,120,149,0,154,255,155,40,156,120,157,0,162,255,163,40,164,120,165,0,170,255,171,40,172,120,173,0,178,255,179,40,180,120,181,0,186,255,187,40,188,120,189,0,194,255,195,40,196,120,197,0,202,255,203,40,204,120,205,0]}, + {id: "c1Warm", rgb: [1.0, 0.941, 0.627], note: 65, name: "Warm", fadeIn: 1000, fadeOut: 1000, levels: [90,255,91,120,92,40,93,120,98,255,99,120,100,40,101,120,106,255,107,120,108,40,109,120,114,255,115,120,116,40,117,120,122,255,123,120,124,40,125,120,130,255,131,120,132,40,133,120,138,255,139,120,140,40,141,120,146,255,147,120,148,40,149,120,154,255,155,120,156,40,157,120,162,255,163,120,164,40,165,120,170,255,171,120,172,40,173,120,178,255,179,120,180,40,181,120,186,255,187,120,188,40,189,120,194,255,195,120,196,40,197,120,202,255,203,120,204,40,205,120]}, + {id: "c1White", rgb: [1.0, 1.0, 1.0], note: 66, name: "White", fadeIn: 1000, fadeOut: 1000, levels: [90,0,91,0,92,0,93,255,98,0,99,0,100,0,101,255,106,0,107,0,108,0,109,255,114,0,115,0,116,0,117,255,122,0,123,0,124,0,125,255,130,0,131,0,132,0,133,255,138,0,139,0,140,0,141,255,146,0,147,0,148,0,149,255,154,0,155,0,156,0,157,255,162,0,163,0,164,0,165,255,170,0,171,0,172,0,173,255,178,0,179,0,180,0,181,255,186,0,187,0,188,0,189,255,194,0,195,0,196,0,197,255,202,0,203,0,204,0,205,255]}, + {id: "c1Cool", rgb: [0.784, 0.941, 1.0], note: 67, name: "Cool", fadeIn: 1000, fadeOut: 1000, levels: [90,80,91,120,92,255,93,120,98,80,99,120,100,255,101,120,106,80,107,120,108,255,109,120,114,80,115,120,116,255,117,120,122,80,123,120,124,255,125,120,130,80,131,120,132,255,133,120,138,80,139,120,140,255,141,120,146,80,147,120,148,255,149,120,154,80,155,120,156,255,157,120,162,80,163,120,164,255,165,120,170,80,171,120,172,255,173,120,178,80,179,120,180,255,181,120,186,80,187,120,188,255,189,120,194,80,195,120,196,255,197,120,202,80,203,120,204,255,205,120]}, ], sliders: [ - {id: "s1Dim", cc: 30, name: "Dim", levels: [88,255,96,255,104,255,112,255,120,255,128,255,136,255,144,255,152,255,160,255,168,255,176,255,184,255,192,255,200,255]}, - {id: "s1R", cc: 31, name: "R", levels: [90,255,98,255,106,255,114,255,122,255,130,255,138,255,146,255,154,255,162,255,170,255,178,255,186,255,194,255,202,255]}, - {id: "s1G", cc: 32, name: "G", levels: [91,255,99,255,107,255,115,255,123,255,131,255,139,255,147,255,155,255,163,255,171,255,179,255,187,255,195,255,203,255]}, - {id: "s1B", cc: 33, name: "B", levels: [92,255,100,255,108,255,116,255,124,255,132,255,140,255,148,255,156,255,164,255,172,255,180,255,188,255,196,255,204,255]}, - {id: "s1W", cc: 34, name: "W", levels: [93,255,101,255,109,255,117,255,125,255,133,255,141,255,149,255,157,255,165,255,173,255,181,255,189,255,197,255,205,255]}, ] }, { name: "Colour 2", now: "now2", pads: [ - {id: "c2Red", rgb: [1.0, 0.0, 0.0], note: 68, name: "Red", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0,38,0,53,255,54,0,55,255,56,0,57,0,58,0,59,255,60,0,61,0,62,0,63,255,64,0,65,0,66,0,67,255,68,0,69,0,70,0,71,255,72,0,73,0,74,0,75,255,76,0,77,0,78,0,79,255,80,0,81,0,82,0,266,255,267,0,268,255,269,0,270,0,271,0,272,255,273,0,274,0,275,0,276,255,277,0,278,0,279,0,280,255,281,0,282,0,283,0,284,255,285,0,286,0,287,0,288,255,289,0,290,0,291,0,292,255,293,0,294,0,295,0,309,255,310,0,311,255,312,0,313,0,314,0,315,255,316,0,317,0,318,0,319,255,320,0,321,0,322,0,323,255,324,0,325,0,326,0,327,255,328,0,329,0,330,0,331,255,332,0,333,0,334,0,335,255,336,0,337,0,338,0]}, - {id: "c2Orange", rgb: [1.0, 0.498, 0.0], note: 69, name: "Orange", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0,38,0,53,255,54,0,55,255,56,127,57,0,58,0,59,255,60,127,61,0,62,0,63,255,64,127,65,0,66,0,67,255,68,127,69,0,70,0,71,255,72,127,73,0,74,0,75,255,76,127,77,0,78,0,79,255,80,127,81,0,82,0,266,255,267,0,268,255,269,127,270,0,271,0,272,255,273,127,274,0,275,0,276,255,277,127,278,0,279,0,280,255,281,127,282,0,283,0,284,255,285,127,286,0,287,0,288,255,289,127,290,0,291,0,292,255,293,127,294,0,295,0,309,255,310,0,311,255,312,127,313,0,314,0,315,255,316,127,317,0,318,0,319,255,320,127,321,0,322,0,323,255,324,127,325,0,326,0,327,255,328,127,329,0,330,0,331,255,332,127,333,0,334,0,335,255,336,127,337,0,338,0]}, - {id: "c2Yellow", rgb: [1.0, 1.0, 0.0], note: 70, name: "Yellow", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0,38,0,53,255,54,0,55,255,56,255,57,0,58,0,59,255,60,255,61,0,62,0,63,255,64,255,65,0,66,0,67,255,68,255,69,0,70,0,71,255,72,255,73,0,74,0,75,255,76,255,77,0,78,0,79,255,80,255,81,0,82,0,266,255,267,0,268,255,269,255,270,0,271,0,272,255,273,255,274,0,275,0,276,255,277,255,278,0,279,0,280,255,281,255,282,0,283,0,284,255,285,255,286,0,287,0,288,255,289,255,290,0,291,0,292,255,293,255,294,0,295,0,309,255,310,0,311,255,312,255,313,0,314,0,315,255,316,255,317,0,318,0,319,255,320,255,321,0,322,0,323,255,324,255,325,0,326,0,327,255,328,255,329,0,330,0,331,255,332,255,333,0,334,0,335,255,336,255,337,0,338,0]}, - {id: "c2Lime", rgb: [0.498, 1.0, 0.0], note: 71, name: "Lime", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0,38,0,53,255,54,0,55,127,56,255,57,0,58,0,59,127,60,255,61,0,62,0,63,127,64,255,65,0,66,0,67,127,68,255,69,0,70,0,71,127,72,255,73,0,74,0,75,127,76,255,77,0,78,0,79,127,80,255,81,0,82,0,266,255,267,0,268,127,269,255,270,0,271,0,272,127,273,255,274,0,275,0,276,127,277,255,278,0,279,0,280,127,281,255,282,0,283,0,284,127,285,255,286,0,287,0,288,127,289,255,290,0,291,0,292,127,293,255,294,0,295,0,309,255,310,0,311,127,312,255,313,0,314,0,315,127,316,255,317,0,318,0,319,127,320,255,321,0,322,0,323,127,324,255,325,0,326,0,327,127,328,255,329,0,330,0,331,127,332,255,333,0,334,0,335,127,336,255,337,0,338,0]}, - {id: "c2Green", rgb: [0.0, 1.0, 0.0], note: 72, name: "Green", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0,38,0,53,255,54,0,55,0,56,255,57,0,58,0,59,0,60,255,61,0,62,0,63,0,64,255,65,0,66,0,67,0,68,255,69,0,70,0,71,0,72,255,73,0,74,0,75,0,76,255,77,0,78,0,79,0,80,255,81,0,82,0,266,255,267,0,268,0,269,255,270,0,271,0,272,0,273,255,274,0,275,0,276,0,277,255,278,0,279,0,280,0,281,255,282,0,283,0,284,0,285,255,286,0,287,0,288,0,289,255,290,0,291,0,292,0,293,255,294,0,295,0,309,255,310,0,311,0,312,255,313,0,314,0,315,0,316,255,317,0,318,0,319,0,320,255,321,0,322,0,323,0,324,255,325,0,326,0,327,0,328,255,329,0,330,0,331,0,332,255,333,0,334,0,335,0,336,255,337,0,338,0]}, - {id: "c2Spring", rgb: [0.0, 1.0, 0.498], note: 73, name: "Spring", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,0,12,255,13,127,14,0,15,0,16,255,17,127,18,0,19,0,20,255,21,127,22,0,23,0,24,255,25,127,26,0,27,0,28,255,29,127,30,0,31,0,32,255,33,127,34,0,35,0,36,255,37,127,38,0,53,255,54,0,55,0,56,255,57,127,58,0,59,0,60,255,61,127,62,0,63,0,64,255,65,127,66,0,67,0,68,255,69,127,70,0,71,0,72,255,73,127,74,0,75,0,76,255,77,127,78,0,79,0,80,255,81,127,82,0,266,255,267,0,268,0,269,255,270,127,271,0,272,0,273,255,274,127,275,0,276,0,277,255,278,127,279,0,280,0,281,255,282,127,283,0,284,0,285,255,286,127,287,0,288,0,289,255,290,127,291,0,292,0,293,255,294,127,295,0,309,255,310,0,311,0,312,255,313,127,314,0,315,0,316,255,317,127,318,0,319,0,320,255,321,127,322,0,323,0,324,255,325,127,326,0,327,0,328,255,329,127,330,0,331,0,332,255,333,127,334,0,335,0,336,255,337,127,338,0]}, - {id: "c2Cyan", rgb: [0.0, 1.0, 1.0], note: 74, name: "Cyan", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,0,12,255,13,255,14,0,15,0,16,255,17,255,18,0,19,0,20,255,21,255,22,0,23,0,24,255,25,255,26,0,27,0,28,255,29,255,30,0,31,0,32,255,33,255,34,0,35,0,36,255,37,255,38,0,53,255,54,0,55,0,56,255,57,255,58,0,59,0,60,255,61,255,62,0,63,0,64,255,65,255,66,0,67,0,68,255,69,255,70,0,71,0,72,255,73,255,74,0,75,0,76,255,77,255,78,0,79,0,80,255,81,255,82,0,266,255,267,0,268,0,269,255,270,255,271,0,272,0,273,255,274,255,275,0,276,0,277,255,278,255,279,0,280,0,281,255,282,255,283,0,284,0,285,255,286,255,287,0,288,0,289,255,290,255,291,0,292,0,293,255,294,255,295,0,309,255,310,0,311,0,312,255,313,255,314,0,315,0,316,255,317,255,318,0,319,0,320,255,321,255,322,0,323,0,324,255,325,255,326,0,327,0,328,255,329,255,330,0,331,0,332,255,333,255,334,0,335,0,336,255,337,255,338,0]}, - {id: "c2Azure", rgb: [0.0, 0.498, 1.0], note: 75, name: "Azure", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,0,12,127,13,255,14,0,15,0,16,127,17,255,18,0,19,0,20,127,21,255,22,0,23,0,24,127,25,255,26,0,27,0,28,127,29,255,30,0,31,0,32,127,33,255,34,0,35,0,36,127,37,255,38,0,53,255,54,0,55,0,56,127,57,255,58,0,59,0,60,127,61,255,62,0,63,0,64,127,65,255,66,0,67,0,68,127,69,255,70,0,71,0,72,127,73,255,74,0,75,0,76,127,77,255,78,0,79,0,80,127,81,255,82,0,266,255,267,0,268,0,269,127,270,255,271,0,272,0,273,127,274,255,275,0,276,0,277,127,278,255,279,0,280,0,281,127,282,255,283,0,284,0,285,127,286,255,287,0,288,0,289,127,290,255,291,0,292,0,293,127,294,255,295,0,309,255,310,0,311,0,312,127,313,255,314,0,315,0,316,127,317,255,318,0,319,0,320,127,321,255,322,0,323,0,324,127,325,255,326,0,327,0,328,127,329,255,330,0,331,0,332,127,333,255,334,0,335,0,336,127,337,255,338,0]}, - {id: "c2Blue", rgb: [0.0, 0.0, 1.0], note: 76, name: "Blue", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255,38,0,53,255,54,0,55,0,56,0,57,255,58,0,59,0,60,0,61,255,62,0,63,0,64,0,65,255,66,0,67,0,68,0,69,255,70,0,71,0,72,0,73,255,74,0,75,0,76,0,77,255,78,0,79,0,80,0,81,255,82,0,266,255,267,0,268,0,269,0,270,255,271,0,272,0,273,0,274,255,275,0,276,0,277,0,278,255,279,0,280,0,281,0,282,255,283,0,284,0,285,0,286,255,287,0,288,0,289,0,290,255,291,0,292,0,293,0,294,255,295,0,309,255,310,0,311,0,312,0,313,255,314,0,315,0,316,0,317,255,318,0,319,0,320,0,321,255,322,0,323,0,324,0,325,255,326,0,327,0,328,0,329,255,330,0,331,0,332,0,333,255,334,0,335,0,336,0,337,255,338,0]}, - {id: "c2Violet", rgb: [0.498, 0.0, 1.0], note: 77, name: "Violet", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,127,12,0,13,255,14,0,15,127,16,0,17,255,18,0,19,127,20,0,21,255,22,0,23,127,24,0,25,255,26,0,27,127,28,0,29,255,30,0,31,127,32,0,33,255,34,0,35,127,36,0,37,255,38,0,53,255,54,0,55,127,56,0,57,255,58,0,59,127,60,0,61,255,62,0,63,127,64,0,65,255,66,0,67,127,68,0,69,255,70,0,71,127,72,0,73,255,74,0,75,127,76,0,77,255,78,0,79,127,80,0,81,255,82,0,266,255,267,0,268,127,269,0,270,255,271,0,272,127,273,0,274,255,275,0,276,127,277,0,278,255,279,0,280,127,281,0,282,255,283,0,284,127,285,0,286,255,287,0,288,127,289,0,290,255,291,0,292,127,293,0,294,255,295,0,309,255,310,0,311,127,312,0,313,255,314,0,315,127,316,0,317,255,318,0,319,127,320,0,321,255,322,0,323,127,324,0,325,255,326,0,327,127,328,0,329,255,330,0,331,127,332,0,333,255,334,0,335,127,336,0,337,255,338,0]}, - {id: "c2Magenta", rgb: [1.0, 0.0, 1.0], note: 78, name: "Magenta", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,255,12,0,13,255,14,0,15,255,16,0,17,255,18,0,19,255,20,0,21,255,22,0,23,255,24,0,25,255,26,0,27,255,28,0,29,255,30,0,31,255,32,0,33,255,34,0,35,255,36,0,37,255,38,0,53,255,54,0,55,255,56,0,57,255,58,0,59,255,60,0,61,255,62,0,63,255,64,0,65,255,66,0,67,255,68,0,69,255,70,0,71,255,72,0,73,255,74,0,75,255,76,0,77,255,78,0,79,255,80,0,81,255,82,0,266,255,267,0,268,255,269,0,270,255,271,0,272,255,273,0,274,255,275,0,276,255,277,0,278,255,279,0,280,255,281,0,282,255,283,0,284,255,285,0,286,255,287,0,288,255,289,0,290,255,291,0,292,255,293,0,294,255,295,0,309,255,310,0,311,255,312,0,313,255,314,0,315,255,316,0,317,255,318,0,319,255,320,0,321,255,322,0,323,255,324,0,325,255,326,0,327,255,328,0,329,255,330,0,331,255,332,0,333,255,334,0,335,255,336,0,337,255,338,0]}, - {id: "c2Pink", rgb: [1.0, 0.157, 0.471], note: 79, name: "Pink", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,255,12,40,13,120,14,0,15,255,16,40,17,120,18,0,19,255,20,40,21,120,22,0,23,255,24,40,25,120,26,0,27,255,28,40,29,120,30,0,31,255,32,40,33,120,34,0,35,255,36,40,37,120,38,0,53,255,54,0,55,255,56,40,57,120,58,0,59,255,60,40,61,120,62,0,63,255,64,40,65,120,66,0,67,255,68,40,69,120,70,0,71,255,72,40,73,120,74,0,75,255,76,40,77,120,78,0,79,255,80,40,81,120,82,0,266,255,267,0,268,255,269,40,270,120,271,0,272,255,273,40,274,120,275,0,276,255,277,40,278,120,279,0,280,255,281,40,282,120,283,0,284,255,285,40,286,120,287,0,288,255,289,40,290,120,291,0,292,255,293,40,294,120,295,0,309,255,310,0,311,255,312,40,313,120,314,0,315,255,316,40,317,120,318,0,319,255,320,40,321,120,322,0,323,255,324,40,325,120,326,0,327,255,328,40,329,120,330,0,331,255,332,40,333,120,334,0,335,255,336,40,337,120,338,0]}, - {id: "c2Warm", rgb: [1.0, 0.941, 0.627], note: 80, name: "Warm", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,255,12,120,13,40,14,120,15,255,16,120,17,40,18,120,19,255,20,120,21,40,22,120,23,255,24,120,25,40,26,120,27,255,28,120,29,40,30,120,31,255,32,120,33,40,34,120,35,255,36,120,37,40,38,120,53,255,54,0,55,255,56,120,57,40,58,120,59,255,60,120,61,40,62,120,63,255,64,120,65,40,66,120,67,255,68,120,69,40,70,120,71,255,72,120,73,40,74,120,75,255,76,120,77,40,78,120,79,255,80,120,81,40,82,120,266,255,267,0,268,255,269,120,270,40,271,120,272,255,273,120,274,40,275,120,276,255,277,120,278,40,279,120,280,255,281,120,282,40,283,120,284,255,285,120,286,40,287,120,288,255,289,120,290,40,291,120,292,255,293,120,294,40,295,120,309,255,310,0,311,255,312,120,313,40,314,120,315,255,316,120,317,40,318,120,319,255,320,120,321,40,322,120,323,255,324,120,325,40,326,120,327,255,328,120,329,40,330,120,331,255,332,120,333,40,334,120,335,255,336,120,337,40,338,120]}, - {id: "c2White", rgb: [1.0, 1.0, 1.0], note: 81, name: "White", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0,38,255,53,255,54,0,55,0,56,0,57,0,58,255,59,0,60,0,61,0,62,255,63,0,64,0,65,0,66,255,67,0,68,0,69,0,70,255,71,0,72,0,73,0,74,255,75,0,76,0,77,0,78,255,79,0,80,0,81,0,82,255,266,255,267,0,268,0,269,0,270,0,271,255,272,0,273,0,274,0,275,255,276,0,277,0,278,0,279,255,280,0,281,0,282,0,283,255,284,0,285,0,286,0,287,255,288,0,289,0,290,0,291,255,292,0,293,0,294,0,295,255,309,255,310,0,311,0,312,0,313,0,314,255,315,0,316,0,317,0,318,255,319,0,320,0,321,0,322,255,323,0,324,0,325,0,326,255,327,0,328,0,329,0,330,255,331,0,332,0,333,0,334,255,335,0,336,0,337,0,338,255]}, - {id: "c2Cool", rgb: [0.784, 0.941, 1.0], note: 82, name: "Cool", fadeIn: 1000, fadeOut: 1000, levels: [9,255,10,0,11,80,12,120,13,255,14,120,15,80,16,120,17,255,18,120,19,80,20,120,21,255,22,120,23,80,24,120,25,255,26,120,27,80,28,120,29,255,30,120,31,80,32,120,33,255,34,120,35,80,36,120,37,255,38,120,53,255,54,0,55,80,56,120,57,255,58,120,59,80,60,120,61,255,62,120,63,80,64,120,65,255,66,120,67,80,68,120,69,255,70,120,71,80,72,120,73,255,74,120,75,80,76,120,77,255,78,120,79,80,80,120,81,255,82,120,266,255,267,0,268,80,269,120,270,255,271,120,272,80,273,120,274,255,275,120,276,80,277,120,278,255,279,120,280,80,281,120,282,255,283,120,284,80,285,120,286,255,287,120,288,80,289,120,290,255,291,120,292,80,293,120,294,255,295,120,309,255,310,0,311,80,312,120,313,255,314,120,315,80,316,120,317,255,318,120,319,80,320,120,321,255,322,120,323,80,324,120,325,255,326,120,327,80,328,120,329,255,330,120,331,80,332,120,333,255,334,120,335,80,336,120,337,255,338,120]}, - {id: "c2Custom", rgb: [1.0, 0.235, 0.0], note: 83, name: "Custom", fadeIn: 1000, fadeOut: 1000, levels: [9,0,53,0,266,0,309,0]}, + {id: "c2Red", rgb: [1.0, 0.0, 0.0], note: 68, name: "Red", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,0,13,0,14,0,15,255,16,0,17,0,18,0,19,255,20,0,21,0,22,0,23,255,24,0,25,0,26,0,27,255,28,0,29,0,30,0,31,255,32,0,33,0,34,0,35,255,36,0,37,0,38,0,54,0,55,255,56,0,57,0,58,0,59,255,60,0,61,0,62,0,63,255,64,0,65,0,66,0,67,255,68,0,69,0,70,0,71,255,72,0,73,0,74,0,75,255,76,0,77,0,78,0,79,255,80,0,81,0,82,0,267,0,268,255,269,0,270,0,271,0,272,255,273,0,274,0,275,0,276,255,277,0,278,0,279,0,280,255,281,0,282,0,283,0,284,255,285,0,286,0,287,0,288,255,289,0,290,0,291,0,292,255,293,0,294,0,295,0,310,0,311,255,312,0,313,0,314,0,315,255,316,0,317,0,318,0,319,255,320,0,321,0,322,0,323,255,324,0,325,0,326,0,327,255,328,0,329,0,330,0,331,255,332,0,333,0,334,0,335,255,336,0,337,0,338,0]}, + {id: "c2Orange", rgb: [1.0, 0.498, 0.0], note: 69, name: "Orange", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,127,13,0,14,0,15,255,16,127,17,0,18,0,19,255,20,127,21,0,22,0,23,255,24,127,25,0,26,0,27,255,28,127,29,0,30,0,31,255,32,127,33,0,34,0,35,255,36,127,37,0,38,0,54,0,55,255,56,127,57,0,58,0,59,255,60,127,61,0,62,0,63,255,64,127,65,0,66,0,67,255,68,127,69,0,70,0,71,255,72,127,73,0,74,0,75,255,76,127,77,0,78,0,79,255,80,127,81,0,82,0,267,0,268,255,269,127,270,0,271,0,272,255,273,127,274,0,275,0,276,255,277,127,278,0,279,0,280,255,281,127,282,0,283,0,284,255,285,127,286,0,287,0,288,255,289,127,290,0,291,0,292,255,293,127,294,0,295,0,310,0,311,255,312,127,313,0,314,0,315,255,316,127,317,0,318,0,319,255,320,127,321,0,322,0,323,255,324,127,325,0,326,0,327,255,328,127,329,0,330,0,331,255,332,127,333,0,334,0,335,255,336,127,337,0,338,0]}, + {id: "c2Amber", rgb: [1.0, 0.749, 0.0], note: 70, name: "Amber", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,191,13,0,14,0,15,255,16,191,17,0,18,0,19,255,20,191,21,0,22,0,23,255,24,191,25,0,26,0,27,255,28,191,29,0,30,0,31,255,32,191,33,0,34,0,35,255,36,191,37,0,38,0,54,0,55,255,56,191,57,0,58,0,59,255,60,191,61,0,62,0,63,255,64,191,65,0,66,0,67,255,68,191,69,0,70,0,71,255,72,191,73,0,74,0,75,255,76,191,77,0,78,0,79,255,80,191,81,0,82,0,267,0,268,255,269,191,270,0,271,0,272,255,273,191,274,0,275,0,276,255,277,191,278,0,279,0,280,255,281,191,282,0,283,0,284,255,285,191,286,0,287,0,288,255,289,191,290,0,291,0,292,255,293,191,294,0,295,0,310,0,311,255,312,191,313,0,314,0,315,255,316,191,317,0,318,0,319,255,320,191,321,0,322,0,323,255,324,191,325,0,326,0,327,255,328,191,329,0,330,0,331,255,332,191,333,0,334,0,335,255,336,191,337,0,338,0]}, + {id: "c2Yellow", rgb: [1.0, 1.0, 0.0], note: 71, name: "Yellow", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,255,13,0,14,0,15,255,16,255,17,0,18,0,19,255,20,255,21,0,22,0,23,255,24,255,25,0,26,0,27,255,28,255,29,0,30,0,31,255,32,255,33,0,34,0,35,255,36,255,37,0,38,0,54,0,55,255,56,255,57,0,58,0,59,255,60,255,61,0,62,0,63,255,64,255,65,0,66,0,67,255,68,255,69,0,70,0,71,255,72,255,73,0,74,0,75,255,76,255,77,0,78,0,79,255,80,255,81,0,82,0,267,0,268,255,269,255,270,0,271,0,272,255,273,255,274,0,275,0,276,255,277,255,278,0,279,0,280,255,281,255,282,0,283,0,284,255,285,255,286,0,287,0,288,255,289,255,290,0,291,0,292,255,293,255,294,0,295,0,310,0,311,255,312,255,313,0,314,0,315,255,316,255,317,0,318,0,319,255,320,255,321,0,322,0,323,255,324,255,325,0,326,0,327,255,328,255,329,0,330,0,331,255,332,255,333,0,334,0,335,255,336,255,337,0,338,0]}, + {id: "c2Lime", rgb: [0.498, 1.0, 0.0], note: 72, name: "Lime", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,127,12,255,13,0,14,0,15,127,16,255,17,0,18,0,19,127,20,255,21,0,22,0,23,127,24,255,25,0,26,0,27,127,28,255,29,0,30,0,31,127,32,255,33,0,34,0,35,127,36,255,37,0,38,0,54,0,55,127,56,255,57,0,58,0,59,127,60,255,61,0,62,0,63,127,64,255,65,0,66,0,67,127,68,255,69,0,70,0,71,127,72,255,73,0,74,0,75,127,76,255,77,0,78,0,79,127,80,255,81,0,82,0,267,0,268,127,269,255,270,0,271,0,272,127,273,255,274,0,275,0,276,127,277,255,278,0,279,0,280,127,281,255,282,0,283,0,284,127,285,255,286,0,287,0,288,127,289,255,290,0,291,0,292,127,293,255,294,0,295,0,310,0,311,127,312,255,313,0,314,0,315,127,316,255,317,0,318,0,319,127,320,255,321,0,322,0,323,127,324,255,325,0,326,0,327,127,328,255,329,0,330,0,331,127,332,255,333,0,334,0,335,127,336,255,337,0,338,0]}, + {id: "c2Green", rgb: [0.0, 1.0, 0.0], note: 73, name: "Green", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,0,12,255,13,0,14,0,15,0,16,255,17,0,18,0,19,0,20,255,21,0,22,0,23,0,24,255,25,0,26,0,27,0,28,255,29,0,30,0,31,0,32,255,33,0,34,0,35,0,36,255,37,0,38,0,54,0,55,0,56,255,57,0,58,0,59,0,60,255,61,0,62,0,63,0,64,255,65,0,66,0,67,0,68,255,69,0,70,0,71,0,72,255,73,0,74,0,75,0,76,255,77,0,78,0,79,0,80,255,81,0,82,0,267,0,268,0,269,255,270,0,271,0,272,0,273,255,274,0,275,0,276,0,277,255,278,0,279,0,280,0,281,255,282,0,283,0,284,0,285,255,286,0,287,0,288,0,289,255,290,0,291,0,292,0,293,255,294,0,295,0,310,0,311,0,312,255,313,0,314,0,315,0,316,255,317,0,318,0,319,0,320,255,321,0,322,0,323,0,324,255,325,0,326,0,327,0,328,255,329,0,330,0,331,0,332,255,333,0,334,0,335,0,336,255,337,0,338,0]}, + {id: "c2Spring", rgb: [0.0, 1.0, 0.498], note: 74, name: "Spring", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,0,12,255,13,127,14,0,15,0,16,255,17,127,18,0,19,0,20,255,21,127,22,0,23,0,24,255,25,127,26,0,27,0,28,255,29,127,30,0,31,0,32,255,33,127,34,0,35,0,36,255,37,127,38,0,54,0,55,0,56,255,57,127,58,0,59,0,60,255,61,127,62,0,63,0,64,255,65,127,66,0,67,0,68,255,69,127,70,0,71,0,72,255,73,127,74,0,75,0,76,255,77,127,78,0,79,0,80,255,81,127,82,0,267,0,268,0,269,255,270,127,271,0,272,0,273,255,274,127,275,0,276,0,277,255,278,127,279,0,280,0,281,255,282,127,283,0,284,0,285,255,286,127,287,0,288,0,289,255,290,127,291,0,292,0,293,255,294,127,295,0,310,0,311,0,312,255,313,127,314,0,315,0,316,255,317,127,318,0,319,0,320,255,321,127,322,0,323,0,324,255,325,127,326,0,327,0,328,255,329,127,330,0,331,0,332,255,333,127,334,0,335,0,336,255,337,127,338,0]}, + {id: "c2Cyan", rgb: [0.0, 1.0, 1.0], note: 75, name: "Cyan", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,0,12,255,13,255,14,0,15,0,16,255,17,255,18,0,19,0,20,255,21,255,22,0,23,0,24,255,25,255,26,0,27,0,28,255,29,255,30,0,31,0,32,255,33,255,34,0,35,0,36,255,37,255,38,0,54,0,55,0,56,255,57,255,58,0,59,0,60,255,61,255,62,0,63,0,64,255,65,255,66,0,67,0,68,255,69,255,70,0,71,0,72,255,73,255,74,0,75,0,76,255,77,255,78,0,79,0,80,255,81,255,82,0,267,0,268,0,269,255,270,255,271,0,272,0,273,255,274,255,275,0,276,0,277,255,278,255,279,0,280,0,281,255,282,255,283,0,284,0,285,255,286,255,287,0,288,0,289,255,290,255,291,0,292,0,293,255,294,255,295,0,310,0,311,0,312,255,313,255,314,0,315,0,316,255,317,255,318,0,319,0,320,255,321,255,322,0,323,0,324,255,325,255,326,0,327,0,328,255,329,255,330,0,331,0,332,255,333,255,334,0,335,0,336,255,337,255,338,0]}, + {id: "c2Azure", rgb: [0.0, 0.498, 1.0], note: 76, name: "Azure", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,0,12,127,13,255,14,0,15,0,16,127,17,255,18,0,19,0,20,127,21,255,22,0,23,0,24,127,25,255,26,0,27,0,28,127,29,255,30,0,31,0,32,127,33,255,34,0,35,0,36,127,37,255,38,0,54,0,55,0,56,127,57,255,58,0,59,0,60,127,61,255,62,0,63,0,64,127,65,255,66,0,67,0,68,127,69,255,70,0,71,0,72,127,73,255,74,0,75,0,76,127,77,255,78,0,79,0,80,127,81,255,82,0,267,0,268,0,269,127,270,255,271,0,272,0,273,127,274,255,275,0,276,0,277,127,278,255,279,0,280,0,281,127,282,255,283,0,284,0,285,127,286,255,287,0,288,0,289,127,290,255,291,0,292,0,293,127,294,255,295,0,310,0,311,0,312,127,313,255,314,0,315,0,316,127,317,255,318,0,319,0,320,127,321,255,322,0,323,0,324,127,325,255,326,0,327,0,328,127,329,255,330,0,331,0,332,127,333,255,334,0,335,0,336,127,337,255,338,0]}, + {id: "c2Blue", rgb: [0.0, 0.0, 1.0], note: 77, name: "Blue", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,0,12,0,13,255,14,0,15,0,16,0,17,255,18,0,19,0,20,0,21,255,22,0,23,0,24,0,25,255,26,0,27,0,28,0,29,255,30,0,31,0,32,0,33,255,34,0,35,0,36,0,37,255,38,0,54,0,55,0,56,0,57,255,58,0,59,0,60,0,61,255,62,0,63,0,64,0,65,255,66,0,67,0,68,0,69,255,70,0,71,0,72,0,73,255,74,0,75,0,76,0,77,255,78,0,79,0,80,0,81,255,82,0,267,0,268,0,269,0,270,255,271,0,272,0,273,0,274,255,275,0,276,0,277,0,278,255,279,0,280,0,281,0,282,255,283,0,284,0,285,0,286,255,287,0,288,0,289,0,290,255,291,0,292,0,293,0,294,255,295,0,310,0,311,0,312,0,313,255,314,0,315,0,316,0,317,255,318,0,319,0,320,0,321,255,322,0,323,0,324,0,325,255,326,0,327,0,328,0,329,255,330,0,331,0,332,0,333,255,334,0,335,0,336,0,337,255,338,0]}, + {id: "c2Violet", rgb: [0.498, 0.0, 1.0], note: 78, name: "Violet", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,127,12,0,13,255,14,0,15,127,16,0,17,255,18,0,19,127,20,0,21,255,22,0,23,127,24,0,25,255,26,0,27,127,28,0,29,255,30,0,31,127,32,0,33,255,34,0,35,127,36,0,37,255,38,0,54,0,55,127,56,0,57,255,58,0,59,127,60,0,61,255,62,0,63,127,64,0,65,255,66,0,67,127,68,0,69,255,70,0,71,127,72,0,73,255,74,0,75,127,76,0,77,255,78,0,79,127,80,0,81,255,82,0,267,0,268,127,269,0,270,255,271,0,272,127,273,0,274,255,275,0,276,127,277,0,278,255,279,0,280,127,281,0,282,255,283,0,284,127,285,0,286,255,287,0,288,127,289,0,290,255,291,0,292,127,293,0,294,255,295,0,310,0,311,127,312,0,313,255,314,0,315,127,316,0,317,255,318,0,319,127,320,0,321,255,322,0,323,127,324,0,325,255,326,0,327,127,328,0,329,255,330,0,331,127,332,0,333,255,334,0,335,127,336,0,337,255,338,0]}, + {id: "c2Magenta", rgb: [1.0, 0.0, 1.0], note: 79, name: "Magenta", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,0,13,255,14,0,15,255,16,0,17,255,18,0,19,255,20,0,21,255,22,0,23,255,24,0,25,255,26,0,27,255,28,0,29,255,30,0,31,255,32,0,33,255,34,0,35,255,36,0,37,255,38,0,54,0,55,255,56,0,57,255,58,0,59,255,60,0,61,255,62,0,63,255,64,0,65,255,66,0,67,255,68,0,69,255,70,0,71,255,72,0,73,255,74,0,75,255,76,0,77,255,78,0,79,255,80,0,81,255,82,0,267,0,268,255,269,0,270,255,271,0,272,255,273,0,274,255,275,0,276,255,277,0,278,255,279,0,280,255,281,0,282,255,283,0,284,255,285,0,286,255,287,0,288,255,289,0,290,255,291,0,292,255,293,0,294,255,295,0,310,0,311,255,312,0,313,255,314,0,315,255,316,0,317,255,318,0,319,255,320,0,321,255,322,0,323,255,324,0,325,255,326,0,327,255,328,0,329,255,330,0,331,255,332,0,333,255,334,0,335,255,336,0,337,255,338,0]}, + {id: "c2Pink", rgb: [1.0, 0.157, 0.471], note: 80, name: "Pink", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,40,13,120,14,0,15,255,16,40,17,120,18,0,19,255,20,40,21,120,22,0,23,255,24,40,25,120,26,0,27,255,28,40,29,120,30,0,31,255,32,40,33,120,34,0,35,255,36,40,37,120,38,0,54,0,55,255,56,40,57,120,58,0,59,255,60,40,61,120,62,0,63,255,64,40,65,120,66,0,67,255,68,40,69,120,70,0,71,255,72,40,73,120,74,0,75,255,76,40,77,120,78,0,79,255,80,40,81,120,82,0,267,0,268,255,269,40,270,120,271,0,272,255,273,40,274,120,275,0,276,255,277,40,278,120,279,0,280,255,281,40,282,120,283,0,284,255,285,40,286,120,287,0,288,255,289,40,290,120,291,0,292,255,293,40,294,120,295,0,310,0,311,255,312,40,313,120,314,0,315,255,316,40,317,120,318,0,319,255,320,40,321,120,322,0,323,255,324,40,325,120,326,0,327,255,328,40,329,120,330,0,331,255,332,40,333,120,334,0,335,255,336,40,337,120,338,0]}, + {id: "c2Warm", rgb: [1.0, 0.941, 0.627], note: 81, name: "Warm", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,255,12,120,13,40,14,120,15,255,16,120,17,40,18,120,19,255,20,120,21,40,22,120,23,255,24,120,25,40,26,120,27,255,28,120,29,40,30,120,31,255,32,120,33,40,34,120,35,255,36,120,37,40,38,120,54,0,55,255,56,120,57,40,58,120,59,255,60,120,61,40,62,120,63,255,64,120,65,40,66,120,67,255,68,120,69,40,70,120,71,255,72,120,73,40,74,120,75,255,76,120,77,40,78,120,79,255,80,120,81,40,82,120,267,0,268,255,269,120,270,40,271,120,272,255,273,120,274,40,275,120,276,255,277,120,278,40,279,120,280,255,281,120,282,40,283,120,284,255,285,120,286,40,287,120,288,255,289,120,290,40,291,120,292,255,293,120,294,40,295,120,310,0,311,255,312,120,313,40,314,120,315,255,316,120,317,40,318,120,319,255,320,120,321,40,322,120,323,255,324,120,325,40,326,120,327,255,328,120,329,40,330,120,331,255,332,120,333,40,334,120,335,255,336,120,337,40,338,120]}, + {id: "c2White", rgb: [1.0, 1.0, 1.0], note: 82, name: "White", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,0,12,0,13,0,14,255,15,0,16,0,17,0,18,255,19,0,20,0,21,0,22,255,23,0,24,0,25,0,26,255,27,0,28,0,29,0,30,255,31,0,32,0,33,0,34,255,35,0,36,0,37,0,38,255,54,0,55,0,56,0,57,0,58,255,59,0,60,0,61,0,62,255,63,0,64,0,65,0,66,255,67,0,68,0,69,0,70,255,71,0,72,0,73,0,74,255,75,0,76,0,77,0,78,255,79,0,80,0,81,0,82,255,267,0,268,0,269,0,270,0,271,255,272,0,273,0,274,0,275,255,276,0,277,0,278,0,279,255,280,0,281,0,282,0,283,255,284,0,285,0,286,0,287,255,288,0,289,0,290,0,291,255,292,0,293,0,294,0,295,255,310,0,311,0,312,0,313,0,314,255,315,0,316,0,317,0,318,255,319,0,320,0,321,0,322,255,323,0,324,0,325,0,326,255,327,0,328,0,329,0,330,255,331,0,332,0,333,0,334,255,335,0,336,0,337,0,338,255]}, + {id: "c2Cool", rgb: [0.784, 0.941, 1.0], note: 83, name: "Cool", fadeIn: 1000, fadeOut: 1000, levels: [10,0,11,80,12,120,13,255,14,120,15,80,16,120,17,255,18,120,19,80,20,120,21,255,22,120,23,80,24,120,25,255,26,120,27,80,28,120,29,255,30,120,31,80,32,120,33,255,34,120,35,80,36,120,37,255,38,120,54,0,55,80,56,120,57,255,58,120,59,80,60,120,61,255,62,120,63,80,64,120,65,255,66,120,67,80,68,120,69,255,70,120,71,80,72,120,73,255,74,120,75,80,76,120,77,255,78,120,79,80,80,120,81,255,82,120,267,0,268,80,269,120,270,255,271,120,272,80,273,120,274,255,275,120,276,80,277,120,278,255,279,120,280,80,281,120,282,255,283,120,284,80,285,120,286,255,287,120,288,80,289,120,290,255,291,120,292,80,293,120,294,255,295,120,310,0,311,80,312,120,313,255,314,120,315,80,316,120,317,255,318,120,319,80,320,120,321,255,322,120,323,80,324,120,325,255,326,120,327,80,328,120,329,255,330,120,331,80,332,120,333,255,334,120,335,80,336,120,337,255,338,120]}, ], sliders: [ - {id: "s2Dim", cc: 35, name: "Dim", levels: [9,255,53,255,266,255,309,255]}, - {id: "s2R", cc: 36, name: "R", levels: [11,255,15,255,19,255,23,255,27,255,31,255,35,255,55,255,59,255,63,255,67,255,71,255,75,255,79,255,268,255,272,255,276,255,280,255,284,255,288,255,292,255,311,255,315,255,319,255,323,255,327,255,331,255,335,255]}, - {id: "s2G", cc: 37, name: "G", levels: [12,255,16,255,20,255,24,255,28,255,32,255,36,255,56,255,60,255,64,255,68,255,72,255,76,255,80,255,269,255,273,255,277,255,281,255,285,255,289,255,293,255,312,255,316,255,320,255,324,255,328,255,332,255,336,255]}, - {id: "s2B", cc: 38, name: "B", levels: [13,255,17,255,21,255,25,255,29,255,33,255,37,255,57,255,61,255,65,255,69,255,73,255,77,255,81,255,270,255,274,255,278,255,282,255,286,255,290,255,294,255,313,255,317,255,321,255,325,255,329,255,333,255,337,255]}, - {id: "s2W", cc: 39, name: "W", levels: [14,255,18,255,22,255,26,255,30,255,34,255,38,255,58,255,62,255,66,255,70,255,74,255,78,255,82,255,271,255,275,255,279,255,283,255,287,255,291,255,295,255,314,255,318,255,322,255,326,255,330,255,334,255,338,255]}, + ] + }, + { + name: "Dimmers", + now: "now3", + pads: [ + ], + sliders: [ + {id: "s3Movers", cc: 44, name: "Movers", value: 1.0, levels: [9,255,53,255,266,255,309,255]}, + {id: "s3Cans915", cc: 34, name: "Cans 9\u201315", value: 1.0, levels: [152,255,160,255,168,255,176,255,184,255,192,255,200,255]}, + {id: "s3Cans36", cc: 36, name: "Cans 3\u20136", value: 1.0, levels: [104,255,112,255,120,255,128,255]}, + {id: "s3Cans1278", cc: 37, name: "Cans 1, 2, 7, 8", value: 1.0, levels: [88,255,96,255,136,255,144,255]}, ] }, ]; @@ -99,7 +101,7 @@ function init() for (var p = 0; p < group.pads.length; p++) mark(touched, group.pads[p].levels); for (var s = 0; s < group.sliders.length; s++) mark(touched, group.sliders[s].levels); var mix = []; - for (var m = 0; m < group.sliders.length; m++) mix[m] = 0; + for (var m = 0; m < group.sliders.length; m++) mix[m] = group.sliders[m].value; states[g] = {active: -1, elapsed: 0, duration: 0, level: level, from: from, to: to, touched: touched, mix: mix}; // Controls on the script's Params, for the dashboard to show. @@ -113,7 +115,7 @@ function init() } for (var r = 0; r < group.sliders.length; r++) { - sliderParams[g][r] = script.addFloatParameter(group.sliders[r].id, group.name + " " + group.sliders[r].name, 0, 0, 1); + sliderParams[g][r] = script.addFloatParameter(group.sliders[r].id, group.name + " " + group.sliders[r].name, group.sliders[r].value, 0, 1); lookup[group.sliders[r].id] = {g: g, p: -1, s: r}; } nowParams[g] = script.addStringParameter(group.now, group.name + " scene", ""); diff --git a/chataigne/test/test.noisette b/chataigne/test/test.noisette index 0dbf1cc..e94d3ac 100644 --- a/chataigne/test/test.noisette +++ b/chataigne/test/test.noisette @@ -53,7 +53,7 @@ }, { "value": [ - 825.0, + 500.0, 32.0 ], "controlAddress": "/viewUISize" @@ -277,6 +277,100 @@ ], "controlAddress": "/viewUISize" }, + { + "value": "/modules/pad/scripts/test/params/c1AmberLamp", + "controlAddress": "/target" + }, + { + "value": "Amber", + "controlAddress": "/customText", + "enabled": true + }, + { + "value": -1, + "controlAddress": "/textColor", + "enabled": true + }, + { + "value": true, + "controlAddress": "/readOnly" + }, + { + "value": false, + "controlAddress": "/showValue" + } + ], + "niceName": "Item 6", + "type": "DashboardParameterItem", + "ghostAddress": "/modules/pad/scripts/test/params/c1AmberLamp", + "controllable": "/modules/pad/scripts/test/params/c1AmberLamp" + }, + { + "parameters": [ + { + "value": [ + -524.0, + -169.5 + ], + "controlAddress": "/viewUIPosition" + }, + { + "value": [ + 112.0, + 75.0 + ], + "controlAddress": "/viewUISize" + }, + { + "value": "/modules/pad/scripts/test/params/c1Amber", + "controlAddress": "/target" + }, + { + "value": " ", + "controlAddress": "/customText", + "enabled": true + }, + { + "value": -16640, + "controlAddress": "/backgroundColor", + "enabled": true + }, + { + "value": -16777216, + "controlAddress": "/textColor", + "enabled": true + }, + { + "value": false, + "controlAddress": "/showLabel" + }, + { + "value": "/home/jimmy/projects/qlcplus/chataigne/test/clear.png", + "controlAddress": "/customImage", + "enabled": true + } + ], + "niceName": "Item 7", + "type": "DashboardTriggerItem", + "ghostAddress": "/modules/pad/scripts/test/params/c1Amber", + "controllable": "/modules/pad/scripts/test/params/c1Amber" + }, + { + "parameters": [ + { + "value": [ + -404.0, + -169.5 + ], + "controlAddress": "/viewUIPosition" + }, + { + "value": [ + 112.0, + 75.0 + ], + "controlAddress": "/viewUISize" + }, { "value": "/modules/pad/scripts/test/params/c1YellowLamp", "controlAddress": "/target" @@ -300,7 +394,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 6", + "niceName": "Item 8", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1YellowLamp", "controllable": "/modules/pad/scripts/test/params/c1YellowLamp" @@ -309,7 +403,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -169.5 ], "controlAddress": "/viewUIPosition" @@ -350,7 +444,7 @@ "enabled": true } ], - "niceName": "Item 7", + "niceName": "Item 9", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Yellow", "controllable": "/modules/pad/scripts/test/params/c1Yellow" @@ -359,8 +453,8 @@ "parameters": [ { "value": [ - -404.0, - -169.5 + -764.0, + -251.5 ], "controlAddress": "/viewUIPosition" }, @@ -394,7 +488,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 8", + "niceName": "Item 10", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1LimeLamp", "controllable": "/modules/pad/scripts/test/params/c1LimeLamp" @@ -403,8 +497,8 @@ "parameters": [ { "value": [ - -404.0, - -169.5 + -764.0, + -251.5 ], "controlAddress": "/viewUIPosition" }, @@ -444,7 +538,7 @@ "enabled": true } ], - "niceName": "Item 9", + "niceName": "Item 11", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Lime", "controllable": "/modules/pad/scripts/test/params/c1Lime" @@ -453,7 +547,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -251.5 ], "controlAddress": "/viewUIPosition" @@ -488,7 +582,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 10", + "niceName": "Item 12", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1GreenLamp", "controllable": "/modules/pad/scripts/test/params/c1GreenLamp" @@ -497,7 +591,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -251.5 ], "controlAddress": "/viewUIPosition" @@ -538,7 +632,7 @@ "enabled": true } ], - "niceName": "Item 11", + "niceName": "Item 13", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Green", "controllable": "/modules/pad/scripts/test/params/c1Green" @@ -547,7 +641,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -251.5 ], "controlAddress": "/viewUIPosition" @@ -582,7 +676,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 12", + "niceName": "Item 14", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1SpringLamp", "controllable": "/modules/pad/scripts/test/params/c1SpringLamp" @@ -591,7 +685,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -251.5 ], "controlAddress": "/viewUIPosition" @@ -632,7 +726,7 @@ "enabled": true } ], - "niceName": "Item 13", + "niceName": "Item 15", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Spring", "controllable": "/modules/pad/scripts/test/params/c1Spring" @@ -641,7 +735,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -251.5 ], "controlAddress": "/viewUIPosition" @@ -676,7 +770,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 14", + "niceName": "Item 16", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1CyanLamp", "controllable": "/modules/pad/scripts/test/params/c1CyanLamp" @@ -685,7 +779,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -251.5 ], "controlAddress": "/viewUIPosition" @@ -726,7 +820,7 @@ "enabled": true } ], - "niceName": "Item 15", + "niceName": "Item 17", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Cyan", "controllable": "/modules/pad/scripts/test/params/c1Cyan" @@ -735,8 +829,8 @@ "parameters": [ { "value": [ - -404.0, - -251.5 + -764.0, + -333.5 ], "controlAddress": "/viewUIPosition" }, @@ -770,7 +864,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 16", + "niceName": "Item 18", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1AzureLamp", "controllable": "/modules/pad/scripts/test/params/c1AzureLamp" @@ -779,8 +873,8 @@ "parameters": [ { "value": [ - -404.0, - -251.5 + -764.0, + -333.5 ], "controlAddress": "/viewUIPosition" }, @@ -820,7 +914,7 @@ "enabled": true } ], - "niceName": "Item 17", + "niceName": "Item 19", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Azure", "controllable": "/modules/pad/scripts/test/params/c1Azure" @@ -829,7 +923,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -333.5 ], "controlAddress": "/viewUIPosition" @@ -864,7 +958,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 18", + "niceName": "Item 20", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1BlueLamp", "controllable": "/modules/pad/scripts/test/params/c1BlueLamp" @@ -873,7 +967,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -333.5 ], "controlAddress": "/viewUIPosition" @@ -914,7 +1008,7 @@ "enabled": true } ], - "niceName": "Item 19", + "niceName": "Item 21", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Blue", "controllable": "/modules/pad/scripts/test/params/c1Blue" @@ -923,7 +1017,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -333.5 ], "controlAddress": "/viewUIPosition" @@ -958,7 +1052,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 20", + "niceName": "Item 22", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1VioletLamp", "controllable": "/modules/pad/scripts/test/params/c1VioletLamp" @@ -967,7 +1061,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -333.5 ], "controlAddress": "/viewUIPosition" @@ -1008,7 +1102,7 @@ "enabled": true } ], - "niceName": "Item 21", + "niceName": "Item 23", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Violet", "controllable": "/modules/pad/scripts/test/params/c1Violet" @@ -1017,7 +1111,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -333.5 ], "controlAddress": "/viewUIPosition" @@ -1052,7 +1146,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 22", + "niceName": "Item 24", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1MagentaLamp", "controllable": "/modules/pad/scripts/test/params/c1MagentaLamp" @@ -1061,7 +1155,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -333.5 ], "controlAddress": "/viewUIPosition" @@ -1102,7 +1196,7 @@ "enabled": true } ], - "niceName": "Item 23", + "niceName": "Item 25", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Magenta", "controllable": "/modules/pad/scripts/test/params/c1Magenta" @@ -1111,8 +1205,8 @@ "parameters": [ { "value": [ - -404.0, - -333.5 + -764.0, + -416.5 ], "controlAddress": "/viewUIPosition" }, @@ -1146,7 +1240,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 24", + "niceName": "Item 26", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1PinkLamp", "controllable": "/modules/pad/scripts/test/params/c1PinkLamp" @@ -1155,8 +1249,8 @@ "parameters": [ { "value": [ - -404.0, - -333.5 + -764.0, + -416.5 ], "controlAddress": "/viewUIPosition" }, @@ -1196,7 +1290,7 @@ "enabled": true } ], - "niceName": "Item 25", + "niceName": "Item 27", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Pink", "controllable": "/modules/pad/scripts/test/params/c1Pink" @@ -1205,7 +1299,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -416.5 ], "controlAddress": "/viewUIPosition" @@ -1240,7 +1334,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 26", + "niceName": "Item 28", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1WarmLamp", "controllable": "/modules/pad/scripts/test/params/c1WarmLamp" @@ -1249,7 +1343,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -416.5 ], "controlAddress": "/viewUIPosition" @@ -1290,7 +1384,7 @@ "enabled": true } ], - "niceName": "Item 27", + "niceName": "Item 29", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Warm", "controllable": "/modules/pad/scripts/test/params/c1Warm" @@ -1299,7 +1393,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -416.5 ], "controlAddress": "/viewUIPosition" @@ -1334,7 +1428,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 28", + "niceName": "Item 30", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1WhiteLamp", "controllable": "/modules/pad/scripts/test/params/c1WhiteLamp" @@ -1343,7 +1437,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -416.5 ], "controlAddress": "/viewUIPosition" @@ -1384,7 +1478,7 @@ "enabled": true } ], - "niceName": "Item 29", + "niceName": "Item 31", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1White", "controllable": "/modules/pad/scripts/test/params/c1White" @@ -1393,7 +1487,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -416.5 ], "controlAddress": "/viewUIPosition" @@ -1428,7 +1522,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 30", + "niceName": "Item 32", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c1CoolLamp", "controllable": "/modules/pad/scripts/test/params/c1CoolLamp" @@ -1437,7 +1531,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -416.5 ], "controlAddress": "/viewUIPosition" @@ -1478,285 +1572,11 @@ "enabled": true } ], - "niceName": "Item 31", + "niceName": "Item 33", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c1Cool", "controllable": "/modules/pad/scripts/test/params/c1Cool" }, - { - "parameters": [ - { - "value": [ - -404.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 112.0, - 75.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/c1CustomLamp", - "controlAddress": "/target" - }, - { - "value": "Custom", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -1, - "controlAddress": "/textColor", - "enabled": true - }, - { - "value": true, - "controlAddress": "/readOnly" - }, - { - "value": false, - "controlAddress": "/showValue" - } - ], - "niceName": "Item 32", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/c1CustomLamp", - "controllable": "/modules/pad/scripts/test/params/c1CustomLamp" - }, - { - "parameters": [ - { - "value": [ - -404.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 112.0, - 75.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/c1Custom", - "controlAddress": "/target" - }, - { - "value": " ", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -50176, - "controlAddress": "/backgroundColor", - "enabled": true - }, - { - "value": -1, - "controlAddress": "/textColor", - "enabled": true - }, - { - "value": false, - "controlAddress": "/showLabel" - }, - { - "value": "/home/jimmy/projects/qlcplus/chataigne/test/clear.png", - "controlAddress": "/customImage", - "enabled": true - } - ], - "niceName": "Item 33", - "type": "DashboardTriggerItem", - "ghostAddress": "/modules/pad/scripts/test/params/c1Custom", - "controllable": "/modules/pad/scripts/test/params/c1Custom" - }, - { - "parameters": [ - { - "value": [ - -277.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s1Dim", - "controlAddress": "/target" - }, - { - "value": "Dim", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -1, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 34", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s1Dim", - "controllable": "/modules/pad/scripts/test/params/s1Dim" - }, - { - "parameters": [ - { - "value": [ - -211.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s1R", - "controlAddress": "/target" - }, - { - "value": "R", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -65536, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 35", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s1R", - "controllable": "/modules/pad/scripts/test/params/s1R" - }, - { - "parameters": [ - { - "value": [ - -147.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s1G", - "controlAddress": "/target" - }, - { - "value": "G", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -16711936, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 36", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s1G", - "controllable": "/modules/pad/scripts/test/params/s1G" - }, - { - "parameters": [ - { - "value": [ - -81.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s1B", - "controlAddress": "/target" - }, - { - "value": "B", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -16776961, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 37", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s1B", - "controllable": "/modules/pad/scripts/test/params/s1B" - }, - { - "parameters": [ - { - "value": [ - -17.0, - -416.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s1W", - "controlAddress": "/target" - }, - { - "value": "W", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -1, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 38", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s1W", - "controllable": "/modules/pad/scripts/test/params/s1W" - }, { "parameters": [ { @@ -1768,7 +1588,7 @@ }, { "value": [ - 825.0, + 500.0, 32.0 ], "controlAddress": "/viewUISize" @@ -1783,7 +1603,7 @@ "enabled": true } ], - "niceName": "Item 39", + "niceName": "Item 34", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/now2", "controllable": "/modules/pad/scripts/test/params/now2" @@ -1827,7 +1647,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 40", + "niceName": "Item 35", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2RedLamp", "controllable": "/modules/pad/scripts/test/params/c2RedLamp" @@ -1877,7 +1697,7 @@ "enabled": true } ], - "niceName": "Item 41", + "niceName": "Item 36", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Red", "controllable": "/modules/pad/scripts/test/params/c2Red" @@ -1921,7 +1741,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 42", + "niceName": "Item 37", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2OrangeLamp", "controllable": "/modules/pad/scripts/test/params/c2OrangeLamp" @@ -1971,7 +1791,7 @@ "enabled": true } ], - "niceName": "Item 43", + "niceName": "Item 38", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Orange", "controllable": "/modules/pad/scripts/test/params/c2Orange" @@ -1992,6 +1812,100 @@ ], "controlAddress": "/viewUISize" }, + { + "value": "/modules/pad/scripts/test/params/c2AmberLamp", + "controlAddress": "/target" + }, + { + "value": "Amber", + "controlAddress": "/customText", + "enabled": true + }, + { + "value": -1, + "controlAddress": "/textColor", + "enabled": true + }, + { + "value": true, + "controlAddress": "/readOnly" + }, + { + "value": false, + "controlAddress": "/showValue" + } + ], + "niceName": "Item 39", + "type": "DashboardParameterItem", + "ghostAddress": "/modules/pad/scripts/test/params/c2AmberLamp", + "controllable": "/modules/pad/scripts/test/params/c2AmberLamp" + }, + { + "parameters": [ + { + "value": [ + -524.0, + 218.5 + ], + "controlAddress": "/viewUIPosition" + }, + { + "value": [ + 112.0, + 75.0 + ], + "controlAddress": "/viewUISize" + }, + { + "value": "/modules/pad/scripts/test/params/c2Amber", + "controlAddress": "/target" + }, + { + "value": " ", + "controlAddress": "/customText", + "enabled": true + }, + { + "value": -16640, + "controlAddress": "/backgroundColor", + "enabled": true + }, + { + "value": -16777216, + "controlAddress": "/textColor", + "enabled": true + }, + { + "value": false, + "controlAddress": "/showLabel" + }, + { + "value": "/home/jimmy/projects/qlcplus/chataigne/test/clear.png", + "controlAddress": "/customImage", + "enabled": true + } + ], + "niceName": "Item 40", + "type": "DashboardTriggerItem", + "ghostAddress": "/modules/pad/scripts/test/params/c2Amber", + "controllable": "/modules/pad/scripts/test/params/c2Amber" + }, + { + "parameters": [ + { + "value": [ + -404.0, + 218.5 + ], + "controlAddress": "/viewUIPosition" + }, + { + "value": [ + 112.0, + 75.0 + ], + "controlAddress": "/viewUISize" + }, { "value": "/modules/pad/scripts/test/params/c2YellowLamp", "controlAddress": "/target" @@ -2015,7 +1929,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 44", + "niceName": "Item 41", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2YellowLamp", "controllable": "/modules/pad/scripts/test/params/c2YellowLamp" @@ -2024,7 +1938,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, 218.5 ], "controlAddress": "/viewUIPosition" @@ -2065,7 +1979,7 @@ "enabled": true } ], - "niceName": "Item 45", + "niceName": "Item 42", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Yellow", "controllable": "/modules/pad/scripts/test/params/c2Yellow" @@ -2074,8 +1988,8 @@ "parameters": [ { "value": [ - -404.0, - 218.5 + -764.0, + 136.5 ], "controlAddress": "/viewUIPosition" }, @@ -2109,7 +2023,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 46", + "niceName": "Item 43", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2LimeLamp", "controllable": "/modules/pad/scripts/test/params/c2LimeLamp" @@ -2118,8 +2032,8 @@ "parameters": [ { "value": [ - -404.0, - 218.5 + -764.0, + 136.5 ], "controlAddress": "/viewUIPosition" }, @@ -2159,7 +2073,7 @@ "enabled": true } ], - "niceName": "Item 47", + "niceName": "Item 44", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Lime", "controllable": "/modules/pad/scripts/test/params/c2Lime" @@ -2168,7 +2082,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, 136.5 ], "controlAddress": "/viewUIPosition" @@ -2203,7 +2117,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 48", + "niceName": "Item 45", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2GreenLamp", "controllable": "/modules/pad/scripts/test/params/c2GreenLamp" @@ -2212,7 +2126,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, 136.5 ], "controlAddress": "/viewUIPosition" @@ -2253,7 +2167,7 @@ "enabled": true } ], - "niceName": "Item 49", + "niceName": "Item 46", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Green", "controllable": "/modules/pad/scripts/test/params/c2Green" @@ -2262,7 +2176,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, 136.5 ], "controlAddress": "/viewUIPosition" @@ -2297,7 +2211,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 50", + "niceName": "Item 47", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2SpringLamp", "controllable": "/modules/pad/scripts/test/params/c2SpringLamp" @@ -2306,7 +2220,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, 136.5 ], "controlAddress": "/viewUIPosition" @@ -2347,7 +2261,7 @@ "enabled": true } ], - "niceName": "Item 51", + "niceName": "Item 48", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Spring", "controllable": "/modules/pad/scripts/test/params/c2Spring" @@ -2356,7 +2270,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, 136.5 ], "controlAddress": "/viewUIPosition" @@ -2391,7 +2305,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 52", + "niceName": "Item 49", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2CyanLamp", "controllable": "/modules/pad/scripts/test/params/c2CyanLamp" @@ -2400,7 +2314,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, 136.5 ], "controlAddress": "/viewUIPosition" @@ -2441,7 +2355,7 @@ "enabled": true } ], - "niceName": "Item 53", + "niceName": "Item 50", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Cyan", "controllable": "/modules/pad/scripts/test/params/c2Cyan" @@ -2450,8 +2364,8 @@ "parameters": [ { "value": [ - -404.0, - 136.5 + -764.0, + 53.5 ], "controlAddress": "/viewUIPosition" }, @@ -2485,7 +2399,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 54", + "niceName": "Item 51", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2AzureLamp", "controllable": "/modules/pad/scripts/test/params/c2AzureLamp" @@ -2494,8 +2408,8 @@ "parameters": [ { "value": [ - -404.0, - 136.5 + -764.0, + 53.5 ], "controlAddress": "/viewUIPosition" }, @@ -2535,7 +2449,7 @@ "enabled": true } ], - "niceName": "Item 55", + "niceName": "Item 52", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Azure", "controllable": "/modules/pad/scripts/test/params/c2Azure" @@ -2544,7 +2458,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, 53.5 ], "controlAddress": "/viewUIPosition" @@ -2579,7 +2493,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 56", + "niceName": "Item 53", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2BlueLamp", "controllable": "/modules/pad/scripts/test/params/c2BlueLamp" @@ -2588,7 +2502,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, 53.5 ], "controlAddress": "/viewUIPosition" @@ -2629,7 +2543,7 @@ "enabled": true } ], - "niceName": "Item 57", + "niceName": "Item 54", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Blue", "controllable": "/modules/pad/scripts/test/params/c2Blue" @@ -2638,7 +2552,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, 53.5 ], "controlAddress": "/viewUIPosition" @@ -2673,7 +2587,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 58", + "niceName": "Item 55", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2VioletLamp", "controllable": "/modules/pad/scripts/test/params/c2VioletLamp" @@ -2682,7 +2596,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, 53.5 ], "controlAddress": "/viewUIPosition" @@ -2723,7 +2637,7 @@ "enabled": true } ], - "niceName": "Item 59", + "niceName": "Item 56", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Violet", "controllable": "/modules/pad/scripts/test/params/c2Violet" @@ -2732,7 +2646,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, 53.5 ], "controlAddress": "/viewUIPosition" @@ -2767,7 +2681,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 60", + "niceName": "Item 57", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2MagentaLamp", "controllable": "/modules/pad/scripts/test/params/c2MagentaLamp" @@ -2776,7 +2690,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, 53.5 ], "controlAddress": "/viewUIPosition" @@ -2817,7 +2731,7 @@ "enabled": true } ], - "niceName": "Item 61", + "niceName": "Item 58", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Magenta", "controllable": "/modules/pad/scripts/test/params/c2Magenta" @@ -2826,8 +2740,8 @@ "parameters": [ { "value": [ - -404.0, - 53.5 + -764.0, + -29.5 ], "controlAddress": "/viewUIPosition" }, @@ -2861,7 +2775,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 62", + "niceName": "Item 59", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2PinkLamp", "controllable": "/modules/pad/scripts/test/params/c2PinkLamp" @@ -2870,8 +2784,8 @@ "parameters": [ { "value": [ - -404.0, - 53.5 + -764.0, + -29.5 ], "controlAddress": "/viewUIPosition" }, @@ -2911,7 +2825,7 @@ "enabled": true } ], - "niceName": "Item 63", + "niceName": "Item 60", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Pink", "controllable": "/modules/pad/scripts/test/params/c2Pink" @@ -2920,7 +2834,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -29.5 ], "controlAddress": "/viewUIPosition" @@ -2955,7 +2869,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 64", + "niceName": "Item 61", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2WarmLamp", "controllable": "/modules/pad/scripts/test/params/c2WarmLamp" @@ -2964,7 +2878,7 @@ "parameters": [ { "value": [ - -764.0, + -644.0, -29.5 ], "controlAddress": "/viewUIPosition" @@ -3005,7 +2919,7 @@ "enabled": true } ], - "niceName": "Item 65", + "niceName": "Item 62", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Warm", "controllable": "/modules/pad/scripts/test/params/c2Warm" @@ -3014,7 +2928,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -29.5 ], "controlAddress": "/viewUIPosition" @@ -3049,7 +2963,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 66", + "niceName": "Item 63", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2WhiteLamp", "controllable": "/modules/pad/scripts/test/params/c2WhiteLamp" @@ -3058,7 +2972,7 @@ "parameters": [ { "value": [ - -644.0, + -524.0, -29.5 ], "controlAddress": "/viewUIPosition" @@ -3099,7 +3013,7 @@ "enabled": true } ], - "niceName": "Item 67", + "niceName": "Item 64", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2White", "controllable": "/modules/pad/scripts/test/params/c2White" @@ -3108,7 +3022,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -29.5 ], "controlAddress": "/viewUIPosition" @@ -3143,7 +3057,7 @@ "controlAddress": "/showValue" } ], - "niceName": "Item 68", + "niceName": "Item 65", "type": "DashboardParameterItem", "ghostAddress": "/modules/pad/scripts/test/params/c2CoolLamp", "controllable": "/modules/pad/scripts/test/params/c2CoolLamp" @@ -3152,7 +3066,7 @@ "parameters": [ { "value": [ - -524.0, + -404.0, -29.5 ], "controlAddress": "/viewUIPosition" @@ -3193,7 +3107,7 @@ "enabled": true } ], - "niceName": "Item 69", + "niceName": "Item 66", "type": "DashboardTriggerItem", "ghostAddress": "/modules/pad/scripts/test/params/c2Cool", "controllable": "/modules/pad/scripts/test/params/c2Cool" @@ -3202,275 +3116,176 @@ "parameters": [ { "value": [ - -404.0, - -29.5 + -777.0, + 308.5 ], "controlAddress": "/viewUIPosition" }, { "value": [ - 112.0, - 75.0 + 312.0, + 32.0 ], "controlAddress": "/viewUISize" }, { - "value": "/modules/pad/scripts/test/params/c2CustomLamp", + "value": "/modules/pad/scripts/test/params/now3", "controlAddress": "/target" }, { - "value": "Custom", + "value": "Dimmers", + "controlAddress": "/customText", + "enabled": true + } + ], + "niceName": "Item 67", + "type": "DashboardParameterItem", + "ghostAddress": "/modules/pad/scripts/test/params/now3", + "controllable": "/modules/pad/scripts/test/params/now3" + }, + { + "parameters": [ + { + "value": [ + -764.0, + 358.5 + ], + "controlAddress": "/viewUIPosition" + }, + { + "value": [ + 65.0, + 250.0 + ], + "controlAddress": "/viewUISize" + }, + { + "value": "/modules/pad/scripts/test/params/s3Movers", + "controlAddress": "/target" + }, + { + "value": "Movers", "controlAddress": "/customText", "enabled": true }, { "value": -1, - "controlAddress": "/textColor", + "controlAddress": "/foregroundColor", + "enabled": true + } + ], + "niceName": "Item 68", + "type": "DashboardParameterItem", + "ghostAddress": "/modules/pad/scripts/test/params/s3Movers", + "controllable": "/modules/pad/scripts/test/params/s3Movers" + }, + { + "parameters": [ + { + "value": [ + -691.0, + 358.5 + ], + "controlAddress": "/viewUIPosition" + }, + { + "value": [ + 65.0, + 250.0 + ], + "controlAddress": "/viewUISize" + }, + { + "value": "/modules/pad/scripts/test/params/s3Cans915", + "controlAddress": "/target" + }, + { + "value": "Cans 9\u201315", + "controlAddress": "/customText", "enabled": true }, { - "value": true, - "controlAddress": "/readOnly" + "value": -1, + "controlAddress": "/foregroundColor", + "enabled": true + } + ], + "niceName": "Item 69", + "type": "DashboardParameterItem", + "ghostAddress": "/modules/pad/scripts/test/params/s3Cans915", + "controllable": "/modules/pad/scripts/test/params/s3Cans915" + }, + { + "parameters": [ + { + "value": [ + -619.0, + 358.5 + ], + "controlAddress": "/viewUIPosition" }, { - "value": false, - "controlAddress": "/showValue" + "value": [ + 65.0, + 250.0 + ], + "controlAddress": "/viewUISize" + }, + { + "value": "/modules/pad/scripts/test/params/s3Cans36", + "controlAddress": "/target" + }, + { + "value": "Cans 3\u20136", + "controlAddress": "/customText", + "enabled": true + }, + { + "value": -1, + "controlAddress": "/foregroundColor", + "enabled": true } ], "niceName": "Item 70", "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/c2CustomLamp", - "controllable": "/modules/pad/scripts/test/params/c2CustomLamp" + "ghostAddress": "/modules/pad/scripts/test/params/s3Cans36", + "controllable": "/modules/pad/scripts/test/params/s3Cans36" }, { "parameters": [ { "value": [ - -404.0, - -29.5 + -547.0, + 358.5 ], "controlAddress": "/viewUIPosition" }, { "value": [ - 112.0, - 75.0 + 65.0, + 250.0 ], "controlAddress": "/viewUISize" }, { - "value": "/modules/pad/scripts/test/params/c2Custom", + "value": "/modules/pad/scripts/test/params/s3Cans1278", "controlAddress": "/target" }, { - "value": " ", + "value": "Cans 1, 2, 7, 8", "controlAddress": "/customText", "enabled": true }, - { - "value": -50176, - "controlAddress": "/backgroundColor", - "enabled": true - }, { "value": -1, - "controlAddress": "/textColor", - "enabled": true - }, - { - "value": false, - "controlAddress": "/showLabel" - }, - { - "value": "/home/jimmy/projects/qlcplus/chataigne/test/clear.png", - "controlAddress": "/customImage", + "controlAddress": "/foregroundColor", "enabled": true } ], "niceName": "Item 71", - "type": "DashboardTriggerItem", - "ghostAddress": "/modules/pad/scripts/test/params/c2Custom", - "controllable": "/modules/pad/scripts/test/params/c2Custom" - }, - { - "parameters": [ - { - "value": [ - -277.0, - -29.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s2Dim", - "controlAddress": "/target" - }, - { - "value": "Dim", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -1, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 72", "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s2Dim", - "controllable": "/modules/pad/scripts/test/params/s2Dim" - }, - { - "parameters": [ - { - "value": [ - -211.0, - -29.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s2R", - "controlAddress": "/target" - }, - { - "value": "R", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -65536, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 73", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s2R", - "controllable": "/modules/pad/scripts/test/params/s2R" - }, - { - "parameters": [ - { - "value": [ - -147.0, - -29.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s2G", - "controlAddress": "/target" - }, - { - "value": "G", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -16711936, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 74", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s2G", - "controllable": "/modules/pad/scripts/test/params/s2G" - }, - { - "parameters": [ - { - "value": [ - -81.0, - -29.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s2B", - "controlAddress": "/target" - }, - { - "value": "B", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -16776961, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 75", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s2B", - "controllable": "/modules/pad/scripts/test/params/s2B" - }, - { - "parameters": [ - { - "value": [ - -17.0, - -29.5 - ], - "controlAddress": "/viewUIPosition" - }, - { - "value": [ - 60.0, - 250.0 - ], - "controlAddress": "/viewUISize" - }, - { - "value": "/modules/pad/scripts/test/params/s2W", - "controlAddress": "/target" - }, - { - "value": "W", - "controlAddress": "/customText", - "enabled": true - }, - { - "value": -1, - "controlAddress": "/foregroundColor", - "enabled": true - } - ], - "niceName": "Item 76", - "type": "DashboardParameterItem", - "ghostAddress": "/modules/pad/scripts/test/params/s2W", - "controllable": "/modules/pad/scripts/test/params/s2W" + "ghostAddress": "/modules/pad/scripts/test/params/s3Cans1278", + "controllable": "/modules/pad/scripts/test/params/s3Cans1278" } ], "viewOffset": [ @@ -3514,7 +3329,7 @@ "output": { "parameters": [ { - "value": "192.168.1.228", + "value": "127.0.0.1", "controlAddress": "/remoteHost" } ] @@ -3549,7 +3364,7 @@ "output": { "parameters": [ { - "value": "192.168.1.228", + "value": "127.0.0.1", "controlAddress": "/remoteHost" } ] @@ -3557,7 +3372,7 @@ }, "parameters": [ { - "value": "192.168.1.92", + "value": "127.0.0.1", "controlAddress": "/networkInterface" } ] diff --git a/scripts/shows/colour_sets.py b/scripts/shows/colour_sets.py index c2ee1d2..af0e1f2 100644 --- a/scripts/shows/colour_sets.py +++ b/scripts/shows/colour_sets.py @@ -8,11 +8,9 @@ Holding Play picks set B: the pad controller turns those notes into 68–83 whil Play is down. Bank 1 is kept for animations. python3 scripts/shows/colour_sets.py && python3 -m showfile write shows/test.show.json -o shows/test.qxw -The sliders are Playback sliders over five scenes per set (Dim, R, G, B, W), -so they never override a channel. Knobs 1–5 move colour 1's sliders and knobs -6–10 colour 2's. Run the pad controller with --lock-knobs to make them work only -after the Custom pad is pressed; any other pad sends them back to zero (see -padcontroller/layer.py). +The colour scenes leave the dimmers alone: the Dimmers frame's Level sliders +own them, on knob 15 (movers), knob 5 (cans 9–15), knob 7 (cans 3–6) and +knob 8 (cans 1, 2, 7, 8). """ from __future__ import annotations @@ -30,13 +28,14 @@ HELD_FIRST_NOTE = 68 # padcontroller/layer.py sends bank 2 here while Play is h PROFILE = "M-VAVE SMC-PAD" OMNI = 16 # QLC+ MIDI plugin channel that accepts every MIDI channel PAD_MIDI_CH = 9 # the pads send notes on channel 10 -KNOB_FIRST_CC = 30 # pad knob 1; colour 2's sliders follow colour 1's +KNOB_FIRST_CC = 30 # pad knob 1 PAD_PORT = "padcontroller" # padcontroller/midi.py; it applies the Play layer # name, r, g, b, w. Bottom row first, four to a row. The cans have a white emitter, so the whites use it. COLOURS = ( ("Red", 255, 0, 0, 0), ("Orange", 255, 127, 0, 0), + ("Amber", 255, 191, 0, 0), ("Yellow", 255, 255, 0, 0), ("Lime", 127, 255, 0, 0), ("Green", 0, 255, 0, 0), @@ -51,10 +50,6 @@ COLOURS = ( ("White", 0, 0, 0, 255), ("Cool", 80, 120, 255, 120), ) -# The top-right pad is the custom colour. Its button shows this swatch, but -# its scene is dark: the sliders next to it mix the colour from five scenes. -# Its pad lamp stays off. -CUSTOM = (("Custom", 255, 60, 0, 0),) CANS = [f"#{n}" for n in range(1, 16)] MOVERS = ["M1", "M2", "M3", "M4"] # Mover channels: 8 is centre brightness, 9 centre strobe, then seven R G B W groups from 10. @@ -65,41 +60,25 @@ def swatch(r: int, g: int, b: int, w: int) -> list[int]: return [min(255, r + w), min(255, g + w), min(255, b + w)] -# Mixer beside each grid: caption, can channel, offset in a mover colour group (None is brightness). -SLIDERS = ( - ("Dim", DIMMER, None, [255, 255, 255]), - ("R", RED, 0, [255, 0, 0]), - ("G", GREEN, 1, [0, 255, 0]), - ("B", BLUE, 2, [0, 0, 255]), - ("W", WHITE, 3, [255, 255, 255]), +# Level sliders on the dimmer channels: caption, knob (from 1), fixtures, channel. +DIMMERS = ( + ("Movers", 15, MOVERS, MOVER_BRIGHTNESS), + ("Cans 9–15", 5, CANS[8:], DIMMER), + ("Cans 3–6", 7, CANS[2:6], DIMMER), + ("Cans 1, 2, 7, 8", 8, CANS[0:2] + CANS[6:8], DIMMER), ) -def component(cans: list[str], movers: list[str], can_channel: int, offset: int | None) -> dict: - """One channel kind of this set at full, for a Playback slider to scale.""" - values = {can: {can_channel: 255} for can in cans} - for mover in movers: - if offset is None: - values[mover] = {MOVER_BRIGHTNESS: 255} - else: - values[mover] = {MOVER_FIRST_COLOUR + group * 4 + offset: 255 for group in range(MOVER_GROUPS)} - return values - - -def custom_off(cans: list[str], movers: list[str]) -> dict: - """The Custom pad's own scene: dark, so the sliders' scenes set the colour.""" - values = {can: {DIMMER: 0} for can in cans} - values.update({mover: {MOVER_BRIGHTNESS: 0} for mover in movers}) - return values - - -def sliders(label: str, first_cc: int) -> list[dict]: - """Playback sliders. Each scales its own scene, so nothing is overridden.""" - return [{ - "type": "slider", "caption": caption, "function": f"custom_{label}_{caption}", - "x": 400 + index * 52, "y": 10, "w": 48, "h": 200, "fg": fg, - "input": {"universe": 1, "cc": [0, first_cc + index]}, - } for index, (caption, _can, _offset, fg) in enumerate(SLIDERS)] +def dimmers() -> dict: + return { + "type": "frame", "caption": "Dimmers", "x": 10, "y": 630, "w": 250, "h": 250, + "children": [{ + "type": "slider", "caption": caption, "value": 255, + "channels": [[fixture, channel] for fixture in fixtures], + "x": 10 + index * 58, "y": 10, "w": 52, "h": 200, + "input": {"universe": 1, "cc": [0, KNOB_FIRST_CC + knob - 1]}, + } for index, (caption, knob, fixtures, channel) in enumerate(DIMMERS)], + } def main() -> None: @@ -108,17 +87,14 @@ def main() -> None: functions, frames = [], [] for si, (label, cans, movers) in enumerate((("1", CANS, []), ("2", [], MOVERS))): buttons = [] - for i, (name, r, g, b, w) in enumerate(COLOURS + CUSTOM): + for i, (name, r, g, b, w) in enumerate(COLOURS): key = f"colour_{label}_{i + 1}" - on = 255 - values = {can: {DIMMER: on, RED: r, GREEN: g, BLUE: b, WHITE: w} for can in cans} + values = {can: {RED: r, GREEN: g, BLUE: b, WHITE: w} for can in cans} for mover in movers: - values[mover] = {MOVER_BRIGHTNESS: on, MOVER_STROBE: 0} + values[mover] = {MOVER_STROBE: 0} for group in range(MOVER_GROUPS): first = MOVER_FIRST_COLOUR + group * 4 values[mover].update({first: r, first + 1: g, first + 2: b, first + 3: w}) - if name == CUSTOM[0][0]: - values = custom_off(cans, movers) functions.append({ "key": key, "type": "scene", "name": f"{label} {name}", "fade_in": FADE_MS, "fade_out": FADE_MS, "values": values, @@ -134,17 +110,12 @@ def main() -> None: } button["input"] = {"universe": 1, "note": [PAD_MIDI_CH, (HELD_FIRST_NOTE if si else PAD_BANK_2_FIRST_NOTE) + i]} buttons.append(button) - for caption, can_channel, offset, _fg in SLIDERS: - functions.append({ - "key": f"custom_{label}_{caption}", "type": "scene", "name": f"{label} Custom {caption}", - "values": component(cans, movers, can_channel, offset), - }) frames.append({ "type": "solo", "caption": f"Colour {label}", "x": 10, "y": 10 + si * 310, - "w": 400 + len(SLIDERS) * 52, "h": 300, "children": buttons + sliders(label, KNOB_FIRST_CC + si * len(SLIDERS)), + "w": 400, "h": 300, "children": buttons, }) spec["functions"] = functions - spec["vc"] = frames + spec["vc"] = frames + [dimmers()] SPEC.write_text(json.dumps(spec, indent=2) + "\n") diff --git a/scripts/shows/make_chataigne.py b/scripts/shows/make_chataigne.py index cb41413..8fc4330 100644 --- a/scripts/shows/make_chataigne.py +++ b/scripts/shows/make_chataigne.py @@ -67,9 +67,13 @@ def collect(show: dict, stage: dict) -> dict: pads, sliders = [], [] for widget in frame.get("children", []): kind = widget["type"] - function = functions[widget["function"]] binding = widget.get("input") or {} - levels = absolute_levels(show, stage, function["values"]) + if "function" in widget: + function = functions[widget["function"]] + values = function["values"] + else: # a Level slider: its channels at full, scaled by the slider + values = {fixture: {channel: 255} for fixture, channel in widget.get("channels", [])} + levels = absolute_levels(show, stage, values) if kind == "button" and "note" in binding: pads.append({ "id": ident("c", number, widget["caption"]), @@ -81,12 +85,13 @@ def collect(show: dict, stage: dict) -> dict: "fade": [function.get("fade_in") or 0, function.get("fade_out") or 0], "levels": levels, }) - elif kind == "slider" and "cc" in binding: + elif kind == "slider": sliders.append({ "id": ident("s", number, widget["caption"]), "box": box(frame, widget), "fg": widget.get("fg", [255, 255, 255]), - "cc": binding["cc"][1], + "cc": binding["cc"][1] if "cc" in binding else -1, # -1: dashboard only + "value": round(int(widget.get("value", 0)) / 255, 3), "name": widget["caption"], "levels": levels, }) @@ -133,7 +138,7 @@ def render_data(groups: dict) -> str: lines.append(" sliders: [") for slider in group["sliders"]: lines.append( - f" {{id: {json.dumps(slider['id'])}, cc: {slider['cc']}, name: {json.dumps(slider['name'])}, levels: {js_levels(slider['levels'])}}}," + f" {{id: {json.dumps(slider['id'])}, cc: {slider['cc']}, name: {json.dumps(slider['name'])}, value: {slider['value']}, levels: {js_levels(slider['levels'])}}}," ) lines.append(" ]") lines.append(" },") diff --git a/shows/test.show.json b/shows/test.show.json index 14f4ba0..3e69020 100644 --- a/shows/test.show.json +++ b/shows/test.show.json @@ -43,105 +43,90 @@ "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#2": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#3": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#4": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#5": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#6": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#7": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#8": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#9": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#10": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#11": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#12": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#13": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#14": { - "0": 255, "2": 255, "3": 0, "4": 0, "5": 0 }, "#15": { - "0": 255, "2": 255, "3": 0, "4": 0, @@ -157,105 +142,90 @@ "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#2": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#3": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#4": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#5": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#6": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#7": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#8": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#9": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#10": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#11": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#12": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#13": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#14": { - "0": 255, "2": 255, "3": 127, "4": 0, "5": 0 }, "#15": { - "0": 255, "2": 255, "3": 127, "4": 0, @@ -266,112 +236,97 @@ { "key": "colour_1_3", "type": "scene", - "name": "1 Yellow", + "name": "1 Amber", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#2": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#3": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#4": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#5": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#6": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#7": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#8": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#9": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#10": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#11": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#12": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#13": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#14": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 }, "#15": { - "0": 255, "2": 255, - "3": 255, + "3": 191, "4": 0, "5": 0 } @@ -380,111 +335,96 @@ { "key": "colour_1_4", "type": "scene", - "name": "1 Lime", + "name": "1 Yellow", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#2": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#3": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#4": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#5": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#6": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#7": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#8": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#9": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#10": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#11": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#12": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#13": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#14": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 }, "#15": { - "0": 255, - "2": 127, + "2": 255, "3": 255, "4": 0, "5": 0 @@ -494,111 +434,96 @@ { "key": "colour_1_5", "type": "scene", - "name": "1 Green", + "name": "1 Lime", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#2": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#3": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#4": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#5": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#6": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#7": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#8": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#9": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#10": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#11": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#12": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#13": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#14": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 }, "#15": { - "0": 255, - "2": 0, + "2": 127, "3": 255, "4": 0, "5": 0 @@ -608,113 +533,98 @@ { "key": "colour_1_6", "type": "scene", - "name": "1 Spring", + "name": "1 Green", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#2": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#3": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#4": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#5": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#6": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#7": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#8": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#9": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#10": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#11": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#12": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#13": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#14": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 }, "#15": { - "0": 255, "2": 0, "3": 255, - "4": 127, + "4": 0, "5": 0 } } @@ -722,113 +632,98 @@ { "key": "colour_1_7", "type": "scene", - "name": "1 Cyan", + "name": "1 Spring", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#2": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#3": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#4": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#5": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#6": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#7": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#8": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#9": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#10": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#11": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#12": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#13": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#14": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 }, "#15": { - "0": 255, "2": 0, "3": 255, - "4": 255, + "4": 127, "5": 0 } } @@ -836,112 +731,97 @@ { "key": "colour_1_8", "type": "scene", - "name": "1 Azure", + "name": "1 Cyan", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#2": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#3": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#4": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#5": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#6": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#7": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#8": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#9": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#10": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#11": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#12": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#13": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#14": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 }, "#15": { - "0": 255, "2": 0, - "3": 127, + "3": 255, "4": 255, "5": 0 } @@ -950,112 +830,97 @@ { "key": "colour_1_9", "type": "scene", - "name": "1 Blue", + "name": "1 Azure", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#2": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#3": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#4": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#5": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#6": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#7": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#8": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#9": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#10": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#11": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#12": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#13": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#14": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 }, "#15": { - "0": 255, "2": 0, - "3": 0, + "3": 127, "4": 255, "5": 0 } @@ -1064,111 +929,96 @@ { "key": "colour_1_10", "type": "scene", - "name": "1 Violet", + "name": "1 Blue", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#2": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#3": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#4": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#5": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#6": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#7": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#8": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#9": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#10": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#11": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#12": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#13": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#14": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 }, "#15": { - "0": 255, - "2": 127, + "2": 0, "3": 0, "4": 255, "5": 0 @@ -1178,111 +1028,96 @@ { "key": "colour_1_11", "type": "scene", - "name": "1 Magenta", + "name": "1 Violet", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#2": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#3": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#4": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#5": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#6": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#7": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#8": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#9": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#10": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#11": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#12": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#13": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#14": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 }, "#15": { - "0": 255, - "2": 255, + "2": 127, "3": 0, "4": 255, "5": 0 @@ -1292,113 +1127,98 @@ { "key": "colour_1_12", "type": "scene", - "name": "1 Pink", + "name": "1 Magenta", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#2": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#3": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#4": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#5": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#6": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#7": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#8": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#9": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#10": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#11": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#12": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#13": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#14": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 }, "#15": { - "0": 255, "2": 255, - "3": 40, - "4": 120, + "3": 0, + "4": 255, "5": 0 } } @@ -1406,656 +1226,396 @@ { "key": "colour_1_13", "type": "scene", - "name": "1 Warm", + "name": "1 Pink", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#2": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#3": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#4": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#5": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#6": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#7": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#8": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#9": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#10": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#11": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#12": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#13": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#14": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 }, "#15": { - "0": 255, "2": 255, - "3": 120, - "4": 40, - "5": 120 + "3": 40, + "4": 120, + "5": 0 } } }, { "key": "colour_1_14", "type": "scene", - "name": "1 White", + "name": "1 Warm", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#2": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#3": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#4": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#5": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#6": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#7": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#8": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#9": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#10": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#11": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#12": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#13": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#14": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 }, "#15": { - "0": 255, - "2": 0, - "3": 0, - "4": 0, - "5": 255 + "2": 255, + "3": 120, + "4": 40, + "5": 120 } } }, { "key": "colour_1_15", "type": "scene", - "name": "1 Cool", + "name": "1 White", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#2": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#3": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#4": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#5": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#6": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#7": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#8": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#9": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#10": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#11": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#12": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#13": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#14": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 }, "#15": { - "0": 255, - "2": 80, - "3": 120, - "4": 255, - "5": 120 + "2": 0, + "3": 0, + "4": 0, + "5": 255 } } }, { "key": "colour_1_16", "type": "scene", - "name": "1 Custom", + "name": "1 Cool", "fade_in": 1000, "fade_out": 1000, "values": { "#1": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#2": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#3": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#4": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#5": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#6": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#7": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#8": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#9": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#10": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#11": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#12": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#13": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#14": { - "0": 0 + "2": 80, + "3": 120, + "4": 255, + "5": 120 }, "#15": { - "0": 0 - } - } - }, - { - "key": "custom_1_Dim", - "type": "scene", - "name": "1 Custom Dim", - "values": { - "#1": { - "0": 255 - }, - "#2": { - "0": 255 - }, - "#3": { - "0": 255 - }, - "#4": { - "0": 255 - }, - "#5": { - "0": 255 - }, - "#6": { - "0": 255 - }, - "#7": { - "0": 255 - }, - "#8": { - "0": 255 - }, - "#9": { - "0": 255 - }, - "#10": { - "0": 255 - }, - "#11": { - "0": 255 - }, - "#12": { - "0": 255 - }, - "#13": { - "0": 255 - }, - "#14": { - "0": 255 - }, - "#15": { - "0": 255 - } - } - }, - { - "key": "custom_1_R", - "type": "scene", - "name": "1 Custom R", - "values": { - "#1": { - "2": 255 - }, - "#2": { - "2": 255 - }, - "#3": { - "2": 255 - }, - "#4": { - "2": 255 - }, - "#5": { - "2": 255 - }, - "#6": { - "2": 255 - }, - "#7": { - "2": 255 - }, - "#8": { - "2": 255 - }, - "#9": { - "2": 255 - }, - "#10": { - "2": 255 - }, - "#11": { - "2": 255 - }, - "#12": { - "2": 255 - }, - "#13": { - "2": 255 - }, - "#14": { - "2": 255 - }, - "#15": { - "2": 255 - } - } - }, - { - "key": "custom_1_G", - "type": "scene", - "name": "1 Custom G", - "values": { - "#1": { - "3": 255 - }, - "#2": { - "3": 255 - }, - "#3": { - "3": 255 - }, - "#4": { - "3": 255 - }, - "#5": { - "3": 255 - }, - "#6": { - "3": 255 - }, - "#7": { - "3": 255 - }, - "#8": { - "3": 255 - }, - "#9": { - "3": 255 - }, - "#10": { - "3": 255 - }, - "#11": { - "3": 255 - }, - "#12": { - "3": 255 - }, - "#13": { - "3": 255 - }, - "#14": { - "3": 255 - }, - "#15": { - "3": 255 - } - } - }, - { - "key": "custom_1_B", - "type": "scene", - "name": "1 Custom B", - "values": { - "#1": { - "4": 255 - }, - "#2": { - "4": 255 - }, - "#3": { - "4": 255 - }, - "#4": { - "4": 255 - }, - "#5": { - "4": 255 - }, - "#6": { - "4": 255 - }, - "#7": { - "4": 255 - }, - "#8": { - "4": 255 - }, - "#9": { - "4": 255 - }, - "#10": { - "4": 255 - }, - "#11": { - "4": 255 - }, - "#12": { - "4": 255 - }, - "#13": { - "4": 255 - }, - "#14": { - "4": 255 - }, - "#15": { - "4": 255 - } - } - }, - { - "key": "custom_1_W", - "type": "scene", - "name": "1 Custom W", - "values": { - "#1": { - "5": 255 - }, - "#2": { - "5": 255 - }, - "#3": { - "5": 255 - }, - "#4": { - "5": 255 - }, - "#5": { - "5": 255 - }, - "#6": { - "5": 255 - }, - "#7": { - "5": 255 - }, - "#8": { - "5": 255 - }, - "#9": { - "5": 255 - }, - "#10": { - "5": 255 - }, - "#11": { - "5": 255 - }, - "#12": { - "5": 255 - }, - "#13": { - "5": 255 - }, - "#14": { - "5": 255 - }, - "#15": { - "5": 255 + "2": 80, + "3": 120, + "4": 255, + "5": 120 } } }, @@ -2067,7 +1627,6 @@ "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 255, "11": 0, @@ -2099,7 +1658,6 @@ "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 255, "11": 0, @@ -2131,7 +1689,6 @@ "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 255, "11": 0, @@ -2163,7 +1720,6 @@ "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 255, "11": 0, @@ -2204,7 +1760,6 @@ "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 255, "11": 127, @@ -2236,7 +1791,6 @@ "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 255, "11": 127, @@ -2268,7 +1822,6 @@ "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 255, "11": 127, @@ -2300,7 +1853,6 @@ "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 255, "11": 127, @@ -2336,135 +1888,131 @@ { "key": "colour_2_3", "type": "scene", - "name": "2 Yellow", + "name": "2 Amber", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 255, - "11": 255, + "11": 191, "12": 0, "13": 0, "14": 255, - "15": 255, + "15": 191, "16": 0, "17": 0, "18": 255, - "19": 255, + "19": 191, "20": 0, "21": 0, "22": 255, - "23": 255, + "23": 191, "24": 0, "25": 0, "26": 255, - "27": 255, + "27": 191, "28": 0, "29": 0, "30": 255, - "31": 255, + "31": 191, "32": 0, "33": 0, "34": 255, - "35": 255, + "35": 191, "36": 0, "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 255, - "11": 255, + "11": 191, "12": 0, "13": 0, "14": 255, - "15": 255, + "15": 191, "16": 0, "17": 0, "18": 255, - "19": 255, + "19": 191, "20": 0, "21": 0, "22": 255, - "23": 255, + "23": 191, "24": 0, "25": 0, "26": 255, - "27": 255, + "27": 191, "28": 0, "29": 0, "30": 255, - "31": 255, + "31": 191, "32": 0, "33": 0, "34": 255, - "35": 255, + "35": 191, "36": 0, "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 255, - "11": 255, + "11": 191, "12": 0, "13": 0, "14": 255, - "15": 255, + "15": 191, "16": 0, "17": 0, "18": 255, - "19": 255, + "19": 191, "20": 0, "21": 0, "22": 255, - "23": 255, + "23": 191, "24": 0, "25": 0, "26": 255, - "27": 255, + "27": 191, "28": 0, "29": 0, "30": 255, - "31": 255, + "31": 191, "32": 0, "33": 0, "34": 255, - "35": 255, + "35": 191, "36": 0, "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 255, - "11": 255, + "11": 191, "12": 0, "13": 0, "14": 255, - "15": 255, + "15": 191, "16": 0, "17": 0, "18": 255, - "19": 255, + "19": 191, "20": 0, "21": 0, "22": 255, - "23": 255, + "23": 191, "24": 0, "25": 0, "26": 255, - "27": 255, + "27": 191, "28": 0, "29": 0, "30": 255, - "31": 255, + "31": 191, "32": 0, "33": 0, "34": 255, - "35": 255, + "35": 191, "36": 0, "37": 0 } @@ -2473,134 +2021,130 @@ { "key": "colour_2_4", "type": "scene", - "name": "2 Lime", + "name": "2 Yellow", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, - "10": 127, + "10": 255, "11": 255, "12": 0, "13": 0, - "14": 127, + "14": 255, "15": 255, "16": 0, "17": 0, - "18": 127, + "18": 255, "19": 255, "20": 0, "21": 0, - "22": 127, + "22": 255, "23": 255, "24": 0, "25": 0, - "26": 127, + "26": 255, "27": 255, "28": 0, "29": 0, - "30": 127, + "30": 255, "31": 255, "32": 0, "33": 0, - "34": 127, + "34": 255, "35": 255, "36": 0, "37": 0 }, "M2": { - "8": 255, "9": 0, - "10": 127, + "10": 255, "11": 255, "12": 0, "13": 0, - "14": 127, + "14": 255, "15": 255, "16": 0, "17": 0, - "18": 127, + "18": 255, "19": 255, "20": 0, "21": 0, - "22": 127, + "22": 255, "23": 255, "24": 0, "25": 0, - "26": 127, + "26": 255, "27": 255, "28": 0, "29": 0, - "30": 127, + "30": 255, "31": 255, "32": 0, "33": 0, - "34": 127, + "34": 255, "35": 255, "36": 0, "37": 0 }, "M3": { - "8": 255, "9": 0, - "10": 127, + "10": 255, "11": 255, "12": 0, "13": 0, - "14": 127, + "14": 255, "15": 255, "16": 0, "17": 0, - "18": 127, + "18": 255, "19": 255, "20": 0, "21": 0, - "22": 127, + "22": 255, "23": 255, "24": 0, "25": 0, - "26": 127, + "26": 255, "27": 255, "28": 0, "29": 0, - "30": 127, + "30": 255, "31": 255, "32": 0, "33": 0, - "34": 127, + "34": 255, "35": 255, "36": 0, "37": 0 }, "M4": { - "8": 255, "9": 0, - "10": 127, + "10": 255, "11": 255, "12": 0, "13": 0, - "14": 127, + "14": 255, "15": 255, "16": 0, "17": 0, - "18": 127, + "18": 255, "19": 255, "20": 0, "21": 0, - "22": 127, + "22": 255, "23": 255, "24": 0, "25": 0, - "26": 127, + "26": 255, "27": 255, "28": 0, "29": 0, - "30": 127, + "30": 255, "31": 255, "32": 0, "33": 0, - "34": 127, + "34": 255, "35": 255, "36": 0, "37": 0 @@ -2610,134 +2154,130 @@ { "key": "colour_2_5", "type": "scene", - "name": "2 Green", + "name": "2 Lime", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, - "10": 0, + "10": 127, "11": 255, "12": 0, "13": 0, - "14": 0, + "14": 127, "15": 255, "16": 0, "17": 0, - "18": 0, + "18": 127, "19": 255, "20": 0, "21": 0, - "22": 0, + "22": 127, "23": 255, "24": 0, "25": 0, - "26": 0, + "26": 127, "27": 255, "28": 0, "29": 0, - "30": 0, + "30": 127, "31": 255, "32": 0, "33": 0, - "34": 0, + "34": 127, "35": 255, "36": 0, "37": 0 }, "M2": { - "8": 255, "9": 0, - "10": 0, + "10": 127, "11": 255, "12": 0, "13": 0, - "14": 0, + "14": 127, "15": 255, "16": 0, "17": 0, - "18": 0, + "18": 127, "19": 255, "20": 0, "21": 0, - "22": 0, + "22": 127, "23": 255, "24": 0, "25": 0, - "26": 0, + "26": 127, "27": 255, "28": 0, "29": 0, - "30": 0, + "30": 127, "31": 255, "32": 0, "33": 0, - "34": 0, + "34": 127, "35": 255, "36": 0, "37": 0 }, "M3": { - "8": 255, "9": 0, - "10": 0, + "10": 127, "11": 255, "12": 0, "13": 0, - "14": 0, + "14": 127, "15": 255, "16": 0, "17": 0, - "18": 0, + "18": 127, "19": 255, "20": 0, "21": 0, - "22": 0, + "22": 127, "23": 255, "24": 0, "25": 0, - "26": 0, + "26": 127, "27": 255, "28": 0, "29": 0, - "30": 0, + "30": 127, "31": 255, "32": 0, "33": 0, - "34": 0, + "34": 127, "35": 255, "36": 0, "37": 0 }, "M4": { - "8": 255, "9": 0, - "10": 0, + "10": 127, "11": 255, "12": 0, "13": 0, - "14": 0, + "14": 127, "15": 255, "16": 0, "17": 0, - "18": 0, + "18": 127, "19": 255, "20": 0, "21": 0, - "22": 0, + "22": 127, "23": 255, "24": 0, "25": 0, - "26": 0, + "26": 127, "27": 255, "28": 0, "29": 0, - "30": 0, + "30": 127, "31": 255, "32": 0, "33": 0, - "34": 0, + "34": 127, "35": 255, "36": 0, "37": 0 @@ -2747,136 +2287,132 @@ { "key": "colour_2_6", "type": "scene", - "name": "2 Spring", + "name": "2 Green", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 127, + "12": 0, "13": 0, "14": 0, "15": 255, - "16": 127, + "16": 0, "17": 0, "18": 0, "19": 255, - "20": 127, + "20": 0, "21": 0, "22": 0, "23": 255, - "24": 127, + "24": 0, "25": 0, "26": 0, "27": 255, - "28": 127, + "28": 0, "29": 0, "30": 0, "31": 255, - "32": 127, + "32": 0, "33": 0, "34": 0, "35": 255, - "36": 127, + "36": 0, "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 127, + "12": 0, "13": 0, "14": 0, "15": 255, - "16": 127, + "16": 0, "17": 0, "18": 0, "19": 255, - "20": 127, + "20": 0, "21": 0, "22": 0, "23": 255, - "24": 127, + "24": 0, "25": 0, "26": 0, "27": 255, - "28": 127, + "28": 0, "29": 0, "30": 0, "31": 255, - "32": 127, + "32": 0, "33": 0, "34": 0, "35": 255, - "36": 127, + "36": 0, "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 127, + "12": 0, "13": 0, "14": 0, "15": 255, - "16": 127, + "16": 0, "17": 0, "18": 0, "19": 255, - "20": 127, + "20": 0, "21": 0, "22": 0, "23": 255, - "24": 127, + "24": 0, "25": 0, "26": 0, "27": 255, - "28": 127, + "28": 0, "29": 0, "30": 0, "31": 255, - "32": 127, + "32": 0, "33": 0, "34": 0, "35": 255, - "36": 127, + "36": 0, "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 127, + "12": 0, "13": 0, "14": 0, "15": 255, - "16": 127, + "16": 0, "17": 0, "18": 0, "19": 255, - "20": 127, + "20": 0, "21": 0, "22": 0, "23": 255, - "24": 127, + "24": 0, "25": 0, "26": 0, "27": 255, - "28": 127, + "28": 0, "29": 0, "30": 0, "31": 255, - "32": 127, + "32": 0, "33": 0, "34": 0, "35": 255, - "36": 127, + "36": 0, "37": 0 } } @@ -2884,136 +2420,132 @@ { "key": "colour_2_7", "type": "scene", - "name": "2 Cyan", + "name": "2 Spring", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 255, + "12": 127, "13": 0, "14": 0, "15": 255, - "16": 255, + "16": 127, "17": 0, "18": 0, "19": 255, - "20": 255, + "20": 127, "21": 0, "22": 0, "23": 255, - "24": 255, + "24": 127, "25": 0, "26": 0, "27": 255, - "28": 255, + "28": 127, "29": 0, "30": 0, "31": 255, - "32": 255, + "32": 127, "33": 0, "34": 0, "35": 255, - "36": 255, + "36": 127, "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 255, + "12": 127, "13": 0, "14": 0, "15": 255, - "16": 255, + "16": 127, "17": 0, "18": 0, "19": 255, - "20": 255, + "20": 127, "21": 0, "22": 0, "23": 255, - "24": 255, + "24": 127, "25": 0, "26": 0, "27": 255, - "28": 255, + "28": 127, "29": 0, "30": 0, "31": 255, - "32": 255, + "32": 127, "33": 0, "34": 0, "35": 255, - "36": 255, + "36": 127, "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 255, + "12": 127, "13": 0, "14": 0, "15": 255, - "16": 255, + "16": 127, "17": 0, "18": 0, "19": 255, - "20": 255, + "20": 127, "21": 0, "22": 0, "23": 255, - "24": 255, + "24": 127, "25": 0, "26": 0, "27": 255, - "28": 255, + "28": 127, "29": 0, "30": 0, "31": 255, - "32": 255, + "32": 127, "33": 0, "34": 0, "35": 255, - "36": 255, + "36": 127, "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 0, "11": 255, - "12": 255, + "12": 127, "13": 0, "14": 0, "15": 255, - "16": 255, + "16": 127, "17": 0, "18": 0, "19": 255, - "20": 255, + "20": 127, "21": 0, "22": 0, "23": 255, - "24": 255, + "24": 127, "25": 0, "26": 0, "27": 255, - "28": 255, + "28": 127, "29": 0, "30": 0, "31": 255, - "32": 255, + "32": 127, "33": 0, "34": 0, "35": 255, - "36": 255, + "36": 127, "37": 0 } } @@ -3021,135 +2553,131 @@ { "key": "colour_2_8", "type": "scene", - "name": "2 Azure", + "name": "2 Cyan", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 0, - "11": 127, + "11": 255, "12": 255, "13": 0, "14": 0, - "15": 127, + "15": 255, "16": 255, "17": 0, "18": 0, - "19": 127, + "19": 255, "20": 255, "21": 0, "22": 0, - "23": 127, + "23": 255, "24": 255, "25": 0, "26": 0, - "27": 127, + "27": 255, "28": 255, "29": 0, "30": 0, - "31": 127, + "31": 255, "32": 255, "33": 0, "34": 0, - "35": 127, + "35": 255, "36": 255, "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 0, - "11": 127, + "11": 255, "12": 255, "13": 0, "14": 0, - "15": 127, + "15": 255, "16": 255, "17": 0, "18": 0, - "19": 127, + "19": 255, "20": 255, "21": 0, "22": 0, - "23": 127, + "23": 255, "24": 255, "25": 0, "26": 0, - "27": 127, + "27": 255, "28": 255, "29": 0, "30": 0, - "31": 127, + "31": 255, "32": 255, "33": 0, "34": 0, - "35": 127, + "35": 255, "36": 255, "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 0, - "11": 127, + "11": 255, "12": 255, "13": 0, "14": 0, - "15": 127, + "15": 255, "16": 255, "17": 0, "18": 0, - "19": 127, + "19": 255, "20": 255, "21": 0, "22": 0, - "23": 127, + "23": 255, "24": 255, "25": 0, "26": 0, - "27": 127, + "27": 255, "28": 255, "29": 0, "30": 0, - "31": 127, + "31": 255, "32": 255, "33": 0, "34": 0, - "35": 127, + "35": 255, "36": 255, "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 0, - "11": 127, + "11": 255, "12": 255, "13": 0, "14": 0, - "15": 127, + "15": 255, "16": 255, "17": 0, "18": 0, - "19": 127, + "19": 255, "20": 255, "21": 0, "22": 0, - "23": 127, + "23": 255, "24": 255, "25": 0, "26": 0, - "27": 127, + "27": 255, "28": 255, "29": 0, "30": 0, - "31": 127, + "31": 255, "32": 255, "33": 0, "34": 0, - "35": 127, + "35": 255, "36": 255, "37": 0 } @@ -3158,135 +2686,131 @@ { "key": "colour_2_9", "type": "scene", - "name": "2 Blue", + "name": "2 Azure", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 0, - "11": 0, + "11": 127, "12": 255, "13": 0, "14": 0, - "15": 0, + "15": 127, "16": 255, "17": 0, "18": 0, - "19": 0, + "19": 127, "20": 255, "21": 0, "22": 0, - "23": 0, + "23": 127, "24": 255, "25": 0, "26": 0, - "27": 0, + "27": 127, "28": 255, "29": 0, "30": 0, - "31": 0, + "31": 127, "32": 255, "33": 0, "34": 0, - "35": 0, + "35": 127, "36": 255, "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 0, - "11": 0, + "11": 127, "12": 255, "13": 0, "14": 0, - "15": 0, + "15": 127, "16": 255, "17": 0, "18": 0, - "19": 0, + "19": 127, "20": 255, "21": 0, "22": 0, - "23": 0, + "23": 127, "24": 255, "25": 0, "26": 0, - "27": 0, + "27": 127, "28": 255, "29": 0, "30": 0, - "31": 0, + "31": 127, "32": 255, "33": 0, "34": 0, - "35": 0, + "35": 127, "36": 255, "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 0, - "11": 0, + "11": 127, "12": 255, "13": 0, "14": 0, - "15": 0, + "15": 127, "16": 255, "17": 0, "18": 0, - "19": 0, + "19": 127, "20": 255, "21": 0, "22": 0, - "23": 0, + "23": 127, "24": 255, "25": 0, "26": 0, - "27": 0, + "27": 127, "28": 255, "29": 0, "30": 0, - "31": 0, + "31": 127, "32": 255, "33": 0, "34": 0, - "35": 0, + "35": 127, "36": 255, "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 0, - "11": 0, + "11": 127, "12": 255, "13": 0, "14": 0, - "15": 0, + "15": 127, "16": 255, "17": 0, "18": 0, - "19": 0, + "19": 127, "20": 255, "21": 0, "22": 0, - "23": 0, + "23": 127, "24": 255, "25": 0, "26": 0, - "27": 0, + "27": 127, "28": 255, "29": 0, "30": 0, - "31": 0, + "31": 127, "32": 255, "33": 0, "34": 0, - "35": 0, + "35": 127, "36": 255, "37": 0 } @@ -3295,134 +2819,130 @@ { "key": "colour_2_10", "type": "scene", - "name": "2 Violet", + "name": "2 Blue", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, - "10": 127, + "10": 0, "11": 0, "12": 255, "13": 0, - "14": 127, + "14": 0, "15": 0, "16": 255, "17": 0, - "18": 127, + "18": 0, "19": 0, "20": 255, "21": 0, - "22": 127, + "22": 0, "23": 0, "24": 255, "25": 0, - "26": 127, + "26": 0, "27": 0, "28": 255, "29": 0, - "30": 127, + "30": 0, "31": 0, "32": 255, "33": 0, - "34": 127, + "34": 0, "35": 0, "36": 255, "37": 0 }, "M2": { - "8": 255, "9": 0, - "10": 127, + "10": 0, "11": 0, "12": 255, "13": 0, - "14": 127, + "14": 0, "15": 0, "16": 255, "17": 0, - "18": 127, + "18": 0, "19": 0, "20": 255, "21": 0, - "22": 127, + "22": 0, "23": 0, "24": 255, "25": 0, - "26": 127, + "26": 0, "27": 0, "28": 255, "29": 0, - "30": 127, + "30": 0, "31": 0, "32": 255, "33": 0, - "34": 127, + "34": 0, "35": 0, "36": 255, "37": 0 }, "M3": { - "8": 255, "9": 0, - "10": 127, + "10": 0, "11": 0, "12": 255, "13": 0, - "14": 127, + "14": 0, "15": 0, "16": 255, "17": 0, - "18": 127, + "18": 0, "19": 0, "20": 255, "21": 0, - "22": 127, + "22": 0, "23": 0, "24": 255, "25": 0, - "26": 127, + "26": 0, "27": 0, "28": 255, "29": 0, - "30": 127, + "30": 0, "31": 0, "32": 255, "33": 0, - "34": 127, + "34": 0, "35": 0, "36": 255, "37": 0 }, "M4": { - "8": 255, "9": 0, - "10": 127, + "10": 0, "11": 0, "12": 255, "13": 0, - "14": 127, + "14": 0, "15": 0, "16": 255, "17": 0, - "18": 127, + "18": 0, "19": 0, "20": 255, "21": 0, - "22": 127, + "22": 0, "23": 0, "24": 255, "25": 0, - "26": 127, + "26": 0, "27": 0, "28": 255, "29": 0, - "30": 127, + "30": 0, "31": 0, "32": 255, "33": 0, - "34": 127, + "34": 0, "35": 0, "36": 255, "37": 0 @@ -3432,134 +2952,130 @@ { "key": "colour_2_11", "type": "scene", - "name": "2 Magenta", + "name": "2 Violet", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, - "10": 255, + "10": 127, "11": 0, "12": 255, "13": 0, - "14": 255, + "14": 127, "15": 0, "16": 255, "17": 0, - "18": 255, + "18": 127, "19": 0, "20": 255, "21": 0, - "22": 255, + "22": 127, "23": 0, "24": 255, "25": 0, - "26": 255, + "26": 127, "27": 0, "28": 255, "29": 0, - "30": 255, + "30": 127, "31": 0, "32": 255, "33": 0, - "34": 255, + "34": 127, "35": 0, "36": 255, "37": 0 }, "M2": { - "8": 255, "9": 0, - "10": 255, + "10": 127, "11": 0, "12": 255, "13": 0, - "14": 255, + "14": 127, "15": 0, "16": 255, "17": 0, - "18": 255, + "18": 127, "19": 0, "20": 255, "21": 0, - "22": 255, + "22": 127, "23": 0, "24": 255, "25": 0, - "26": 255, + "26": 127, "27": 0, "28": 255, "29": 0, - "30": 255, + "30": 127, "31": 0, "32": 255, "33": 0, - "34": 255, + "34": 127, "35": 0, "36": 255, "37": 0 }, "M3": { - "8": 255, "9": 0, - "10": 255, + "10": 127, "11": 0, "12": 255, "13": 0, - "14": 255, + "14": 127, "15": 0, "16": 255, "17": 0, - "18": 255, + "18": 127, "19": 0, "20": 255, "21": 0, - "22": 255, + "22": 127, "23": 0, "24": 255, "25": 0, - "26": 255, + "26": 127, "27": 0, "28": 255, "29": 0, - "30": 255, + "30": 127, "31": 0, "32": 255, "33": 0, - "34": 255, + "34": 127, "35": 0, "36": 255, "37": 0 }, "M4": { - "8": 255, "9": 0, - "10": 255, + "10": 127, "11": 0, "12": 255, "13": 0, - "14": 255, + "14": 127, "15": 0, "16": 255, "17": 0, - "18": 255, + "18": 127, "19": 0, "20": 255, "21": 0, - "22": 255, + "22": 127, "23": 0, "24": 255, "25": 0, - "26": 255, + "26": 127, "27": 0, "28": 255, "29": 0, - "30": 255, + "30": 127, "31": 0, "32": 255, "33": 0, - "34": 255, + "34": 127, "35": 0, "36": 255, "37": 0 @@ -3569,136 +3085,132 @@ { "key": "colour_2_12", "type": "scene", - "name": "2 Pink", + "name": "2 Magenta", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 255, - "11": 40, - "12": 120, + "11": 0, + "12": 255, "13": 0, "14": 255, - "15": 40, - "16": 120, + "15": 0, + "16": 255, "17": 0, "18": 255, - "19": 40, - "20": 120, + "19": 0, + "20": 255, "21": 0, "22": 255, - "23": 40, - "24": 120, + "23": 0, + "24": 255, "25": 0, "26": 255, - "27": 40, - "28": 120, + "27": 0, + "28": 255, "29": 0, "30": 255, - "31": 40, - "32": 120, + "31": 0, + "32": 255, "33": 0, "34": 255, - "35": 40, - "36": 120, + "35": 0, + "36": 255, "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 255, - "11": 40, - "12": 120, + "11": 0, + "12": 255, "13": 0, "14": 255, - "15": 40, - "16": 120, + "15": 0, + "16": 255, "17": 0, "18": 255, - "19": 40, - "20": 120, + "19": 0, + "20": 255, "21": 0, "22": 255, - "23": 40, - "24": 120, + "23": 0, + "24": 255, "25": 0, "26": 255, - "27": 40, - "28": 120, + "27": 0, + "28": 255, "29": 0, "30": 255, - "31": 40, - "32": 120, + "31": 0, + "32": 255, "33": 0, "34": 255, - "35": 40, - "36": 120, + "35": 0, + "36": 255, "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 255, - "11": 40, - "12": 120, + "11": 0, + "12": 255, "13": 0, "14": 255, - "15": 40, - "16": 120, + "15": 0, + "16": 255, "17": 0, "18": 255, - "19": 40, - "20": 120, + "19": 0, + "20": 255, "21": 0, "22": 255, - "23": 40, - "24": 120, + "23": 0, + "24": 255, "25": 0, "26": 255, - "27": 40, - "28": 120, + "27": 0, + "28": 255, "29": 0, "30": 255, - "31": 40, - "32": 120, + "31": 0, + "32": 255, "33": 0, "34": 255, - "35": 40, - "36": 120, + "35": 0, + "36": 255, "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 255, - "11": 40, - "12": 120, + "11": 0, + "12": 255, "13": 0, "14": 255, - "15": 40, - "16": 120, + "15": 0, + "16": 255, "17": 0, "18": 255, - "19": 40, - "20": 120, + "19": 0, + "20": 255, "21": 0, "22": 255, - "23": 40, - "24": 120, + "23": 0, + "24": 255, "25": 0, "26": 255, - "27": 40, - "28": 120, + "27": 0, + "28": 255, "29": 0, "30": 255, - "31": 40, - "32": 120, + "31": 0, + "32": 255, "33": 0, "34": 255, - "35": 40, - "36": 120, + "35": 0, + "36": 255, "37": 0 } } @@ -3706,623 +3218,532 @@ { "key": "colour_2_13", "type": "scene", - "name": "2 Warm", + "name": "2 Pink", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, "10": 255, - "11": 120, - "12": 40, - "13": 120, + "11": 40, + "12": 120, + "13": 0, "14": 255, - "15": 120, - "16": 40, - "17": 120, + "15": 40, + "16": 120, + "17": 0, "18": 255, - "19": 120, - "20": 40, - "21": 120, + "19": 40, + "20": 120, + "21": 0, "22": 255, - "23": 120, - "24": 40, - "25": 120, + "23": 40, + "24": 120, + "25": 0, "26": 255, - "27": 120, - "28": 40, - "29": 120, + "27": 40, + "28": 120, + "29": 0, "30": 255, - "31": 120, - "32": 40, - "33": 120, + "31": 40, + "32": 120, + "33": 0, "34": 255, - "35": 120, - "36": 40, - "37": 120 + "35": 40, + "36": 120, + "37": 0 }, "M2": { - "8": 255, "9": 0, "10": 255, - "11": 120, - "12": 40, - "13": 120, + "11": 40, + "12": 120, + "13": 0, "14": 255, - "15": 120, - "16": 40, - "17": 120, + "15": 40, + "16": 120, + "17": 0, "18": 255, - "19": 120, - "20": 40, - "21": 120, + "19": 40, + "20": 120, + "21": 0, "22": 255, - "23": 120, - "24": 40, - "25": 120, + "23": 40, + "24": 120, + "25": 0, "26": 255, - "27": 120, - "28": 40, - "29": 120, + "27": 40, + "28": 120, + "29": 0, "30": 255, - "31": 120, - "32": 40, - "33": 120, + "31": 40, + "32": 120, + "33": 0, "34": 255, - "35": 120, - "36": 40, - "37": 120 + "35": 40, + "36": 120, + "37": 0 }, "M3": { - "8": 255, "9": 0, "10": 255, - "11": 120, - "12": 40, - "13": 120, + "11": 40, + "12": 120, + "13": 0, "14": 255, - "15": 120, - "16": 40, - "17": 120, + "15": 40, + "16": 120, + "17": 0, "18": 255, - "19": 120, - "20": 40, - "21": 120, + "19": 40, + "20": 120, + "21": 0, "22": 255, - "23": 120, - "24": 40, - "25": 120, + "23": 40, + "24": 120, + "25": 0, "26": 255, - "27": 120, - "28": 40, - "29": 120, + "27": 40, + "28": 120, + "29": 0, "30": 255, - "31": 120, - "32": 40, - "33": 120, + "31": 40, + "32": 120, + "33": 0, "34": 255, - "35": 120, - "36": 40, - "37": 120 + "35": 40, + "36": 120, + "37": 0 }, "M4": { - "8": 255, "9": 0, "10": 255, - "11": 120, - "12": 40, - "13": 120, + "11": 40, + "12": 120, + "13": 0, "14": 255, - "15": 120, - "16": 40, - "17": 120, + "15": 40, + "16": 120, + "17": 0, "18": 255, - "19": 120, - "20": 40, - "21": 120, + "19": 40, + "20": 120, + "21": 0, "22": 255, - "23": 120, - "24": 40, - "25": 120, + "23": 40, + "24": 120, + "25": 0, "26": 255, - "27": 120, - "28": 40, - "29": 120, + "27": 40, + "28": 120, + "29": 0, "30": 255, - "31": 120, - "32": 40, - "33": 120, + "31": 40, + "32": 120, + "33": 0, "34": 255, - "35": 120, - "36": 40, - "37": 120 + "35": 40, + "36": 120, + "37": 0 } } }, { "key": "colour_2_14", "type": "scene", - "name": "2 White", + "name": "2 Warm", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, - "10": 0, - "11": 0, - "12": 0, - "13": 255, - "14": 0, - "15": 0, - "16": 0, - "17": 255, - "18": 0, - "19": 0, - "20": 0, - "21": 255, - "22": 0, - "23": 0, - "24": 0, - "25": 255, - "26": 0, - "27": 0, - "28": 0, - "29": 255, - "30": 0, - "31": 0, - "32": 0, - "33": 255, - "34": 0, - "35": 0, - "36": 0, - "37": 255 + "10": 255, + "11": 120, + "12": 40, + "13": 120, + "14": 255, + "15": 120, + "16": 40, + "17": 120, + "18": 255, + "19": 120, + "20": 40, + "21": 120, + "22": 255, + "23": 120, + "24": 40, + "25": 120, + "26": 255, + "27": 120, + "28": 40, + "29": 120, + "30": 255, + "31": 120, + "32": 40, + "33": 120, + "34": 255, + "35": 120, + "36": 40, + "37": 120 }, "M2": { - "8": 255, "9": 0, - "10": 0, - "11": 0, - "12": 0, - "13": 255, - "14": 0, - "15": 0, - "16": 0, - "17": 255, - "18": 0, - "19": 0, - "20": 0, - "21": 255, - "22": 0, - "23": 0, - "24": 0, - "25": 255, - "26": 0, - "27": 0, - "28": 0, - "29": 255, - "30": 0, - "31": 0, - "32": 0, - "33": 255, - "34": 0, - "35": 0, - "36": 0, - "37": 255 + "10": 255, + "11": 120, + "12": 40, + "13": 120, + "14": 255, + "15": 120, + "16": 40, + "17": 120, + "18": 255, + "19": 120, + "20": 40, + "21": 120, + "22": 255, + "23": 120, + "24": 40, + "25": 120, + "26": 255, + "27": 120, + "28": 40, + "29": 120, + "30": 255, + "31": 120, + "32": 40, + "33": 120, + "34": 255, + "35": 120, + "36": 40, + "37": 120 }, "M3": { - "8": 255, "9": 0, - "10": 0, - "11": 0, - "12": 0, - "13": 255, - "14": 0, - "15": 0, - "16": 0, - "17": 255, - "18": 0, - "19": 0, - "20": 0, - "21": 255, - "22": 0, - "23": 0, - "24": 0, - "25": 255, - "26": 0, - "27": 0, - "28": 0, - "29": 255, - "30": 0, - "31": 0, - "32": 0, - "33": 255, - "34": 0, - "35": 0, - "36": 0, - "37": 255 + "10": 255, + "11": 120, + "12": 40, + "13": 120, + "14": 255, + "15": 120, + "16": 40, + "17": 120, + "18": 255, + "19": 120, + "20": 40, + "21": 120, + "22": 255, + "23": 120, + "24": 40, + "25": 120, + "26": 255, + "27": 120, + "28": 40, + "29": 120, + "30": 255, + "31": 120, + "32": 40, + "33": 120, + "34": 255, + "35": 120, + "36": 40, + "37": 120 }, "M4": { - "8": 255, "9": 0, - "10": 0, - "11": 0, - "12": 0, - "13": 255, - "14": 0, - "15": 0, - "16": 0, - "17": 255, - "18": 0, - "19": 0, - "20": 0, - "21": 255, - "22": 0, - "23": 0, - "24": 0, - "25": 255, - "26": 0, - "27": 0, - "28": 0, - "29": 255, - "30": 0, - "31": 0, - "32": 0, - "33": 255, - "34": 0, - "35": 0, - "36": 0, - "37": 255 + "10": 255, + "11": 120, + "12": 40, + "13": 120, + "14": 255, + "15": 120, + "16": 40, + "17": 120, + "18": 255, + "19": 120, + "20": 40, + "21": 120, + "22": 255, + "23": 120, + "24": 40, + "25": 120, + "26": 255, + "27": 120, + "28": 40, + "29": 120, + "30": 255, + "31": 120, + "32": 40, + "33": 120, + "34": 255, + "35": 120, + "36": 40, + "37": 120 } } }, { "key": "colour_2_15", "type": "scene", - "name": "2 Cool", + "name": "2 White", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 255, "9": 0, - "10": 80, - "11": 120, - "12": 255, - "13": 120, - "14": 80, - "15": 120, - "16": 255, - "17": 120, - "18": 80, - "19": 120, - "20": 255, - "21": 120, - "22": 80, - "23": 120, - "24": 255, - "25": 120, - "26": 80, - "27": 120, - "28": 255, - "29": 120, - "30": 80, - "31": 120, - "32": 255, - "33": 120, - "34": 80, - "35": 120, - "36": 255, - "37": 120 + "10": 0, + "11": 0, + "12": 0, + "13": 255, + "14": 0, + "15": 0, + "16": 0, + "17": 255, + "18": 0, + "19": 0, + "20": 0, + "21": 255, + "22": 0, + "23": 0, + "24": 0, + "25": 255, + "26": 0, + "27": 0, + "28": 0, + "29": 255, + "30": 0, + "31": 0, + "32": 0, + "33": 255, + "34": 0, + "35": 0, + "36": 0, + "37": 255 }, "M2": { - "8": 255, "9": 0, - "10": 80, - "11": 120, - "12": 255, - "13": 120, - "14": 80, - "15": 120, - "16": 255, - "17": 120, - "18": 80, - "19": 120, - "20": 255, - "21": 120, - "22": 80, - "23": 120, - "24": 255, - "25": 120, - "26": 80, - "27": 120, - "28": 255, - "29": 120, - "30": 80, - "31": 120, - "32": 255, - "33": 120, - "34": 80, - "35": 120, - "36": 255, - "37": 120 + "10": 0, + "11": 0, + "12": 0, + "13": 255, + "14": 0, + "15": 0, + "16": 0, + "17": 255, + "18": 0, + "19": 0, + "20": 0, + "21": 255, + "22": 0, + "23": 0, + "24": 0, + "25": 255, + "26": 0, + "27": 0, + "28": 0, + "29": 255, + "30": 0, + "31": 0, + "32": 0, + "33": 255, + "34": 0, + "35": 0, + "36": 0, + "37": 255 }, "M3": { - "8": 255, "9": 0, - "10": 80, - "11": 120, - "12": 255, - "13": 120, - "14": 80, - "15": 120, - "16": 255, - "17": 120, - "18": 80, - "19": 120, - "20": 255, - "21": 120, - "22": 80, - "23": 120, - "24": 255, - "25": 120, - "26": 80, - "27": 120, - "28": 255, - "29": 120, - "30": 80, - "31": 120, - "32": 255, - "33": 120, - "34": 80, - "35": 120, - "36": 255, - "37": 120 + "10": 0, + "11": 0, + "12": 0, + "13": 255, + "14": 0, + "15": 0, + "16": 0, + "17": 255, + "18": 0, + "19": 0, + "20": 0, + "21": 255, + "22": 0, + "23": 0, + "24": 0, + "25": 255, + "26": 0, + "27": 0, + "28": 0, + "29": 255, + "30": 0, + "31": 0, + "32": 0, + "33": 255, + "34": 0, + "35": 0, + "36": 0, + "37": 255 }, "M4": { - "8": 255, "9": 0, - "10": 80, - "11": 120, - "12": 255, - "13": 120, - "14": 80, - "15": 120, - "16": 255, - "17": 120, - "18": 80, - "19": 120, - "20": 255, - "21": 120, - "22": 80, - "23": 120, - "24": 255, - "25": 120, - "26": 80, - "27": 120, - "28": 255, - "29": 120, - "30": 80, - "31": 120, - "32": 255, - "33": 120, - "34": 80, - "35": 120, - "36": 255, - "37": 120 + "10": 0, + "11": 0, + "12": 0, + "13": 255, + "14": 0, + "15": 0, + "16": 0, + "17": 255, + "18": 0, + "19": 0, + "20": 0, + "21": 255, + "22": 0, + "23": 0, + "24": 0, + "25": 255, + "26": 0, + "27": 0, + "28": 0, + "29": 255, + "30": 0, + "31": 0, + "32": 0, + "33": 255, + "34": 0, + "35": 0, + "36": 0, + "37": 255 } } }, { "key": "colour_2_16", "type": "scene", - "name": "2 Custom", + "name": "2 Cool", "fade_in": 1000, "fade_out": 1000, "values": { "M1": { - "8": 0 - }, - "M2": { - "8": 0 - }, - "M3": { - "8": 0 - }, - "M4": { - "8": 0 - } - } - }, - { - "key": "custom_2_Dim", - "type": "scene", - "name": "2 Custom Dim", - "values": { - "M1": { - "8": 255 - }, - "M2": { - "8": 255 - }, - "M3": { - "8": 255 - }, - "M4": { - "8": 255 - } - } - }, - { - "key": "custom_2_R", - "type": "scene", - "name": "2 Custom R", - "values": { - "M1": { - "10": 255, - "14": 255, - "18": 255, - "22": 255, - "26": 255, - "30": 255, - "34": 255 - }, - "M2": { - "10": 255, - "14": 255, - "18": 255, - "22": 255, - "26": 255, - "30": 255, - "34": 255 - }, - "M3": { - "10": 255, - "14": 255, - "18": 255, - "22": 255, - "26": 255, - "30": 255, - "34": 255 - }, - "M4": { - "10": 255, - "14": 255, - "18": 255, - "22": 255, - "26": 255, - "30": 255, - "34": 255 - } - } - }, - { - "key": "custom_2_G", - "type": "scene", - "name": "2 Custom G", - "values": { - "M1": { - "11": 255, - "15": 255, - "19": 255, - "23": 255, - "27": 255, - "31": 255, - "35": 255 - }, - "M2": { - "11": 255, - "15": 255, - "19": 255, - "23": 255, - "27": 255, - "31": 255, - "35": 255 - }, - "M3": { - "11": 255, - "15": 255, - "19": 255, - "23": 255, - "27": 255, - "31": 255, - "35": 255 - }, - "M4": { - "11": 255, - "15": 255, - "19": 255, - "23": 255, - "27": 255, - "31": 255, - "35": 255 - } - } - }, - { - "key": "custom_2_B", - "type": "scene", - "name": "2 Custom B", - "values": { - "M1": { + "9": 0, + "10": 80, + "11": 120, "12": 255, + "13": 120, + "14": 80, + "15": 120, "16": 255, + "17": 120, + "18": 80, + "19": 120, "20": 255, + "21": 120, + "22": 80, + "23": 120, "24": 255, + "25": 120, + "26": 80, + "27": 120, "28": 255, + "29": 120, + "30": 80, + "31": 120, "32": 255, - "36": 255 + "33": 120, + "34": 80, + "35": 120, + "36": 255, + "37": 120 }, "M2": { + "9": 0, + "10": 80, + "11": 120, "12": 255, + "13": 120, + "14": 80, + "15": 120, "16": 255, + "17": 120, + "18": 80, + "19": 120, "20": 255, + "21": 120, + "22": 80, + "23": 120, "24": 255, + "25": 120, + "26": 80, + "27": 120, "28": 255, + "29": 120, + "30": 80, + "31": 120, "32": 255, - "36": 255 + "33": 120, + "34": 80, + "35": 120, + "36": 255, + "37": 120 }, "M3": { + "9": 0, + "10": 80, + "11": 120, "12": 255, + "13": 120, + "14": 80, + "15": 120, "16": 255, + "17": 120, + "18": 80, + "19": 120, "20": 255, + "21": 120, + "22": 80, + "23": 120, "24": 255, + "25": 120, + "26": 80, + "27": 120, "28": 255, + "29": 120, + "30": 80, + "31": 120, "32": 255, - "36": 255 + "33": 120, + "34": 80, + "35": 120, + "36": 255, + "37": 120 }, "M4": { + "9": 0, + "10": 80, + "11": 120, "12": 255, + "13": 120, + "14": 80, + "15": 120, "16": 255, + "17": 120, + "18": 80, + "19": 120, "20": 255, + "21": 120, + "22": 80, + "23": 120, "24": 255, + "25": 120, + "26": 80, + "27": 120, "28": 255, + "29": 120, + "30": 80, + "31": 120, "32": 255, - "36": 255 - } - } - }, - { - "key": "custom_2_W", - "type": "scene", - "name": "2 Custom W", - "values": { - "M1": { - "13": 255, - "17": 255, - "21": 255, - "25": 255, - "29": 255, - "33": 255, - "37": 255 - }, - "M2": { - "13": 255, - "17": 255, - "21": 255, - "25": 255, - "29": 255, - "33": 255, - "37": 255 - }, - "M3": { - "13": 255, - "17": 255, - "21": 255, - "25": 255, - "29": 255, - "33": 255, - "37": 255 - }, - "M4": { - "13": 255, - "17": 255, - "21": 255, - "25": 255, - "29": 255, - "33": 255, - "37": 255 + "33": 120, + "34": 80, + "35": 120, + "36": 255, + "37": 120 } } } @@ -4333,7 +3754,7 @@ "caption": "Colour 1", "x": 10, "y": 10, - "w": 660, + "w": 400, "h": 300, "children": [ { @@ -4390,7 +3811,7 @@ }, { "type": "button", - "caption": "Yellow", + "caption": "Amber", "function": "colour_1_3", "x": 202, "y": 208, @@ -4398,7 +3819,7 @@ "h": 60, "bg": [ 255, - 255, + 191, 0 ], "fg": [ @@ -4416,14 +3837,14 @@ }, { "type": "button", - "caption": "Lime", + "caption": "Yellow", "function": "colour_1_4", "x": 298, "y": 208, "w": 90, "h": 60, "bg": [ - 127, + 255, 255, 0 ], @@ -4442,12 +3863,38 @@ }, { "type": "button", - "caption": "Green", + "caption": "Lime", "function": "colour_1_5", "x": 10, "y": 142, "w": 90, "h": 60, + "bg": [ + 127, + 255, + 0 + ], + "fg": [ + 0, + 0, + 0 + ], + "input": { + "universe": 1, + "note": [ + 9, + 56 + ] + } + }, + { + "type": "button", + "caption": "Green", + "function": "colour_1_6", + "x": 106, + "y": 142, + "w": 90, + "h": 60, "bg": [ 0, 255, @@ -4462,15 +3909,15 @@ "universe": 1, "note": [ 9, - 56 + 57 ] } }, { "type": "button", "caption": "Spring", - "function": "colour_1_6", - "x": 106, + "function": "colour_1_7", + "x": 202, "y": 142, "w": 90, "h": 60, @@ -4484,32 +3931,6 @@ 0, 0 ], - "input": { - "universe": 1, - "note": [ - 9, - 57 - ] - } - }, - { - "type": "button", - "caption": "Cyan", - "function": "colour_1_7", - "x": 202, - "y": 142, - "w": 90, - "h": 60, - "bg": [ - 0, - 255, - 255 - ], - "fg": [ - 0, - 0, - 0 - ], "input": { "universe": 1, "note": [ @@ -4520,7 +3941,7 @@ }, { "type": "button", - "caption": "Azure", + "caption": "Cyan", "function": "colour_1_8", "x": 298, "y": 142, @@ -4528,7 +3949,7 @@ "h": 60, "bg": [ 0, - 127, + 255, 255 ], "fg": [ @@ -4546,7 +3967,7 @@ }, { "type": "button", - "caption": "Blue", + "caption": "Azure", "function": "colour_1_9", "x": 10, "y": 76, @@ -4554,33 +3975,7 @@ "h": 60, "bg": [ 0, - 0, - 255 - ], - "fg": [ - 255, - 255, - 255 - ], - "input": { - "universe": 1, - "note": [ - 9, - 60 - ] - } - }, - { - "type": "button", - "caption": "Violet", - "function": "colour_1_10", - "x": 106, - "y": 76, - "w": 90, - "h": 60, - "bg": [ 127, - 0, 255 ], "fg": [ @@ -4588,6 +3983,32 @@ 0, 0 ], + "input": { + "universe": 1, + "note": [ + 9, + 60 + ] + } + }, + { + "type": "button", + "caption": "Blue", + "function": "colour_1_10", + "x": 106, + "y": 76, + "w": 90, + "h": 60, + "bg": [ + 0, + 0, + 255 + ], + "fg": [ + 255, + 255, + 255 + ], "input": { "universe": 1, "note": [ @@ -4598,14 +4019,14 @@ }, { "type": "button", - "caption": "Magenta", + "caption": "Violet", "function": "colour_1_11", "x": 202, "y": 76, "w": 90, "h": 60, "bg": [ - 255, + 127, 0, 255 ], @@ -4624,7 +4045,7 @@ }, { "type": "button", - "caption": "Pink", + "caption": "Magenta", "function": "colour_1_12", "x": 298, "y": 76, @@ -4632,8 +4053,8 @@ "h": 60, "bg": [ 255, - 40, - 120 + 0, + 255 ], "fg": [ 0, @@ -4650,12 +4071,38 @@ }, { "type": "button", - "caption": "Warm", + "caption": "Pink", "function": "colour_1_13", "x": 10, "y": 10, "w": 90, "h": 60, + "bg": [ + 255, + 40, + 120 + ], + "fg": [ + 0, + 0, + 0 + ], + "input": { + "universe": 1, + "note": [ + 9, + 64 + ] + } + }, + { + "type": "button", + "caption": "Warm", + "function": "colour_1_14", + "x": 106, + "y": 10, + "w": 90, + "h": 60, "bg": [ 255, 240, @@ -4666,32 +4113,6 @@ 0, 0 ], - "input": { - "universe": 1, - "note": [ - 9, - 64 - ] - } - }, - { - "type": "button", - "caption": "White", - "function": "colour_1_14", - "x": 106, - "y": 10, - "w": 90, - "h": 60, - "bg": [ - 255, - 255, - 255 - ], - "fg": [ - 0, - 0, - 0 - ], "input": { "universe": 1, "note": [ @@ -4702,15 +4123,15 @@ }, { "type": "button", - "caption": "Cool", + "caption": "White", "function": "colour_1_15", "x": 202, "y": 10, "w": 90, "h": 60, "bg": [ - 200, - 240, + 255, + 255, 255 ], "fg": [ @@ -4728,21 +4149,21 @@ }, { "type": "button", - "caption": "Custom", + "caption": "Cool", "function": "colour_1_16", "x": 298, "y": 10, "w": 90, "h": 60, "bg": [ - 255, - 60, - 0 + 200, + 240, + 255 ], "fg": [ - 255, - 255, - 255 + 0, + 0, + 0 ], "input": { "universe": 1, @@ -4751,111 +4172,6 @@ 67 ] } - }, - { - "type": "slider", - "caption": "Dim", - "function": "custom_1_Dim", - "x": 400, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 255, - 255, - 255 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 30 - ] - } - }, - { - "type": "slider", - "caption": "R", - "function": "custom_1_R", - "x": 452, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 255, - 0, - 0 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 31 - ] - } - }, - { - "type": "slider", - "caption": "G", - "function": "custom_1_G", - "x": 504, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 0, - 255, - 0 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 32 - ] - } - }, - { - "type": "slider", - "caption": "B", - "function": "custom_1_B", - "x": 556, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 0, - 0, - 255 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 33 - ] - } - }, - { - "type": "slider", - "caption": "W", - "function": "custom_1_W", - "x": 608, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 255, - 255, - 255 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 34 - ] - } } ] }, @@ -4864,7 +4180,7 @@ "caption": "Colour 2", "x": 10, "y": 320, - "w": 660, + "w": 400, "h": 300, "children": [ { @@ -4921,7 +4237,7 @@ }, { "type": "button", - "caption": "Yellow", + "caption": "Amber", "function": "colour_2_3", "x": 202, "y": 208, @@ -4929,7 +4245,7 @@ "h": 60, "bg": [ 255, - 255, + 191, 0 ], "fg": [ @@ -4947,14 +4263,14 @@ }, { "type": "button", - "caption": "Lime", + "caption": "Yellow", "function": "colour_2_4", "x": 298, "y": 208, "w": 90, "h": 60, "bg": [ - 127, + 255, 255, 0 ], @@ -4973,12 +4289,38 @@ }, { "type": "button", - "caption": "Green", + "caption": "Lime", "function": "colour_2_5", "x": 10, "y": 142, "w": 90, "h": 60, + "bg": [ + 127, + 255, + 0 + ], + "fg": [ + 0, + 0, + 0 + ], + "input": { + "universe": 1, + "note": [ + 9, + 72 + ] + } + }, + { + "type": "button", + "caption": "Green", + "function": "colour_2_6", + "x": 106, + "y": 142, + "w": 90, + "h": 60, "bg": [ 0, 255, @@ -4993,15 +4335,15 @@ "universe": 1, "note": [ 9, - 72 + 73 ] } }, { "type": "button", "caption": "Spring", - "function": "colour_2_6", - "x": 106, + "function": "colour_2_7", + "x": 202, "y": 142, "w": 90, "h": 60, @@ -5015,32 +4357,6 @@ 0, 0 ], - "input": { - "universe": 1, - "note": [ - 9, - 73 - ] - } - }, - { - "type": "button", - "caption": "Cyan", - "function": "colour_2_7", - "x": 202, - "y": 142, - "w": 90, - "h": 60, - "bg": [ - 0, - 255, - 255 - ], - "fg": [ - 0, - 0, - 0 - ], "input": { "universe": 1, "note": [ @@ -5051,7 +4367,7 @@ }, { "type": "button", - "caption": "Azure", + "caption": "Cyan", "function": "colour_2_8", "x": 298, "y": 142, @@ -5059,7 +4375,7 @@ "h": 60, "bg": [ 0, - 127, + 255, 255 ], "fg": [ @@ -5077,7 +4393,7 @@ }, { "type": "button", - "caption": "Blue", + "caption": "Azure", "function": "colour_2_9", "x": 10, "y": 76, @@ -5085,33 +4401,7 @@ "h": 60, "bg": [ 0, - 0, - 255 - ], - "fg": [ - 255, - 255, - 255 - ], - "input": { - "universe": 1, - "note": [ - 9, - 76 - ] - } - }, - { - "type": "button", - "caption": "Violet", - "function": "colour_2_10", - "x": 106, - "y": 76, - "w": 90, - "h": 60, - "bg": [ 127, - 0, 255 ], "fg": [ @@ -5119,6 +4409,32 @@ 0, 0 ], + "input": { + "universe": 1, + "note": [ + 9, + 76 + ] + } + }, + { + "type": "button", + "caption": "Blue", + "function": "colour_2_10", + "x": 106, + "y": 76, + "w": 90, + "h": 60, + "bg": [ + 0, + 0, + 255 + ], + "fg": [ + 255, + 255, + 255 + ], "input": { "universe": 1, "note": [ @@ -5129,14 +4445,14 @@ }, { "type": "button", - "caption": "Magenta", + "caption": "Violet", "function": "colour_2_11", "x": 202, "y": 76, "w": 90, "h": 60, "bg": [ - 255, + 127, 0, 255 ], @@ -5155,7 +4471,7 @@ }, { "type": "button", - "caption": "Pink", + "caption": "Magenta", "function": "colour_2_12", "x": 298, "y": 76, @@ -5163,8 +4479,8 @@ "h": 60, "bg": [ 255, - 40, - 120 + 0, + 255 ], "fg": [ 0, @@ -5181,12 +4497,38 @@ }, { "type": "button", - "caption": "Warm", + "caption": "Pink", "function": "colour_2_13", "x": 10, "y": 10, "w": 90, "h": 60, + "bg": [ + 255, + 40, + 120 + ], + "fg": [ + 0, + 0, + 0 + ], + "input": { + "universe": 1, + "note": [ + 9, + 80 + ] + } + }, + { + "type": "button", + "caption": "Warm", + "function": "colour_2_14", + "x": 106, + "y": 10, + "w": 90, + "h": 60, "bg": [ 255, 240, @@ -5197,32 +4539,6 @@ 0, 0 ], - "input": { - "universe": 1, - "note": [ - 9, - 80 - ] - } - }, - { - "type": "button", - "caption": "White", - "function": "colour_2_14", - "x": 106, - "y": 10, - "w": 90, - "h": 60, - "bg": [ - 255, - 255, - 255 - ], - "fg": [ - 0, - 0, - 0 - ], "input": { "universe": 1, "note": [ @@ -5233,15 +4549,15 @@ }, { "type": "button", - "caption": "Cool", + "caption": "White", "function": "colour_2_15", "x": 202, "y": 10, "w": 90, "h": 60, "bg": [ - 200, - 240, + 255, + 255, 255 ], "fg": [ @@ -5259,21 +4575,21 @@ }, { "type": "button", - "caption": "Custom", + "caption": "Cool", "function": "colour_2_16", "x": 298, "y": 10, "w": 90, "h": 60, "bg": [ - 255, - 60, - 0 + 200, + 240, + 255 ], "fg": [ - 255, - 255, - 255 + 0, + 0, + 0 ], "input": { "universe": 1, @@ -5282,41 +4598,123 @@ 83 ] } - }, + } + ] + }, + { + "type": "frame", + "caption": "Dimmers", + "x": 10, + "y": 630, + "w": 250, + "h": 250, + "children": [ { "type": "slider", - "caption": "Dim", - "function": "custom_2_Dim", - "x": 400, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 255, - 255, - 255 + "caption": "Movers", + "value": 255, + "channels": [ + [ + "M1", + 8 + ], + [ + "M2", + 8 + ], + [ + "M3", + 8 + ], + [ + "M4", + 8 + ] ], + "x": 10, + "y": 10, + "w": 52, + "h": 200, "input": { "universe": 1, "cc": [ 0, - 35 + 44 ] } }, { "type": "slider", - "caption": "R", - "function": "custom_2_R", - "x": 452, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 255, - 0, - 0 + "caption": "Cans 9\u201315", + "value": 255, + "channels": [ + [ + "#9", + 0 + ], + [ + "#10", + 0 + ], + [ + "#11", + 0 + ], + [ + "#12", + 0 + ], + [ + "#13", + 0 + ], + [ + "#14", + 0 + ], + [ + "#15", + 0 + ] ], + "x": 68, + "y": 10, + "w": 52, + "h": 200, + "input": { + "universe": 1, + "cc": [ + 0, + 34 + ] + } + }, + { + "type": "slider", + "caption": "Cans 3\u20136", + "value": 255, + "channels": [ + [ + "#3", + 0 + ], + [ + "#4", + 0 + ], + [ + "#5", + 0 + ], + [ + "#6", + 0 + ] + ], + "x": 126, + "y": 10, + "w": 52, + "h": 200, "input": { "universe": 1, "cc": [ @@ -5327,17 +4725,30 @@ }, { "type": "slider", - "caption": "G", - "function": "custom_2_G", - "x": 504, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 0, - 255, - 0 + "caption": "Cans 1, 2, 7, 8", + "value": 255, + "channels": [ + [ + "#1", + 0 + ], + [ + "#2", + 0 + ], + [ + "#7", + 0 + ], + [ + "#8", + 0 + ] ], + "x": 184, + "y": 10, + "w": 52, + "h": 200, "input": { "universe": 1, "cc": [ @@ -5345,48 +4756,6 @@ 37 ] } - }, - { - "type": "slider", - "caption": "B", - "function": "custom_2_B", - "x": 556, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 0, - 0, - 255 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 38 - ] - } - }, - { - "type": "slider", - "caption": "W", - "function": "custom_2_W", - "x": 608, - "y": 10, - "w": 48, - "h": 200, - "fg": [ - 255, - 255, - 255 - ], - "input": { - "universe": 1, - "cc": [ - 0, - 39 - ] - } } ] } diff --git a/tests/test_chataigne.py b/tests/test_chataigne.py index 18126f1..4637fea 100644 --- a/tests/test_chataigne.py +++ b/tests/test_chataigne.py @@ -26,11 +26,22 @@ class ChataigneExportTest(unittest.TestCase): def test_groups_hold_pads_and_sliders(self) -> None: groups = make_chataigne.collect(self.show, self.stage) - self.assertEqual(list(groups), ["Colour 1", "Colour 2"]) + self.assertEqual(list(groups), ["Colour 1", "Colour 2", "Dimmers"]) cans = groups["Colour 1"] self.assertEqual([p["note"] for p in cans["pads"]][:2], [52, 53]) - self.assertEqual([s["cc"] for s in cans["sliders"]], [30, 31, 32, 33, 34]) + self.assertEqual(cans["sliders"], []) self.assertEqual(cans["pads"][0]["fade"], [1000, 1000]) + self.assertNotIn(88, cans["pads"][0]["levels"]) # the dimmer is the knob's + + def test_dimmers_are_on_knobs_15_5_7_and_8(self) -> None: + dimmers = make_chataigne.collect(self.show, self.stage)["Dimmers"]["sliders"] + self.assertEqual([(s["name"], s["cc"], s["value"]) for s in dimmers], + [("Movers", 44, 1.0), ("Cans 9–15", 34, 1.0), ("Cans 3–6", 36, 1.0), ("Cans 1, 2, 7, 8", 37, 1.0)]) + dmx = lambda *cans: {88 + 8 * (n - 1): 255 for n in cans} + self.assertEqual(dimmers[1]["levels"], dmx(*range(9, 16))) + self.assertEqual(dimmers[2]["levels"], dmx(3, 4, 5, 6)) + self.assertEqual(dimmers[3]["levels"], dmx(1, 2, 7, 8)) + self.assertEqual(dimmers[0]["levels"][9], 255) def test_writes_project_and_script(self) -> None: with tempfile.TemporaryDirectory() as tmp: @@ -45,7 +56,7 @@ class ChataigneExportTest(unittest.TestCase): self.assertIn({"value": True, "controlAddress": "/enableDashboardServer"}, settings) board = project["dashboardManager"]["items"][0]["itemManager"]["items"] targets = [item["controllable"] for item in board] - self.assertEqual(len(board), 32 * 2 + 10 + 2) + self.assertEqual(len(board), 32 * 2 + 4 + 3) self.assertEqual(len(set(targets)), len(targets)) for item in board: self.assertIn(item["controllable"].rsplit("/", 1)[1].removesuffix("Lamp"), script)