# HG changeset patch # User drewp@bigasterisk.com # Date 2023-06-02 21:53:18 # Node ID 887fde4a9a2c24bb94a9bd8ae054489cb987860f # Parent 447f25b2712d15126eb4ffbfd7008730d1ce3c78 light devs rename and swap URIs too diff --git a/show/dance2023/effect/effect0.n3 b/show/dance2023/effect/effect0.n3 --- a/show/dance2023/effect/effect0.n3 +++ b/show/dance2023/effect/effect0.n3 @@ -10,7 +10,7 @@ effect:effect0 a :Effect; rdfs:label "su :e_set0 :effectAttr :deviceSettings; :value :ds_val0 . :e_set10 :effectAttr :onTime; :value 0.1 . :e_set11 :effectAttr :period; :value 0.5 . -effect:effect0_set0 :device ; +effect:effect0_set0 :device ; :deviceAttr :color; :value "#543a79" . -effect:effect0_set2 :device ; +effect:effect0_set2 :device ; :deviceAttr :color; :value "#ffffff" . diff --git a/show/dance2023/effect/effect1.n3 b/show/dance2023/effect/effect1.n3 --- a/show/dance2023/effect/effect1.n3 +++ b/show/dance2023/effect/effect1.n3 @@ -5,18 +5,22 @@ effect:effect1 a :Effect; rdfs:label "blues"; :effectFunction ; :publishAttr :strength; :setting :e_set1 . -:ds_val1 :setting effect:effect1_set1, effect:effect1_set13, effect:effect1_set14, effect:effect1_set15, effect:effect1_set2, effect:effect1_set4, effect:effect1_set5, effect:effect1_set6, effect:effect1_set7, effect:effect1_set8, effect:effect1_set9 . +:ds_val1 :setting effect:effect1_set0, effect:effect1_set1, effect:effect1_set13, effect:effect1_set14, effect:effect1_set15, effect:effect1_set2, effect:effect1_set3, effect:effect1_set4, effect:effect1_set5, effect:effect1_set6, effect:effect1_set7, effect:effect1_set8, effect:effect1_set9 . :e_set1 :effectAttr :deviceSettings; :value :ds_val1 . +effect:effect1_set0 :device ; + :deviceAttr :color; :value "#0d00ff" . effect:effect1_set1 :device ; - :deviceAttr :color; :value "#2c00ff" . + :deviceAttr :color; :value "#3200ff" . effect:effect1_set13 :device ; :deviceAttr :color; :value "#1500ff" . effect:effect1_set14 :device ; - :deviceAttr :color; :value "#ffffff" . + :deviceAttr :color; :value "#0d00ff" . effect:effect1_set15 :device ; :deviceAttr :color; :value "#0000ff" . effect:effect1_set2 :device ; :deviceAttr :color; :value "#1100ff" . +effect:effect1_set3 :device ; + :deviceAttr :color; :value "#1100ff" . effect:effect1_set4 :device ; :deviceAttr :color; :value "#0d00ff" . effect:effect1_set5 :device ; @@ -24,7 +28,7 @@ effect:effect1_set5 :device ; :deviceAttr :color; :value "#0800ff" . effect:effect1_set7 :device ; - :deviceAttr :color; :value "#1100ff" . + :deviceAttr :color; :value "#0e00ff" . effect:effect1_set8 :device ; :deviceAttr :color; :value "#0000ff" . effect:effect1_set9 :device ; diff --git a/show/dance2023/effect/effect2.n3 b/show/dance2023/effect/effect2.n3 --- a/show/dance2023/effect/effect2.n3 +++ b/show/dance2023/effect/effect2.n3 @@ -11,21 +11,21 @@ effect:effect2_set0 :device ; :deviceAttr :color; :value "#ff0800" . -effect:effect2_set10 :device ; +effect:effect2_set10 :device ; :deviceAttr :color; :value "#ff0800" . -effect:effect2_set11 :device ; +effect:effect2_set11 :device ; :deviceAttr :color; :value "#ff0008" . effect:effect2_set2 :device ; :deviceAttr :color; :value "#ff000d" . -effect:effect2_set3 :device ; +effect:effect2_set3 :device ; :deviceAttr :color; :value "#ff000d" . -effect:effect2_set4 :device ; +effect:effect2_set4 :device ; :deviceAttr :color; :value "#ff0004" . -effect:effect2_set5 :device ; +effect:effect2_set5 :device ; :deviceAttr :color; :value "#ff0019" . -effect:effect2_set7 :device ; +effect:effect2_set7 :device ; :deviceAttr :color; :value "#ff0d00" . -effect:effect2_set8 :device ; +effect:effect2_set8 :device ; :deviceAttr :color; :value "#ff0400" . -effect:effect2_set9 :device ; +effect:effect2_set9 :device ; :deviceAttr :color; :value "#ff0800" . diff --git a/show/dance2023/effect/effect3.n3 b/show/dance2023/effect/effect3.n3 --- a/show/dance2023/effect/effect3.n3 +++ b/show/dance2023/effect/effect3.n3 @@ -13,19 +13,19 @@ effect:effect3_set1 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set2 :device ; +effect:effect3_set2 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set3 :device ; +effect:effect3_set3 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set4 :device ; +effect:effect3_set4 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set5 :device ; +effect:effect3_set5 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set6 :device ; +effect:effect3_set6 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set7 :device ; +effect:effect3_set7 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set8 :device ; +effect:effect3_set8 :device ; :deviceAttr :color; :value "#0dff00" . -effect:effect3_set9 :device ; +effect:effect3_set9 :device ; :deviceAttr :color; :value "#0dff00" . diff --git a/show/dance2023/effect/effect4.n3 b/show/dance2023/effect/effect4.n3 --- a/show/dance2023/effect/effect4.n3 +++ b/show/dance2023/effect/effect4.n3 @@ -9,19 +9,19 @@ effect:effect4 a :Effect; rdfs:label "ra :e_set4 :effectAttr :deviceSettings; :value :ds_val4 . effect:effect4_set0 :device ; :deviceAttr :color; :value "#ffffff" . -effect:effect4_set10 :device ; +effect:effect4_set10 :device ; :deviceAttr :color; :value "#ffec9a" . -effect:effect4_set3 :device ; +effect:effect4_set3 :device ; :deviceAttr :color; :value "#7f6c59" . -effect:effect4_set4 :device ; +effect:effect4_set4 :device ; :deviceAttr :color; :value "#ff9bf7" . -effect:effect4_set5 :device ; +effect:effect4_set5 :device ; :deviceAttr :color; :value "#efaba8" . -effect:effect4_set6 :device ; +effect:effect4_set6 :device ; :deviceAttr :color; :value "#ffdcaa" . -effect:effect4_set7 :device ; +effect:effect4_set7 :device ; :deviceAttr :color; :value "#ffe8c7" . -effect:effect4_set8 :device ; +effect:effect4_set8 :device ; :deviceAttr :color; :value "#ffe682" . -effect:effect4_set9 :device ; +effect:effect4_set9 :device ; :deviceAttr :color; :value "#ffde9d" . diff --git a/show/dance2023/effect/effect5.n3 b/show/dance2023/effect/effect5.n3 --- a/show/dance2023/effect/effect5.n3 +++ b/show/dance2023/effect/effect5.n3 @@ -11,7 +11,7 @@ effect:effect5_set0 :device ; :deviceAttr :color; :value "#ffe5fb" . -effect:effect5_set11 :device ; +effect:effect5_set11 :device ; :deviceAttr :color; :value "#342dff" . effect:effect5_set2 :device ; :deviceAttr :color; :value "#ff4cab" . diff --git a/show/dance2023/effect/effect6.n3 b/show/dance2023/effect/effect6.n3 --- a/show/dance2023/effect/effect6.n3 +++ b/show/dance2023/effect/effect6.n3 @@ -13,7 +13,7 @@ effect:effect6_set1 :device ; :deviceAttr :color; :value "#0800ff" . -effect:effect6_set5 :device ; +effect:effect6_set5 :device ; :deviceAttr :color; :value "#0044ff" . -effect:effect6_set8 :device ; +effect:effect6_set8 :device ; :deviceAttr :color; :value "#0000ff" . diff --git a/show/dance2023/effect/effect7.n3 b/show/dance2023/effect/effect7.n3 --- a/show/dance2023/effect/effect7.n3 +++ b/show/dance2023/effect/effect7.n3 @@ -9,7 +9,7 @@ effect:effect7 a :Effect; rdfs:label "3g :e_set7 :effectAttr :deviceSettings; :value :ds_val7 . effect:effect7_set0 :device ; :deviceAttr :color; :value "#cecece" . -effect:effect7_set1 :device ; +effect:effect7_set1 :device ; :deviceAttr :color; :value "#acacac" . -effect:effect7_set2 :device ; +effect:effect7_set2 :device ; :deviceAttr :color; :value "#c1c1c1" . diff --git a/show/dance2023/theaterLightConfig.n3 b/show/dance2023/theaterLightConfig.n3 --- a/show/dance2023/theaterLightConfig.n3 +++ b/show/dance2023/theaterLightConfig.n3 @@ -22,7 +22,7 @@ func:scale rdfs:label "a submaster- scales :deviceSettings"; :input [ :effectAttr :strength; :defaultValue 0.0 ], - [ :effectAttr :deviceSettings; ] . # e.g. "par2 at color=red; par3 at color=white" + [ :effectAttr :deviceSettings; ] . # e.g. "parR2 at color=red; parR3 at color=white" func:strobe a :EffectFunction; @@ -43,19 +43,19 @@ func:image [ :effectAttr :deviceSettings; rdfs:comment "these might have a :sort key or a :y value" ] . -dev:strip1 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 175 . -dev:strip2 a :ChauvetColorStrip; :dmxUniverse dmxA:; :dmxBase 12 . -dev:strip3 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 178 . +dev:strip1 a :Bar612601d; rdfs:label "strip-r"; :dmxUniverse dmxA:; :dmxBase 175 . +dev:strip2 a :ChauvetColorStrip; rdfs:label "strip-c"; :dmxUniverse dmxA:; :dmxBase 12 . +dev:strip3 a :Bar612601d; rdfs:label "strip-l"; :dmxUniverse dmxA:; :dmxBase 178 . # dev:par90 a :LedPar90; :dmxUniverse dmxA:; :dmxBase 16 . -dev:par1 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 84 . -dev:par2 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 1 . -dev:par3 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 188 . -dev:par4 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 105 . -dev:par5 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 147 . -dev:par6 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 154 . -dev:par7 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 161 . -dev:par8 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 168 . +dev:parFloorL a :LedPar54; rdfs:label "floor-l"; :dmxUniverse dmxA:; :dmxBase 84 . +dev:parFloorR a :LedPar54; rdfs:label "floor-r"; :dmxUniverse dmxA:; :dmxBase 168 . +dev:parL1 a :LedPar54;rdfs:label "l-1"; :dmxUniverse dmxA:; :dmxBase 105 . +dev:parL2 a :LedPar54;rdfs:label "l-2"; :dmxUniverse dmxA:; :dmxBase 161 . +dev:parL3 a :LedPar54;rdfs:label "l-3"; :dmxUniverse dmxA:; :dmxBase 147 . +dev:parR2 a :LedPar54;rdfs:label "r-2"; :dmxUniverse dmxA:; :dmxBase 1 . +dev:parR3 a :LedPar54;rdfs:label "r-3"; :dmxUniverse dmxA:; :dmxBase 188 . +dev:parR1 a :LedPar54;rdfs:label "r-1"; :dmxUniverse dmxA:; :dmxBase 154 . # dev:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 .