Mercurial > code > home > repos > light9

changeset 2334:887fde4a9a2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
light devs rename and swap URIs too
author drewp@bigasterisk.com
date Fri, 02 Jun 2023 14:53:18 -0700
parents 447f25b2712d
children 54cf7034bee0
files show/dance2023/effect/effect0.n3 show/dance2023/effect/effect1.n3 show/dance2023/effect/effect2.n3 show/dance2023/effect/effect3.n3 show/dance2023/effect/effect4.n3 show/dance2023/effect/effect5.n3 show/dance2023/effect/effect6.n3 show/dance2023/effect/effect7.n3 show/dance2023/theaterLightConfig.n3
diffstat 9 files changed, 51 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2023/effect/effect0.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect0.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -10,7 +10,7 @@
 :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 <http://light9.bigasterisk.com/theater/vet/device/par1>;
+effect:effect0_set0 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
      :deviceAttr :color; :value "#543a79" .
-effect:effect0_set2 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
+effect:effect0_set2 :device <http://light9.bigasterisk.com/theater/vet/device/parR2>;
      :deviceAttr :color; :value "#ffffff" .
--- a/show/dance2023/effect/effect1.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect1.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -5,18 +5,22 @@
 
 effect:effect1 a :Effect; rdfs:label "blues"; :effectFunction <http://light9.bigasterisk.com/effectFunction/scale>;
      :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 <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
+     :deviceAttr :color; :value "#0d00ff" .
 effect:effect1_set1 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
-     :deviceAttr :color; :value "#2c00ff" .
+     :deviceAttr :color; :value "#3200ff" .
 effect:effect1_set13 :device <http://light9.bigasterisk.com/theater/vet/device/strip3>;
      :deviceAttr :color; :value "#1500ff" .
 effect:effect1_set14 :device <http://light9.bigasterisk.com/theater/vet/device/par3>;
-     :deviceAttr :color; :value "#ffffff" .
+     :deviceAttr :color; :value "#0d00ff" .
 effect:effect1_set15 :device <http://light9.bigasterisk.com/theater/vet/device/strip1>;
      :deviceAttr :color; :value "#0000ff" .
 effect:effect1_set2 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
      :deviceAttr :color; :value "#1100ff" .
+effect:effect1_set3 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorR>;
+     :deviceAttr :color; :value "#1100ff" .
 effect:effect1_set4 :device <http://light9.bigasterisk.com/theater/vet/device/par4>;
      :deviceAttr :color; :value "#0d00ff" .
 effect:effect1_set5 :device <http://light9.bigasterisk.com/theater/vet/device/par5>;
@@ -24,7 +28,7 @@
 effect:effect1_set6 :device <http://light9.bigasterisk.com/theater/vet/device/par7>;
      :deviceAttr :color; :value "#0800ff" .
 effect:effect1_set7 :device <http://light9.bigasterisk.com/theater/vet/device/par6>;
-     :deviceAttr :color; :value "#1100ff" .
+     :deviceAttr :color; :value "#0e00ff" .
 effect:effect1_set8 :device <http://light9.bigasterisk.com/theater/vet/device/par8>;
      :deviceAttr :color; :value "#0000ff" .
 effect:effect1_set9 :device <http://light9.bigasterisk.com/theater/vet/device/strip2>;
--- a/show/dance2023/effect/effect2.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect2.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -11,21 +11,21 @@
      :deviceAttr :color; :value "#ff0800" .
 effect:effect2_set1 :device <http://light9.bigasterisk.com/theater/vet/device/strip1>;
      :deviceAttr :color; :value "#ff0800" .
-effect:effect2_set10 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
+effect:effect2_set10 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
      :deviceAttr :color; :value "#ff0800" .
-effect:effect2_set11 :device <http://light9.bigasterisk.com/theater/vet/device/par6>;
+effect:effect2_set11 :device <http://light9.bigasterisk.com/theater/vet/device/parR1>;
      :deviceAttr :color; :value "#ff0008" .
 effect:effect2_set2 :device <http://light9.bigasterisk.com/theater/vet/device/strip3>;
      :deviceAttr :color; :value "#ff000d" .
