Mercurial > code > home > repos > light9

changeset 1474:a093a69067fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strobe support for quantum Ignore-this: de605da71370bed0ff4a15d3898bf25b
author drewp@bigasterisk.com
date Sun, 12 Jun 2016 20:58:19 +0000
parents eea47b8ae21d
children a749079ec774
files light9/collector/device.py show/dance2016/deviceClass.n3 show/dance2016/effect.n3
diffstat 3 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/light9/collector/device.py	Sun Jun 12 19:28:15 2016 +0000
+++ b/light9/collector/device.py	Sun Jun 12 20:58:19 2016 +0000
@@ -174,7 +174,6 @@
     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 @@
         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,
--- a/show/dance2016/deviceClass.n3	Sun Jun 12 19:28:15 2016 +0000
+++ b/show/dance2016/deviceClass.n3	Sun Jun 12 20:58:19 2016 +0000
@@ -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 ],
--- a/show/dance2016/effect.n3	Sun Jun 12 19:28:15 2016 +0000
+++ b/show/dance2016/effect.n3	Sun Jun 12 20:58:19 2016 +0000
@@ -21,6 +21,8 @@
 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" .