From 6dd29d95967288448d9064705dab263027424c41 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Thu, 28 Sep 2023 20:46:45 -0400 Subject: [PATCH] Disable home feature for now. Fixed impossibly stupid bug with reverse mode. Used uint16_t rather than int16_t causing an overflow. --- app/data/cfg.json | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 2 +- ino/mcopy_projector_firmware/McopyProjector.cpp | 5 +++-- ino/mcopy_projector_firmware/mcopy_projector_firmware.ino | 2 +- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index ff4c2ea..3111b03 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.37", + "version": "1.8.38", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index 428c162..48d9198 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.37", + "version": "1.8.38", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 8d87d2b..f47d03d 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.37", + "version": "1.8.38", "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 ff4c2ea..3111b03 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.37", + "version": "1.8.38", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/ino/mcopy_projector_firmware/McopyProjector.cpp b/ino/mcopy_projector_firmware/McopyProjector.cpp index e22c027..af0c31b 100644 --- a/ino/mcopy_projector_firmware/McopyProjector.cpp +++ b/ino/mcopy_projector_firmware/McopyProjector.cpp @@ -47,7 +47,7 @@ void McopyProjector::setDirection (bool dir) { } void McopyProjector::frame (bool dir) { - uint16_t spf = _stepsPerFrame * _mode; //scaled + int16_t spf = _stepsPerFrame * _mode; //scaled bool running = true; if (dir != _dir) { setDirection(dir); @@ -157,6 +157,7 @@ void McopyProjector::setStepperMode (uint8_t mode) { } void McopyProjector::home () { + /* uint16_t steps = _motorSteps * _mode; long reading; // @@ -205,7 +206,7 @@ void McopyProjector::home () { _takeup.move(-1); _takeup.runToPosition(); } - } + }*/ } long McopyProjector::readVcc() { diff --git a/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino b/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino index 9802c4e..65cc71c 100644 --- a/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino +++ b/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino @@ -75,7 +75,7 @@ void setup () { delay(42); digitalWrite(LED_FWD, LOW); digitalWrite(LED_BWD, LOW); - projector.home(); + //projector.home(); } void loop () { diff --git a/package-lock.json b/package-lock.json index e01062e..7f9da98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.37", + "version": "1.8.38", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.37", + "version": "1.8.38", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index 10f4606..9af7e8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.37", + "version": "1.8.38", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index ff4c2ea..3111b03 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.37", + "version": "1.8.38", "ext_port": 1111, "profiles": { "mcopy": {