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

Testing issue with light.js and the new async/await functions in main.js. Fundamental breakdown in light functionality that isn't occuring in proj.js. Ok I am just figuring out the issue as I type this, damnit.

This commit is contained in:
mmcwilliams 2018-03-15 11:55:10 -04:00
parent f4afcaf8cc
commit 2f05a3d21e
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/ui/light.js
View File

@ -124,6 +124,8 @@ light.set = function (rgb, callback) { //rgb = [0,0,0]
rgb : rgb, rgb : rgb,
id : uuid.v4() id : uuid.v4()
}; };
console.log(rgb)
console.log(obj)
ipcRenderer.sendSync('light', obj); ipcRenderer.sendSync('light', obj);
if (typeof callback !== 'undefined') { if (typeof callback !== 'undefined') {

54
app/main.js
View File

@ -354,7 +354,8 @@ var createWindow = function () {
width: 800, width: 800,
height: 600, height: 600,
minWidth : 800, minWidth : 800,
minHeight : 600 minHeight : 600,
icon: path.join(__dirname, 'assets/icons/icon.png')
}) })
mainWindow.loadURL('file://' + __dirname + '/index.html') mainWindow.loadURL('file://' + __dirname + '/index.html')
if (process.argv.indexOf('-d') !== -1 || process.argv.indexOf('--dev') !== -1) { if (process.argv.indexOf('-d') !== -1 || process.argv.indexOf('--dev') !== -1) {
@ -369,9 +370,17 @@ light.init = function () {
light.listen() light.listen()
} }
light.listen = function () { light.listen = function () {
ipcMain.on('light', (event, arg) => { ipcMain.on('light', async (event, arg) => {
light.set(arg.rgb, arg.id) //return new Promise(async(resolve, reject) => {
event.returnValue = true try {
await light.set(arg.rgb, arg.id)
}catch (err) {
console.error(err)
return reject(err)
}
event.returnValue = true
// return resolve(true)
//})
}) })
} }
light.set = async function (rgb, id) { light.set = async function (rgb, id) {
@ -382,7 +391,13 @@ light.set = async function (rgb, id) {
} catch (err) { } catch (err) {
console.error(err) console.error(err)
} }
await arduino.string('light', str) console.log(ms)
await delay(10)
try {
arduino.string('light', str)
} catch (err) {
console.error(err)
}
return await light.end(rgb, id, ms) return await light.end(rgb, id, ms)
} }
light.end = async function (rgb, id, ms) { light.end = async function (rgb, id, ms) {
@ -423,11 +438,19 @@ proj.move = async function (frame, id) {
return await proj.end(mcopy.cfg.arduino.cmd.projector, id, ms) return await proj.end(mcopy.cfg.arduino.cmd.projector, id, ms)
} }
proj.listen = function () { proj.listen = function () {
ipcMain.on('proj', (event, arg) => { ipcMain.on('proj', async (event, arg) => {
if (typeof arg.dir !== 'undefined') { if (typeof arg.dir !== 'undefined') {
proj.set(arg.dir, arg.id) try {
await proj.set(arg.dir, arg.id)
} catch (err) {
console.error(err)
}
} else if (typeof arg.frame !== 'undefined') { } else if (typeof arg.frame !== 'undefined') {
proj.move(arg.frame, arg.id) try {
await proj.move(arg.frame, arg.id)
} catch (err) {
console.error(err)
}
} }
event.returnValue = true event.returnValue = true
}) })
@ -488,6 +511,7 @@ cam.move = async function (frame, id) {
const cmd = mcopy.cfg.arduino.cmd.camera const cmd = mcopy.cfg.arduino.cmd.camera
let ms let ms
if (cam.intval) { if (cam.intval) {
ms = await cam.intval.move() ms = await cam.intval.move()
} else { } else {
ms = await arduino.send('camera', cmd) ms = await arduino.send('camera', cmd)
@ -527,11 +551,19 @@ cam.connectIntval = function (event, arg) {
} }
cam.listen = function () { cam.listen = function () {
ipcMain.on('cam', (event, arg) => { ipcMain.on('cam', async (event, arg) => {
if (typeof arg.dir !== 'undefined') { if (typeof arg.dir !== 'undefined') {
cam.set(arg.dir, arg.id) try {
await cam.set(arg.dir, arg.id)
} catch (err) {
console.error(err)
}
} else if (typeof arg.frame !== 'undefined') { } else if (typeof arg.frame !== 'undefined') {
cam.move(arg.frame, arg.id) try {
await cam.move(arg.frame, arg.id)
} catch (err) {
console.error(err)
}
} }
event.returnValue = true event.returnValue = true
}) })