light9 Changeset - f66dbe512025

Changeset - f66dbe512025

Parent rev.

Child rev.

[Not reviewed]

default

0 8 0

drewp@bigasterisk.com - 6 years ago 2019-06-08 07:45:25
drewp@bigasterisk.com

reformat
Ignore-this: c968c4cd1b9a580c7b0fedc00df8a80

7 files changed with 42 insertions and 22 deletions:

bin/ascoltami2

bin/effecteval

light9/collector/collector.py

light9/collector/dmx_controller_output.py

light9/collector/output.py

light9/effect/effecteval.py

light9/effect/sequencer.py

0 comments (0 inline, 0 general)

bin/ascoltami2

➞

Show inline comments

@@ @@ -17,6 +17,7 @@ from gi.repository import GObject, Gst @@
 gatherProcessStats()
 class App(object):
     def __init__(self, graph, show):

bin/effecteval

➞

Show inline comments

@@ @@ -23,6 +23,7 @@ from light9.coffee import StaticCoffee @@
 gatherProcessStats()
 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler):
     def get(self):

light9/collector/collector.py

➞

Show inline comments

@@ @@ -202,7 +202,9 @@ class Collector: @@
                 index = DmxMessageIndex(_index)
                 _, outArray = pendingOut[outputUri]
                 if outArray[index] != 0:
                     log.warn(f'conflict: {output} output array was already nonzero at 0-based index {index}')
                     log.warn(
                         f'conflict: {output} output array was already nonzero at 0-based index {index}'
+                    )
                     raise ValueError(f"someone already wrote to index {index}")
                 outArray[index] = value

light9/collector/dmx_controller_output.py

➞

Show inline comments

@@ @@ -14,10 +14,12 @@ from pyftdi import ftdi @@
 vendor=0x0403
 product=0x6001
 #####################
 # DMX USB controller
 #####################
 class OpenDmxUsb():
     def __init__(self):
         self.baud_rate = 250000
         self.data_bits = 8
@@ @@ -32,7 +34,10 @@ class OpenDmxUsb(): @@
         self.ftdi=ftdi.Ftdi()
         self.ftdi.open(vendor,product,0)
         self.ftdi.set_baudrate(self.baud_rate)
         self.ftdi.set_line_property(self.data_bits,self.stop_bits,self.parity,break_=0)
         self.ftdi.set_line_property(self.data_bits,
                                     self.stop_bits,
                                     self.parity,
                                     break_=0)
         self.ftdi.set_flowctrl(self.flow_ctrl)
         self.ftdi.purge_rx_buffer()
         self.ftdi.purge_tx_buffer()
@@ @@ -42,9 +47,19 @@ class OpenDmxUsb(): @@
     def send_dmx(self,channelVals):
         assert self.ftdi.write_data(channelVals) == 513
         # Need to generate two bits for break
         self.ftdi.set_line_property(self.data_bits,self.stop_bits,self.parity,break_=1)
         self.ftdi.set_line_property(self.data_bits,self.stop_bits,self.parity,break_=1)
         self.ftdi.set_line_property(self.data_bits,self.stop_bits,self.parity,break_=0)
         self.ftdi.set_line_property(self.data_bits,
                                     self.stop_bits,
                                     self.parity,
                                     break_=1)
         self.ftdi.set_line_property(self.data_bits,
                                     self.stop_bits,
                                     self.parity,
                                     break_=1)
         self.ftdi.set_line_property(self.data_bits,
                                     self.stop_bits,
                                     self.parity,
                                     break_=0)
 if __name__=="__main__":
     dmxUsb=OpenDmxUsb()

light9/collector/output.py

➞

Show inline comments

@@ @@ -28,10 +28,8 @@ class Output(object): @@
         scales.init(self, self.statPath)
         self._writeStats = scales.collection(
             self.statPath + '/write',
             scales.IntStat('succeed'),
             scales.IntStat('fail'),
             scales.PmfStat('call', recalcPeriod=1),
             self.statPath + '/write', scales.IntStat('succeed'),
             scales.IntStat('fail'), scales.PmfStat('call', recalcPeriod=1),
             scales.RecentFpsStat('fps'))
         self._currentBuffer = b''
@@ @@ -69,6 +67,7 @@ class Output(object): @@
         log.error('unrecoverable- exiting')
         reactor.crash()
 class DummyOutput(Output):
     def __init__(self, uri, **kw):
