16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Update lens assembly to start using a 2020 frame

This commit is contained in:
Matt McWilliams 2023-09-05 23:15:32 -04:00
parent f8e5968f30
commit 2b24dc647c
9 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.20", "version": "1.8.21",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.20", "version": "1.8.21",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.20", "version": "1.8.21",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.20", "version": "1.8.21",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.20", "version": "1.8.21",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy", "name": "mcopy",
"version": "1.8.20", "version": "1.8.21",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"arduino": "file:app/lib/arduino", "arduino": "file:app/lib/arduino",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.20", "version": "1.8.21",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.20", "version": "1.8.21",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

23
scad/mcopy_lens_assembly.scad
View File

@ -1,9 +1,10 @@
// //
// JK lens assembly // JK lens assembly
// //
include <./common.scad>; include <./common/common.scad>;
include <./bellows.scad>; include <./bellows.scad>;
include <./knurledFinishLib_v2.scad>; include <./knurledFinishLib_v2.scad>;
use <2020_profile.scad>;
PART = ""; PART = "";
@ -36,6 +37,16 @@ LinearMotionZ = 14;
XPosition = 0; XPosition = 0;
ZPosition = 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) { module linearBearing (padD = 0, padH = 0) {
difference () { difference () {
cylinder(r = R(LinearBearingOuterDiameter + padD), h = LinearBearingHeight + padH, center = true, $fn = 100); 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, -((RodLength + 20)/2)+31]) lensAssemblyThreadedCollar();
translate([ZOffset/2, BackOffset, 0]) linearMotionRod(RodLength); 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, 0]) rotate([90, 0, 0]) bellows_camera_board();
translate([0, 130/2, 0]) color("blue") { translate([0, 130/2, 0]) color("blue") {
difference () { difference () {
cube([70, 130-10, 70], center = true); cube([70, 130 - 10, 70], center = true);
cube([40, 130 + 1, 40], 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") { if (PART == "lens_assembly_camera_bellows_board") {
bellows_camera_board(); bellows_camera_board();

1
scripts/scad.sh
View File

@ -8,6 +8,7 @@ FILES=(
cpc_connectors cpc_connectors
mcopy_rails mcopy_rails
mcopy_projector mcopy_projector
mcopy_lens_assembly
) )
PARALLEL=0 PARALLEL=0