light9 Changeset - 60e559cb1a5e

Changeset - 60e559cb1a5e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Drew Perttula - 8 years ago 2017-05-17 08:02:58
drewp@bigasterisk.com

collector now runs the device function even on devs that have no settings, in case they have some fixed output values (e.g. light mode)
Ignore-this: f13d891964f1a3274f63a52684b4c896

3 files changed with 10 insertions and 7 deletions:

light9/collector/collector.py

light9/collector/collector_test.py

light9/collector/web/index.html

0 comments (0 inline, 0 general)

light9/collector/collector.py

➞

Show inline comments

@@ @@ -51,12 +51,14 @@ class Collector(Generic[ClientType, Clie @@
     def __init__(self, graph, outputs, listeners=None, clientTimeoutSec=10):
         # type: (Graph, List[Output], float) -> None
         self.graph = graph
         self.outputs = outputs
         self.listeners = listeners
         self.clientTimeoutSec = clientTimeoutSec
         self.initTime = time.time()
         self.allDevices = set()
         self.graph.addHandler(self.rebuildOutputMap)
         # client : (session, time, {(dev,devattr): latestValue})
         self.lastRequest = {} # type: Dict[ClientType, Tuple[ClientSessionType, float, Dict[Tuple[URIRef, URIRef], float]]]
@@ @@ -66,12 +68,13 @@ class Collector(Generic[ClientType, Clie @@
     def rebuildOutputMap(self):
         self.outputMap = outputMap(self.graph, self.outputs) # (device, outputattr) : (output, index)
         self.deviceType = {} # uri: type that's a subclass of Device
         self.remapOut = {} # (device, deviceAttr) : (start, end)
         for dc in self.graph.subjects(RDF.type, L9['DeviceClass']):
             for dev in self.graph.subjects(RDF.type, dc):
                 self.allDevices.add(dev)
                 self.deviceType[dev] = dc
                 for remap in self.graph.objects(dev, L9['outputAttrRange']):
                     attr = self.graph.value(remap, L9['outputAttr'])
                     start = float(self.graph.value(remap, L9['start']))
                     end = float(self.graph.value(remap, L9['end']))
@@ @@ -96,13 +99,13 @@ class Collector(Generic[ClientType, Clie @@
             else:
                 out[(d, da)] = v
         return out
     def _warnOnLateRequests(self, client, now, sendTime):
         requestLag = now - sendTime
         if requestLag > .1:
+        if requestLag > .1 and now > self.initTime + 5:
             log.warn('collector.setAttrs from %s is running %.1fms after the request was made',
                      client, requestLag * 1000)
     def setAttrs(self, client, clientSession, settings, sendTime):
         """
         settings is a list of (device, attr, value). These attrs are
@@ @@ -142,19 +145,19 @@ class Collector(Generic[ClientType, Clie @@
         for (d, da), v in self.stickyAttrs.iteritems():
             daDict = deviceAttrs.setdefault(d, {})
             if da not in daDict:
                 daDict[da] = v
         outputAttrs = {} # device: {outputAttr: value}
-        for d in deviceAttrs:
+        for d in self.allDevices:
             try:
                 devType = self.deviceType[d]
             except KeyError:
                 log.warn("request for output to unconfigured device %s" % d)
                 continue
-            outputAttrs[d] = toOutputAttrs(devType, deviceAttrs[d])
+            outputAttrs[d] = toOutputAttrs(devType, deviceAttrs.get(d, {}))
             if self.listeners:
                 self.listeners.outputAttrsSet(d, outputAttrs[d], self.outputMap)
         pendingOut = {} # output : values
         for out in self.outputs:
             pendingOut[out] = [0] * out.numChannels

light9/collector/collector_test.py

➞

Show inline comments

@@ @@ -216,14 +216,14 @@ class TestCollector(unittest.TestCase): @@
         c = Collector(self.config, outputs=[self.dmx0, self.udmx])
         t0 = time.time()
         c.setAttrs('client1', 'sess1', [(DEV['inst1'], L9['brightness'], .5)], t0)
         c.setAttrs('client1', 'sess1', [(DEV['inst1'], L9['brightness'], 1)], t0)
         c.setAttrs('client1', 'sess1', [(DEV['colorStrip'], L9['color'], '#00ff00')], t0)
         self.assertEqual([[0, 0, 0, 0], 'flush',
                           [0, 0, 0, 0], 'flush',
         self.assertEqual([[215, 0, 0, 0], 'flush',
                           [215, 0, 0, 0], 'flush',
                           [215, 0, 255, 0], 'flush'],
                          self.udmx.updates)
         self.assertEqual([[127, 0, 0, 0], 'flush',
                           [255, 0, 0, 0], 'flush',
                           [0, 0, 0, 0], 'flush'],
                          self.dmx0.updates)

light9/collector/web/index.html

➞

Show inline comments

@@ @@ -53,29 +53,29 @@ @@
            Polymer({
                is: "light9-collector-device",
                properties: {
                    graph: {type: Object, notify: true},
                    uri: {type: String, notify: true},
                    label: {type: String, notify: true},
                    attrs: {type: Array, notify: true},
                },
                observers: [
                    "setLabel(graph, uri)",
                    "initUpdates(updates)",
                ],
                initUpdates: function(updates) {
                    updates.addListener(function(msg) {
                        if (msg.outputAttrsSet && msg.outputAttrsSet.dev == this.uri) {
-                           this.attrs = msg.outputAttrsSet.attrs;
+                           this.set('attrs', msg.outputAttrsSet.attrs);
                            this.attrs.forEach(function(row) {
                                row.valClass = row.val == 255 ? 'full' : (row.val ? 'nonzero' : '');
                            });
+                       }
                    }.bind(this));
                },
                setLabel: function(graph, uri) {
                    console.log('setlab', uri);
                    this.label = uri.replace(/.*\//, '');
                    graph.runHandler(function() {
                        this.label = graph.stringValue(uri, graph.Uri('rdfs:label'));
                    }.bind(this), 'setLabel');
+               }
            });

0 comments (0 inline, 0 general)