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

Filmout release 1.5.0.

This commit is contained in:
sixteenmillimeter 2020-01-20 01:37:38 -05:00
parent 49ba9a090b
commit ed75924e24
15 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.21", "version": "1.5.0",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -79,6 +79,15 @@
}, },
"light": false, "light": false,
"projector_second": true "projector_second": true
},
"oxberry": {
"label": "Oxberry",
"cam": {
"time": 550,
"delay": 50,
"momentary": 130
},
"light": false
} }
}, },
"cmd": { "cmd": {

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

File diff suppressed because one or more lines are too long

3
app/lib/ui/filmout.js
View File

@ -188,6 +188,7 @@ class FilmOut {
} }
//cancel video //cancel video
} }
//callback after
onFilmout(evt, args) { onFilmout(evt, args) {
let state; let state;
let color = [255, 255, 255]; let color = [255, 255, 255];
@ -204,7 +205,7 @@ class FilmOut {
seq.setLight(1, color); seq.setLight(1, color);
grid.state(1); grid.state(1);
if (light.disabled) { if (light.disabled) {
light.enable(); //light.enable();
} }
this.state.frame = 0; this.state.frame = 0;
this.state.frames = state.frames; this.state.frames = state.frames;

2
app/lib/ui/filmout.js.map
View File

File diff suppressed because one or more lines are too long

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.4.21", "version": "1.5.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.4.21", "version": "1.5.0",
"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": {

3
app/src/lib/ui/filmout.ts
View File

@ -192,6 +192,7 @@ class FilmOut {
} }
//cancel video //cancel video
} }
//callback after
onFilmout (evt : any, args : any) { onFilmout (evt : any, args : any) {
let state : any; let state : any;
let color : number[] = [255, 255, 255]; let color : number[] = [255, 255, 255];
@ -213,7 +214,7 @@ class FilmOut {
grid.state(1); grid.state(1);
if (light.disabled) { if (light.disabled) {
light.enable(); //light.enable();
} }
this.state.frame = 0; this.state.frame = 0;

20
cli/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.21", "version": "1.5.0",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -17,7 +17,8 @@
"black": { "black": {
"before": 0, "before": 0,
"after": 0 "after": 0
} },
"light": false
}, },
"jk103": { "jk103": {
"label": "JK103", "label": "JK103",
@ -52,7 +53,8 @@
"black": { "black": {
"before": 250, "before": 250,
"after": 250 "after": 250
} },
"light": false
}, },
"intval3": { "intval3": {
"label": "INTVAL3", "label": "INTVAL3",
@ -60,7 +62,8 @@
"time": 630, "time": 630,
"delay": 50, "delay": 50,
"momentary": 0 "momentary": 0
} },
"light": false
}, },
"jk_mono": { "jk_mono": {
"label": "MONO's JK", "label": "MONO's JK",
@ -76,6 +79,15 @@
}, },
"light": false, "light": false,
"projector_second": true "projector_second": true
},
"oxberry": {
"label": "Oxberry",
"cam": {
"time": 550,
"delay": 50,
"momentary": 130
},
"light": false
} }
}, },
"cmd": { "cmd": {

2
cli/lib/filmout/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.21", "version": "1.5.0",
"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": {

20
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.21", "version": "1.5.0",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -17,7 +17,8 @@
"black": { "black": {
"before": 0, "before": 0,
"after": 0 "after": 0
} },
"light": false
}, },
"jk103": { "jk103": {
"label": "JK103", "label": "JK103",
@ -52,7 +53,8 @@
"black": { "black": {
"before": 250, "before": 250,
"after": 250 "after": 250
} },
"light": false
}, },
"intval3": { "intval3": {
"label": "INTVAL3", "label": "INTVAL3",
@ -60,7 +62,8 @@
"time": 630, "time": 630,
"delay": 50, "delay": 50,
"momentary": 0 "momentary": 0
} },
"light": false
}, },
"jk_mono": { "jk_mono": {
"label": "MONO's JK", "label": "MONO's JK",
@ -76,6 +79,15 @@
}, },
"light": false, "light": false,
"projector_second": true "projector_second": true
},
"oxberry": {
"label": "Oxberry",
"cam": {
"time": 550,
"delay": 50,
"momentary": 130
},
"light": false
} }
}, },
"cmd": { "cmd": {

4
ino/oxberry_firmware/oxberry_firmware.ino
View File

@ -1,10 +1,10 @@
/** /**
* This is a customized firmware originally designed to * This is a customized firmware originally designed to
* control the Oxberry camera at the . This uses an 8 Solid State Relay * control the Oxberry camera at the . This uses a single 5VDC relay
* board wired into the "EXPOSE" trigger switch of an Oxberry control box. * board wired into the "EXPOSE" trigger switch of an Oxberry control box.
* *
* Pins * Pins
* 07 - CH4 - * 09 - Trigger for relay
*/ */
boolean debug_state = false; boolean debug_state = false;

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.4.21", "version": "1.5.0",
"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.21", "version": "1.5.0",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

20
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.21", "version": "1.5.0",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -17,7 +17,8 @@
"black": { "black": {
"before": 0, "before": 0,
"after": 0 "after": 0
} },
"light": false
}, },
"jk103": { "jk103": {
"label": "JK103", "label": "JK103",
@ -52,7 +53,8 @@
"black": { "black": {
"before": 250, "before": 250,
"after": 250 "after": 250
} },
"light": false
}, },
"intval3": { "intval3": {
"label": "INTVAL3", "label": "INTVAL3",
@ -60,7 +62,8 @@
"time": 630, "time": 630,
"delay": 50, "delay": 50,
"momentary": 0 "momentary": 0
} },
"light": false
}, },
"jk_mono": { "jk_mono": {
"label": "MONO's JK", "label": "MONO's JK",
@ -76,6 +79,15 @@
}, },
"light": false, "light": false,
"projector_second": true "projector_second": true
},
"oxberry": {
"label": "Oxberry",
"cam": {
"time": 550,
"delay": 50,
"momentary": 130
},
"light": false
} }
}, },
"cmd": { "cmd": {