16mm
/
mcopy
1
0
Fork 0
Code Issues 15 Pull Requests Projects 2 Releases 13 Wiki Activity

Typescript adding commas to compiled code.

This commit is contained in:
mmcwilliams 2019-03-04 22:10:15 -05:00
parent ec0b8e3b4f
commit fcdc6ebb1d
1 changed files with 312 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

626
app/lib/arduino/index.js
View File

@ -1,15 +1,12 @@
'use strict' 'use strict';
const SerialPort = require('serialport');
const SerialPort = require('serialport') const Readline = SerialPort.parsers.Readline;
const Readline = SerialPort.parsers.Readline const exec = require('child_process').exec;
const exec = require('child_process').exec const parser = new Readline('');
const parser = new Readline('') const newlineRe = new RegExp('\n', 'g');
const newlineRe = new RegExp('\n', 'g') const returnRe = new RegExp('\r', 'g');
const returnRe = new RegExp('\r', 'g') let eventEmitter;
let eventEmitter let cfg;
let cfg
/** /**
* Pause the process for X milliseconds in async/await functions * Pause the process for X milliseconds in async/await functions
* *
@ -17,12 +14,11 @@ let cfg
* *
* @returns {Promise} Resolves after wait * @returns {Promise} Resolves after wait
**/ **/
async function delay (ms) { async function delay(ms) {
return new Promise(resolve => { return new Promise(resolve => {
return setTimeout(resolve, ms) return setTimeout(resolve, ms);
}) });
} }
/** /**
* Send a command to an Arduino using async/await * Send a command to an Arduino using async/await
* *
@ -31,21 +27,20 @@ async function delay (ms) {
* *
* @returns {Promise} Resolves after sending * @returns {Promise} Resolves after sending
**/ **/
async function send (device, cmd) { async function send(device, cmd) {
return new Promise ((resolve, reject) => { return new Promise((resolve, reject) => {
arduino.queue[cmd] = (ms) => { arduino.queue[cmd] = (ms) => {
return resolve(ms) return resolve(ms);
} };
return arduino.serial[device].write(cmd, (err, results) => { return arduino.serial[device].write(cmd, (err, results) => {
if (err) { if (err) {
//console.error(err) //console.error(err)
return reject(err) return reject(err);
} }
// //
}) });
}) });
} }
/** /**
* Send a string to an Arduino using async/await * Send a string to an Arduino using async/await
* *
@ -54,18 +49,17 @@ async function send (device, cmd) {
* *
* @returns {Promise} Resolves after sending * @returns {Promise} Resolves after sending
**/ **/
async function write (device, str) { async function write(device, str) {
return new Promise ((resolve, reject) => { return new Promise((resolve, reject) => {
arduino.serial[device].write(str, function (err, results) { arduino.serial[device].write(str, function (err, results) {
if (err) { if (err) {
return reject(err) return reject(err);
} }
//console.log('sent: ' + str) //console.log('sent: ' + str)
return resolve(results) return resolve(results);
}) });
}) });
} }
/** /**
* Connect to an Arduino using async/await * Connect to an Arduino using async/await
* *
@ -73,17 +67,16 @@ async function write (device, str) {
* *
* @returns {Promise} Resolves after opening * @returns {Promise} Resolves after opening
**/ **/
async function open (device) { async function openArduino(device) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
return arduino.serial[device].open(error => { return arduino.serial[device].open(error => {
if (error) { if (error) {
return reject(error) return reject(error);
} }
return resolve(true) return resolve(true);
}) });
}) });
} }
/** /**
* Close a connection to an Arduino using async/await * Close a connection to an Arduino using async/await
* *
@ -91,284 +84,289 @@ async function open (device) {
* *
* @returns {Promise} Resolves after closing * @returns {Promise} Resolves after closing
**/ **/
async function close (device) { async function closeArduino(device) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
return arduino.serial[device].close((err) => { return arduino.serial[device].close((err) => {
if (err) { if (err) {
return reject(err) return reject(err);
} }
return resolve(true) return resolve(true);
}) });
}) });
} }
/****** /******
Arduino handlers Arduino handlers
*******/ *******/
const arduino = { const arduino = {
path : {}, path: {},
known: [ known: [
'/dev/tty.usbmodem1a161', '/dev/tty.usbmodem1a161',
'/dev/tty.usbserial-A800f8dk', '/dev/tty.usbserial-A800f8dk',
'/dev/tty.usbserial-A900cebm', '/dev/tty.usbserial-A900cebm',
'/dev/tty.usbmodem1a131', '/dev/tty.usbmodem1a131',
'/dev/tty.usbserial-a900f6de', '/dev/tty.usbserial-a900f6de',
'/dev/tty.usbmodem1a141', '/dev/tty.usbmodem1a141',
'/dev/ttyACM0', '/dev/ttyACM0',
'COM3' 'COM3'
], ],
alias : { alias: {},
serial: {
}, connect: {},
serial : { projector: {},
connect : {}, camera: {},
projector : {}, light: {}
camera : {}, },
light : {} baud: 57600,
}, queue: {},
baud : 57600, timer: 0,
queue : {}, lock: false,
timer : 0, locks: {}
lock : false, };
locks : {
}
}
arduino.enumerate = async function () { arduino.enumerate = async function () {
return new Promise( (resolve, reject) => { return new Promise((resolve, reject) => {
return SerialPort.list((err, ports) => { return SerialPort.list((err, ports) => {
let matches = [] let matches = [];
if (err) { if (err) {
return reject(err) return reject(err);
} }
ports.forEach(port => { ports.forEach(port => {
if (arduino.known.indexOf(port.comName) !== -1) { if (arduino.known.indexOf(port.comName) !== -1) {
matches.push(port.comName) matches.push(port.comName);
} else if ((port.manufacturer + '').toLowerCase().indexOf('arduino') !== -1) { }
matches.push(port.comName) else if ((port.manufacturer + '').toLowerCase().indexOf('arduino') !== -1) {
} else if ((port.comName + '').toLowerCase().indexOf('usbserial') !== -1) { matches.push(port.comName);
matches.push(port.comName) }
} else if ((port.comName + '').toLowerCase().indexOf('usbmodem') !== -1) { else if ((port.comName + '').toLowerCase().indexOf('usbserial') !== -1) {
matches.push(port.comName) matches.push(port.comName);
} }
}) else if ((port.comName + '').toLowerCase().indexOf('usbmodem') !== -1) {
if (matches.length === 0) { matches.push(port.comName);
return reject('No USB devices found'); }
} else if (matches.length > 0) { });
return resolve(matches) if (matches.length === 0) {
} return reject('No USB devices found');
}) }
}) else if (matches.length > 0) {
} return resolve(matches);
}
});
});
};
//commands which respond to a sent char //commands which respond to a sent char
arduino.send = async function (serial, cmd, res) { arduino.send = async function (serial, cmd, res) {
const device = arduino.alias[serial] const device = arduino.alias[serial];
let results let results;
if (arduino.locks[serial]) { if (arduino.locks[serial]) {
return false return false;
} }
arduino.locks[serial] = true arduino.locks[serial] = true;
await delay(cfg.arduino.serialDelay) await delay(cfg.arduino.serialDelay);
try { try {
results = await send(device, cmd) results = await send(device, cmd);
} catch (e) { }
return console.error(e) catch (e) {
} return console.error(e);
arduino.locks[serial] = false }
arduino.timer = new Date().getTime() arduino.locks[serial] = false;
return await eventEmitter.emit('arduino_send', cmd) arduino.timer = new Date().getTime();
} return await eventEmitter.emit('arduino_send', cmd);
};
//send strings, after char triggers firmware to accept //send strings, after char triggers firmware to accept
arduino.string = async function (serial, str) { arduino.string = async function (serial, str) {
const device = arduino.alias[serial] const device = arduino.alias[serial];
let writeSuccess let writeSuccess;
await delay(cfg.arduino.serialDelay) await delay(cfg.arduino.serialDelay);
if (typeof arduino.serial[device].fake !== 'undefined' if (typeof arduino.serial[device].fake !== 'undefined'
&& arduino.serial[device].fake) { && arduino.serial[device].fake) {
return arduino.serial[device].string(str) return arduino.serial[device].string(str);
} else { }
try { else {
writeSuccess = await write(device, str) try {
} catch (e) { writeSuccess = await write(device, str);
return console.error(e) }
} catch (e) {
return writeSuccess return console.error(e);
} }
} return writeSuccess;
}
};
//respond with same char over serial when done //respond with same char over serial when done
arduino.end = async function (serial, data) { arduino.end = async function (serial, data) {
const end = new Date().getTime() const end = new Date().getTime();
const ms = end - arduino.timer const ms = end - arduino.timer;
let complete let complete;
if (arduino.queue[data] !== undefined) { if (arduino.queue[data] !== undefined) {
arduino.locks[serial] = false; arduino.locks[serial] = false;
//console.log('Command ' + data + ' took ' + ms + 'ms'); //console.log('Command ' + data + ' took ' + ms + 'ms');
complete = arduino.queue[data](ms) //execute callback complete = arduino.queue[data](ms); //execute callback
eventEmitter.emit('arduino_end', data) eventEmitter.emit('arduino_end', data);
delete arduino.queue[data] delete arduino.queue[data];
} else { }
//console.log('Received stray "' + data + '"'); //silent to user else {
} //console.log('Received stray "' + data + '"'); //silent to user
return complete }
return complete;
}; };
arduino.alias = function (serial, device) { arduino.alias = function (serial, device) {
console.log(`Making "${serial}" an alias of ${device}`) console.log(`Making "${serial}" an alias of ${device}`);
arduino.alias[serial] = device arduino.alias[serial] = device;
} };
arduino.connect = async function (serial, device, confirm) { arduino.connect = async function (serial, device, confirm) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let connectSuccess let connectSuccess;
arduino.path[serial] = device; arduino.path[serial] = device;
arduino.alias[serial] = device; arduino.alias[serial] = device;
arduino.serial[device] = new SerialPort(arduino.path[serial], { arduino.serial[device] = new SerialPort(arduino.path[serial], {
autoOpen : false, autoOpen: false,
baudRate: cfg.arduino.baud, baudRate: cfg.arduino.baud,
parser: parser parser: parser
}) });
arduino.locks[device] = false arduino.locks[device] = false;
try { try {
connectSuccess = await open(device) connectSuccess = await openArduino(device);
} catch (e) { }
console.error('failed to open: ' + e) catch (e) {
return reject(e) console.error('failed to open: ' + e);
} return reject(e);
console.log(`Opened connection with ${arduino.path[serial]} as ${serial}`); }
if (!confirm) { console.log(`Opened connection with ${arduino.path[serial]} as ${serial}`);
arduino.serial[device].on('data', async (data) => { if (!confirm) {
let d = data.toString('utf8') arduino.serial[device].on('data', async (data) => {
d = d.replace(newlineRe, '').replace(returnRe, '') let d = data.toString('utf8');
return await arduino.end(serial, d) d = d.replace(newlineRe, '').replace(returnRe, '');
}) return await arduino.end(serial, d);
} else { });
arduino.serial[device].on('data', async (data) => { }
let d = data.toString('utf8') else {
d = d.replace(newlineRe, '').replace(returnRe, '') arduino.serial[device].on('data', async (data) => {
return await arduino.confirmEnd(d) let d = data.toString('utf8');
}) d = d.replace(newlineRe, '').replace(returnRe, '');
} return await arduino.confirmEnd(d);
return resolve(arduino.path[serial]) });
}) }
return resolve(arduino.path[serial]);
} });
};
arduino.confirmExec = {}; arduino.confirmExec = {};
arduino.confirmEnd = function (data) { arduino.confirmEnd = function (data) {
//console.dir(data) //console.dir(data)
if (data === cfg.arduino.cmd.connect if (data === cfg.arduino.cmd.connect
|| data === cfg.arduino.cmd.proj_identifier || data === cfg.arduino.cmd.proj_identifier
|| data === cfg.arduino.cmd.cam_identifier || data === cfg.arduino.cmd.cam_identifier
|| data === cfg.arduino.cmd.light_identifier || data === cfg.arduino.cmd.light_identifier
|| data === cfg.arduino.cmd.proj_light_identifier || data === cfg.arduino.cmd.proj_light_identifier
|| data === cfg.arduino.cmd.proj_cam_light_identifier || data === cfg.arduino.cmd.proj_cam_light_identifier
|| data === cfg.arduino.cmd.proj_cam_identifier ) { || data === cfg.arduino.cmd.proj_cam_identifier) {
arduino.confirmExec(null, data); arduino.confirmExec(null, data);
arduino.confirmExec = {}; arduino.confirmExec = {};
} }
} };
arduino.verify = async function () {
arduino.verify = async function () { return new Promise(async (resolve, reject) => {
return new Promise(async (resolve, reject) => { const device = arduino.alias['connect'];
const device = arduino.alias['connect'] let writeSuccess;
let writeSuccess arduino.confirmExec = function (err, data) {
arduino.confirmExec = function (err, data) { if (data === cfg.arduino.cmd.connect) {
if (data === cfg.arduino.cmd.connect) { return resolve(true);
return resolve(true) }
} else { else {
return reject('Wrong data returned') return reject('Wrong data returned');
} }
} };
await delay(cfg.arduino.serialDelay) await delay(cfg.arduino.serialDelay);
try { try {
writeSuccess = await send(device, cfg.arduino.cmd.connect) writeSuccess = await send(device, cfg.arduino.cmd.connect);
} catch (e) { }
return reject(e) catch (e) {
} return reject(e);
return resolve(writeSuccess) }
}) return resolve(writeSuccess);
} });
};
arduino.distinguish = async function () { arduino.distinguish = async function () {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const device = arduino.alias['connect'] const device = arduino.alias['connect'];
let writeSuccess let writeSuccess;
let type let type;
arduino.confirmExec = function (err, data) { arduino.confirmExec = function (err, data) {
if (data === cfg.arduino.cmd.proj_identifier) { if (data === cfg.arduino.cmd.proj_identifier) {
type = 'projector' type = 'projector';
} else if (data === cfg.arduino.cmd.cam_identifier) { }
type = 'camera' else if (data === cfg.arduino.cmd.cam_identifier) {
} else if (data === cfg.arduino.cmd.light_identifier) { type = 'camera';
type = 'light' }
} else if (data === cfg.arduino.cmd.proj_light_identifier) { else if (data === cfg.arduino.cmd.light_identifier) {
type = 'projector,light' type = 'light';
} else if (data === cfg.arduino.cmd.proj_cam_light_identifier) { }
type = 'projector,camera,light' else if (data === cfg.arduino.cmd.proj_light_identifier) {
} else if (data === cfg.arduino.cmd.proj_cam_identifier) { type = 'projector,light';
type = 'projector,camera' }
} else if (data === cfg.ardino.cmd.proj_second_identifier) { else if (data === cfg.arduino.cmd.proj_cam_light_identifier) {
type = 'projector_second' type = 'projector,camera,light';
} }
return resolve(type) else if (data === cfg.arduino.cmd.proj_cam_identifier) {
} type = 'projector,camera';
await delay(cfg.arduino.serialDelay) }
try { else if (data === cfg.ardino.cmd.proj_second_identifier) {
writeSuccess = await send(device, cfg.arduino.cmd.mcopy_identifier) type = 'projector_second';
} catch (e) { }
console.error(e) return resolve(type);
return reject(e) };
} await delay(cfg.arduino.serialDelay);
}) try {
} writeSuccess = await send(device, cfg.arduino.cmd.mcopy_identifier);
}
arduino.close = async function (callback) { catch (e) {
const device = arduino.alias['connect'] console.error(e);
let closeSuccess return reject(e);
try { }
closeSuccess = await close(device) });
} catch (e) { };
return console.error(e) arduino.close = async function (callback) {
} const device = arduino.alias['connect'];
return closeSuccess let closeSuccess;
try {
closeSuccess = await closeArduino(device);
}
catch (e) {
return console.error(e);
}
return closeSuccess;
}; };
arduino.fakeConnect = async function (serial) { arduino.fakeConnect = async function (serial) {
//console.log('Connecting to fake arduino...'); //console.log('Connecting to fake arduino...');
const device = '/dev/fake' const device = '/dev/fake';
arduino.alias[serial] = device arduino.alias[serial] = device;
arduino.serial[device] = { arduino.serial[device] = {
write : function (cmd, cb) { write: function (cmd, cb) {
const t = { const t = {
c : cfg.arduino.cam.time + cfg.arduino.cam.delay, c: cfg.arduino.cam.time + cfg.arduino.cam.delay,
p : cfg.arduino.proj.time + cfg.arduino.proj.delay p: cfg.arduino.proj.time + cfg.arduino.proj.delay
} };
let timeout = t[cmd] let timeout = t[cmd];
let end let end;
if (typeof timeout === 'undefined') timeout = 10 if (typeof timeout === 'undefined')
arduino.timer = +new Date() timeout = 10;
setTimeout(() => { arduino.timer = +new Date();
arduino.end(serial, cmd) setTimeout(() => {
return cb() arduino.end(serial, cmd);
}, timeout) return cb();
}, timeout);
}, },
string : async function (str) { string: async function (str) {
//do nothing //do nothing
return true return true;
}, },
fake : true fake: true
}; };
//console.log('Connected to fake arduino! Not real! Doesn\'t exist!'); //console.log('Connected to fake arduino! Not real! Doesn\'t exist!');
return true return true;
} };
if (typeof module !== 'undefined' && module.parent) { if (typeof module !== 'undefined' && module.parent) {
module.exports = function (c, ee) { module.exports = function (c, ee) {
eventEmitter = ee eventEmitter = ee;
cfg = c cfg = c;
return arduino return arduino;
} };
} }
//# sourceMappingURL=index.js.map