Mercurial > code > home > repos > light9

changeset 1450:ddb7622698a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't mix remapped values with unremapped ones Ignore-this: 80a2fbf0293d26d88ea34ec1e0eab5b5
author drewp@bigasterisk.com
date Sat, 11 Jun 2016 22:27:51 +0000
parents b76017f0b622
children f477772374d2
files light9/collector/collector.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/light9/collector/collector.py	Sat Jun 11 22:27:10 2016 +0000
+++ b/light9/collector/collector.py	Sat Jun 11 22:27:51 2016 +0000
@@ -104,13 +104,13 @@
         deviceAttrs = {} # device: {deviceAttr: value}
         for _, _, lastSettings in self.lastRequest.itervalues():
             for (device, deviceAttr), value in lastSettings.iteritems():
-                attrs = deviceAttrs.setdefault(device, {})
-                if deviceAttr in attrs:
-                    value = resolve(device, deviceAttr, [attrs[deviceAttr],
-                                                         value])
                 if (device, deviceAttr) in self.remapOut:
                     start, end = self.remapOut[(device, deviceAttr)]
                     value = Literal(start + float(value) * (end - start))
+
+                attrs = deviceAttrs.setdefault(device, {})
+                if deviceAttr in attrs:
+                    value = resolve(device, deviceAttr, [attrs[deviceAttr], value])
                 attrs[deviceAttr] = value
 
         outputAttrs = {} # device: {outputAttr: value}