light9 Changeset - c5974a6bbc28

Changeset - c5974a6bbc28

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 20 months ago 2023-05-18 17:13:55
drewp@bigasterisk.com

reformat

3 files changed with 14 insertions and 20 deletions:

light9/collector/output.py

light9/web/live/Light9LiveControls.ts

light9/web/live/index.html

0 comments (0 inline, 0 general)

light9/collector/output.py

➞

Show inline comments

@@ @@ -3,12 +3,13 @@ import socket @@
 import struct
 import time
 import usb.core
 import logging
 from twisted.internet import threads, reactor, task
 from light9.metrics import metrics
 log = logging.getLogger('output')
 logAllDmx = logging.getLogger('output.allDmx')
 class Output(object):
     """
@@ @@ -39,14 +40,13 @@ class Output(object): @@
     def update(self, buf: bytes) -> None:
         """caller asks for the output to be this buffer"""
         self._currentBuffer = buf
     def _periodicLog(self):
         msg = '%s: %s' % (self.shortId(), ' '.join(map(str,
                                                        self._currentBuffer)))
         msg = '%s: %s' % (self.shortId(), ' '.join(map(str, self._currentBuffer)))
         if msg != self._lastLoggedMsg:
             log.debug(msg)
             self._lastLoggedMsg = msg
     def _write(self, buf: bytes) -> None:
         """
@@ @@ -84,14 +84,13 @@ class BackgroundLoopOutput(Output): @@
     def _loop(self):
         start = time.time()
         sendingBuffer = self._currentBuffer
         def done(worked):
             metrics('write_success', output=self.shortId()).incr()
             reactor.callLater(max(0, start + 1 / self.rate - time.time()),
                               self._loop)
             reactor.callLater(max(0, start + 1 / self.rate - time.time()), self._loop)
         def err(e):
             metrics('write_fail', output=self.shortId()).incr()
             log.error(e)
             reactor.callLater(.2, self._loop)
@@ @@ -117,14 +116,13 @@ class FtdiDmx(BackgroundLoopOutput): @@
             # to 0? No it is not. DMX receivers don't add implicit
             # zeros there.
             buf = bytes([0]) + buf[:self.lastDmxChannel]
             if logAllDmx.isEnabledFor(logging.DEBUG):
                 # for testing fps, smooth fades, etc
                 logAllDmx.debug('%s: %s...' %
                                 (self.shortId(), ' '.join(map(str, buf[:32]))))
                 logAllDmx.debug('%s: %s...' % (self.shortId(), ' '.join(map(str, buf[:32]))))
             self.dmx.send_dmx(buf)
 class ArtnetDmx(BackgroundLoopOutput):
     # adapted from https://github.com/spacemanspiff2007/PyArtNet/blob/master/pyartnet/artnet_node.py (gpl3)
@@ @@ -145,36 +143,34 @@ class ArtnetDmx(BackgroundLoopOutput): @@
             if not buf:
                 logAllDmx.debug('%s: empty buf- no output', self.shortId())
                 return
             if logAllDmx.isEnabledFor(logging.DEBUG):
                 # for testing fps, smooth fades, etc
                 logAllDmx.debug('%s: %s...' %
                                 (self.shortId(), ' '.join(map(str, buf[:32]))))
                 logAllDmx.debug('%s: %s...' % (self.shortId(), ' '.join(map(str, buf[:32]))))
             if self.sequence_counter:
                 self.sequence_counter += 1
                 if self.sequence_counter > 255:
                     self.sequence_counter = 1
             packet = self.base_packet[:]
             packet.append(self.sequence_counter)  # Sequence,
             packet.append(0x00)  # Physical
             universe_nr = 0
             packet.append(universe_nr & 0xFF)  # Universe LowByte
             packet.append(universe_nr >> 8 & 0xFF)  # Universe HighByte
             packet.extend(struct.pack(
                 '>h', len(buf)))  # Pack the number of channels Big endian
             packet.extend(struct.pack('>h', len(buf)))  # Pack the number of channels Big endian
             packet.extend(buf)
             self._socket.sendto(packet, ('127.0.0.1', 6454))
 class Udmx(BackgroundLoopOutput):
     def __init__(self, uri, bus, address, lastDmxChannel, rate=22):
+    def __init__(self, uri: URIRef, bus: int, address: int, lastDmxChannel: int, rate=22):
         self.bus = bus
         self.address = address
         self.lastDmxChannel = lastDmxChannel
         self.dev = None
         super().__init__(uri, rate=rate)
@@ @@ -213,15 +209,13 @@ class Udmx(BackgroundLoopOutput): @@
                 # to 0? No it is not. DMX receivers don't add implicit
                 # zeros there.
                 buf = buf[:self.lastDmxChannel]
                 if logAllDmx.isEnabledFor(logging.DEBUG):
                     # for testing fps, smooth fades, etc
                     logAllDmx.debug(
                         '%s: %s...' %
                         (self.shortId(), ' '.join(map(str, buf[:32]))))
                     logAllDmx.debug('%s: %s...' % (self.shortId(), ' '.join(map(str, buf[:32]))))
                 sent = self.dev.send_multi_value(1, buf)
                 if sent != len(buf):
                     raise ValueError("incomplete send")
             except ValueError:
                 self.reconnect()
@@ @@ -237,14 +231,13 @@ class Udmx(BackgroundLoopOutput): @@
                     return
                 if e.errno == 32:  # pipe err
                     metrics('write_pipe_error', output=self.shortId()).inc()
                     return
                 msg = 'usb: sending %s bytes to %r; error %r' % (len(buf),
                                                                  self.uri, e)
                 msg = 'usb: sending %s bytes to %r; error %r' % (len(buf), self.uri, e)
                 log.warn(msg)
                 if e.errno == 13:  # permissions
                     return self.crash()
                 if e.errno == 19:  # no such dev; usb hw restarted

light9/web/live/Light9LiveControls.ts

➞

Show inline comments

@@ @@ -93,13 +93,13 @@ export class Light9LiveControls extends @@
     if (patch && !patchContainsPreds(patch, [U("rdf:type")])) {
       return;
+    }
     this.devices = [];
     let classes = this.graph.subjects(U("rdf:type"), U(":DeviceClass"));
     log(`found ${classes.length} device classes`)
+    log(`found ${classes.length} device classes`);
     uniq(sortBy(classes, "value"), true).forEach((dc) => {
       sortBy(this.graph.subjects(U("rdf:type"), dc), "value").forEach((dev) => {
         this.devices.push(dev as NamedNode);
       });
     });
     this.requestUpdate();

light9/web/live/index.html

➞

Show inline comments

-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <title>device control</title>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="../style.css">
+    <link rel="stylesheet" href="../style.css" />
     <script type="module" src="../live/Light9LiveControls"></script>
   </head>
   <body>
     <style>
      body, html {
       body,
       html {
          margin: 0;
+     }
      light9-live-controls {
          position: absolute;
          left: 2px;
          top: 2px;

0 comments (0 inline, 0 general)