From 29cd83eecf4ec9bada8ea2bcc97e3cd12dc6b722 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Sun, 7 Jul 2024 21:32:02 -0400 Subject: [PATCH] There does not need to be separate open_forward/open_backward and closed_forward/closed_backward commands. Direction should be set with separate commands and can be controlled at a higher level. --- app/data/cfg.json | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 8 +++----- ino/components/mcopy_light/McopySerial.h | 6 ++---- ino/lib/McopySerial/McopySerial.h | 6 ++---- ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h | 6 ++---- ino/mcopy_JKMM100/McopySerial.h | 6 ++---- ino/mcopy_JKMM100_second_projector/McopySerial.h | 6 ++---- ino/mcopy_JKMM100_work/McopySerial.h | 6 ++---- ino/mcopy_arri_s_firmware/McopySerial.h | 6 ++---- ino/mcopy_cam_canon_ble_nano/McopySerial.h | 6 ++---- ino/mcopy_cam_relay/McopySerial.h | 6 ++---- ino/mcopy_mitchell_camera/McopySerial.h | 6 ++---- ino/mcopy_oxberry_camera/McopySerial.h | 6 ++---- ino/mcopy_projector_firmware/McopySerial.h | 6 ++---- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- 19 files changed, 34 insertions(+), 60 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index 4c4c61d..42a3d9d 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.121", + "version": "1.8.122", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index cc80c15..3a59e9c 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.121", + "version": "1.8.122", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index d1035bf..765edd9 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.121", + "version": "1.8.122", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/data/cfg.json b/data/cfg.json index 4c4c61d..3bba373 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.121", + "version": "1.8.122", "ext_port": 1111, "profiles": { "mcopy": { @@ -185,10 +185,8 @@ "camera_capper_projectors_identifier": "0", "capper_on": "A", "capper_off": "B", - "camera_open_forward": "J", - "camera_open_backward": "K", - "camera_close_forward": "L", - "camera_close_backward": "M", + "camera_open": "J", + "camera_close": "K", "takeup_forward": "D", "takeup_backward": "F", "error": "E", diff --git a/ino/components/mcopy_light/McopySerial.h b/ino/components/mcopy_light/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/components/mcopy_light/McopySerial.h +++ b/ino/components/mcopy_light/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/lib/McopySerial/McopySerial.h b/ino/lib/McopySerial/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/lib/McopySerial/McopySerial.h +++ b/ino/lib/McopySerial/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h +++ b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_JKMM100/McopySerial.h b/ino/mcopy_JKMM100/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_JKMM100/McopySerial.h +++ b/ino/mcopy_JKMM100/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_JKMM100_second_projector/McopySerial.h b/ino/mcopy_JKMM100_second_projector/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_JKMM100_second_projector/McopySerial.h +++ b/ino/mcopy_JKMM100_second_projector/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_JKMM100_work/McopySerial.h b/ino/mcopy_JKMM100_work/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_JKMM100_work/McopySerial.h +++ b/ino/mcopy_JKMM100_work/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_arri_s_firmware/McopySerial.h b/ino/mcopy_arri_s_firmware/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_arri_s_firmware/McopySerial.h +++ b/ino/mcopy_arri_s_firmware/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_cam_canon_ble_nano/McopySerial.h b/ino/mcopy_cam_canon_ble_nano/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_cam_canon_ble_nano/McopySerial.h +++ b/ino/mcopy_cam_canon_ble_nano/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_cam_relay/McopySerial.h b/ino/mcopy_cam_relay/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_cam_relay/McopySerial.h +++ b/ino/mcopy_cam_relay/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_mitchell_camera/McopySerial.h b/ino/mcopy_mitchell_camera/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_mitchell_camera/McopySerial.h +++ b/ino/mcopy_mitchell_camera/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_oxberry_camera/McopySerial.h b/ino/mcopy_oxberry_camera/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_oxberry_camera/McopySerial.h +++ b/ino/mcopy_oxberry_camera/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/ino/mcopy_projector_firmware/McopySerial.h b/ino/mcopy_projector_firmware/McopySerial.h index 17c7f73..f968574 100644 --- a/ino/mcopy_projector_firmware/McopySerial.h +++ b/ino/mcopy_projector_firmware/McopySerial.h @@ -30,13 +30,11 @@ class McopySerial { const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char CAMERA_CLOSE_BACKWARD = 'M'; - const char CAMERA_CLOSE_FORWARD = 'L'; + const char CAMERA_CLOSE = 'K'; const char CAMERA_EXPOSURE = 'G'; const char CAMERA_FORWARD = 'e'; const char CAMERA_IDENTIFIER = 'k'; - const char CAMERA_OPEN_BACKWARD = 'K'; - const char CAMERA_OPEN_FORWARD = 'J'; + const char CAMERA_OPEN = 'J'; const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_SECOND = '3'; const char CAMERA_SECOND_BACKWARD = '2'; diff --git a/package-lock.json b/package-lock.json index ce775f1..2398c80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.121", + "version": "1.8.122", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.121", + "version": "1.8.122", "license": "MIT", "dependencies": { "alert": "file:app/lib/alert", diff --git a/package.json b/package.json index 6ec41e2..deedbc4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.121", + "version": "1.8.122", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 4c4c61d..42a3d9d 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.121", + "version": "1.8.122", "ext_port": 1111, "profiles": { "mcopy": {