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

2 files changed, 12 insertions, 2 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..1730cc4
--- /dev/null
+++ 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
index 47bc931..f9165b1 100644
--- 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
+