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

Merge in 9 months of work on capper branch #71

Merged
mattmcw merged 95 commits from capper into main 2023-02-19 05:28:46 +00:00
Conversation 0 Commits 95 Files Changed 120 +19 -19
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ec1373f08 - Show all commits

14
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.0", "version": "1.7.1",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -179,12 +179,12 @@
"camera_projectors_identifier": "5", "camera_projectors_identifier": "5",
"cameras_projector_identifier": "6", "cameras_projector_identifier": "6",
"cameras_projectors_identifier": "7", "cameras_projectors_identifier": "7",
"capper_identifier" : "C", "capper_identifier": "C",
"camera_capper_identifier" : "8", "camera_capper_identifier": "8",
"camera_capper_projector_identifier" : "9", "camera_capper_projector_identifier": "9",
"camera_capper_projectors_identifier" : "0", "camera_capper_projectors_identifier": "0",
"capper_on" : "A", "capper_on": "A",
"capper_off" : "B" "capper_off": "B"
} }
} }
} }

4
app/lib/mscript/index.js
View File

@ -679,7 +679,7 @@ class Mscript {
this.cam -= val; this.cam -= val;
} }
else { else {
this.loops[this.rec].cam--; this.loops[this.rec].cam -= val;
} }
} }
else if (cmd === 'PF') { else if (cmd === 'PF') {
@ -695,7 +695,7 @@ class Mscript {
this.proj -= val; this.proj -= val;
} }
else { else {
this.loops[this.rec].proj--; this.loops[this.rec].proj -= val;
} }
} }
else if (cmd === 'BF') { else if (cmd === 'BF') {

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

File diff suppressed because one or more lines are too long

14
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.0", "version": "1.7.1",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -179,12 +179,12 @@
"camera_projectors_identifier": "5", "camera_projectors_identifier": "5",
"cameras_projector_identifier": "6", "cameras_projector_identifier": "6",
"cameras_projectors_identifier": "7", "cameras_projectors_identifier": "7",
"capper_identifier" : "C", "capper_identifier": "C",
"camera_capper_identifier" : "8", "camera_capper_identifier": "8",
"camera_capper_projector_identifier" : "9", "camera_capper_projector_identifier": "9",
"camera_capper_projectors_identifier" : "0", "camera_capper_projectors_identifier": "0",
"capper_on" : "A", "capper_on": "A",
"capper_off" : "B" "capper_off": "B"
} }
} }
} }

4
src/mscript/index.ts
View File

@ -700,7 +700,7 @@ class Mscript {
if (this.rec === -1) { if (this.rec === -1) {
this.cam -= val; this.cam -= val;
} else { } else {
this.loops[this.rec].cam--; this.loops[this.rec].cam -= val;
} }
} else if (cmd === 'PF') { } else if (cmd === 'PF') {
if (this.rec === -1) { if (this.rec === -1) {
@ -712,7 +712,7 @@ class Mscript {
if (this.rec === -1) { if (this.rec === -1) {
this.proj -= val; this.proj -= val;
} else { } else {
this.loops[this.rec].proj--; this.loops[this.rec].proj -= val;
} }
} else if (cmd === 'BF') { } else if (cmd === 'BF') {
if (this.rec === -1) { if (this.rec === -1) {