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

Distinguish devices better and asynchronously

This commit is contained in:
mmcw-dev 2018-01-02 01:16:33 -05:00
parent fa10ee6785
commit c2a079d9af
1 changed files with 106 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
app/main.js
View File

@ -8,9 +8,10 @@ const moment = require('moment')
const uuid = require('uuid') const uuid = require('uuid')
const Q = require('q') const Q = require('q')
const events = require('events') const events = require('events')
const async = require('async')
const ee = new events.EventEmitter() const ee = new events.EventEmitter()
const capture = require('./lib/capture-report.js')(ee) const capture = require('./lib/capture-report.js')(ee)
const mcopy = {} const mcopy = {}
let mainWindow let mainWindow
@ -32,7 +33,7 @@ mcopy.cfgInit = function () {
mcopy.cfg = JSON.parse(fs.readFileSync(mcopy.cfgFile, 'utf8')) mcopy.cfg = JSON.parse(fs.readFileSync(mcopy.cfgFile, 'utf8'))
} }
mcopy.cfgStore = function () { mcopy.cfgStore = function () {
var data = JSON.stringify(mcopy.cfg) var data = JSON.stringify(mcopy.cfg, null, '\t')
fs.writeFileSync(mcopy.cfgFile, data, 'utf8') fs.writeFileSync(mcopy.cfgFile, data, 'utf8')
} }
@ -65,6 +66,7 @@ var distinguishDevice = function (device, callback) {
if (err) { if (err) {
return console.error(err) return console.error(err)
} }
log.info(`Verified ${device} as mcopy device`, 'SERIAL', true, true)
setTimeout(function () { setTimeout(function () {
arduino.distinguish(distinguishCb); arduino.distinguish(distinguishCb);
}, 1000); }, 1000);
@ -73,6 +75,7 @@ var distinguishDevice = function (device, callback) {
if (err) { if (err) {
return console.error(err) return console.error(err)
} }
log.info(`Determined ${device} to be ${type}`, 'SERIAL', true, true)
if (callback) { callback(err, type); } if (callback) { callback(err, type); }
} }
arduino.connect('connect', device, true, connectCb) arduino.connect('connect', device, true, connectCb)
@ -80,54 +83,112 @@ var distinguishDevice = function (device, callback) {
//Cases for 1 or 2 arduinos connected //Cases for 1 or 2 arduinos connected
var distinguishDevices = function (devices) { var distinguishDevices = function (devices) {
var distinguishOne = function (err, type) { var connected = {
projector : false,
camera : false,
light : false
}
var checklist = []
var fakeProjector = function () {
connected.projector = '/dev/fake'
arduino.fakeConnect('projector', () => {
log.info('Connected to fake PROJECTOR device', 'SERIAL', true, true)
})
}
var fakeCamera = function () {
connected.camera = '/dev/fake'
arduino.fakeConnect('camera', () => {
log.info('Connected to fake CAMERA device', 'SERIAL', true, true)
})
}
var fakeLight = function () {
connected.light = '/dev/fake'
arduino.fakeConnect('light', () => {
log.info('Connected to fake LIGHT device', 'SERIAL', true, true)
})
}
var distinguishCb = function (device, type, cb) {
arduino.close(() => { arduino.close(() => {
if (type === 'projector') { if (type === 'projector') {
arduino.connect('projector', devices[0], false, () => { connected.projector = device
log.info('Connected to ' + devices[0] + ' as PROJECTOR', 'SERIAL', true, true) arduino.connect('projector', device, false, () => {
}); log.info(`Connected to ${device} as PROJECTOR`, 'SERIAL', true, true)
if (devices.length === 1) { cb()
arduino.fakeConnect('camera', () => { })
log.info('Connected to fake CAMERA device', 'SERIAL', true, true)
devicesReady(devices[0], 'fake')
});
}
} else if (type === 'camera') { } else if (type === 'camera') {
arduino.connect('camera', devices[0], false, () => { connected.camera = device
log.info('Connected to ' + devices[0] + ' as CAMERA', 'SERIAL', true, true) arduino.connect('camera', device, false, () => {
}); log.info(`Connected to ${device} as CAMERA`, 'SERIAL', true, true)
if (devices.length === 1) { cb()
arduino.fakeConnect('projector', () => { })
log.info('Connected to fake PROJECTOR device', 'SERIAL', true, true) } else if (type === 'light') {
devicesReady('fake', devices[0]) connected.light = device
}) arduino.connect('light', device, false, () => {
} log.info(`Connected to ${device} as LIGHT`, 'SERIAL', true, true)
} cb()
if (devices.length > 1) { })
distinguishDevice(devices[1], distinguishTwo) } else if (type === 'projector,light') {
connected.projector = device
connected.light = device
arduino.connect('projector', device, false, () => {
log.info(`Connected to ${device} as PROJECTOR + LIGHT`, 'SERIAL', true, true)
cb()
})
arduino.alias('light', device)
} else if (type === 'projector,camera,light') {
connected.projector = device
connected.camera = device
connected.light = device
arduino.connect('projector', device, false, () => {
log.info(`Connected to ${device} as PROJECTOR + CAMERA + LIGHT`, 'SERIAL', true, true)
cb()
})
arduino.alias('camera', device)
arduino.alias('light', device)
} else if (type === 'projector,camera') {
connected.projector = device
connected.camera = device
arduino.connect('projector', device, false, () => {
log.info(`Connected to ${device} as PROJECTOR`, 'SERIAL', true, true)
cb()
})
arduino.alias('camera', device)
} else {
cb()
} }
}) })
}, }
distinguishTwo = function (err, type) {
arduino.close(() => { checklist = devices.map(device => {
if (type === 'projector') { return next => {
arduino.connect('projector', devices[1], false, () => { distinguishDevice(device, (err, type) => {
log.info('Connected to ' + devices[1] + ' as PROJECTOR', 'SERIAL', true, true) if (err) {
devicesReady(devices[1], devices[0]) console.error(err)
}); return next()
} else if (type === 'camera') { }
arduino.connect('camera', devices[1], false, () => { distinguishCb(device, type, next)
log.info('Connected to ' + devices[1] + ' as CAMERA', 'SERIAL', true, true) })
devicesReady(devices[0], devices[1]) }
}); })
} async.series(checklist, () => {
}); //done checking devices
}; if (!connected.projector) {
distinguishDevice(devices[0], distinguishOne) fakeProjector()
}
if (!connected.camera) {
fakeCamera()
}
if (!connected.light) {
fakeLight()
}
devicesReady(connected.projector, connected.camera, connected.light)
})
}; };
var devicesReady = function (camera, projector) { var devicesReady = function (camera, projector, light) {
mainWindow.webContents.send('ready', {camera: camera, projector: projector }) mainWindow.webContents.send('ready', {camera: camera, projector: projector, light: light })
}; };
var createMenu = function () { var createMenu = function () {
@ -285,10 +346,10 @@ light.listen = function () {
}; };
light.set = function (rgb, id) { light.set = function (rgb, id) {
var str = rgb.join(','); var str = rgb.join(',');
arduino.send('projector', mcopy.cfg.arduino.cmd.light, (ms) => { arduino.send('light', mcopy.cfg.arduino.cmd.light, (ms) => {
light.end(rgb, id, ms) light.end(rgb, id, ms)
}) })
arduino.string('projector', str) arduino.string('light', str)
}; };
light.end = function (rgb, id, ms) { light.end = function (rgb, id, ms) {
log.info('Light set to ' + rgb.join(','), 'LIGHT', true, true) log.info('Light set to ' + rgb.join(','), 'LIGHT', true, true)