From d96e5478d9c48c23555a736e3c3938592f69879e Mon Sep 17 00:00:00 2001 From: Evan Tahler Date: Sat, 1 Feb 2014 20:16:30 -0800 Subject: [PATCH 1/2] enttec openDMX attempt 1 --- .gitignore | 1 + dmx.js | 5 +-- drivers/enttec-open-usb-dmx.js | 60 ++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 drivers/enttec-open-usb-dmx.js diff --git a/.gitignore b/.gitignore index cfdef68..6568e15 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ lib-cov pids logs results +.DS_Store node_modules diff --git a/dmx.js b/dmx.js index 7ba4b0e..235549f 100644 --- a/dmx.js +++ b/dmx.js @@ -7,8 +7,9 @@ function DMX() { this.universes = {} this.drivers = {} - this.registerDriver('null', require('./drivers/null')) - this.registerDriver('enttec-usb-dmx-pro', require('./drivers/enttec-usb-dmx-pro')) + this.registerDriver('null', require('./drivers/null')) + this.registerDriver('enttec-usb-dmx-pro', require('./drivers/enttec-usb-dmx-pro')) + this.registerDriver('enttec-open-usb-dmx', require('./drivers/enttec-open-usb-dmx')) } util.inherits(DMX, EventEmitter) diff --git a/drivers/enttec-open-usb-dmx.js b/drivers/enttec-open-usb-dmx.js new file mode 100644 index 0000000..64d77c3 --- /dev/null +++ b/drivers/enttec-open-usb-dmx.js @@ -0,0 +1,60 @@ +"use strict" + +var FTDI = require('ftdi') + +var ENTTEC_PRO_DMX_STARTCODE = 0x00 + , ENTTEC_PRO_START_OF_MSG = 0x7e + , ENTTEC_PRO_END_OF_MSG = 0xe7 + , ENTTEC_PRO_SEND_DMX_RQ = 0x06 + ; + +function EnttecUSBDMXPRO(device_id, cb) { + var self = this + cb = cb || function() {} + this.universe = new Buffer(512) + this.universe.fill(0) + + this.dev = new FTDI.FtdiDevice(device_id) + this.dev.open({ + 'baudrate': 115200, + 'databits': 8, + 'stopbits': 2, + 'parity': 'none' + }, function(err) { + cb(err, device_id) + if(!err) { + self.send_universe() + } + }) +} + +EnttecUSBDMXPRO.prototype.send_universe = function() { + var hdr = Buffer([ + ENTTEC_PRO_START_OF_MSG, + ENTTEC_PRO_SEND_DMX_RQ, + // (this.universe.length + 1) & 0xff, + ((this.universe.length + 1) >> 0) & 0xff, + ((this.universe.length + 1) >> 8) & 0xff, + ENTTEC_PRO_DMX_STARTCODE + ]) + + var msg = Buffer.concat([ + hdr, + this.universe, + Buffer([ENTTEC_PRO_END_OF_MSG]) + ]) + this.dev.write(msg) +} + +EnttecUSBDMXPRO.prototype.update = function(u) { + for(var c in u) { + this.universe[c] = u[c] + } + this.send_universe() +} + +EnttecUSBDMXPRO.prototype.get = function(c) { + return this.universe[c] +} + +module.exports = EnttecUSBDMXPRO \ No newline at end of file From bf6e796b96ff77b03c89a8cd05156c11054e38f9 Mon Sep 17 00:00:00 2001 From: Evan Tahler Date: Sat, 22 Feb 2014 15:32:46 -0800 Subject: [PATCH 2/2] rename --- drivers/enttec-open-usb-dmx.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/enttec-open-usb-dmx.js b/drivers/enttec-open-usb-dmx.js index 64d77c3..dd482c0 100644 --- a/drivers/enttec-open-usb-dmx.js +++ b/drivers/enttec-open-usb-dmx.js @@ -8,7 +8,7 @@ var ENTTEC_PRO_DMX_STARTCODE = 0x00 , ENTTEC_PRO_SEND_DMX_RQ = 0x06 ; -function EnttecUSBDMXPRO(device_id, cb) { +function EnttecOpenUsbDMX(device_id, cb) { var self = this cb = cb || function() {} this.universe = new Buffer(512) @@ -28,7 +28,7 @@ function EnttecUSBDMXPRO(device_id, cb) { }) } -EnttecUSBDMXPRO.prototype.send_universe = function() { +EnttecOpenUsbDMX.prototype.send_universe = function() { var hdr = Buffer([ ENTTEC_PRO_START_OF_MSG, ENTTEC_PRO_SEND_DMX_RQ, @@ -46,15 +46,15 @@ EnttecUSBDMXPRO.prototype.send_universe = function() { this.dev.write(msg) } -EnttecUSBDMXPRO.prototype.update = function(u) { +EnttecOpenUsbDMX.prototype.update = function(u) { for(var c in u) { this.universe[c] = u[c] } this.send_universe() } -EnttecUSBDMXPRO.prototype.get = function(c) { +EnttecOpenUsbDMX.prototype.get = function(c) { return this.universe[c] } -module.exports = EnttecUSBDMXPRO \ No newline at end of file +module.exports = EnttecOpenUsbDMX \ No newline at end of file