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.

This commit is contained in:
Matt McWilliams 2024-07-07 21:32:02 -04:00
parent c0e7422920
commit 29cd83eecf
19 changed files with 34 additions and 60 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.121", "version": "1.8.122",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.121", "version": "1.8.122",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.121", "version": "1.8.122",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.121", "version": "1.8.122",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -185,10 +185,8 @@
"camera_capper_projectors_identifier": "0", "camera_capper_projectors_identifier": "0",
"capper_on": "A", "capper_on": "A",
"capper_off": "B", "capper_off": "B",
"camera_open_forward": "J", "camera_open": "J",
"camera_open_backward": "K", "camera_close": "K",
"camera_close_forward": "L",
"camera_close_backward": "M",
"takeup_forward": "D", "takeup_forward": "D",
"takeup_backward": "F", "takeup_backward": "F",
"error": "E", "error": "E",

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

View File

@ -30,13 +30,11 @@ class McopySerial {
const char CAMERA_CAPPER_IDENTIFIER = '8'; const char CAMERA_CAPPER_IDENTIFIER = '8';
const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
const char CAMERA_CLOSE_BACKWARD = 'M'; const char CAMERA_CLOSE = 'K';
const char CAMERA_CLOSE_FORWARD = 'L';
const char CAMERA_EXPOSURE = 'G'; const char CAMERA_EXPOSURE = 'G';
const char CAMERA_FORWARD = 'e'; const char CAMERA_FORWARD = 'e';
const char CAMERA_IDENTIFIER = 'k'; const char CAMERA_IDENTIFIER = 'k';
const char CAMERA_OPEN_BACKWARD = 'K'; const char CAMERA_OPEN = 'J';
const char CAMERA_OPEN_FORWARD = 'J';
const char CAMERA_PROJECTORS_IDENTIFIER = '5'; const char CAMERA_PROJECTORS_IDENTIFIER = '5';
const char CAMERA_SECOND = '3'; const char CAMERA_SECOND = '3';
const char CAMERA_SECOND_BACKWARD = '2'; const char CAMERA_SECOND_BACKWARD = '2';

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.121", "version": "1.8.122",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy", "name": "mcopy",
"version": "1.8.121", "version": "1.8.122",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"alert": "file:app/lib/alert", "alert": "file:app/lib/alert",

View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.121", "version": "1.8.122",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.121", "version": "1.8.122",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {