Make mscript command line function

Can issue commands using GUI
This commit is contained in:
mmcwilliams 2016-06-09 17:21:49 -04:00
parent ed593b3b7c
commit 11cdb9b514
3 changed files with 150 additions and 214 deletions

View File

@ -3051,9 +3051,10 @@ var remote = require('remote'),
cam = {}, cam = {},
nav = {}, nav = {},
seq = require('./lib/seq-ui.js'), seq = require('./lib/seq-ui.js'),
cmd = {}, cmd = require('./lib/cmd-ui.js'),
gui = {}, gui = {},
log = require('./lib/log-ui.js'); log = require('./lib/log-ui.js'),
mscript = require('./lib/mscript.js');
//console.log(ipcRenderer.sendSync('light', { 'fuck' : true }) ); //console.log(ipcRenderer.sendSync('light', { 'fuck' : true }) );
mcopy.cfg = JSON.parse(fs.readFileSync('./data/cfg.json'), 'utf8'); mcopy.cfg = JSON.parse(fs.readFileSync('./data/cfg.json'), 'utf8');
@ -3097,111 +3098,6 @@ mcopy.state = {
//mcopy.gui.updateState(); //mcopy.gui.updateState();
cmd.proj_forward = function (callback) {
'use strict';
var res = function (ms) {
gui.updateState();
if (callback) { callback(ms); }
};
if (!mcopy.state.projector.direction) {
proj.set(true, function (ms) {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.proj_backward = function (callback) {
'use strict';
var res = function (ms) {
gui.updateState();
if (callback) { callback(ms); }
};
if (mcopy.state.projector.direction) {
proj.set(false, function (ms) {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.cam_forward = function (rgb, callback) {
'use strict';
var res = function (ms) {
gui.updateState();
setTimeout(function () {
light.display([0,0,0]);
light.set([0, 0, 0], function () {
if (callback) { callback(ms); }
});
}, mcopy.cfg.arduino.serialDelay);
};
if (!mcopy.state.camera.direction) {
cam.set(true, function () {
setTimeout( function () {
light.display(rgb);
light.set(rgb, function () {
setTimeout( function () {
cam.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
}, mcopy.cfg.arduino.serialDelay);
});
} else {
light.display(rgb);
light.set(rgb, function () {
setTimeout(function () {
cam.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
}
};
cmd.black_forward = function (callback) {
'use strict';
var off = [0, 0, 0];
cmd.cam_forward(off, callback);
};
cmd.cam_backward = function (rgb, callback) {
'use strict';
var res = function (ms) {
gui.updateState();
light.display([0,0,0]);
light.set([0, 0, 0], function () {
if (callback) { callback(ms); }
});
};
if (mcopy.state.camera.direction) {
cam.set(false, function () {
setTimeout(function () {
light.display(rgb);
light.set(rgb, function () {
cam.move(res);
});
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
light.display(rgb);
light.set(rgb, function () {
cam.move(res);
});
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.black_backward = function (callback) {
'use strict';
var off = [0, 0, 0];
cmd.cam_backward(off, callback);
};
proj.queue = {}; proj.queue = {};
proj.lock = false; proj.lock = false;
proj.init = function () { proj.init = function () {
@ -3579,8 +3475,26 @@ gui.console.init = function () {
} }
}); });
}; };
gui.console.lines = [];
gui.console.parse = function () {
'use strict';
var lines = gui.console.elem.val().split('\n'),
line = lines[lines.length - 2].replace('>', '').trim();
gui.console.lines.push(line);
};
gui.console.exec = function () { gui.console.exec = function () {
'use strict'; 'use strict';
var command;
gui.console.parse();
command = gui.console.lines[gui.console.lines.length - 1].replace('>', '').trim();
console.log(command);
if (mscript.cmd.indexOf(command) !== -1) {
if (command === 'CF') {
cmd.cam_forward(light.color);
} else if (cmd === 'CB') {
cmd.cam_backward(light.color);
}
}
gui.console.newLine(); gui.console.newLine();
}; };
gui.console.newLine = function () { gui.console.newLine = function () {

108
app/lib/cmd-ui.js Normal file
View File

@ -0,0 +1,108 @@
var cmd = {};
cmd.proj_forward = function (callback) {
'use strict';
var res = function (ms) {
gui.updateState();
if (callback) { callback(ms); }
};
if (!mcopy.state.projector.direction) {
proj.set(true, function (ms) {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.proj_backward = function (callback) {
'use strict';
var res = function (ms) {
gui.updateState();
if (callback) { callback(ms); }
};
if (mcopy.state.projector.direction) {
proj.set(false, function (ms) {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.cam_forward = function (rgb, callback) {
'use strict';
var res = function (ms) {
gui.updateState();
setTimeout(function () {
light.display([0,0,0]);
light.set([0, 0, 0], function () {
if (callback) { callback(ms); }
});
}, mcopy.cfg.arduino.serialDelay);
};
if (!mcopy.state.camera.direction) {
cam.set(true, function () {
setTimeout( function () {
light.display(rgb);
light.set(rgb, function () {
setTimeout( function () {
cam.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
}, mcopy.cfg.arduino.serialDelay);
});
} else {
light.display(rgb);
light.set(rgb, function () {
setTimeout(function () {
cam.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
}
};
cmd.black_forward = function (callback) {
'use strict';
var off = [0, 0, 0];
cmd.cam_forward(off, callback);
};
cmd.cam_backward = function (rgb, callback) {
'use strict';
var res = function (ms) {
gui.updateState();
light.display([0,0,0]);
light.set([0, 0, 0], function () {
if (callback) { callback(ms); }
});
};
if (mcopy.state.camera.direction) {
cam.set(false, function () {
setTimeout(function () {
light.display(rgb);
light.set(rgb, function () {
cam.move(res);
});
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
light.display(rgb);
light.set(rgb, function () {
cam.move(res);
});
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.black_backward = function (callback) {
'use strict';
var off = [0, 0, 0];
cmd.cam_backward(off, callback);
};
module.exports = cmd;

View File

@ -12,9 +12,10 @@ var remote = require('remote'),
cam = {}, cam = {},
nav = {}, nav = {},
seq = require('./lib/seq-ui.js'), seq = require('./lib/seq-ui.js'),
cmd = {}, cmd = require('./lib/cmd-ui.js'),
gui = {}, gui = {},
log = require('./lib/log-ui.js'); log = require('./lib/log-ui.js'),
mscript = require('./lib/mscript.js');
//console.log(ipcRenderer.sendSync('light', { 'fuck' : true }) ); //console.log(ipcRenderer.sendSync('light', { 'fuck' : true }) );
mcopy.cfg = JSON.parse(fs.readFileSync('./data/cfg.json'), 'utf8'); mcopy.cfg = JSON.parse(fs.readFileSync('./data/cfg.json'), 'utf8');
@ -58,111 +59,6 @@ mcopy.state = {
//mcopy.gui.updateState(); //mcopy.gui.updateState();
cmd.proj_forward = function (callback) {
'use strict';
var res = function (ms) {
gui.updateState();
if (callback) { callback(ms); }
};
if (!mcopy.state.projector.direction) {
proj.set(true, function (ms) {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.proj_backward = function (callback) {
'use strict';
var res = function (ms) {
gui.updateState();
if (callback) { callback(ms); }
};
if (mcopy.state.projector.direction) {
proj.set(false, function (ms) {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
proj.move(res);
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.cam_forward = function (rgb, callback) {
'use strict';
var res = function (ms) {
gui.updateState();
setTimeout(function () {
light.display([0,0,0]);
light.set([0, 0, 0], function () {
if (callback) { callback(ms); }
});
}, mcopy.cfg.arduino.serialDelay);
};
if (!mcopy.state.camera.direction) {
cam.set(true, function () {
setTimeout( function () {
light.display(rgb);
light.set(rgb, function () {
setTimeout( function () {
cam.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
}, mcopy.cfg.arduino.serialDelay);
});
} else {
light.display(rgb);
light.set(rgb, function () {
setTimeout(function () {
cam.move(res);
}, mcopy.cfg.arduino.serialDelay);
});
}
};
cmd.black_forward = function (callback) {
'use strict';
var off = [0, 0, 0];
cmd.cam_forward(off, callback);
};
cmd.cam_backward = function (rgb, callback) {
'use strict';
var res = function (ms) {
gui.updateState();
light.display([0,0,0]);
light.set([0, 0, 0], function () {
if (callback) { callback(ms); }
});
};
if (mcopy.state.camera.direction) {
cam.set(false, function () {
setTimeout(function () {
light.display(rgb);
light.set(rgb, function () {
cam.move(res);
});
}, mcopy.cfg.arduino.serialDelay);
});
} else {
setTimeout(function () {
light.display(rgb);
light.set(rgb, function () {
cam.move(res);
});
}, mcopy.cfg.arduino.serialDelay);
}
};
cmd.black_backward = function (callback) {
'use strict';
var off = [0, 0, 0];
cmd.cam_backward(off, callback);
};
proj.queue = {}; proj.queue = {};
proj.lock = false; proj.lock = false;
proj.init = function () { proj.init = function () {
@ -540,8 +436,26 @@ gui.console.init = function () {
} }
}); });
}; };
gui.console.lines = [];
gui.console.parse = function () {
'use strict';
var lines = gui.console.elem.val().split('\n'),
line = lines[lines.length - 2].replace('>', '').trim();
gui.console.lines.push(line);
};
gui.console.exec = function () { gui.console.exec = function () {
'use strict'; 'use strict';
var command;
gui.console.parse();
command = gui.console.lines[gui.console.lines.length - 1].replace('>', '').trim();
console.log(command);
if (mscript.cmd.indexOf(command) !== -1) {
if (command === 'CF') {
cmd.cam_forward(light.color);
} else if (cmd === 'CB') {
cmd.cam_backward(light.color);
}
}
gui.console.newLine(); gui.console.newLine();
}; };
gui.console.newLine = function () { gui.console.newLine = function () {