From 2b24dc647c57fed46e9bffed45cdb350c582039c Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Tue, 5 Sep 2023 23:15:32 -0400
Subject: [PATCH] Update lens assembly to start using a 2020 frame

---
 app/data/cfg.json             |  2 +-
 app/package-lock.json         |  2 +-
 app/package.json              |  2 +-
 data/cfg.json                 |  2 +-
 package-lock.json             |  4 ++--
 package.json                  |  2 +-
 processing/mcopy/cfg.json     |  2 +-
 scad/mcopy_lens_assembly.scad | 23 +++++++++++++++++++----
 scripts/scad.sh               |  1 +
 9 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/data/cfg.json b/app/data/cfg.json
index a64f5d5..f49749d 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.20",
+  "version": "1.8.21",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/app/package-lock.json b/app/package-lock.json
index cae6115..23d375a 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.20",
+  "version": "1.8.21",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/app/package.json b/app/package.json
index bb208c5..a026172 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.20",
+  "version": "1.8.21",
   "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 a64f5d5..f49749d 100644
--- a/data/cfg.json
+++ b/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.20",
+  "version": "1.8.21",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/package-lock.json b/package-lock.json
index 6a24a1e..22ae868 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.8.20",
+  "version": "1.8.21",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.8.20",
+      "version": "1.8.21",
       "license": "MIT",
       "dependencies": {
         "arduino": "file:app/lib/arduino",
diff --git a/package.json b/package.json
index b271654..8dc20f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.8.20",
+  "version": "1.8.21",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {
diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json
index a64f5d5..f49749d 100644
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.20",
+  "version": "1.8.21",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/scad/mcopy_lens_assembly.scad b/scad/mcopy_lens_assembly.scad
index e37651c..2c1c099 100644
--- a/scad/mcopy_lens_assembly.scad
+++ b/scad/mcopy_lens_assembly.scad
@@ -1,9 +1,10 @@
 //
 // JK lens assembly
 //
-include <./common.scad>;
+include <./common/common.scad>;
 include <./bellows.scad>;
 include <./knurledFinishLib_v2.scad>;
+use <2020_profile.scad>;
 
 PART = "";
 
@@ -36,6 +37,16 @@ LinearMotionZ = 14;
 XPosition = 0;
 ZPosition = 0;
 
+RailSpacingX = 100;
+RailEndX = RailSpacingX + 72;
+LensFrameSpacingX = (RailEndX / 2) - (40 / 2);
+
+module rail_debug (H = 175) {
+    color("lime") linear_extrude(height=H) {
+        2020_profile();
+    }
+}
+
 module linearBearing (padD = 0, padH = 0) {
 	difference () {
 		cylinder(r = R(LinearBearingOuterDiameter + padD), h = LinearBearingHeight + padH, center = true, $fn = 100);
@@ -351,18 +362,22 @@ module debug () {
     translate([-ZOffset/2, BackOffset, -((RodLength + 20)/2)+31])  lensAssemblyThreadedCollar();
 	translate([ZOffset/2, BackOffset, 0]) linearMotionRod(RodLength);
     
-    translate([0, BackOffset, -70]) lensAssemblyBaseZ();
+    //translate([0, BackOffset, -70]) lensAssemblyBaseZ();
     
     translate([0, 130, 0]) rotate([90, 0, 0]) bellows_camera_board();
     translate([0, 130/2, 0]) color("blue") {
         difference () {
-            cube([70, 130-10, 70], center = true);
+            cube([70, 130 - 10, 70], center = true);
             cube([40, 130 + 1, 40], center = true);
         }
     }
+    
+    translate([LensFrameSpacingX + 20, 15, -100]) rail_debug(200);
+    translate([-LensFrameSpacingX - 20, 15, -100]) rail_debug(200);
+    translate([-100, 35, 90]) rotate([0, 90, 0]) rail_debug(200);
 }
 
-PART = "lens_assembly_bellows_board_magnetic";
+PART = "lens_assembly_bellows_board_magneticx";
 
 if (PART == "lens_assembly_camera_bellows_board") {
     bellows_camera_board();
diff --git a/scripts/scad.sh b/scripts/scad.sh
index 40fd7ed..519166b 100644
--- a/scripts/scad.sh
+++ b/scripts/scad.sh
@@ -8,6 +8,7 @@ FILES=(
 	cpc_connectors
 	mcopy_rails
 	mcopy_projector
+	mcopy_lens_assembly
 )
 
 PARALLEL=0