-effect:effect2_set3 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
+effect:effect2_set3 :device <http://light9.bigasterisk.com/theater/vet/device/parR2>;
      :deviceAttr :color; :value "#ff000d" .
-effect:effect2_set4 :device <http://light9.bigasterisk.com/theater/vet/device/par5>;
+effect:effect2_set4 :device <http://light9.bigasterisk.com/theater/vet/device/parL3>;
      :deviceAttr :color; :value "#ff0004" .
-effect:effect2_set5 :device <http://light9.bigasterisk.com/theater/vet/device/par7>;
+effect:effect2_set5 :device <http://light9.bigasterisk.com/theater/vet/device/parL2>;
      :deviceAttr :color; :value "#ff0019" .
-effect:effect2_set7 :device <http://light9.bigasterisk.com/theater/vet/device/par8>;
+effect:effect2_set7 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorR>;
      :deviceAttr :color; :value "#ff0d00" .
-effect:effect2_set8 :device <http://light9.bigasterisk.com/theater/vet/device/par4>;
+effect:effect2_set8 :device <http://light9.bigasterisk.com/theater/vet/device/parL1>;
      :deviceAttr :color; :value "#ff0400" .
-effect:effect2_set9 :device <http://light9.bigasterisk.com/theater/vet/device/par3>;
+effect:effect2_set9 :device <http://light9.bigasterisk.com/theater/vet/device/parR3>;
      :deviceAttr :color; :value "#ff0800" .
--- a/show/dance2023/effect/effect3.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect3.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -13,19 +13,19 @@
      :deviceAttr :color; :value "#0dff00" .
 effect:effect3_set10 :device <http://light9.bigasterisk.com/theater/vet/device/strip3>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set2 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
+effect:effect3_set2 :device <http://light9.bigasterisk.com/theater/vet/device/parR2>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set3 :device <http://light9.bigasterisk.com/theater/vet/device/par4>;
+effect:effect3_set3 :device <http://light9.bigasterisk.com/theater/vet/device/parL1>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set4 :device <http://light9.bigasterisk.com/theater/vet/device/par6>;
+effect:effect3_set4 :device <http://light9.bigasterisk.com/theater/vet/device/parR1>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set5 :device <http://light9.bigasterisk.com/theater/vet/device/par8>;
+effect:effect3_set5 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorR>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set6 :device <http://light9.bigasterisk.com/theater/vet/device/par7>;
+effect:effect3_set6 :device <http://light9.bigasterisk.com/theater/vet/device/parL2>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set7 :device <http://light9.bigasterisk.com/theater/vet/device/par5>;
+effect:effect3_set7 :device <http://light9.bigasterisk.com/theater/vet/device/parL3>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set8 :device <http://light9.bigasterisk.com/theater/vet/device/par3>;
+effect:effect3_set8 :device <http://light9.bigasterisk.com/theater/vet/device/parR3>;
      :deviceAttr :color; :value "#0dff00" .
-effect:effect3_set9 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
+effect:effect3_set9 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
      :deviceAttr :color; :value "#0dff00" .
--- a/show/dance2023/effect/effect4.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect4.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -9,19 +9,19 @@
 :e_set4 :effectAttr :deviceSettings; :value :ds_val4 .
 effect:effect4_set0 :device <http://light9.bigasterisk.com/theater/vet/device/strip2>;
      :deviceAttr :color; :value "#ffffff" .
-effect:effect4_set10 :device <http://light9.bigasterisk.com/theater/vet/device/par8>;
+effect:effect4_set10 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorR>;
      :deviceAttr :color; :value "#ffec9a" .
-effect:effect4_set3 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
+effect:effect4_set3 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
      :deviceAttr :color; :value "#7f6c59" .
