From 702fc4680d282a54f04ee309727ef94614cf38d6 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Mon, 9 Oct 2023 22:58:48 -0400 Subject: [PATCH] Had accidentally switched motors, explaining odd homing behavior. New homing behavior whips ass. --- app/data/cfg.json | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 2 +- ino/mcopy_projector_firmware/McopyProjector.h | 8 ++++---- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index db45c0a..c8a07e6 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.54", + "version": "1.8.55", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index c210158..bf851c2 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.54", + "version": "1.8.55", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 2be976e..feafef1 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.54", + "version": "1.8.55", "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 db45c0a..c8a07e6 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.54", + "version": "1.8.55", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/ino/mcopy_projector_firmware/McopyProjector.h b/ino/mcopy_projector_firmware/McopyProjector.h index c03d451..6cc72ef 100644 --- a/ino/mcopy_projector_firmware/McopyProjector.h +++ b/ino/mcopy_projector_firmware/McopyProjector.h @@ -43,16 +43,16 @@ class McopyProjector { int64_t _posTakeup = 0; int64_t _posFeed = 0; - //X + //Y uint8_t _takeupSettingA; uint8_t _takeupSettingB; - //Y + //X uint8_t _feedSettingA; uint8_t _feedSettingB; - //X + //Y uint8_t _takeupEmitter; uint8_t _takeupReceiver; - //Y + //X uint8_t _feedEmitter; uint8_t _feedReceiver; diff --git a/package-lock.json b/package-lock.json index 57b9924..db9b20e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.54", + "version": "1.8.55", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.54", + "version": "1.8.55", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index 563fae6..c3a30d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.54", + "version": "1.8.55", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index db45c0a..c8a07e6 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.54", + "version": "1.8.55", "ext_port": 1111, "profiles": { "mcopy": {