Remove dev object and replace with new devices module. Log an error on failure to enumerate devices that isn't caught within the method.
This commit is contained in:
parent
82e10bb4a4
commit
7ce3fa854a
344
app/main.js
344
app/main.js
|
|
@ -23,10 +23,9 @@ const delay = require('delay')
|
|||
|
||||
//Objects
|
||||
const mcopy = {}
|
||||
const dev = {}
|
||||
|
||||
let log;
|
||||
let SYSTEM;
|
||||
let log;
|
||||
let mainWindow;
|
||||
let mscript;
|
||||
let arduino;
|
||||
|
|
@ -39,329 +38,9 @@ let cam;
|
|||
let proj;
|
||||
let light;
|
||||
let dig;
|
||||
let dev;
|
||||
|
||||
mcopy.cfg = require('./data/cfg.json')
|
||||
mcopy.settings = {}
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
*
|
||||
**/
|
||||
|
||||
dev.init = function () {
|
||||
dev.listen()
|
||||
}
|
||||
|
||||
dev.listen = function () {
|
||||
ipcMain.on('profile', (event, arg) => {
|
||||
log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false)
|
||||
settings.update('profile', arg.profile)
|
||||
settings.save()
|
||||
})
|
||||
}
|
||||
|
||||
dev.enumerate = async function () {
|
||||
let devices
|
||||
try{
|
||||
devices = await arduino.enumerate()
|
||||
} catch (err) {
|
||||
log.info(err, 'SERIAL', false, true)
|
||||
await delay(1000)
|
||||
return dev.all([])
|
||||
}
|
||||
log.info(`Found ${devices.length} USB devices`, 'SERIAL', true, true)
|
||||
devices = dev.favor(devices)
|
||||
return await dev.all(devices)
|
||||
}
|
||||
|
||||
dev.favor = function (devices) {
|
||||
const past = mcopy.settings.devices.filter(device => {
|
||||
if (device.arduino) {
|
||||
return device
|
||||
}
|
||||
}).map(device => {
|
||||
return device.arduino
|
||||
})
|
||||
if (past.length === 0) {
|
||||
return devices
|
||||
}
|
||||
devices.sort((a, b) => {
|
||||
if (past.indexOf(a) !== -1 && past.indexOf(b) === -1) {
|
||||
return 1
|
||||
} else if (past.indexOf(a) === -1 && past.indexOf(b) !== -1) {
|
||||
return -1
|
||||
}
|
||||
return 0
|
||||
})
|
||||
return devices
|
||||
}
|
||||
|
||||
dev.distinguish = async function (device) {
|
||||
let connectSuccess
|
||||
let verifySuccess
|
||||
let type
|
||||
|
||||
try {
|
||||
connectSuccess = await arduino.connect('connect', device, true)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
|
||||
await delay(2000)
|
||||
|
||||
try {
|
||||
verifySuccess = await arduino.verify()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
|
||||
log.info(`Verified ${device} as mcopy device`, 'SERIAL', true, true)
|
||||
|
||||
await delay(1000)
|
||||
|
||||
try {
|
||||
type = await arduino.distinguish()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return null
|
||||
}
|
||||
|
||||
dev.remember('arduino', device, type)
|
||||
log.info(`Determined ${device} to be ${type}`, 'SERIAL', true, true)
|
||||
|
||||
return type
|
||||
}
|
||||
|
||||
dev.fakeProjector = async function () {
|
||||
dev.connected.projector = '/dev/fake'
|
||||
try {
|
||||
await arduino.fakeConnect('projector')
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
log.error(`Error connecting to fake PRONECTOR device`, 'SERIAL', true, true)
|
||||
return false
|
||||
}
|
||||
log.info('Connected to fake PROJECTOR device', 'SERIAL', true, true)
|
||||
return true
|
||||
}
|
||||
dev.fakeCamera = async function () {
|
||||
dev.connected.camera = '/dev/fake'
|
||||
try {
|
||||
await arduino.fakeConnect('camera')
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
log.error(`Error connecting to fake CAMERA device`, 'SERIAL', true, true)
|
||||
return false
|
||||
}
|
||||
log.info('Connected to fake CAMERA device', 'SERIAL', true, true)
|
||||
return true
|
||||
}
|
||||
dev.fakeLight = async function () {
|
||||
dev.connected.light = '/dev/fake'
|
||||
try {
|
||||
await arduino.fakeConnect('light')
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
log.error(`Error connecting to fake LIGHT device`, 'SERIAL', true, true)
|
||||
return false
|
||||
}
|
||||
log.info('Connected to fake LIGHT device', 'SERIAL', true, true)
|
||||
return true
|
||||
}
|
||||
|
||||
dev.connectDevice = async function (device, type) {
|
||||
let closeSuccess
|
||||
let connectSuccess
|
||||
try {
|
||||
closeSuccess = await arduino.close()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
if (type === 'projector') {
|
||||
dev.connected.projector = device
|
||||
try {
|
||||
connectSuccess = await arduino.connect('projector', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
log.info(`Connected to ${device} as PROJECTOR`, 'SERIAL', true, true)
|
||||
} else if (type === 'camera') {
|
||||
dev.connected.camera = device
|
||||
try {
|
||||
connectSuccess = await arduino.connect('camera', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
log.info(`Connected to ${device} as CAMERA`, 'SERIAL', true, true)
|
||||
} else if (type === 'light') {
|
||||
dev.connected.light = device
|
||||
try {
|
||||
connectSuccess = await arduino.connect('light', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
log.info(`Connected to ${device} as LIGHT`, 'SERIAL', true, true)
|
||||
} else if (type === 'projector,light') {
|
||||
dev.connected.projector = device
|
||||
dev.connected.light = device
|
||||
arduino.aliasSerial('light', device)
|
||||
try{
|
||||
connectSuccess = await arduino.connect('projector', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
log.info(`Connected to ${device} as PROJECTOR + LIGHT`, 'SERIAL', true, true)
|
||||
|
||||
} else if (type === 'projector,camera,light') {
|
||||
dev.connected.projector = device
|
||||
dev.connected.camera = device
|
||||
dev.connected.light = device
|
||||
arduino.aliasSerial('camera', device)
|
||||
arduino.aliasSerial('light', device)
|
||||
try {
|
||||
connectSuccess = await arduino.connect('projector', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
log.info(`Connected to ${device} as PROJECTOR + CAMERA + LIGHT`, 'SERIAL', true, true)
|
||||
|
||||
} else if (type === 'projector,camera') {
|
||||
dev.connected.projector = device
|
||||
dev.connected.camera = device
|
||||
arduino.aliasSerial('camera', device)
|
||||
try {
|
||||
connectSuccess = await arduino.connect('projector', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
log.info(`Connected to ${device} as PROJECTOR`, 'SERIAL', true, true)
|
||||
} else if (type === 'projector_second') {
|
||||
dev.connected.projector_second = device
|
||||
arduino.aliasSerial('projector_second', device)
|
||||
try {
|
||||
connectSuccess = await arduino.connect('projector_second', device, false)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return false
|
||||
}
|
||||
}
|
||||
return connectSuccess
|
||||
}
|
||||
|
||||
//Cases for 1 or 2 arduinos connected
|
||||
dev.all = async function (devices) {
|
||||
let c = {}
|
||||
let p = {}
|
||||
let l = {}
|
||||
let type
|
||||
let d
|
||||
let s = {}
|
||||
|
||||
|
||||
dev.connected = {
|
||||
projector : false,
|
||||
camera : false,
|
||||
light : false,
|
||||
projector_second : false
|
||||
}
|
||||
|
||||
let checklist = []
|
||||
|
||||
for (let device of devices) {
|
||||
try {
|
||||
type = await dev.distinguish(device)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return reject(err)
|
||||
}
|
||||
|
||||
try {
|
||||
await dev.connectDevice(device, type)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
return reject(err)
|
||||
}
|
||||
}
|
||||
|
||||
//done checking devices
|
||||
|
||||
if (!dev.connected.projector) {
|
||||
await dev.fakeProjector()
|
||||
}
|
||||
p.arduino = dev.connected.projector
|
||||
if (!dev.connected.camera) {
|
||||
await dev.fakeCamera()
|
||||
}
|
||||
c.arduino = dev.connected.camera
|
||||
|
||||
if (mcopy.settings.camera.intval) {
|
||||
c.intval = mcopy.settings.camera.intval
|
||||
await delay(1000)
|
||||
await cam.connectIntval(null, { connect : true, url : c.intval })
|
||||
}
|
||||
|
||||
if (!dev.connected.light) {
|
||||
await dev.fakeLight()
|
||||
}
|
||||
|
||||
l.arduino = dev.connected.light
|
||||
|
||||
if (dev.connected.projector_second) {
|
||||
s = dev.connected.projector_second
|
||||
}
|
||||
|
||||
return dev.ready(p, c, l, s)
|
||||
}
|
||||
|
||||
dev.remember = function (which, device, type) {
|
||||
let deviceEntry
|
||||
const match = mcopy.settings.devices.filter(dev => {
|
||||
if (dev[which] && dev[which] === device) {
|
||||
return dev
|
||||
}
|
||||
})
|
||||
if (match.length === 0) {
|
||||
deviceEntry = {
|
||||
type : type
|
||||
}
|
||||
deviceEntry[which] = device
|
||||
mcopy.settings.devices.push(deviceEntry)
|
||||
settings.update('devices', mcopy.settings.devices)
|
||||
settings.save()
|
||||
}
|
||||
};
|
||||
|
||||
dev.ready = function (projector, camera, light, projector_second) {
|
||||
let args = {
|
||||
camera,
|
||||
projector,
|
||||
light,
|
||||
profile: mcopy.settings.profile
|
||||
}
|
||||
if (projector_second && projector_second.arduino) {
|
||||
args.projector_second = projector_second
|
||||
}
|
||||
mainWindow.webContents.send('ready', args)
|
||||
settings.update('camera', camera)
|
||||
settings.update('projector', projector)
|
||||
settings.update('light', light)
|
||||
if (projector_second && projector_second.arduino) {
|
||||
settings.update('projector_second', projector_second)
|
||||
mainWindow.setSize(800, 800)
|
||||
}
|
||||
settings.save()
|
||||
return true
|
||||
};
|
||||
const cfg = require('./data/cfg.json')
|
||||
|
||||
var createMenu = function () {
|
||||
const template = require('./data/menu.json')
|
||||
|
|
@ -413,30 +92,31 @@ var init = async function () {
|
|||
createMenu()
|
||||
|
||||
await settings.restore()
|
||||
mcopy.settings = await settings.all()
|
||||
|
||||
dev.init()
|
||||
//dev.init()
|
||||
seq.init()
|
||||
|
||||
display = require('display')(SYSTEM)
|
||||
ffmpeg = require('ffmpeg')(SYSTEM)
|
||||
ffprobe = require('ffprobe')(SYSTEM)
|
||||
arduino = require('arduino')(mcopy.cfg, ee)
|
||||
arduino = require('arduino')(cfg, ee)
|
||||
mscript = require('mscript')
|
||||
|
||||
dig = require('digital')(display, ffmpeg, ffprobe)
|
||||
cam = require('cam')(arduino, mcopy.cfg, mainWindow.webContents, dig)
|
||||
proj = require('proj')(arduino, mcopy.cfg, mainWindow.webContents, dig)
|
||||
light = require('light')(arduino, mcopy.cfg, mainWindow.webContents)
|
||||
//dev
|
||||
light = require('light')(arduino, cfg, mainWindow.webContents)
|
||||
dig = require('digital')(display, ffmpeg, ffprobe, mainWindow.webContents, light)
|
||||
cam = require('cam')(arduino, cfg, mainWindow.webContents, dig)
|
||||
proj = require('proj')(arduino, cfg, mainWindow.webContents, dig)
|
||||
dev = require('devices')(arduino, settings, mainWindow, cam)
|
||||
//cmd
|
||||
//seq
|
||||
|
||||
await delay(2000)
|
||||
|
||||
try {
|
||||
await dev.enumerate()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
log.error('Error enumerating connected devices', err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue