# HG changeset patch
# User drewp@bigasterisk.com
# Date 2023-05-27 08:15:29
# Node ID f5e4aa36985d4371e7a48021f5adaf0acd48e838
# Parent 5c269c03863d5e8aee11daa3b783faa497160592
checkpoint show data
diff --git a/light9/live/Light9DeviceSettings.ts b/light9/live/Light9DeviceSettings.ts
--- a/light9/live/Light9DeviceSettings.ts
+++ b/light9/live/Light9DeviceSettings.ts
@@ -44,7 +44,7 @@ export class Light9DeviceSettings extend
return html`
-
diff --git a/show/dance2023/deviceClass.n3 b/show/dance2023/deviceClass.n3
--- a/show/dance2023/deviceClass.n3
+++ b/show/dance2023/deviceClass.n3
@@ -3,10 +3,11 @@
:color a :DeviceAttr; rdfs:label "color"; :dataType :color .
:brightness a :DeviceAttr; rdfs:label "brightness"; :dataType :scalar .
+:white a :DeviceAttr; rdfs:label "white"; :dataType :scalar .
:strobe a :DeviceAttr; rdfs:label "strobe"; :dataType :scalar;
rdfs:comment "0=none, 1=fastest" .
:strobeSpeed a :DeviceAttr; rdfs:label "strobeSpeed"; :dataType :scalar .
-:doNotUse a :DeviceAttr; rdfs:label "-"; :dataType :scalar .
+:doNotUse a :DeviceAttr; rdfs:label "-"; :dataType :scalar .
:MegaFlash a :DeviceClass; rdfs:label "Mega Flash" ;
:doc ;
@@ -51,7 +52,7 @@
[ :outputAttr :doNotUse; :dmxOffset 7 ] .
:LedPar54 a :DeviceClass; rdfs:label "LED Par 54 RGBW";
- :deviceAttr :color;
+ :deviceAttr :color, :white;
:attr
[ :outputAttr :master; :dmxOffset 0 ],
[ :outputAttr :red; :dmxOffset 1 ],
diff --git a/show/dance2023/effect/effect0.n3 b/show/dance2023/effect/effect0.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2023/effect/effect0.n3
@@ -0,0 +1,11 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+@prefix xsd: .
+
+
+effect:effect0 a :Effect; rdfs:label "effect0"; :publishAttr :strength; :setting effect:effect0_set0, effect:effect0_set1 .
+effect:effect0_set0 :device ;
+ :deviceAttr :color; :value 0.675 .
+effect:effect0_set1 :device ;
+ :deviceAttr :color; :value 0.404 .
diff --git a/show/dance2023/effect/effect1.n3 b/show/dance2023/effect/effect1.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2023/effect/effect1.n3
@@ -0,0 +1,6 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+
+
+effect:effect1 a :Effect; rdfs:label "effect1"; :publishAttr :strength .
diff --git a/show/dance2023/effect/effect2.n3 b/show/dance2023/effect/effect2.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2023/effect/effect2.n3
@@ -0,0 +1,13 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+@prefix xsd: .
+
+
+effect:effect2 a :Effect; rdfs:label "effect2"; :publishAttr :strength; :setting effect:effect2_set0, effect:effect2_set1, effect:effect2_set2 .
+effect:effect2_set0 :device ;
+ :deviceAttr :color; :value "#854e25" .
+effect:effect2_set1 :device ;
+ :deviceAttr :brightness; :value 0.482 .
+effect:effect2_set2 :device ;
+ :deviceAttr :white; :value 0.506 .
diff --git a/show/dance2023/effect/effect3.n3 b/show/dance2023/effect/effect3.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2023/effect/effect3.n3
@@ -0,0 +1,6 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+
+
+effect:effect3 a :Effect; rdfs:label "effect3"; :publishAttr :strength .
diff --git a/show/dance2023/fade.n3 b/show/dance2023/fade.n3
--- a/show/dance2023/fade.n3
+++ b/show/dance2023/fade.n3
@@ -4,19 +4,22 @@
@prefix show: .
@prefix xsd: .
+:fade_set0 :effectAttr :strength .
show:fadePage1 a :FadePage; rdfs:label "live controls"; :fader show:fadePage1f0, show:fadePage1f1 .
-show:fadePage1f2 :effect effect:submagenta; :value 0 .
-show:fadePage1f3 :value 0 .
+show:fadePage1f2 :effect effect:effect0; :setting :fade_set2; :value 0.525 .
+show:fadePage1f3 :setting :fade_set1; :value 0 .
show:fadePage1f4 :value 0 .
show:fadePage1f5 :value 0 .
show:fadePage1f6 :value 0 .
-show:fadePage1f7 :value 0 .
+show:fadePage1f7 :value 0.286 .
+:fade_set1 :effectAttr :strength .
+:fade_set2 :effectAttr :strength .
:fs1 :effectAttr :strength .
:fs2 :effectAttr :strength .
show:fadePage1f0 a :Fader; :column "1"; :effect effect:subyellow; :setting :fs1;
- :value 0.373; rdfs:comment ":strength connects the fader to sub0" .
+ :value 0; rdfs:comment ":strength connects the fader to sub0" .
show:fadePage1f1 a :Fader; :column "2"; :effect effect:submagenta; :setting :fs2;
:value 0 .
diff --git a/show/dance2023/theaterLightConfig.n3 b/show/dance2023/theaterLightConfig.n3
--- a/show/dance2023/theaterLightConfig.n3
+++ b/show/dance2023/theaterLightConfig.n3
@@ -54,19 +54,19 @@ effect:scale
# effect:effect2_set3 :device dev:strip2; :deviceAttr :color; :scaledValue 0.22 .
-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; :dmxUniverse dmxA:; :dmxBase 175 .
+# dev:strip2 a :ChauvetColorStrip; :dmxUniverse dmxA:; :dmxBase 12 .
+# dev:strip3 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 178 .
-dev:par90 a :LedPar90; :dmxUniverse dmxA:; :dmxBase 16 .
+# 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: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:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 .