# HG changeset patch
# User drewp@bigasterisk.com
# Date 2023-05-31 06:47:08
# Node ID 33d1f00de39581bc6d5c2d8bac809f938157aeea
# Parent  6529768a96a2bdfc4b2b2c7296ed2cae5d1a51a5

checkpoint show data

diff --git a/show/dance2023/deviceClass.n3 b/show/dance2023/deviceClass.n3
--- a/show/dance2023/deviceClass.n3
+++ b/show/dance2023/deviceClass.n3
@@ -9,6 +9,8 @@
 :strobeSpeed        a :DeviceAttr; rdfs:label "strobeSpeed"; :dataType :scalar .
 :doNotUse           a :DeviceAttr; rdfs:label "-"; :dataType :scalar .
 
+
+
 :MegaFlash a :DeviceClass; rdfs:label "Mega Flash" ;
 :doc <https://cdb.s3-us-west-1.amazonaws.com/ItemRelatedFiles/7470/Mega%20Flash%20DMX-JAN2005.pdf>;
   :deviceAttr :brightness, :strobeSpeed;
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
@@ -4,9 +4,11 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 
-effect:effect0 a :Effect; rdfs:label "effect0"; :effectFunction effect:scale;
-     :publishAttr :strength; :setting effect:effect0_set0, effect:effect0_set3 .
-effect:effect0_set0 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
-     :deviceAttr :color; :value "#ff00e1" .
-effect:effect0_set3 :device <http://light9.bigasterisk.com/theater/vet/device/par1>;
-     :deviceAttr :white; :value 0.557 .
+effect:effect0 a :Effect; rdfs:label "sub0"; :effectFunction <http://light9.bigasterisk.com/effectFunction/strobe>;
+     :publishAttr :strength; :setting :e_set0, :e_set10, :e_set11 .
+:ds_val0 :setting effect:effect0_set2 .
+:e_set0 :effectAttr :deviceSettings; :value :ds_val0 .
+:e_set10 :effectAttr :onTime; :value 0.1 .
+:e_set11 :effectAttr :period; :value 0.5 .
+effect:effect0_set2 :device <http://light9.bigasterisk.com/theater/vet/device/par2>;
+     :deviceAttr :color; :value "#ffffff" .
diff --git a/show/dance2023/fade.n3 b/show/dance2023/fade.n3
--- a/show/dance2023/fade.n3
+++ b/show/dance2023/fade.n3
@@ -9,9 +9,9 @@ show:fadePage1 a :FadePage; rdfs:label "
 
 show:fadePage1f0 a :Fader; :column "1"; :effect effect:effect0; :setting show:fadeset0 .
 
-show:fadePage1f1 a :Fader; :column "2"; :effect effect:effect0; :setting show:fadeset1 .
+show:fadePage1f1 a :Fader; :column "2"; :effect effect:effect3; :setting show:fadeset1 .
 
-show:fadePage1f2 a :Fader; :column "2"; :effect effect:effect0; :setting show:fadeset2 .
+show:fadePage1f2 a :Fader; :column "2"; :effect effect:effect1; :setting show:fadeset2 .
 
 show:fadePage1f3 a :Fader; :column "3"; :effect effect:effect0; :setting show:fadeset3 .
 
@@ -22,9 +22,9 @@ show:fadePage1f5 a :Fader; :column "5"; 
 show:fadePage1f6 a :Fader; :column "6"; :effect effect:effect0; :setting show:fadeset6 .
 
 show:fadePage1f7 a :Fader; :column "7"; :effect effect:effect0; :setting show:fadeset7 .
-show:fadeset0 :effectAttr :strength; :value 0.424 .
+show:fadeset0 :effectAttr :strength; :value 0.00 .
 show:fadeset1 :effectAttr :strength; :value 0.00 .
-show:fadeset2 :effectAttr :strength; :value 0 .
+show:fadeset2 :effectAttr :strength; :value 0.290 .
 show:fadeset3 :effectAttr :strength; :value 0 .
 show:fadeset4 :effectAttr :strength; :value 0 .
 show:fadeset5 :effectAttr :strength; :value 0 .
diff --git a/show/dance2023/theaterLightConfig.n3 b/show/dance2023/theaterLightConfig.n3
--- a/show/dance2023/theaterLightConfig.n3
+++ b/show/dance2023/theaterLightConfig.n3
@@ -2,6 +2,7 @@
 @prefix dev: <http://light9.bigasterisk.com/theater/vet/device/> .
 @prefix dmxA: <http://light9.bigasterisk.com/output/dmxA/> .
 @prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix func: <http://light9.bigasterisk.com/effectFunction/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix show: <http://light9.bigasterisk.com/show/dance2023/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -16,16 +17,32 @@ Outputs are always a DeviceSettings list
 
 ######## effectFunction
 
-effect:scale
+func:scale
   a :EffectFunction;
-  rdfs:label "a submaster- a few devices at specified colors";
+  rdfs:label "a submaster- scales :deviceSettings";
+  :input 
+    [ :effectAttr :strength; :defaultValue 0.0 ],
+    [ :effectAttr :deviceSettings; ] . # e.g. "par2 at color=red; par3 at color=white"
+  
+func:strobe
+  a :EffectFunction;
+  rdfs:label "blink specified devices";
   :input 
-    [ :effectAttr :strength; :value 0 ], # overridden by fader
-    [ :effectAttr :output; :value2 [ # something to say 'this attr value must resemble the following graph'
-        :device     :valueRequired;  # ...and it's repeatable, unlike :strength
-        :deviceAttr :valueRequired;
-        :value      :valueRequired ] ] .
+    [ :effectAttr :strength; :defaultValue 0.0 ],
+    [ :effectAttr :period; :defaultValue 0.5 ],
+    [ :effectAttr :onTime; :defaultValue 0.1 ],
+    [ :effectAttr :deviceSettings ] .
   
+func:image
+  a :EffectFunction;
+  rdfs:label "sample image at x=time";
+  :input
+    [ :effectAttr :strength; :defaultValue 0.0 ],
+    [ :effectAttr :period; :defaultValue 2.0 ],
+    [ :effectAttr :image; :defaultValue "specks.png" ],
+    [ :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 .