# HG changeset patch
# User drewp <drewp@bigasterisk.com>
# Date 1520128537 28800
# Node ID f349fe25789ce68b612cf8bc7b8853b8f6161278
# Parent  db955e7943afa361563c0dbdb81962bb658349a9
rgb strip animation support in arduinoNode

Ignore-this: 5f50c7b54ce1588243735c43d2cbea0f

darcs-hash:0e2e1e2156b181c83d6e4f2f85afc849dc07fec0

diff -r db955e7943af -r f349fe25789c service/arduinoNode/arduinoNode.py
--- a/service/arduinoNode/arduinoNode.py	Sat Mar 03 17:53:37 2018 -0800
+++ b/service/arduinoNode/arduinoNode.py	Sat Mar 03 17:55:37 2018 -0800
@@ -200,6 +200,12 @@
         byte = self.ser.read(1)
         if byte != 'x':
             raise ValueError("after poll, got %x instead of 'x'" % byte)
+        for i in self._devs:
+            if i.wantIdleOutput():
+                self.ser.write("\x60" + chr(self._devCommandNum[i.uri]))
+                i.outputIdle(self.ser.write)
+                if self.ser.read(1) != 'k':
+                    raise ValueError('no ack after outputIdle')
         elapsed = time.time() - t1
         if elapsed > 1.0:
             log.warn('poll took %.1f seconds' % elapsed)
diff -r db955e7943af -r f349fe25789c service/arduinoNode/devices.py
--- a/service/arduinoNode/devices.py	Sat Mar 03 17:53:37 2018 -0800
+++ b/service/arduinoNode/devices.py	Sat Mar 03 17:55:37 2018 -0800
@@ -641,11 +641,10 @@
 
     def __init__(self, graph, uri, pinNumber):
         super(RgbPixels, self).__init__(graph, uri, pinNumber)
-        px = graph.value(self.uri, ROOM['pixels'])
-        self.pixelUris = list(graph.items(px))
-        self.values = dict((uri, Literal('#000000')) for uri in self.pixelUris)
+        self.anim = RgbPixelsAnimation(graph, uri, self.updateOutput)
+        
         self.replace = {'ledArray': 'leds_%s' % self.pinNumber,
-                        'ledCount': len(self.pixelUris),
+                        'ledCount': self.anim.maxIndex() - 1,
                         'pin': self.pinNumber,
                         'ledType': 'WS2812',
         }
@@ -667,34 +666,42 @@
     def generateSetupCode(self):
         return 'FastLED.addLeds<{ledType}, {pin}>({ledArray}, {ledCount});'.format(**self.replace)
     
-    def _rgbFromHex(self, h):
-        rrggbb = h.lstrip('#')
-        return [int(x, 16) for x in [rrggbb[0:2], rrggbb[2:4], rrggbb[4:6]]]
-    
     def sendOutput(self, statements, write, read):
-        px, pred, color = statements[0]
-        if pred != ROOM['color']:
-            raise ValueError(pred)
-        rgb = self._rgbFromHex(color)
-        if px not in self.values:
-            raise ValueError(px)
-        self.values[px] = Literal(color)
-        write(chr(self.pixelUris.index(px)) +
-              chr(rgb[1]) + # my WS2812 need these flipped
-              chr(rgb[0]) +
-              chr(rgb[2]))
+        log.info('sendOutput start')
+        self.write = write
+        self.anim.onStatements(statements)
+        self.anim.updateOutput()
+        log.info('sendOutput end')
 
+    def updateOutput(self):
+        write = self.write
+        write(chr(self.anim.maxIndex() + 1))
+        for idx, (r, g, b) in self.anim.currentColors():
+            # my WS2812 need these flipped
+            write(chr(idx) + chr(g) + chr(r) + chr(b))
+
+    def wantIdleOutput(self):
+        return True
+            
+    def outputIdle(self, write):
+        self.write = write
+        self.updateOutput()        
+            
     def hostStatements(self):
-        return [(uri, ROOM['color'], hexCol)
-                for uri, hexCol in self.values.items()]
+        return self.anim.hostStatements()
         
     def outputPatterns(self):
-        return [(px, ROOM['color'], None) for px in self.pixelUris]
+        return self.anim.outputPatterns()
+
+    def outputWidgets(self):
+        return self.anim.outputWidgets()
 
     def generateActionCode(self):
-        
+        # not yet combining updates- may be slow
         return '''
-
+        while(Serial.available() < 1) NULL;
+byte count = Serial.read();
+       for (byte elt=0; elt<count; ++elt) {{
           while(Serial.available() < 1) NULL;
           byte id = Serial.read();
 
@@ -707,17 +714,12 @@
           while(Serial.available() < 1) NULL;
           byte b = Serial.read();
           
-        {ledArray}[id] = CRGB(r, g, b); FastLED.show();
+        {ledArray}[id] = CRGB(r, g, b);
+        }}
+        FastLED.show();
 
         '''.format(**self.replace)
     
-    def outputWidgets(self):
-        return [{
-            'element': 'output-rgb',
-            'subj': px,
-            'pred': ROOM['color'],
-        } for px in self.pixelUris]
-    
 def makeDevices(graph, board):
     out = []
     for dt in sorted(_knownTypes, key=lambda cls: cls.__name__):
diff -r db955e7943af -r f349fe25789c service/arduinoNode/write_arduino_code.py
--- a/service/arduinoNode/write_arduino_code.py	Sat Mar 03 17:53:37 2018 -0800
+++ b/service/arduinoNode/write_arduino_code.py	Sat Mar 03 17:55:37 2018 -0800
@@ -40,7 +40,9 @@
                 code = dev.generateActionCode()
                 if code:
                     gen = '''else if (cmd == %(cmdNum)s) {
-                               %(code)s
+                               {
+                                 %(code)s
+                               }
                                Serial.write('k');
                              }
                           ''' % dict(cmdNum=devCommandNum[dev.uri],