From c29e0880ac74ff140e3e42e99fb0166e2c36ac41 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Mon, 30 Oct 2023 22:02:30 -0400 Subject: [PATCH] Work on rails and lens gantry. First prototype is made. Rendering all. --- 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/jk_lens_assembly.scad | 4 ++-- scad/mcopy_lens_assembly.scad | 2 +- scad/mcopy_rails.scad | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index a823beb..d1ccfcd 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.62", + "version": "1.8.63", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index df26b19..68011d4 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.62", + "version": "1.8.63", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 1f03848..5cbb3ec 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.62", + "version": "1.8.63", "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 3ba13f3..47cddf4 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.62", + "version": "1.8.63", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index 3c9f14d..e10f2b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.62", + "version": "1.8.63", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.62", + "version": "1.8.63", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index f51bc2d..cb622dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.62", + "version": "1.8.63", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index a823beb..d1ccfcd 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.62", + "version": "1.8.63", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/scad/jk_lens_assembly.scad b/scad/jk_lens_assembly.scad index e37651c..c56b22c 100644 --- a/scad/jk_lens_assembly.scad +++ b/scad/jk_lens_assembly.scad @@ -362,7 +362,7 @@ module debug () { } } -PART = "lens_assembly_bellows_board_magnetic"; +PART = ""; if (PART == "lens_assembly_camera_bellows_board") { bellows_camera_board(); @@ -385,5 +385,5 @@ if (PART == "lens_assembly_camera_bellows_board") { } else if (PART == "lens_assembly_threaded_collar") { lensAssemblyThreadedCollar(6, 0.2); } else { - debug(); + echo("DEPRECATED: see mcopy_lens_assembly"); } diff --git a/scad/mcopy_lens_assembly.scad b/scad/mcopy_lens_assembly.scad index c1b0a7d..6f43d17 100644 --- a/scad/mcopy_lens_assembly.scad +++ b/scad/mcopy_lens_assembly.scad @@ -385,7 +385,7 @@ module debug () { translate([-100, 35, 90]) rotate([0, 90, 0]) rail_debug(200); } -PART = "lens_assembly_bellows_board_magneticx"; +PART = "lens_assembly_bellows_board_magnetic"; if (PART == "lens_assembly_camera_bellows_board") { bellows_camera_board(); diff --git a/scad/mcopy_rails.scad b/scad/mcopy_rails.scad index 46f813a..6199031 100644 --- a/scad/mcopy_rails.scad +++ b/scad/mcopy_rails.scad @@ -554,7 +554,7 @@ module debug () { } -PART = "lens_frame_top_gantry"; +PART = "bearing_roller_inner"; if (PART == "rail_end") { rail_end();