diff --git a/show/dance2024/ascoltami.n3 b/show/dance2024/ascoltami.n3
--- a/show/dance2024/ascoltami.n3
+++ b/show/dance2024/ascoltami.n3
@@ -2,5 +2,5 @@
@prefix show: .
@prefix xsd: .
-:ascoltami :duration 136.4; :endOfSong false; :playing true; :song show:song14;
- :wallStartTime 1717119860.75 .
+:ascoltami :duration 208.58; :endOfSong false; :pausedSongTime 1.97; :playing false;
+ :song show:song3 .
diff --git a/show/dance2024/blender.n3 b/show/dance2024/blender.n3
--- a/show/dance2024/blender.n3
+++ b/show/dance2024/blender.n3
@@ -5,6 +5,6 @@
:publishAttr :strength; :setting .
:effectAttr :deviceSettings;
:value :blenderControlDevSets .
- :device ;
- :deviceAttr :color; :value "#000000" .
+ :device ;
+ :deviceAttr :color; :value "#000003" .
:blenderControlDevSets :setting .
diff --git a/show/dance2024/effect/effect0.n3 b/show/dance2024/effect/effect0.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2024/effect/effect0.n3
@@ -0,0 +1,13 @@
+@prefix : .
+@prefix effect: .
+@prefix xsd: .
+
+effect:effect0 :setting :e_set1 .
+:ds_val1 :setting effect:effect0_set0, effect:effect0_set1, effect:effect0_set2 .
+:e_set1 :effectAttr :deviceSettings; :value :ds_val1 .
+effect:effect0_set0 :device ;
+ :deviceAttr :color; :value "#a0a0a0" .
+effect:effect0_set1 :device ;
+ :deviceAttr :white; :value 0.969 .
+effect:effect0_set2 :device ;
+ :deviceAttr :color; :value "#c3c3c3" .
diff --git a/show/dance2024/effect/effect1.n3 b/show/dance2024/effect/effect1.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2024/effect/effect1.n3
@@ -0,0 +1,20 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+@prefix xsd: .
+
+
+effect:effect1 a :Effect; rdfs:label "red"; :effectFunction ;
+ :publishAttr :strength; :setting :e_set0 .
+:ds_val0 :setting effect:effect1_set0, effect:effect1_set2, effect:effect1_set3, effect:effect1_set4, effect:effect1_set5 .
+:e_set0 :effectAttr :deviceSettings; :value :ds_val0 .
+effect:effect1_set0 :device ;
+ :deviceAttr :color; :value "#dd001a" .
+effect:effect1_set2 :device ;
+ :deviceAttr :color; :value "#ff2200" .
+effect:effect1_set3 :device ;
+ :deviceAttr :white; :value 0.00392 .
+effect:effect1_set4 :device ;
+ :deviceAttr :color; :value "#ff0008" .
+effect:effect1_set5 :device ;
+ :deviceAttr :color; :value "#ff004c" .
diff --git a/show/dance2024/effect/effect2.n3 b/show/dance2024/effect/effect2.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2024/effect/effect2.n3
@@ -0,0 +1,17 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+
+
+effect:effect2 a :Effect; rdfs:label "green"; :effectFunction ;
+ :publishAttr :strength; :setting :e_set2 .
+:ds_val2 :setting effect:effect2_set0, effect:effect2_set1, effect:effect2_set2, effect:effect2_set3 .
+:e_set2 :effectAttr :deviceSettings; :value :ds_val2 .
+effect:effect2_set0 :device ;
+ :deviceAttr :color; :value "#22ff00" .
+effect:effect2_set1 :device ;
+ :deviceAttr :color; :value "#44ff00" .
+effect:effect2_set2 :device ;
+ :deviceAttr :color; :value "#26ff00" .
+effect:effect2_set3 :device ;
+ :deviceAttr :color; :value "#33ff00" .
diff --git a/show/dance2024/effect/effect3.n3 b/show/dance2024/effect/effect3.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2024/effect/effect3.n3
@@ -0,0 +1,17 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+
+
+effect:effect3 a :Effect; rdfs:label "blue"; :effectFunction ;
+ :publishAttr :strength; :setting :e_set3 .
+:ds_val3 :setting effect:effect3_set0, effect:effect3_set1, effect:effect3_set2, effect:effect3_set3 .
+:e_set3 :effectAttr :deviceSettings; :value :ds_val3 .
+effect:effect3_set0 :device ;
+ :deviceAttr :color; :value "#1100ff" .
+effect:effect3_set1 :device ;
+ :deviceAttr :color; :value "#0800ff" .
+effect:effect3_set2 :device ;
+ :deviceAttr :color; :value "#1100ff" .
+effect:effect3_set3 :device ;
+ :deviceAttr :color; :value "#0d00ff" .
diff --git a/show/dance2024/effect/effect4.n3 b/show/dance2024/effect/effect4.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2024/effect/effect4.n3
@@ -0,0 +1,18 @@
+@prefix : .
+@prefix effect: .
+@prefix rdfs: .
+@prefix xsd: .
+
+
+effect:effect4 a :Effect; rdfs:label "white"; :effectFunction ;
+ :publishAttr :strength; :setting :e_set4 .
+:ds_val4 :setting effect:effect4_set0, effect:effect4_set1, effect:effect4_set2, effect:effect4_set3 .
+:e_set4 :effectAttr :deviceSettings; :value :ds_val4 .
+effect:effect4_set0 :device ;
+ :deviceAttr :white; :value 1.00 .
+effect:effect4_set1 :device ;
+ :deviceAttr :white; :value 0.953 .
+effect:effect4_set2 :device ;
+ :deviceAttr :white; :value 1.00 .
+effect:effect4_set3 :device ;
+ :deviceAttr :white; :value 1.00 .
diff --git a/show/dance2024/fade.n3 b/show/dance2024/fade.n3
--- a/show/dance2024/fade.n3
+++ b/show/dance2024/fade.n3
@@ -1,4 +1,5 @@
@prefix : .
+@prefix effect: .
@prefix rdfs: .
@prefix show: .
@prefix xsd: .
@@ -6,14 +7,14 @@
:grandMaster :value 1.00 .
:midiControl :map :midiControl0 .
-show:fadePage0 a :FadePage; rdfs:label "unnamed"; :fader show:fader0, show:fader1, show:fader2, show:fader3, show:fader4, show:fader5, show:fader6, show:fader7 .
-:midiControl0 :inputs "mainSliders"; :midiDev "bcf2000"; :outputs show:fadePage1 .
+show:fadePage1 a :FadePage; rdfs:label "unnamed"; :fader show:fader10, show:fader11, show:fader12, show:fader13, show:fader14, show:fader15, show:fader8, show:fader9 .
+:midiControl0 :inputs "mainSliders"; :midiDev "bcf2000"; :outputs show:fadePage0 .
-show:fadePage1 a :FadePage; rdfs:label "unnamed"; :fader show:fader10, show:fader11, show:fader12, show:fader13, show:fader14, show:fader15, show:fader8, show:fader9 .
+show:fadePage0 a :FadePage; rdfs:label "unnamed"; :fader show:fader0, show:fader1, show:fader2, show:fader3, show:fader4, show:fader5, show:fader6, show:fader7 .
-show:fader0 a :Fader; :column "1"; :setting show:faderset0 .
+show:fader0 a :Fader; :column "1"; :effect effect:effect1; :setting show:faderset0 .
-show:fader1 a :Fader; :column "2"; :setting show:faderset1 .
+show:fader1 a :Fader; :column "2"; :effect effect:effect2; :setting show:faderset1 .
show:fader10 a :Fader; :column "3"; :setting show:faderset10 .
@@ -27,9 +28,9 @@ show:fader14 a :Fader; :column "7"; :set
show:fader15 a :Fader; :column "8"; :setting show:faderset15 .
-show:fader2 a :Fader; :column "3"; :setting show:faderset2 .
+show:fader2 a :Fader; :column "3"; :effect effect:effect3; :setting show:faderset2 .
-show:fader3 a :Fader; :column "4"; :setting show:faderset3 .
+show:fader3 a :Fader; :column "4"; :effect effect:effect4; :setting show:faderset3 .
show:fader4 a :Fader; :column "5"; :setting show:faderset4 .
@@ -42,19 +43,19 @@ show:fader7 a :Fader; :column "8"; :sett
show:fader8 a :Fader; :column "1"; :setting show:faderset8 .
show:fader9 a :Fader; :column "2"; :setting show:faderset9 .
-show:faderset0 :effectAttr :strength; :value 0.00 .
-show:faderset1 :effectAttr :strength; :value 0.0 .
+show:faderset0 :effectAttr :strength; :value 0.78 .
+show:faderset1 :effectAttr :strength; :value 0.85 .
show:faderset10 :effectAttr :strength; :value 0.0 .
show:faderset11 :effectAttr :strength; :value 0.0 .
show:faderset12 :effectAttr :strength; :value 0.0 .
show:faderset13 :effectAttr :strength; :value 0.0 .
show:faderset14 :effectAttr :strength; :value 0.0 .
show:faderset15 :effectAttr :strength; :value 0.0 .
-show:faderset2 :effectAttr :strength; :value 0.0 .
-show:faderset3 :effectAttr :strength; :value 0.0 .
-show:faderset4 :effectAttr :strength; :value 0.0 .
+show:faderset2 :effectAttr :strength; :value 1.0 .
+show:faderset3 :effectAttr :strength; :value 1.0 .
+show:faderset4 :effectAttr :strength; :value 0.00 .
show:faderset5 :effectAttr :strength; :value 0.0 .
-show:faderset6 :effectAttr :strength; :value 0.0 .
-show:faderset7 :effectAttr :strength; :value 0.0 .
+show:faderset6 :effectAttr :strength; :value 0.00 .
+show:faderset7 :effectAttr :strength; :value 0.00 .
show:faderset8 :effectAttr :strength; :value 0.0 .
show:faderset9 :effectAttr :strength; :value 0.0 .
diff --git a/show/dance2024/playlist.n3 b/show/dance2024/playlist.n3
--- a/show/dance2024/playlist.n3
+++ b/show/dance2024/playlist.n3
@@ -16,7 +16,7 @@ show:dance2024 :playList (
sh:song1 a :Song; rdfs:label "1 be our guest"; :songFilename "01-guest.wav" .
sh:song2 a :Song; rdfs:label "2 dancing happy"; :songFilename "02_dancing_happy.wav" .
-sh:song3 a :Song; rdfs:label "3 bear"; :songFilename "03-bear.wav" .
+sh:song3 a :Song; rdfs:label "3 bear/trim"; :songFilename "03-bear-trim.wav" .
sh:song4 a :Song; rdfs:label "4 disney swing"; :songFilename "04-disneyswing.wav" .
sh:song5 a :Song; rdfs:label "5 encanto"; :songFilename "05-encanto.wav" .
sh:song6 a :Song; rdfs:label "6 frozen"; :songFilename "06-frozen.wav" .
diff --git a/show/dance2024/theaterLightConfig.n3 b/show/dance2024/theaterLightConfig.n3
--- a/show/dance2024/theaterLightConfig.n3
+++ b/show/dance2024/theaterLightConfig.n3
@@ -43,19 +43,18 @@ func:image
[ :effectAttr :deviceSettings; rdfs:comment "these might have a :sort key or a :y value" ] .
-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: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:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 .
-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 21 .
-dev:parR1 a :LedPar54;rdfs:label "r-1"; :dmxUniverse dmxA:; :dmxBase 154 .
+dev:parLLow a :LedPar54; rdfs:label "L-low"; :dmxUniverse dmxA:; :dmxBase 1 .
+dev:parLIn a :LedPar54; rdfs:label "L-in"; :dmxUniverse dmxA:; :dmxBase 8 .
+dev:parRLow a :LedPar54; rdfs:label "R-low"; :dmxUniverse dmxA:; :dmxBase 16 .
+dev:parRIn a :LedPar54; rdfs:label "R-in"; :dmxUniverse dmxA:; :dmxBase 24 .
-# dev:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 .
+
+
+