-effect:effect4_set4 :device <http://light9.bigasterisk.com/theater/vet/device/par3>;
+effect:effect4_set4 :device <http://light9.bigasterisk.com/theater/vet/device/parR3>;
      :deviceAttr :color; :value "#ff9bf7" .
-effect:effect4_set5 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
+effect:effect4_set5 :device <http://light9.bigasterisk.com/theater/vet/device/parR2>;
      :deviceAttr :color; :value "#efaba8" .
-effect:effect4_set6 :device <http://light9.bigasterisk.com/theater/vet/device/par4>;
+effect:effect4_set6 :device <http://light9.bigasterisk.com/theater/vet/device/parL1>;
      :deviceAttr :color; :value "#ffdcaa" .
-effect:effect4_set7 :device <http://light9.bigasterisk.com/theater/vet/device/par5>;
+effect:effect4_set7 :device <http://light9.bigasterisk.com/theater/vet/device/parL3>;
      :deviceAttr :color; :value "#ffe8c7" .
-effect:effect4_set8 :device <http://light9.bigasterisk.com/theater/vet/device/par7>;
+effect:effect4_set8 :device <http://light9.bigasterisk.com/theater/vet/device/parL2>;
      :deviceAttr :color; :value "#ffe682" .
-effect:effect4_set9 :device <http://light9.bigasterisk.com/theater/vet/device/par6>;
+effect:effect4_set9 :device <http://light9.bigasterisk.com/theater/vet/device/parR1>;
      :deviceAttr :color; :value "#ffde9d" .
--- a/show/dance2023/effect/effect5.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect5.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -11,7 +11,7 @@
      :deviceAttr :color; :value "#ff7438" .
 effect:effect5_set1 :device <http://light9.bigasterisk.com/theater/vet/device/strip3>;
      :deviceAttr :color; :value "#ffe5fb" .
-effect:effect5_set11 :device <http://light9.bigasterisk.com/theater/vet/device/par3>;
+effect:effect5_set11 :device <http://light9.bigasterisk.com/theater/vet/device/parR3>;
      :deviceAttr :color; :value "#342dff" .
 effect:effect5_set2 :device <http://light9.bigasterisk.com/theater/vet/device/strip2>;
      :deviceAttr :color; :value "#ff4cab" .
--- a/show/dance2023/effect/effect6.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect6.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -13,7 +13,7 @@
      :deviceAttr :color; :value "#0004ff" .
 effect:effect6_set2 :device <http://light9.bigasterisk.com/theater/vet/device/strip2>;
      :deviceAttr :color; :value "#0800ff" .
-effect:effect6_set5 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
+effect:effect6_set5 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
      :deviceAttr :color; :value "#0044ff" .
-effect:effect6_set8 :device <http://light9.bigasterisk.com/theater/vet/device/par8>;
+effect:effect6_set8 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorR>;
      :deviceAttr :color; :value "#0000ff" .
--- a/show/dance2023/effect/effect7.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/effect/effect7.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -9,7 +9,7 @@
 :e_set7 :effectAttr :deviceSettings; :value :ds_val7 .
 effect:effect7_set0 :device <http://light9.bigasterisk.com/theater/vet/device/strip1>;
      :deviceAttr :color; :value "#cecece" .
-effect:effect7_set1 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
+effect:effect7_set1 :device <http://light9.bigasterisk.com/theater/vet/device/parFloorL>;
      :deviceAttr :color; :value "#acacac" .
-effect:effect7_set2 :device <http://light9.bigasterisk.com/theater/vet/device/par4>;
+effect:effect7_set2 :device <http://light9.bigasterisk.com/theater/vet/device/parL1>;
      :deviceAttr :color; :value "#c1c1c1" .
--- a/show/dance2023/theaterLightConfig.n3	Fri Jun 02 09:59:52 2023 -0700
+++ b/show/dance2023/theaterLightConfig.n3	Fri Jun 02 14:53:18 2023 -0700
@@ -22,7 +22,7 @@
   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 @@
     [ :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 .