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

Rename all uses of the previously-named "digital" module to "filmout" in sequence module. Woo! Let's call that a patch.

This commit is contained in:
mmcwilliams 2019-06-18 16:54:08 -04:00
parent ede6fcdfb8
commit 717cf77e55
12 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/lib/sequencer/index.js
View File

@ -89,8 +89,8 @@ class Sequencer {
//start sequence //start sequence
this.log.info(`Starting sequence...`); this.log.info(`Starting sequence...`);
this.ui.send(this.id, { start: true }); this.ui.send(this.id, { start: true });
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.open(); await this.cmd.proj.filmout.display.open();
} }
for (let x = 0; x < this.loops; x++) { for (let x = 0; x < this.loops; x++) {
//start loop //start loop
@ -121,8 +121,8 @@ class Sequencer {
this.log.info(`Ended loop ${x + 1}`); this.log.info(`Ended loop ${x + 1}`);
this.ui.send(this.id, { loop: x, stop: true }); this.ui.send(this.id, { loop: x, stop: true });
} }
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.close(); await this.cmd.proj.filmout.display.close();
} }
ms = (+new Date()) - startTime; ms = (+new Date()) - startTime;
//end sequence //end sequence
@ -137,8 +137,8 @@ class Sequencer {
* Stop the sequence * Stop the sequence
**/ **/
stop() { stop() {
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
this.cmd.proj.dig.display.close(); this.cmd.proj.filmout.display.close();
} }
this.running = false; this.running = false;
//clear? //clear?

2
app/lib/sequencer/index.js.map
View File

File diff suppressed because one or more lines are too long

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.4.11", "version": "1.4.12",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

12
cli/lib/sequencer/index.js
View File

@ -89,8 +89,8 @@ class Sequencer {
//start sequence //start sequence
this.log.info(`Starting sequence...`); this.log.info(`Starting sequence...`);
this.ui.send(this.id, { start: true }); this.ui.send(this.id, { start: true });
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.open(); await this.cmd.proj.filmout.display.open();
} }
for (let x = 0; x < this.loops; x++) { for (let x = 0; x < this.loops; x++) {
//start loop //start loop
@ -121,8 +121,8 @@ class Sequencer {
this.log.info(`Ended loop ${x + 1}`); this.log.info(`Ended loop ${x + 1}`);
this.ui.send(this.id, { loop: x, stop: true }); this.ui.send(this.id, { loop: x, stop: true });
} }
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.close(); await this.cmd.proj.filmout.display.close();
} }
ms = (+new Date()) - startTime; ms = (+new Date()) - startTime;
//end sequence //end sequence
@ -137,8 +137,8 @@ class Sequencer {
* Stop the sequence * Stop the sequence
**/ **/
stop() { stop() {
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
this.cmd.proj.dig.display.close(); this.cmd.proj.filmout.display.close();
} }
this.running = false; this.running = false;
//clear? //clear?

2
cli/lib/sequencer/index.js.map
View File

File diff suppressed because one or more lines are too long

2
cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-cli", "name": "mcopy-cli",
"version": "1.4.11", "version": "1.4.12",
"description": "CLI for controlling the mcopy optical printer platform", "description": "CLI for controlling the mcopy optical printer platform",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.11", "version": "1.4.12",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

12
lib/sequencer/index.js
View File

@ -89,8 +89,8 @@ class Sequencer {
//start sequence //start sequence
this.log.info(`Starting sequence...`); this.log.info(`Starting sequence...`);
this.ui.send(this.id, { start: true }); this.ui.send(this.id, { start: true });
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.open(); await this.cmd.proj.filmout.display.open();
} }
for (let x = 0; x < this.loops; x++) { for (let x = 0; x < this.loops; x++) {
//start loop //start loop
@ -121,8 +121,8 @@ class Sequencer {
this.log.info(`Ended loop ${x + 1}`); this.log.info(`Ended loop ${x + 1}`);
this.ui.send(this.id, { loop: x, stop: true }); this.ui.send(this.id, { loop: x, stop: true });
} }
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.close(); await this.cmd.proj.filmout.display.close();
} }
ms = (+new Date()) - startTime; ms = (+new Date()) - startTime;
//end sequence //end sequence
@ -137,8 +137,8 @@ class Sequencer {
* Stop the sequence * Stop the sequence
**/ **/
stop() { stop() {
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
this.cmd.proj.dig.display.close(); this.cmd.proj.filmout.display.close();
} }
this.running = false; this.running = false;
//clear? //clear?

2
lib/sequencer/index.js.map
View File

File diff suppressed because one or more lines are too long

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.4.11", "version": "1.4.12",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.4.11", "version": "1.4.12",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

12
src/sequencer/index.ts
View File

@ -107,8 +107,8 @@ class Sequencer {
this.log.info(`Starting sequence...`) this.log.info(`Starting sequence...`)
this.ui.send(this.id, { start : true }) this.ui.send(this.id, { start : true })
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.open() await this.cmd.proj.filmout.display.open()
} }
for (let x = 0; x < this.loops; x++) { for (let x = 0; x < this.loops; x++) {
@ -147,8 +147,8 @@ class Sequencer {
this.ui.send(this.id, { loop : x, stop : true }); this.ui.send(this.id, { loop : x, stop : true });
} }
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.dig.display.close(); await this.cmd.proj.filmout.display.close();
} }
ms = ( +new Date() ) - startTime; ms = ( +new Date() ) - startTime;
@ -166,8 +166,8 @@ class Sequencer {
* Stop the sequence * Stop the sequence
**/ **/
public stop () { public stop () {
if (this.cmd.proj.dig.state.enabled === true) { if (this.cmd.proj.filmout.state.enabled === true) {
this.cmd.proj.dig.display.close(); this.cmd.proj.filmout.display.close();
} }
this.running = false; this.running = false;
//clear? //clear?