De-bit-rot so tests/app.js works again.

lib/components/lcd-digit.js

@@ -1,4 +1,4 @@
-const LCDchars = require('./7segment_chars.json');
+const LCDchars = require('../7segment_chars.json');
 
 function LCDDigit(config,controller) {
   var char = ' ';
@@ -54,4 +54,4 @@ function LCDDigit(config,controller) {
   }
 };
 
-module.exports = LCDDigit;
+module.exports = LCDDigit;

lib/components/led-rgb.js

@@ -20,4 +20,4 @@ var LED_RGB = function(config,controller) {
   };
 };
 
-module.exports = LED_RGB;
+module.exports = LED_RGB;

lib/components/slider.js

@@ -18,4 +18,4 @@ function Slider(name,config,controller) {
   }
 };
 
-module.exports = Slider;
+module.exports = Slider;

lib/traktor_f1.js

@@ -2,10 +2,17 @@
 
 const HID = require('node-hid');
 const util = require('util');
-const Emitter = require('events').EventEmitter,
-const = require('lodash'),
+const Emitter = require('events').EventEmitter;
+const _ = require('lodash');
 
-const f1Config = require('./traktor_f1_config.json'),
+const Button = require('./components/button');
+const StepWheel = require('./components/stepwheel');
+const Slider = require('./components/slider');
+const LED = require('./components/led');
+const LED_RGB = require('./components/led-rgb');
+const LCDDigit = require('./components/lcd-digit');
+
+const f1Config = require('./traktor_f1_config.json');
 
 var VENDOR_ID  = 6092;
 var PRODUCT_ID = 4384;
@@ -42,28 +49,27 @@ function TraktorF1() {
 	for(var key in f1Config.output.lcd)
 		this.lcd[key] = new LCDDigit(f1Config.output.lcd[key],this);
 
-
-	this.outPacket = new Buffer(81);
+	this.outPacket = new Array(81);
 	this.outPacket[0] = 0x80;
-	this.outPacket.fill(0,1);
+	for (let i = 1; i < 81; i++) {
+	  this.outPacket[i] = 0;
+	}
 
-	var sendOutput = function() {
+	var sendOutput = () => {
 		try {
 			this.device.write(this.outPacket);
 			dirty = false;
 		}
 		catch(ex) {
-			console.log("Error");
-			console.log(ex)
+			console.log("failed write", ex);
 		}
 	};
 
 
-	var boundSendOutput = sendOutput.bind(this);
 	this.invalidateOutput = function() {
 		if(!dirty) {
 			dirty = true;
-			setImmediate(boundSendOutput);
+			setImmediate(sendOutput);
 		}
 	};
 
@@ -74,7 +80,10 @@ function TraktorF1() {
 		console.log('Could not connect to F1',e);
 	}
 
-	this.device.on("data",this.parseInput.bind(this));
+	this.device.on("data", this.parseInput.bind(this));
+	this.device.on("error", (ex) => {
+		console.log("device error:", ex);
+	});
 }
 
 util.inherits(TraktorF1, Emitter);
@@ -83,7 +92,7 @@ TraktorF1.prototype.parseInput = function(data) {
 	for(var key in this.buttons) {
 		this.buttons[key].parseInput(data);
 	}
-	
+
 	this.stepper.parseInput(data);
 
 	for(var key in this.knobs) {

package.json

@@ -6,7 +6,8 @@
   "main": "./lib/traktor_f1",
   "dependencies": {
     "lodash": "^4.5.1",
-    "node-hid": "^0.5.1"
+    "node-hid": "^0.7.0",
+    "tinycolor2": "^1.4.1"
   },
   "devDependencies": {},
   "scripts": {

tests/app.js

@@ -89,7 +89,7 @@ f1.on('stepper:step',function(e) {
 	f1.setLCDString(Number(bpm%100).toString());
 	f1.setLCDDot("l",(bpm >= 100));
 	f1.setLCDDot("r",(bpm >= 200));
-	
+
 });
 
 f1.setLED("l1_r",1);
@@ -147,19 +147,19 @@ var setRGBsToCanvas = function() {
 	for(var i=0; i<16; i++) {
 		var pixIndex = i*4;
 		var alpha = pixels[pixIndex+3]/255;
-		f1.setRGB('p'+(i+1),alpha*pixels[pixIndex],alpha*pixels[pixIndex+1],alpha*pixels[pixIndex+2]);		
+		f1.setRGB('p'+(i+1),alpha*pixels[pixIndex],alpha*pixels[pixIndex+1],alpha*pixels[pixIndex+2]);
 	}*/
 };
 
 
 var setAllRGBs = function() {
-	for(var a=1; a<=16; a++) 
+	for(var a=1; a<=16; a++)
 		f1.setRGB('p'+a,0,0,0);
-	var colors = tinycolor.analogous(tinycolor({h:hue,s:sat,v:val}),17,dist);
+	var colors = tinycolor({h:hue,s:sat,v:val}).analogous(17,dist);
 	for(var a=0, b=1; a < 16; a++, b = (b+1)%colors.length) {
 		//var c = (Math.floor(a/4)+b)%4;
 		var c = b;
-		f1.setRGB('p'+(a+1),colors[c]._r,colors[c]._g,colors[c]._b);		
+		f1.setRGB('p'+(a+1),colors[c]._r,colors[c]._g,colors[c]._b);
 	}
 };
 
@@ -202,12 +202,12 @@ var strobeOffCount = 0;
 f1.on('shift:pressed',function() {
 	strobeInterval = setInterval(function() {
 		if(strobeOffCount < 3) {
-			for(var a=1; a<=16; a++) 
+			for(var a=1; a<=16; a++)
 				f1.setRGB('p'+a,0,0,0);
-			strobeOffCount++;			
+			strobeOffCount++;
 		}
 		else {
-			for(var a=1; a<=16; a++) 
+			for(var a=1; a<=16; a++)
 				f1.setRGB('p'+a,255,255,255);
 			strobeOffCount = 0;
 		}