From da735779b42060a9c68b5c71bb95124fe9aafa0c Mon Sep 17 00:00:00 2001 From: mattmcw Date: Sat, 6 Apr 2024 20:00:54 -0400 Subject: [PATCH] Add more trycatches add more logs. Not sure where failure is. --- app/data/cfg.json | 2 +- app/lib/ui/devices.js | 7 ++++--- app/lib/ui/devices.js.map | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- app/src/lib/ui/devices.ts | 8 ++++---- data/cfg.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index 0ca4c93..39f4777 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.97", + "version": "1.8.98", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/lib/ui/devices.js b/app/lib/ui/devices.js index 917b009..2a31574 100644 --- a/app/lib/ui/devices.js +++ b/app/lib/ui/devices.js @@ -74,15 +74,15 @@ class Devices { if (typeof arg !== 'undefined' && typeof arg.timing !== 'undefined') { timing.restore(arg.timing); } - if (arg.projector_second) { + if (typeof arg !== 'undefined' && typeof arg.projector_second !== 'undefined') { //add second row of projector pads to grid proj.second.enable(); } - if (arg.camera_second) { + if (typeof arg !== 'undefined' && typeof arg.camera_second !== 'undefined') { //add second row of camera pads to grid cam.second.enable(); } - if (arg.capper) { + if (typeof arg !== 'undefined' && typeof arg.capper !== 'undefined') { //add capper features to grid capper.enable(); } @@ -91,6 +91,7 @@ class Devices { grid.state(0); grid.state(1); seq.stats(); + log.info('Got past stats'); //@ts-ignore yield delay(1000); try { diff --git a/app/lib/ui/devices.js.map b/app/lib/ui/devices.js.map index 3f9525d..223b371 100644 --- a/app/lib/ui/devices.js.map +++ b/app/lib/ui/devices.js.map @@ -1 +1 @@ -{"version":3,"file":"devices.js","sourceRoot":"","sources":["../../src/lib/ui/devices.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"devices.js","sourceRoot":"","sources":["../../src/lib/ui/devices.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app/package-lock.json b/app/package-lock.json index 05f5d0f..f8904c7 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.97", + "version": "1.8.98", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 34d5559..d68a329 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.97", + "version": "1.8.98", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/app/src/lib/ui/devices.ts b/app/src/lib/ui/devices.ts index 3d26860..d0e0100 100644 --- a/app/src/lib/ui/devices.ts +++ b/app/src/lib/ui/devices.ts @@ -74,15 +74,15 @@ class Devices { timing.restore(arg.timing); } - if (arg.projector_second) { + if (typeof arg !== 'undefined' && typeof arg.projector_second !== 'undefined') { //add second row of projector pads to grid proj.second.enable(); } - if (arg.camera_second) { + if (typeof arg !== 'undefined' && typeof arg.camera_second !== 'undefined') { //add second row of camera pads to grid cam.second.enable(); } - if (arg.capper) { + if (typeof arg !== 'undefined' && typeof arg.capper !== 'undefined') { //add capper features to grid capper.enable(); } @@ -92,7 +92,7 @@ class Devices { grid.state(0); grid.state(1); seq.stats(); - + log.info('Got past stats'); //@ts-ignore await delay(1000); diff --git a/data/cfg.json b/data/cfg.json index 0ca4c93..39f4777 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.97", + "version": "1.8.98", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index 26b6f3c..08d48da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.97", + "version": "1.8.98", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.97", + "version": "1.8.98", "license": "MIT", "dependencies": { "alert": "file:app/lib/alert", diff --git a/package.json b/package.json index d4219ae..2dc53ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.97", + "version": "1.8.98", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 0ca4c93..39f4777 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.97", + "version": "1.8.98", "ext_port": 1111, "profiles": { "mcopy": {