Merge in 9 months of work on capper branch #71

Merged
mattmcw merged 95 commits from capper into main 2023-02-19 05:28:46 +00:00
1 changed files with 7 additions and 5 deletions
Showing only changes of commit c181e003a3 - Show all commits

View File

@ -222,16 +222,18 @@ module lensAssemblyBaseZ () {
difference () { difference () {
rounded_cube([150, 22, 22], d = 8, $fn = 30, center = true); rounded_cube([150, 22, 22], d = 8, $fn = 30, center = true);
translate([ZOffset/2, 0, 5]) linearMotionRod(22 + 1, 0.2); translate([ZOffset/2, 0, 5]) linearMotionRod(22 + 1, 0.2);
} translate([-ZOffset/2, 0, 0]) threadedRod(50, 0.2);
translate([ZOffset/2+10, 0, 0]) rotate([0, 90, 0]) m4Bolt(20); translate([ZOffset/2+10, 0, 0]) rotate([0, 90, 0]) m4Bolt(20);
} }
module lensAssemblyThreadedCollar (H = 8) { }
module lensAssemblyThreadedCollar (H = 8, pad = 0) {
difference () { difference () {
union () { union () {
cylinder(r = R(26), h = H, center = true, $fn = 80); cylinder(r = R(26), h = H, center = true, $fn = 80);
} }
threadedRod(H*2, 0.1); threadedRod(H*2, 0.1 + pad);
translate([8.5, 0, 0]) rotate([0, 90, 0]) m3BoltNut(10, -1); translate([8.5, 0, 0]) rotate([0, 90, 0]) m3BoltNut(10, -1);
} }
} }
@ -278,7 +280,7 @@ module debug () {
translate([0, BackOffset, -70]) lensAssemblyBaseZ(); translate([0, BackOffset, -70]) lensAssemblyBaseZ();
} }
PART = "lens_assembly_threaded_z"; PART = "lens_assembly_base_z";
if (PART == "lens_assembly_bellows_board") { if (PART == "lens_assembly_bellows_board") {
lensAssemblyBellowsBoard(); lensAssemblyBellowsBoard();
@ -291,7 +293,7 @@ if (PART == "lens_assembly_bellows_board") {
} else if (PART == "lens_assembly_threaded_knob") { } else if (PART == "lens_assembly_threaded_knob") {
lensAssemblyThreadedKnob(); lensAssemblyThreadedKnob();
} else if (PART == "lens_assembly_threaded_collar") { } else if (PART == "lens_assembly_threaded_collar") {
lensAssemblyThreadedCollar(6); lensAssemblyThreadedCollar(6, 0.2);
} else { } else {
debug(); debug();
} }