light9 Changeset - a093a69067fb

Changeset - a093a69067fb

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 9 years ago 2016-06-12 20:58:19
drewp@bigasterisk.com

strobe support for quantum
Ignore-this: de605da71370bed0ff4a15d3898bf25b

3 files changed with 12 insertions and 3 deletions:

light9/collector/device.py

show/dance2016/deviceClass.n3

show/dance2016/effect.n3

0 comments (0 inline, 0 general)

light9/collector/device.py

➞

Show inline comments

@@ @@ -171,13 +171,12 @@ def toOutputAttrs(deviceType, deviceAttr @@
         out[L9['white']] = 0
         return out
     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,
             L9['fx2Select']:  0,
             L9['fx2Adjust']:  0,
             L9['fxSync']:  0,
@@ @@ -203,12 +202,18 @@ def toOutputAttrs(deviceType, deviceAttr @@
             }[deviceAttrSettings.get(L9['gobo'], L9['open'])]
         # my goboSpeed deviceAttr goes 0=stopped to 1=fastest (using one direction only)
         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,
             L9['goboStaticRotate']: 0,
             L9['prismRotation']: _8bit(floatAttr(L9['prism'])),
             L9['iris']: _8bit(floatAttr(L9['iris']) * (200/255)),

show/dance2016/deviceClass.n3

➞

Show inline comments

@@ @@ -8,12 +8,14 @@ @@
 :brightness         a :DeviceAttr; :dataType :scalar .
 :zoom               a :DeviceAttr; :dataType :scalar ;
   rdfs:comment "maybe make this a separate 'wide to narrow' type" .
 :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;
   :choice :open, :spider, :windmill, :limbo, :brush, :whirlpool, :stars .
 :SimpleDimmer a :DeviceClass;
@@ @@ -105,15 +107,15 @@ @@
     [ :dmxOffset 22 ; :outputAttr :auraRed ],
     [ :dmxOffset 23 ; :outputAttr :auraGreen ],
     [ :dmxOffset 24 ; :outputAttr :auraBlue ] .
 :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 ],
     [ :dmxOffset 4; :outputAttr :magenta ],
     [ :dmxOffset 5; :outputAttr :yellow ],
     [ :dmxOffset 6; :outputAttr :colorWheel ; rdfs:comment "use 0" ],

show/dance2016/effect.n3

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ @@
 effect:animRainbow a :Effect; rdfs:label "animRainbow"; :publishAttr :strength, :rate ; :group "anim".
 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" .
 effect:centerSpot a :Effect; rdfs:label "center spot";
      :group "main"; :order 3; :publishAttr :strength;
      :setting effect:centerSpots0, effect:centerSpots1, effect:centerSpots2, effect:centerSpots3, effect:centerSpots4 .

0 comments (0 inline, 0 general)