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