unicornpaint

commit e8215610fda6a39cf57dd19367fe9757597d31e7
parent 8add16bd0fff15dffe3b0a7931052c5218108cc1
Author: Martin Ashby <martin@martin-laptop.lan>
Date:   Thu, 17 May 2018 20:57:18 +0100

Merge branch 'master' of github.com:MFAshby/unicornpaint

Diffstat:
A
docker-compose.yml
 | 
10
++++++++++
M
server.py
 | 
5
++---

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '3'
+services:
+    unicornpaint:
+        build: .
+        image: mfashby/unicornpaint
+        ports: 
+            - "3001:3001"
+        volumes:
+            - "/dev/spidev0.0:/dev/spidev0.0"
+            - "/home/pi/unicornpaint/saves/:/saves/"
diff --git a/server.py b/server.py
@@ -29,7 +29,7 @@ def send_state():
     global all_clients
     state = {
         "saves": os.listdir(SAVES_DIR),
-        "pixels": unicorn.get_pixels()
+        "pixels": unicorn.get_pixels().tolist()
     }
     stateJson = json.dumps(state)
     for client in all_clients:
@@ -106,4 +106,4 @@ def main():
 
 if __name__=="__main__":
     main()
-    
-\ No newline at end of file
+