').text(x)));
+ } else {
+ $('#' + cmds[i]).append($(check).addClass(mcopy.state.sequence.pads[cmds[i]]));
+ }
+ gui.grid.state(x);
+ }
+ }
+};
+gui.grid.click = function (t) {
+ 'use strict';
+ var i = parseInt($(t).attr('x'));
+ if ($(t).prop('checked')) {
+ mcopy.log( $(t).attr('class').replace('.', ''));
+ mcopy.state.sequence.arr[i] = $(t).attr('class').replace('.', '');
+ gui.grid.state(i);
+ } else {
+ mcopy.state.sequence.arr[i] = undefined;
+ delete mcopy.state.sequence.arr[i];
+ }
+ mcopy.seq.stats();
+};
+gui.grid.clear = function () {
+ 'use strict';
+ var doit = confirm('Are you sure you want to clear this sequence?');
+ if (doit) {
+ mcopy.seq.clear();
+ gui.grid.refresh();
+ mcopy.seq.stats();
+ mcopy.log('Sequencer cleared');
+ }
+};
+gui.grid.loopChange = function (t) {
+ 'use strict';
+ count = parseInt(t.value);
+ mcopy.loop = count;
+ mcopy.log('Loop count set to ' + mcopy.loop);
+ mcopy.seq.stats();
+};
+gui.grid.plus_24 = function () {
+ 'use strict';
+ mcopy.state.sequence.size += 24;
+ gui.grid.refresh();
+ mcopy.log('Sequencer expanded to ' + mcopy.state.sequence.size + ' steps');
+};
+gui.grid.events = function () {
+ 'use strict';
+ $(document.body).on('click', 'input[type=checkbox]', function () {
+ gui.grid.click(this);
+ });
+};
+
//LIGHT
light.preview = false;
light.color = [0, 0, 0]; //preview status
@@ -2598,14 +2713,12 @@ light.init = function () {
}
});
};
-//color = [0,0,0]
+//rgb = [0,0,0]
light.set = function (rgb) {
'use strict';
light.current = rgb;
- console.dir(rgb);
- ipcRenderer.sendSync('light', rgb);
+ return ipcRenderer.sendSync('light', rgb);
};
-
light.display = function (rgb) {
'use strict';
var str,
@@ -2625,6 +2738,7 @@ light.color_init = function () {
'use strict';
if (!light.color_on) {
$('#rgb').focus();
+ light.color_on = true;
}
};
@@ -2645,7 +2759,6 @@ nav.init = function () {
}
});
};
-
nav.change = function (id) {
'use strict';
$('.screen').hide();
@@ -2660,6 +2773,7 @@ nav.change = function (id) {
var init = function () {
'use strict';
nav.init();
+ gui.grid.layout();
log.init();
light.init();
};
\ No newline at end of file
diff --git a/app/lib/mcopy-arduino.js b/app/lib/mcopy-arduino.js
index bfc4971..3d6a86b 100644
--- a/app/lib/mcopy-arduino.js
+++ b/app/lib/mcopy-arduino.js
@@ -115,6 +115,30 @@ mcopy.arduino.connect = function (callback) {
});
};
+mcopy.arduino.fakeConnect = function (callback) {
+ console.log('Connecting to fake arduino...');
+ mcopy.arduino.serial = {
+ write : function (cmd, res) {
+ var t = {
+ c : mcopy.cfg.arduino.cam.time + mcopy.cfg.arduino.cam.delay,
+ p : mcopy.cfg.arduino.proj.time + mcopy.cfg.arduino.proj.delay
+ },
+ timeout = t[cmd];
+ if (typeof timeout === 'undefined') timeout = 500;
+ mcopy.arduino.timer = +new Date();
+ setTimeout(function () {
+ mcopy.arduino.end(cmd);
+ }, timeout);
+ },
+ string : function (str) {
+ //do nothing
+ return true;
+ }
+ };
+ console.log('Connected to fake arduino! Not real! Doesn\'t exist!');
+ if (callback) callback();
+};
+
if (typeof module !== 'undefined' && module.parent) {
module.exports = function (cfg) {
mcopy.cfg = cfg;
diff --git a/app/main.js b/app/main.js
index a3beb6d..50049f3 100644
--- a/app/main.js
+++ b/app/main.js
@@ -7,6 +7,7 @@ var electron = require('electron'),
uuid = require('node-uuid'),
winston = require('winston'),
moment = require('moment'),
+ Q = require('q'),
mcopy = {};
mcopy.cfg = JSON.parse(fs.readFileSync('./cfg.json', 'utf8'));
@@ -22,6 +23,9 @@ var init = function () {
mcopy.arduino.init(function (err, device) {
if (err) {
log.info(err, 'SERIAL', false, true);
+ mcopy.arduino.fakeConnect(function () {
+ log.info('Connected to fake USB device', 'SERIAL', true, true);
+ });
} else {
log.info('Found device ' + device, 'SERIAL', true, true);
mcopy.arduino.connect(function () {
@@ -67,13 +71,16 @@ ipcMain.on('light', function(event, arg) {
var light = {};
-light.set = function (obj) {
+light.set = function (rgb) {
'use strict';
- var str = obj.rgb.join(',');
+ var str = rgb.join(','),
+ deferred = Q.defer();
mcopy.arduino.send(mcopy.cfg.arduino.cmd.light, function () {
log.info('Light set to ' + str, 'LIGHT', true, true);
+ return deferred.resolve(mcopy.cfg.arduino.cmd.light);
});
mcopy.arduino.string(str);
+ return deferred.promise;
};
var log = {};
diff --git a/app/package.json b/app/package.json
index 1e80b11..6da7193 100644
--- a/app/package.json
+++ b/app/package.json
@@ -34,6 +34,7 @@
"moment": "^2.12.0",
"node-notifier": "^4.5.0",
"node-uuid": "^1.4.7",
+ "q": "^1.4.1",
"serialport": "^2.1.0",
"winston": "^2.2.0"
}
diff --git a/app/src/index.js b/app/src/index.js
index b45d9a3..de5faf5 100644
--- a/app/src/index.js
+++ b/app/src/index.js
@@ -1,11 +1,50 @@
var remote = require('remote'),
+ fs = require('fs'),
uuid = require('node-uuid'),
ipcRenderer = require('electron').ipcRenderer,
+ mcopy = {},
light = {},
nav = {},
+ gui = {},
log = {};
//console.log(ipcRenderer.sendSync('light', { 'fuck' : true }) );
+mcopy.cfg = JSON.parse(fs.readFileSync('./cfg.json'), 'utf8');
+
+/******
+ State shared by ALL interfaces
+*******/
+mcopy.state = {
+ version : 'alpha', //use for file compatibility check
+ camera : {
+ pos : 0,
+ direction: true
+ },
+ projector : {
+ pos : 0,
+ direction: true
+ },
+ sequence : {
+ size : 24,
+ arr : ['CF', 'PF'],
+ cmd : {
+ camera: mcopy.cfg.arduino.cmd.camera,
+ projector: mcopy.cfg.arduino.cmd.projector,
+ cam_direction: mcopy.cfg.arduino.cmd.cam_direction,
+ cam_direction: mcopy.cfg.arduino.cmd.proj_direction
+ },
+ pads: {
+ cam_forward: 'CF',
+ proj_forward : 'PF',
+ black_forward : 'BF',
+
+ cam_backward: 'CB',
+ proj_backward : 'PB',
+ black_backward : 'BB'
+ }
+ }
+};
+
log.time = 'MM/DD/YY-HH:mm:ss';
log.count = 0;
log.init = function () {
@@ -24,7 +63,6 @@ log.init = function () {
log.info('Started app', 'MAIN', true);
log.listen();
};
-
log.listen = function () {
'use strict';
ipcRenderer.on('log', function (event, arg) {
@@ -32,7 +70,6 @@ log.listen = function () {
return event.returnValue = true;
});
};
-
log.display = function (action, service, status, time) {
'use strict';
var obj = {
@@ -53,12 +90,10 @@ log.display = function (action, service, status, time) {
}, 100);
return obj;
};
-
log.report = function (obj) {
'use strict';
ipcRenderer.sendSync('log', obj);
};
-
log.info = function (action, service, status, time) {
'use strict';
var obj = log.display(action, service, status, time);
@@ -66,6 +101,86 @@ log.info = function (action, service, status, time) {
console.log(obj);
};
+
+/******
+ Sequencer grid
+*******/
+gui.grid = {};
+gui.grid.layout = function () {
+ 'use strict';
+ gui.grid.refresh();
+ mcopy.seq.stats();
+};
+gui.grid.state = function (i) {
+ 'use strict';
+ if (mcopy.state.sequence.arr[i] !== undefined) {
+ $('input[x=' + i + ']').prop('checked', false);
+ $('.' + mcopy.state.sequence.arr[i] + '[x=' + i + ']').prop('checked', true);
+ }
+};
+gui.grid.refresh = function () {
+ 'use strict';
+ var cmds = ['cam_forward', 'proj_forward', 'black_forward', 'cam_backward', 'proj_backward', 'black_backward'],
+ check = '',
+ width = 970 + ((940 / 24) * Math.abs(24 - mcopy.state.sequence.size));
+ $('#sequence').width(width + 'px');
+ for (var i = 0; i < cmds.length; i++) {
+ $('#' + cmds[i]).empty();
+ for (var x = 0; x < mcopy.state.sequence.size; x++) {
+ check = '
'.replace('xxxx', x);
+
+ if (i === cmds.length - 1) {
+ $('#' + cmds[i]).append($('
').append($(check).addClass(mcopy.state.sequence.pads[cmds[i]])).append($('
').text(x)));
+ } else {
+ $('#' + cmds[i]).append($(check).addClass(mcopy.state.sequence.pads[cmds[i]]));
+ }
+ gui.grid.state(x);
+ }
+ }
+};
+gui.grid.click = function (t) {
+ 'use strict';
+ var i = parseInt($(t).attr('x'));
+ if ($(t).prop('checked')) {
+ mcopy.log( $(t).attr('class').replace('.', ''));
+ mcopy.state.sequence.arr[i] = $(t).attr('class').replace('.', '');
+ gui.grid.state(i);
+ } else {
+ mcopy.state.sequence.arr[i] = undefined;
+ delete mcopy.state.sequence.arr[i];
+ }
+ mcopy.seq.stats();
+};
+gui.grid.clear = function () {
+ 'use strict';
+ var doit = confirm('Are you sure you want to clear this sequence?');
+ if (doit) {
+ mcopy.seq.clear();
+ gui.grid.refresh();
+ mcopy.seq.stats();
+ mcopy.log('Sequencer cleared');
+ }
+};
+gui.grid.loopChange = function (t) {
+ 'use strict';
+ count = parseInt(t.value);
+ mcopy.loop = count;
+ mcopy.log('Loop count set to ' + mcopy.loop);
+ mcopy.seq.stats();
+};
+gui.grid.plus_24 = function () {
+ 'use strict';
+ mcopy.state.sequence.size += 24;
+ gui.grid.refresh();
+ mcopy.log('Sequencer expanded to ' + mcopy.state.sequence.size + ' steps');
+};
+gui.grid.events = function () {
+ 'use strict';
+ $(document.body).on('click', 'input[type=checkbox]', function () {
+ gui.grid.click(this);
+ });
+};
+
//LIGHT
light.preview = false;
light.color = [0, 0, 0]; //preview status
@@ -161,20 +276,12 @@ light.init = function () {
}
});
};
-light.lock = false;
-light.waiting = {};
//rgb = [0,0,0]
light.set = function (rgb) {
'use strict';
- var cmd = {
- id : uuid.v4(),
- rgb : rgb
- }
light.current = rgb;
- console.dir(rgb);
- ipcRenderer.sendSync('light', rgb);
+ return ipcRenderer.sendSync('light', rgb);
};
-
light.display = function (rgb) {
'use strict';
var str,
@@ -194,6 +301,7 @@ light.color_init = function () {
'use strict';
if (!light.color_on) {
$('#rgb').focus();
+ light.color_on = true;
}
};
@@ -214,7 +322,6 @@ nav.init = function () {
}
});
};
-
nav.change = function (id) {
'use strict';
$('.screen').hide();
@@ -229,6 +336,7 @@ nav.change = function (id) {
var init = function () {
'use strict';
nav.init();
+ gui.grid.layout();
log.init();
light.init();
};
\ No newline at end of file