# HG changeset patch
# User drewp@bigasterisk.com
# Date 1465684071 0
# Node ID ddb7622698a8859e35635a5f7562eac0dbd95c57
# Parent  b76017f0b6228423f481d3e516afe0164b5356fa
don't mix remapped values with unremapped ones
Ignore-this: 80a2fbf0293d26d88ea34ec1e0eab5b5

diff -r b76017f0b622 -r ddb7622698a8 light9/collector/collector.py
--- 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}