Merge branch dev into master

DatNoHand · Aug 13, 2018 · 4bc920b · 4bc920b
1 parent e31eb95
commit 4bc920b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/server/Led.js b/server/Led.js
@@ -71,7 +71,7 @@ ledlib.setAllLeds = (_color, _amount = 1, _on = true) => {
 		ledlib.setLed(i, _color, _on)
 	}
 	for (let i = 0; i < ledlib.walls.length; i++) {
-		ledlib.wall_data[i] = [ true, _color, _amount ]
+		ledlib.wall_data[i] = [ _on, _color, _amount ]
 	}
 	return ledlib.color = _color
 }

diff --git a/server/public/js/client.js b/server/public/js/client.js
@@ -29,7 +29,6 @@ function Start() {
   // Server Messages
   ws.onmessage = function(e) {
     var msg = JSON.parse(e.data);
-    console.log(msg)
 
     switch(msg.type) {
       case 'status':
@@ -257,7 +256,6 @@ function SetLed(bright, amount, _on = true) {
     }
   }
   SendBrightness(bright)
-  console.log(wall_data)
   send({type: 'led', wall_data: wall_data})
 }
 

diff --git a/server/server.js b/server/server.js
@@ -73,7 +73,6 @@ wss.on('connection', function(ws, req) {
         LedLib.render()
       break;
       case 'led':
-        LedLib.setBrightness(msg.bright)
         /** @typedef {Array} wall_data */
         LedLib.setStripAdvanced(msg.wall_data)
         LedLib.render()