From 03f2b55762ab5e9b37f51a7a7872026e0564eabd Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Tue, 29 Aug 2023 23:33:42 -0400
Subject: [PATCH] Fucked up the merge

---
 app/data/cfg.json                             |  2 +-
 app/package-lock.json                         |  2 +-
 app/package.json                              |  2 +-
 data/cfg.json                                 |  2 +-
 ino/mcopy_projector_firmware/McopyProjector.h |  2 +-
 .../mcopy_projector_firmware.ino              | 21 ++++++-------------
 package-lock.json                             |  4 ++--
 package.json                                  |  2 +-
 processing/mcopy/cfg.json                     |  2 +-
 scad/mcopy_projector.scad                     |  2 +-
 10 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/data/cfg.json b/app/data/cfg.json
index 134960b..2140d83 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.14",
+  "version": "1.8.15",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/app/package-lock.json b/app/package-lock.json
index 553bc81..c93d293 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.14",
+  "version": "1.8.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/app/package.json b/app/package.json
index 4baf6af..f3c81ec 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.14",
+  "version": "1.8.15",
   "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 134960b..2140d83 100644
--- a/data/cfg.json
+++ b/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.14",
+  "version": "1.8.15",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/ino/mcopy_projector_firmware/McopyProjector.h b/ino/mcopy_projector_firmware/McopyProjector.h
index ad98193..bb3fa7f 100644
--- a/ino/mcopy_projector_firmware/McopyProjector.h
+++ b/ino/mcopy_projector_firmware/McopyProjector.h
@@ -13,7 +13,7 @@ class McopyProjector {
 
 	uint8_t _motorSteps = 1600; //microstepped
 	uint8_t _frames = 8;
-	uint8_t _stepsPerFrame = 50; //round(_motorSteps / _frames);
+	uint8_t _stepsPerFrame = 25; //round(_motorSteps / _frames);
 	float _speed = 500.0;
 
 	int64_t _posTakeup = 0;
diff --git a/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino b/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino
index 841d214..49506dd 100644
--- a/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino
+++ b/ino/mcopy_projector_firmware/mcopy_projector_firmware.ino
@@ -31,20 +31,16 @@
 #define FEED_DIR_PIN 7
 #define FEED_STEP_PIN 6
 
-#define TAKEUP_SETTING_A 4
-#define TAKEUP_SETTING_B 5
-#define FEED_SETTING_A 8
-#define FEED_SETTING_B 9
-
 AccelStepper takeup(AccelStepper::DRIVER, TAKEUP_STEP_PIN, TAKEUP_DIR_PIN);
 AccelStepper feed(AccelStepper::DRIVER, FEED_STEP_PIN, FEED_DIR_PIN);
 
-//PROJECTOR CONSTANTS
-const int BUTTON = 10;
-const int LED_FWD = 11;
-const int LED_BWD = 12;
+//CAMERA CONSTANTS
+const int BUTTON = 7;
+const int LED_FWD = 8;
+const int LED_BWD = 9;
 
 const int PROJECTOR_MOMENT = 240;
+const int PROJECTOR_STEPS = 25;
 
 //VARIABLES
 volatile int projectorFrame = -1;
@@ -54,7 +50,7 @@ volatile bool direction = true;
 volatile long start;
 
 McopySerial mcopy;
-McopyProjector projector(takeup, feed, TAKEUP_SETTING_A, TAKEUP_SETTING_B, FEED_SETTING_A, FEED_SETTING_B);
+McopyProjector projector(takeup, feed);
 
 void setup () {
   pins();
@@ -82,11 +78,6 @@ void pins () {
   pinMode(LED_BWD, OUTPUT);
   pinMode(BUTTON, INPUT_PULLUP);
 
-  pinMode(TAKEUP_SETTING_A, OUTPUT);
-  pinMode(TAKEUP_SETTING_B, OUTPUT);
-  pinMode(FEED_SETTING_A, OUTPUT);
-  pinMode(FEED_SETTING_B, OUTPUT);
-
   digitalWrite(LED_FWD, LOW);
   digitalWrite(LED_BWD, LOW);
 }
diff --git a/package-lock.json b/package-lock.json
index abe4ee4..7cd8a5c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.8.14",
+  "version": "1.8.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.8.14",
+      "version": "1.8.15",
       "license": "MIT",
       "dependencies": {
         "arduino": "file:app/lib/arduino",
diff --git a/package.json b/package.json
index f7edb4c..62af448 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.8.14",
+  "version": "1.8.15",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {
diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json
index 134960b..2140d83 100644
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.14",
+  "version": "1.8.15",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/scad/mcopy_projector.scad b/scad/mcopy_projector.scad
index 5f952f7..f0f633a 100644
--- a/scad/mcopy_projector.scad
+++ b/scad/mcopy_projector.scad
@@ -348,7 +348,7 @@ module debug () {
     
 }
 
-PART = "gate_keyx";
+PART = "gate_key";
 
 if (PART == "gate_key") {
 	gate_key();