From 0eaefb2b48f9530e2b830f8e5e7222dd63c7e906 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Mon, 14 Oct 2024 12:12:39 -0400 Subject: [PATCH] When mscript compilation fails, throw error in console. --- app/data/cfg.json | 2 +- app/lib/ui/mscript.js | 9 ++++++++- app/lib/ui/mscript.js.map | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- app/src/lib/ui/mscript.ts | 9 ++++++++- app/test/mscript.test.js | 16 ++++++++++------ data/cfg.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- 11 files changed, 35 insertions(+), 17 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index a34acbb..1cc15ff 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.137", + "version": "1.8.138", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/lib/ui/mscript.js b/app/lib/ui/mscript.js index f3f6355..1ee7cff 100644 --- a/app/lib/ui/mscript.js +++ b/app/lib/ui/mscript.js @@ -140,7 +140,14 @@ PF 1`; compile() { const data = this.editor.getValue(); const mscript = new mscript_1.default(); - const output = mscript.interpret(data); + let output = null; + try { + output = mscript.interpret(data); + } + catch (err) { + mse.console.print(err.toString()); + return; + } const len = output.arr.length; const cam2 = typeof output.cam2 !== 'undefined' ? `, CAM2 : ${output.cam2}` : ''; const proj2 = typeof output.proj2 !== 'undefined' ? `, PROJ2 : ${output.proj2}` : ''; diff --git a/app/lib/ui/mscript.js.map b/app/lib/ui/mscript.js.map index 35724d6..725ec0b 100644 --- a/app/lib/ui/mscript.js.map +++ b/app/lib/ui/mscript.js.map @@ -1 +1 @@ -{"version":3,"file":"mscript.js","sourceRoot":"","sources":["../../src/lib/ui/mscript.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mscript.js","sourceRoot":"","sources":["../../src/lib/ui/mscript.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;AAEb,qCAAqC;AAErC,sDAA8B;AAY9B;;QAEQ;AAER,MAAM,UAAU;IAKf;QAJO,WAAM,GAAS,EAAE,CAAC;QAClB,SAAI,GAAS,EAAE,CAAC;QAChB,QAAG,GAAY,EAAE,CAAC;IAIzB,CAAC;IAED;;;QAGI;IACG,IAAI;QACV,MAAM,cAAc,GAAY;KAC7B,CAAC;QACJ,MAAM,YAAY,GAAY,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACnF,MAAM,UAAU,GAAyB,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAwB,CAAC;QAClG,MAAM,YAAY,GAAS;YAC1B,WAAW,EAAE,IAAI;YACjB,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,IAAI;YACnB,KAAK,EAAE,SAAS;SAChB,CAAC;QACF,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAS,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAS;YAC3C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACzC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACf,CAAC;IAED;;QAEI;IACG,IAAI;QACV,+CAA+C;QAC/C,MAAM,YAAY,GAAY,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACnF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED;;;;QAII;IACH,YAAY;QACZ,IAAI,GAAY,CAAC;QACjB,IAAI,GAAG,GAAW,EAAE,CAAC;QACrB,IAAI,IAAc,CAAC;QACnB,IAAI,GAAY,CAAC;QAEjB,0EAA0E;QAC1E,wBAAwB;QAExB,KAAK,IAAI,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE;YAC1B,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,SAAS;aACT;YACD,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACf,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACtD,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC1B,SAAS;aACT;YACD,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAG,CAAC,EAAE,CAAC,CAAC;SAC3B;QAED,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACpB,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE;YACtB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACd,OAAO,IAAI,IAAI,EAAE,CAAC;YACnB,CAAC,CAAC,CAAA;YACF,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAChB;QAED,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACrB,IAAI,GAAG,OAAO,CAAC,2DAA2D,CAAC,CAAC;QAC5E,IAAI,IAAI,EAAE;YACT,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACnC;IACF,CAAC;IAED;;;;QAII;IACJ,KAAK;QACJ,IAAI,CAAU,CAAC;QACf,IAAI,IAAa,CAAC;QAClB,KAAK,IAAI,CAAC,GAAY,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvD,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACd,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE;gBAC7B,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;oBACzE,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACnC;qBAAM;oBACN,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;iBAC7B;aACD;iBAAM;gBACN,cAAc;aACd;YACD,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACd;IACF,CAAC;IAED;;;QAGI;IACH,UAAU;QACV,MAAM,IAAI,GAAY,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,IAAI,IAAI,KAAK,IAAI,CAAC,GAAG,EAAE;YACtB,IAAI,GAAG,OAAO,CAAC,sDAAsD,CAAC,CAAC;YACvE,IAAI,IAAI,EAAE;gBACT,IAAI,CAAC,OAAO,EAAE,CAAA;aACd;SACD;QACD,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IAED;;;QAGI;IACH,OAAO;QACP,MAAM,IAAI,GAAY,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAa,IAAI,iBAAO,EAAE,CAAC;QACxC,IAAI,MAAM,GAAS,IAAI,CAAC;QACxB,IAAI;YACH,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACjC;QAAC,OAAO,GAAG,EAAE;YACb,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClC,OAAO;SACP;QACD,MAAM,GAAG,GAAY,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;QACvC,MAAM,IAAI,GAAY,OAAO,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,KAAK,GAAY,OAAO,MAAM,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,aAAa,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9F,MAAM,MAAM,GAAY,qBAAqB,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC;QAE1I,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,8DAA8D;QAC9D,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;QAKI;IACJ,OAAO;QACN,MAAM,GAAG,GAAW,EAAE,CAAC;QACvB,IAAI,GAAS,CAAC;QACd,KAAK,IAAI,CAAC,GAAY,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvD,GAAG,GAAG;gBACL,GAAG,EAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB,CAAC;YACF,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;gBACzE,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAC9B;iBAAM;gBACN,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAClC;YACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACd;QACD,OAAO,GAAG,CAAC;IACZ,CAAC;IAED;;QAEI;IACJ,GAAG;QACF,MAAM,IAAI,GAAY,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,GAAW,CAAC;QAChB,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,IAAI,IAAI,KAAK,IAAI,CAAC,GAAG,EAAE;YACtB,IAAI,GAAG,OAAO,CAAC,sDAAsD,CAAC,CAAC;YACvE,IAAI,IAAI,EAAE;gBACT,IAAI,CAAC,OAAO,EAAE,CAAC;aACf;SACD;QACD,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClB,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7D,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;CACD;AAGD;;SAES;AAET,MAAM,cAAc;IAKnB;;;;QAII;IACG,IAAI;QACV,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,mBAAmB,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAiB;YAChD,IAAI,IAAI,GAAY,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC;YACzC,IAAI,IAAI,KAAK,EAAE,EAAE;gBAChB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,CAAC,CAAC,cAAc,EAAE,CAAC;gBACnB,OAAO,KAAK,CAAC;aACb;QACF,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACf,CAAC;IAED;;;QAGI;IACJ,KAAK;QACJ,MAAM,KAAK,GAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAY,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACtE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED;;;;QAII;IACJ,IAAI;QACH,IAAI,OAAgB,CAAC;QACrB,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACpE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;YACxC,IAAI,OAAO,KAAK,IAAI,EAAE;gBACrB,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAChC;iBAAM,IAAI,GAAG,KAAK,IAAI,EAAE;gBACxB,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACjC;SACD;QAED,IAAI,OAAO,KAAK,SAAS,EAAE;YAC1B,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACtB;aAAM,IAAI,OAAO,KAAK,KAAK,EAAE;YAC7B,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;SAClB;IACF,CAAC;IAED;;;;QAII;IACJ,OAAO;QACN,IAAI,OAAO,GAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9C,IAAI,MAAe,CAAC;QACpB,OAAO,IAAI,IAAI,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvB,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACd,SAAS,EAAG,MAAM;SACrB,EAAE,QAAQ,CAAC,CAAC;IACd,CAAC;IAED;;QAEI;IACJ,KAAK,CAAE,GAAY;QAClB,IAAI,OAAO,GAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9C,IAAI,MAAe,CAAC;QACpB,OAAO,IAAI,GAAG,CAAC;QACf,OAAO,IAAI,IAAI,CAAC;QAChB,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAEzB,IAAI,CAAC,OAAO,EAAE,CAAC;IAChB,CAAC;CACD;AAED,MAAM,GAAG,GAAS;IACjB,OAAO,EAAG,IAAI,UAAU,EAAE;IAC1B,OAAO,EAAG,IAAI,cAAc,EAAE;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC"} \ No newline at end of file diff --git a/app/package-lock.json b/app/package-lock.json index 2bb7407..7949e6a 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.137", + "version": "1.8.138", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 1f726b1..5285d9b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.137", + "version": "1.8.138", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/app/src/lib/ui/mscript.ts b/app/src/lib/ui/mscript.ts index 970edcb..0436a19 100644 --- a/app/src/lib/ui/mscript.ts +++ b/app/src/lib/ui/mscript.ts @@ -162,7 +162,14 @@ PF 1`; compile () { const data : string = this.editor.getValue(); const mscript : Mscript = new Mscript(); - const output : any = mscript.interpret(data); + let output : any = null; + try { + output = mscript.interpret(data); + this.raw = ''; + } catch (err) { + mse.console.print(err.toString()); + return; + } const len : number = output.arr.length; const cam2 : string = typeof output.cam2 !== 'undefined' ? `, CAM2 : ${output.cam2}` : ''; const proj2 : string = typeof output.proj2 !== 'undefined' ? `, PROJ2 : ${output.proj2}` : ''; diff --git a/app/test/mscript.test.js b/app/test/mscript.test.js index 9304753..1362f6a 100644 --- a/app/test/mscript.test.js +++ b/app/test/mscript.test.js @@ -126,12 +126,16 @@ LOOP 10 PF END`; - it('Should SET state within LOOP', () => { - const obj = mscript.interpret(script2) - assert.ok(typeof obj === 'object', 'Mscript produced an object response'); - assert.ok(obj.success, 'Mscript labeled output success'); - assert.equal(obj.cam, 10, 'Camera state ends at 10'); - assert.equal(obj.proj, 11, 'Projector state should be 11'); + it('Should fail when SET state within LOOP', () => { + let errorCaught = false; + try { + const obj = mscript.interpret(script2); + } catch (err) { + //fail silently + errorCaught = true; + } + assert.ok(typeof obj === 'undefined', 'Mscript fails to produce an output object'); + assert.ok(errorCaught, 'Error should be thrown by script'); }); }); diff --git a/data/cfg.json b/data/cfg.json index a34acbb..1cc15ff 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.137", + "version": "1.8.138", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index 4b3bfdc..54bebd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.137", + "version": "1.8.138", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.137", + "version": "1.8.138", "license": "MIT", "dependencies": { "alert": "file:app/lib/alert", diff --git a/package.json b/package.json index 8423822..829f8da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.137", + "version": "1.8.138", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index a34acbb..1cc15ff 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.137", + "version": "1.8.138", "ext_port": 1111, "profiles": { "mcopy": {