From 8e9a57bcd3fd0b878accfc67d355a61872c712b6 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Thu, 13 Jun 2024 13:35:25 -0400 Subject: [PATCH 1/2] Add new command flags for camera open camera closed. Re-organized and separated identifiers and cmd flags --- app/data/cfg.json | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 2 +- ino/components/mcopy_light/McopySerial.h | 21 +++++++++++++++++++ ino/lib/McopySerial/McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_JKMM100/McopySerial.h | 21 +++++++++++++++++++ .../McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_JKMM100_work/McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_arri_s_firmware/McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_cam_canon_ble_nano/McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_cam_relay/McopySerial.h | 21 +++++++++++++++++++ ino/mcopy_projector_firmware/McopySerial.h | 21 +++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- 17 files changed, 218 insertions(+), 8 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index a6c0a86..01ab4a1 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.118", + "version": "1.8.119", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index 85bebb4..4c3961c 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.118", + "version": "1.8.119", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index ce8acd1..b514ed2 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.118", + "version": "1.8.119", "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 a6c0a86..01ab4a1 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.118", + "version": "1.8.119", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/ino/components/mcopy_light/McopySerial.h b/ino/components/mcopy_light/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/components/mcopy_light/McopySerial.h +++ b/ino/components/mcopy_light/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/lib/McopySerial/McopySerial.h b/ino/lib/McopySerial/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/lib/McopySerial/McopySerial.h +++ b/ino/lib/McopySerial/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h +++ b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_JKMM100/McopySerial.h b/ino/mcopy_JKMM100/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_JKMM100/McopySerial.h +++ b/ino/mcopy_JKMM100/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_JKMM100_second_projector/McopySerial.h b/ino/mcopy_JKMM100_second_projector/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_JKMM100_second_projector/McopySerial.h +++ b/ino/mcopy_JKMM100_second_projector/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_JKMM100_work/McopySerial.h b/ino/mcopy_JKMM100_work/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_JKMM100_work/McopySerial.h +++ b/ino/mcopy_JKMM100_work/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_arri_s_firmware/McopySerial.h b/ino/mcopy_arri_s_firmware/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_arri_s_firmware/McopySerial.h +++ b/ino/mcopy_arri_s_firmware/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_cam_canon_ble_nano/McopySerial.h b/ino/mcopy_cam_canon_ble_nano/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_cam_canon_ble_nano/McopySerial.h +++ b/ino/mcopy_cam_canon_ble_nano/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_cam_relay/McopySerial.h b/ino/mcopy_cam_relay/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_cam_relay/McopySerial.h +++ b/ino/mcopy_cam_relay/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/ino/mcopy_projector_firmware/McopySerial.h b/ino/mcopy_projector_firmware/McopySerial.h index 8b9a80c..299fb8c 100644 --- a/ino/mcopy_projector_firmware/McopySerial.h +++ b/ino/mcopy_projector_firmware/McopySerial.h @@ -72,6 +72,27 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ + /* IDENTIFIERS FLAGS */ + const char MCOPY_IDENTIFIER = 'm'; + const char CAMERA_IDENTIFIER = 'k'; + const char PROJECTOR_IDENTIFIER = 'j'; + const char PROJECTOR_CAMERA_IDENTIFIER = 's'; + const char CAMERA_PROJECTORS_IDENTIFIER = '5'; + const char CAMERA_CAPPER_IDENTIFIER = '8'; + const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; + const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; + const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; + const char PROJECTORS_IDENTIFIER = 'd'; + const char PROJECTOR_SECOND_IDENTIFIER = 't'; + const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; + const char CAMERA_SECOND_IDENTIFIER = 'y'; + const char CAMERAS_IDENTIFIER = 'a'; + const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; + const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; + const char CAPPER_IDENTIFIER = 'C'; + const char LIGHT_IDENTIFIER = 'o'; + /* END IDENTIFIERS FLAGS */ + McopySerial(); void begin(char identity); diff --git a/package-lock.json b/package-lock.json index 918e6f6..05ad57c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.118", + "version": "1.8.119", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.118", + "version": "1.8.119", "license": "MIT", "dependencies": { "alert": "file:app/lib/alert", diff --git a/package.json b/package.json index 539863e..21f38c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.118", + "version": "1.8.119", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index a6c0a86..01ab4a1 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.118", + "version": "1.8.119", "ext_port": 1111, "profiles": { "mcopy": { From e6ef1ff395fa100b86c7e405edfdd9cf496b9170 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Thu, 13 Jun 2024 13:42:05 -0400 Subject: [PATCH 2/2] Actually add new commands to cfg and all libs --- app/data/cfg.json | 6 +++++- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 6 +++++- ino/components/mcopy_light/McopySerial.h | 4 ++++ ino/lib/McopySerial/McopySerial.h | 4 ++++ ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h | 4 ++++ ino/mcopy_JKMM100/McopySerial.h | 4 ++++ ino/mcopy_JKMM100_second_projector/McopySerial.h | 4 ++++ ino/mcopy_JKMM100_work/McopySerial.h | 4 ++++ ino/mcopy_arri_s_firmware/McopySerial.h | 4 ++++ ino/mcopy_cam_canon_ble_nano/McopySerial.h | 4 ++++ ino/mcopy_cam_relay/McopySerial.h | 4 ++++ ino/mcopy_projector_firmware/McopySerial.h | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 6 +++++- 17 files changed, 60 insertions(+), 8 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index 01ab4a1..37baf68 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.119", + "version": "1.8.120", "ext_port": 1111, "profiles": { "mcopy": { @@ -185,6 +185,10 @@ "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", "takeup_forward": "D", "takeup_backward": "F", "error": "E", diff --git a/app/package-lock.json b/app/package-lock.json index 4c3961c..f791c97 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.119", + "version": "1.8.120", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index b514ed2..f57e3e0 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.119", + "version": "1.8.120", "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 01ab4a1..37baf68 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.119", + "version": "1.8.120", "ext_port": 1111, "profiles": { "mcopy": { @@ -185,6 +185,10 @@ "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", "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 299fb8c..6ea8e11 100644 --- a/ino/components/mcopy_light/McopySerial.h +++ b/ino/components/mcopy_light/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/lib/McopySerial/McopySerial.h +++ b/ino/lib/McopySerial/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h +++ b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_JKMM100/McopySerial.h +++ b/ino/mcopy_JKMM100/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_JKMM100_second_projector/McopySerial.h +++ b/ino/mcopy_JKMM100_second_projector/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_JKMM100_work/McopySerial.h +++ b/ino/mcopy_JKMM100_work/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_arri_s_firmware/McopySerial.h +++ b/ino/mcopy_arri_s_firmware/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_cam_canon_ble_nano/McopySerial.h +++ b/ino/mcopy_cam_canon_ble_nano/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_cam_relay/McopySerial.h +++ b/ino/mcopy_cam_relay/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 299fb8c..6ea8e11 100644 --- a/ino/mcopy_projector_firmware/McopySerial.h +++ b/ino/mcopy_projector_firmware/McopySerial.h @@ -30,9 +30,13 @@ 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_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_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 05ad57c..68ee361 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.119", + "version": "1.8.120", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.119", + "version": "1.8.120", "license": "MIT", "dependencies": { "alert": "file:app/lib/alert", diff --git a/package.json b/package.json index 21f38c5..f7149d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.119", + "version": "1.8.120", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 01ab4a1..37baf68 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.119", + "version": "1.8.120", "ext_port": 1111, "profiles": { "mcopy": { @@ -185,6 +185,10 @@ "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", "takeup_forward": "D", "takeup_backward": "F", "error": "E",