light9 Changeset - fccb6ca6516d

Changeset - fccb6ca6516d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 10 years ago 2015-06-13 06:09:24
drewp@bigasterisk.com

currentSubLevel lets subs drive effects
Ignore-this: 13c5c1743c456386b8aca36a189d905b

2 files changed with 37 insertions and 6 deletions:

light9/effecteval/effect.py

light9/effecteval/effectloop.py

0 comments (0 inline, 0 general)

light9/effecteval/effect.py

➞

Show inline comments

@@ @@ -124,19 +124,46 @@ class EffectNode(object): @@
         for c in self.codes:
             outName = c.outName
             inNames = c.possibleVars.intersection(codeFromOutput.keys())
             inNames.discard(outName)
             deps[outName] = inNames
         self.codes = [codeFromOutput[n] for n in toposort.toposort_flatten(deps)]
     def _currentSubSettingValues(self, sub):
         """what KC subSettings are setting levels right now?"""
         cs = self.graph.currentState
         with cs(tripleFilter=(None, L9['sub'], sub)) as g1:
             for subj in g1.subjects(L9['sub'], sub):
                 with cs(tripleFilter=(subj, None, None)) as g2:
                     if (subj, RDF.type, L9['SubSetting']) in g2:
                         v = g2.value(subj, L9['level']).toPython()
                         yield v
     def currentSubLevel(self, uri):
         """what's the max level anyone (probably KC) is
         holding this sub to right now?"""
         if isinstance(uri, Submaster.Submaster):
             # likely the uri was spotted and replaced
             uri = uri.uri
         if not isinstance(uri, URIRef):
             raise TypeError("got %r" % uri)
         foundLevels = list(self._currentSubSettingValues(uri))
         if not foundLevels:
             return 0
         return max(foundLevels)
     def eval(self, songTime):
         ns = {'t': songTime}
         ns.update(self.otherFuncs)
         ns.update(dict(
             curve=lambda c, t: c.eval(t),
             currentSubLevel=self.currentSubLevel,
             ))
         for c in self.codes:
             codeNs = ns.copy()
             codeNs.update(c.pyResources)
             try:

light9/effecteval/effectloop.py

➞

Show inline comments

@@ @@ -151,13 +151,13 @@ class EffectLoop(object): @@
                 else:
                     outputs.append(out)
             except Exception as exc:
                 now = time.time()
                 if now > self.lastErrorLog + 5:
                     if hasattr(exc, 'expr'):
-                        log.error('in expression %r', exc.expr)
+                        log.exception('in expression %r', exc.expr)
                     log.error("effect %s: %s" % (e.uri, exc))
                     self.lastErrorLog = now
         log.debug('eval %s effects, got %s outputs', len(self.currentEffects), len(outputs))
         return outputs
@@ @@ -179,13 +179,13 @@ class EffectLoop(object): @@
                           for k,v in out.get_levels().items()))
 Z = numpy.zeros((50, 3), dtype=numpy.float16)
 class ControlBoard(object):
     def __init__(self, dev='/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A7027NYX-if00-port0'):
-        self._dev = None#serial.Serial(dev, baudrate=115200)
         self._dev = serial.Serial(dev, baudrate=115200)
     def _8bitMessage(self, floatArray):
         px255 = (numpy.clip(floatArray, 0, 1) * 255).astype(numpy.uint8)
         return px255.reshape((-1,)).tostring()
     def setStrip(self, which, pixels):
@@ @@ -218,20 +218,21 @@ class ControlBoard(object): @@
         self._dev.flush()
 class LedLoop(EffectLoop):
     def initOutput(self):
         self.board = ControlBoard()
         self.lastSent = {}
+        self.lastSent = {} # what's in arduino's memory
     def combineOutputs(self, outputs):
         combined = {'L': Z, 'R': Z,
                     'blacklight0': 0, 'blacklight1': 0,
                     'rgb': numpy.zeros((1, 3), dtype=numpy.float16)}
         for out in outputs:
             log.debug('combine output %r', out)
             if isinstance(out, Effects.Blacklight):
                 key = 'blacklight%s' % out.which
                 combined[key] = max(combined[key], out)
             elif isinstance(out, Effects.Strip):
                 pixels = numpy.array(out.pixels, dtype=numpy.float16)
                 for w in out.which:
@@ @@ -244,20 +245,23 @@ class LedLoop(EffectLoop): @@
         for meth, selectArgs, value in [
                 ('setStrip', (0,), combined['L']),
                 ('setStrip', (1,), combined['R']),
                 ('setUv', (0,), combined['blacklight0']),
                 ('setUv', (1,), combined['blacklight1']),
                 ('setRgb', (), combined['rgb']),
         ]:
+            ]:
             key = (meth, selectArgs)
             if self.lastSent.get(key) == value:
             compValue = value.tolist() if isinstance(value, numpy.ndarray) else value
             if self.lastSent.get(key) == compValue:
                 continue
             log.debug('value changed: %s(%s %s)', meth, selectArgs, value)
             getattr(self.board, meth)(*(selectArgs + (value,)))
-            self.lastSent[key] = value
+            self.lastSent[key] = compValue
         yield succeed(None) # there was an attempt at an async send
     def logMessage(self, out):
         return str([(w, p.tolist() if isinstance(p, numpy.ndarray) else p) for w,p in out.items()])

0 comments (0 inline, 0 general)