Added final wand programs, and some cleanups

PampaWarro · Feb 14, 2023 · 39ca9ef · 39ca9ef
1 parent acee50d
commit 39ca9ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/server/setups/program-presets/default.json b/server/setups/program-presets/default.json
@@ -1464,6 +1464,16 @@
                     }
                 }
             ]
+        },
+        "MainWithWand": {
+            "programs": [
+                {
+                    "programName": "PROGRAM_Main_fuego2022"
+                },
+                {
+                    "programName": "wand-empty-canvas"
+                }
+            ]
         }
     },
     "DJTap": {

diff --git a/server/src/LightController.js b/server/src/LightController.js
@@ -70,15 +70,10 @@ const programNames = [
   "warroBass",
   "water-flood",
   "waveform",
-  "PROGRAM_Tap_fuego2023",
-  "PROGRAM_Wand_fuego2023",
   "DJTap",
   "wand-empty-canvas",
   "wandMix",
-  "wandRelampejo",
-  "wand-mixable",
   "wand-stars",
-  "djtap"
 ];
 
 module.exports = class LightController extends EventEmitter {

diff --git a/server/src/light-programs/programs/radial.js b/server/src/light-programs/programs/radial.js
@@ -6,16 +6,9 @@ const {loadGradient} = require("../utils/gradients");
 
 module.exports = class Radial extends LightProgram {
   init() {
-    this.taps = [];
-    this.holdWhite = 0;
     super.init();
   }
 
-  tap(data){
-    console.log('tap received program');
-    this.taps.push(data);
-  }
-
   drawFrame(leds) {
     const elapsed = this.timeInMs / 1000;
 
@@ -34,12 +27,6 @@ module.exports = class Radial extends LightProgram {
         this.config.power
       );
 
-      if (this.taps.length > 0){
-        this.taps.pop();
-        this.holdWhite = 3000;
-        console.log('adentro tap');
-      }
-
       if (this.config.colorMap) {
         const gradient = loadGradient(this.config.colorMap);
         const [r, g, b, a] = gradient.colorAt(1 - v);
@@ -51,7 +38,6 @@ module.exports = class Radial extends LightProgram {
             v
         );
       }
-      leds[i] = --this.holdWhite > 0 ? [255,255,255] : leds[i];
 
     }
   }

diff --git a/server/src/light-programs/programs/wand-empty-canvas.js b/server/src/light-programs/programs/wand-empty-canvas.js
@@ -14,9 +14,8 @@ module.exports = class WandEmptyCanvas extends LightProgram {
       this.ledsToPaint = new Array(this.numberOfLeds).fill([0, 0, 0]);
       return;
     }
-    if (data.move){
-      this.config.move = true;
-    }
+    this.config.move = data.move !== undefined ? data.move : this.config.move;
+
     this.ledsToPaint[data.position] = data.color;
   }
   // Override base class