@@ @@ -104,7 +103,9 @@ class BackgroundLoopOutput(Output): @@
         d = threads.deferToThread(self._write, sendingBuffer)
         d.addCallbacks(done, err)
 class FtdiDmx(BackgroundLoopOutput):
     def __init__(self, uri, lastDmxChannel, rate=22):
         super().__init__(uri)
         self.lastDmxChannel = lastDmxChannel
@@ @@ -115,8 +116,7 @@ class FtdiDmx(BackgroundLoopOutput): @@
         self._writeStats.fps.mark()
         with self._writeStats.call.time():
             if not buf:
                 logAllDmx.debug('%s: empty buf- no output',
                                 self.shortId())
                 logAllDmx.debug('%s: empty buf- no output', self.shortId())
                 return
             # ok to truncate the last channels if they just went
@@ @@ -126,8 +126,7 @@ class FtdiDmx(BackgroundLoopOutput): @@
             if logAllDmx.isEnabledFor(logging.DEBUG):
                 # for testing fps, smooth fades, etc
                 logAllDmx.debug(
                     '%s: %s...' %
                 logAllDmx.debug('%s: %s...' %
                     (self.shortId(), ' '.join(map(str, buf[:32]))))
             self.dmx.send_dmx(buf)
@@ @@ -192,11 +191,12 @@ class Udmx(BackgroundLoopOutput): @@
         self._errStats = scales.collection(self.statPath + '/write',
                                           scales.IntStat('overflow'),
                                           scales.IntStat('ioError'),
                                           scales.IntStat('pipeError')
+        )
                                            scales.IntStat('pipeError'))
         self.reconnect()
     def shortId(self) -> str:
         return super().shortId() + f'_bus={self.bus}'
     def reconnect(self):
         self._connected = 0
         from pyudmx import pyudmx
@@ @@ -220,8 +220,7 @@ class Udmx(BackgroundLoopOutput): @@
         with self._writeStats.call.time():
             try:
                 if not buf:
                     logAllDmx.debug('%s: empty buf- no output',
                                     self.shortId())
                     logAllDmx.debug('%s: empty buf- no output', self.shortId())
                     return
                 # ok to truncate the last channels if they just went

light9/effect/effecteval.py

➞

Show inline comments

@@ @@ -387,6 +387,7 @@ def effect_lightning(effectSettings, str @@
             out[(dev, L9['color'])] = col
     return out
 def sample(img, x, y, repeat=False):
     if 0 <= x < img.width:
         return img.getpixel((x, y))
@@ @@ -395,6 +396,7 @@ def sample(img, x, y, repeat=False): @@
     else:
         return img.getpixel((x % img.width, y))
 def effect_image(effectSettings, strength, songTime, noteTime):
     out = {}
     imgPath = f'cur/anim/{effectSettings[L9["image"]]}'

light9/effect/sequencer.py

➞

Show inline comments

@@ @@ -120,8 +120,7 @@ class Note(object): @@
             'effectClass': self.effectEval.effect,
+        }
         effectSettings: Dict[DeviceAttr, Union[float, str]] = dict(
             (DeviceAttr(da), v)
             for da, v in self.baseEffectSettings.items())
             (DeviceAttr(da), v) for da, v in self.baseEffectSettings.items())
         effectSettings[L9['strength']] = self.evalCurve(t)
         def prettyFormat(x: Union[float, str]):
@@ @@ -209,7 +208,8 @@ class Sequencer(object): @@
         self.notes[song] = []
         for note in self.graph.objects(song, L9['note']):
             try:
                 n = Note(self.graph, NoteUri(note), effecteval, self.simpleOutputs)
                 n = Note(self.graph, NoteUri(note), effecteval,
                          self.simpleOutputs)
             except Exception:
                 log.warn(f"failed to build Note {note} - skipping")
                 anyErrors = True
@@ @@ -257,8 +257,7 @@ class Sequencer(object): @@
         with updateStats.s1_eval.time():
             settings = []
             songNotes = sorted(self.notes.get(song, []),
                                key=lambda n: n.uri)
             songNotes = sorted(self.notes.get(song, []), key=lambda n: n.uri)
             noteReports = []
             for note in songNotes:
                 try:
@@ @@ -280,6 +279,7 @@ class Sequencer(object): @@
         #if isinstance(sendSecs, float):
         #    updateStats.s3_send_client = sendSecs
 class Updates(cyclone.sse.SSEHandler):
     def __init__(self, application, request, **kwargs) -> None:

0 comments (0 inline, 0 general)