# HG changeset patch
# User drewp@bigasterisk.com
# Date 2016-06-12 20:58:19
# Node ID a093a69067fb11e499e59e81138aabea4a05136f
# Parent  eea47b8ae21d6a648c896dd1bd1955ec91665c80

strobe support for quantum
Ignore-this: de605da71370bed0ff4a15d3898bf25b

diff --git a/light9/collector/device.py b/light9/collector/device.py
--- a/light9/collector/device.py
+++ b/light9/collector/device.py
@@ -174,7 +174,6 @@ def toOutputAttrs(deviceType, deviceAttr
     elif deviceType == L9['MacQuantum']:
         out = {
             L9['dimmerFadeLo']: 0,
-            L9['shutter']: 30, # strobe is in here too: slow @ 50 -> fast @ 200
             L9['fixtureControl']: 0,
             L9['fx1Select']:  0,
             L9['fx1Adjust']:  0,
@@ -206,6 +205,12 @@ def toOutputAttrs(deviceType, deviceAttr
         x = .5 + .5 * floatAttr(L9['goboSpeed'])
         out[L9['goboSpeedHi']] = _8bit(x)
         out[L9['goboSpeedLo']] = _8bit((x * 255) % 1.0)
+
+        strobe = floatAttr(L9['strobe'])
+        if strobe < .1:
+            out[L9['shutter']] = 30
+        else:
+            out[L9['shutter']] = 50 + int(150 * (strobe - .1) / .9)
         
         out.update( {
             L9['colorWheel']: 0,
diff --git a/show/dance2016/deviceClass.n3 b/show/dance2016/deviceClass.n3
--- a/show/dance2016/deviceClass.n3
+++ b/show/dance2016/deviceClass.n3
@@ -11,6 +11,8 @@
 :focus              a :DeviceAttr; :dataType :scalar .
 :iris               a :DeviceAttr; :dataType :scalar .
 :prism              a :DeviceAttr; :dataType :scalar .
+:strobe             a :DeviceAttr; :dataType :scalar;
+  rdfs:comment "0=none, 1=fastest" .
 :goboSpeed          a :DeviceAttr; :dataType :scalar ;
   rdfs:comment "0=stopped, 1=rotate the fastest".
 :quantumGoboChoice  a :DeviceAttr; :dataType :choice;
@@ -108,9 +110,9 @@
 
 :MacQuantum a :DeviceClass; 
   :docs <http://www.martin.com/Martin.Download.aspx?file=/files/files/productdocuments/11_MANUALS/999/35000279b%20UM_MACQuantumProfile_EN_B.pdf>;
-  :deviceAttr :color, :rx, :ry, :zoom, :focus, :iris, :prism, :quantumGoboChoice, :goboSpeed;
+  :deviceAttr :color, :rx, :ry, :zoom, :focus, :iris, :prism, :quantumGoboChoice, :goboSpeed, :strobe;
   :attr
-    [ :dmxOffset 0; :outputAttr :shutter ; rdfs:comment "use 30" ],
+    [ :dmxOffset 0; :outputAttr :shutter ],
     [ :dmxOffset 1; :outputAttr :dimmerFadeHi ],
     [ :dmxOffset 2; :outputAttr :dimmerFadeLo ],
     [ :dmxOffset 3; :outputAttr :cyan ],
diff --git a/show/dance2016/effect.n3 b/show/dance2016/effect.n3
--- a/show/dance2016/effect.n3
+++ b/show/dance2016/effect.n3
@@ -21,6 +21,8 @@ effect:animRainbow a :Effect; rdfs:label
 effect:orangeSearch a :Effect; :publishAttr :strength ; :group "anim".
 effect:lightning a :Effect; :publishAttr :strength ; :group "anim".
 
+effect:strobewarm :group "anim".
+
 effect:house :group "main" .
 effect:cyc :group "main" .