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
7 changed files with 65 additions and 25 deletions
Showing only changes of commit 164bde8cce - Show all commits

View File

@ -41,18 +41,45 @@ module camera_bolt (width = 20) {
cube([width, camBoltD, Z + 1], center = true); cube([width, camBoltD, Z + 1], center = true);
} }
module wing_nuts (nutZ = 0) {
translate([mountBoltsX/2, mountBoltsY/2, nutZ]) rotate([0, 0, 5]) cube([3.5, 22, 11], center = true);
translate([-mountBoltsX/2, mountBoltsY/2, nutZ]) rotate([0, 0, 5]) cube([3.5, 22, 11], center = true);
translate([mountBoltsX/2, -mountBoltsY/2, nutZ]) rotate([0, 0, 5]) cube([3.5, 22, 11], center = true);
translate([-mountBoltsX/2, -mountBoltsY/2, nutZ]) rotate([0, 0, 5]) cube([3.5, 22, 11], center = true);
}
module mount () { module mount () {
difference () { difference () {
rounded_cube([mountBoltsX + 20, baseY, Z], d = 20, center =true, $fn = 60); rounded_cube([mountBoltsX + 20, baseY, Z], d = 20, center =true, $fn = 60);
//center void //center void
translate([0, 0, -camBoltZ]) cube([mountBoltsX - 20, innerBaseY, Z], center =true); translate([0, 0, -camBoltZ]) cube([mountBoltsX - 20, innerBaseY, Z], center =true);
//side void
translate([0, 0, -camBoltZ]) cube([baseX + 1, innerBaseY - 40, Z], center =true); translate([0, 0, -camBoltZ]) cube([baseX + 1, innerBaseY - 40, Z], center =true);
bolts(boltD + .4, Z + 1); bolts(boltD + .4, Z + 1);
//inset //inset
translate([0, 0, (Z / 2) - (Z / 2) + 15]) bolts(20, Z); translate([0, 0, (Z / 2) - (Z / 2) + 15]) bolts(20, Z);
camera_bolt(); camera_bolt();
wing_nuts(-(Z / 2) + 20.5);
}
}
module center_fitting () {
SMALL_D = 4.5;
SMALL_Z = 9;
LARGE_D = 9.4;
translate([10.7, 0, 0]) cylinder(r = R(SMALL_D), h = SMALL_Z, center = true, $fn = 40);
difference () {
//cube
translate([(SMALL_D/2) + (LARGE_D / 2), 0, -(SMALL_Z/2)-(camBoltZ/2)]) cube([camBoltD + SMALL_D, camBoltD - 0.3, camBoltZ], center = true);
cylinder(r = R(LARGE_D), h = 60, center = true, $fn = 60);
translate([10.7 - 1, 0, 0]) difference () {
translate([(camBoltD + 1) / 2, 0, 0]) cube([camBoltD + 1, camBoltD + 1, 60], center = true);
cylinder(r = R(camBoltD), h = 60, center = true, $fn = 60);
}
} }
} }
//base(); //base();
translate([0, 0, (baseZ/2) + (Z/2) + 5]) mount(); //translate([0, 0, (baseZ/2) + (Z/2) + 5]) mount();
//translate([0, 0, (baseZ/2) + Z + 9])
center_fitting();

View File

@ -72,26 +72,35 @@ module lensAssemblyBellowsBoard () {
} }
rotate([-90, 0, 0]) { rotate([-90, 0, 0]) {
translate([-(XWidth/2) + 2.5, -FrontOffset, -XOffset]) rotate([0, 90, 0]) TNut(); translate([-(XWidth/2) + 2.5, -FrontOffset, -XOffset]) rotate([0, 90, 0]) TNut();
//m3 //m3s
translate([-(XWidth/2) + 2.5 + 5, -FrontOffset - 8, -XOffset]) rotate([0, -90, 0]) rotate([0, 0, 90]) m3BoltNut(); // -centered
translate([-(XWidth/2) + 2.5 + 5, -FrontOffset - 8, -XOffset]) rotate([0, -90, 0]) rotate([0, 0, 90]) m3BoltNut();
// -top no nut
translate([-(XWidth/2) + 2.5 + 5, -FrontOffset, -XOffset + 8]) rotate([0, -90, 0]) cylinder(r = 3.1 / 2, h = 20, center = true, $fn = 40);
// -bottom no nut
translate([-(XWidth/2) + 2.5 + 5, -FrontOffset, -XOffset - 8]) rotate([0, -90, 0]) cylinder(r = 3.1 / 2, h = 20, center = true, $fn = 40);
translate([(XWidth/2) - 2.5, -FrontOffset, -XOffset]) rotate([0, -90, 0]) TNut(); translate([(XWidth/2) - 2.5, -FrontOffset, -XOffset]) rotate([0, -90, 0]) TNut();
//m3 //m3s
// -center
translate([(XWidth/2) - 2.5 - 5, -FrontOffset - 8, -XOffset]) rotate([0, 90, 0]) rotate([0, 0, 90]) m3BoltNut(); translate([(XWidth/2) - 2.5 - 5, -FrontOffset - 8, -XOffset]) rotate([0, 90, 0]) rotate([0, 0, 90]) m3BoltNut();
// -top no nut
translate([(XWidth/2) - 2.5 - 5, -FrontOffset, -XOffset + 8]) rotate([0, 90, 0]) cylinder(r = 3.1 / 2, h = 20, center = true, $fn = 40);
// -bottom no nut
translate([(XWidth/2) - 2.5 - 5, -FrontOffset, -XOffset - 8]) rotate([0, 90, 0]) cylinder(r = 3.1 / 2, h = 20, center = true, $fn = 40);
} }
rotate([-90, 0, 0]) translate([0, -FrontOffset, -XOffset]) rotate([0, 90, 0]) threadedRod(RodLength, 0.5); rotate([-90, 0, 0]) translate([0, -FrontOffset, -XOffset]) rotate([0, 90, 0]) threadedRod(RodLength, 0.5);
translate([0, -XOffset, -10.5]) cube([100,30, 15], center = true); translate([0, -XOffset, -10.5]) cube([100,30, 15], center = true);
} }
//top //top
difference () { difference () {
translate([0, XOffset, FrontOffset]) rotate([0, 90, 0]) cylinder(r = R(25), h = 24, center = true, $fn = 80); translate([0, XOffset, FrontOffset]) rotate([0, 90, 0]) cylinder(r = R(25), h = 24, center = true, $fn = 80);
rotate([-90, 0, 0]) { rotate([-90, 0, 0]) {
translate([0, -FrontOffset, XOffset]) rotate([0, 90, 0]) linearBearing(0.25); translate([0, -FrontOffset, XOffset]) rotate([0, 90, 0]) linearBearing(0.25);
} }
//translate([0, XOffset + 10, 0]) cube([24 + 1, 10, 3], center = true);
translate([0, XOffset, -10.5]) cube([24 + 1,30, 15], center = true); translate([0, XOffset, -10.5]) cube([24 + 1,30, 15], center = true);
rotate([-90, 0, 0]) translate([0, -FrontOffset, XOffset]) rotate([0, 90, 0]) linearMotionRod(RodLength); rotate([-90, 0, 0]) translate([0, -FrontOffset, XOffset]) rotate([0, 90, 0]) linearMotionRod(RodLength);
} }
} }
module lensAssemblyThreadedZ () { module lensAssemblyThreadedZ () {
@ -169,35 +178,39 @@ module lensAssemblyLinearZ () {
} }
} }
//rotate([90, 0, 0]) lensAssemblyBellowsBoard(); module debug () {
rotate([90, 0, 0]) lensAssemblyBellowsBoard();
//translate([-ZOffset, BackOffset, 0]) lensAssemblyThreadedZ(); translate([-ZOffset, BackOffset, 0]) lensAssemblyThreadedZ();
//translate([ZOffset, BackOffset, 5]) lensAssemblyLinearZ(); translate([ZOffset, BackOffset, 5]) lensAssemblyLinearZ();
//Z axis //Z axis
//translate([-ZOffset, BackOffset, 0]) threadedRod(RodLength); //translate([-ZOffset, BackOffset, 0]) threadedRod(RodLength);
//translate([ZOffset, BackOffset, 0]) linearMotionRod(RodLength); //translate([ZOffset, BackOffset, 0]) linearMotionRod(RodLength);
//translate([40, 8, 0]) linearBearing(); //translate([40, 8, 0]) linearBearing();
//translate([-40, 8, 25]) rotate([180, 0, 0]) TNut(); //translate([-40, 8, 25]) rotate([180, 0, 0]) TNut();
//translate([-40, 8, -25]) TNut(); //translate([-40, 8, -25]) TNut();
//translate([ZOffset, 5, 15]) color("blue") m4_nut(); //translate([ZOffset, 5, 15]) color("blue") m4_nut();
//translate([ZOffset, 5, -15]) color("blue") m4_nut(); //translate([ZOffset, 5, -15]) color("blue") m4_nut();
//X axis //X axis
//translate([0, -FrontOffset, -XOffset]) rotate([0, 90, 0]) threadedRod(RodLength); //translate([0, -FrontOffset, -XOffset]) rotate([0, 90, 0]) threadedRod(RodLength);
//translate([0, -FrontOffset, XOffset]) rotate([0, 90, 0]) linearMotionRod(RodLength); //translate([0, -FrontOffset, XOffset]) rotate([0, 90, 0]) linearMotionRod(RodLength);
//translate([0, -8, 40]) rotate([0, 90, 0]) linearBearing(); //translate([0, -8, 40]) rotate([0, 90, 0]) linearBearing();
//translate([-25, -8, -XOffset]) rotate([0, 90, 0]) TNut(); //translate([-25, -8, -XOffset]) rotate([0, 90, 0]) TNut();
//translate([25, -8, -XOffset]) rotate([0, -90, 0]) TNut(); //translate([25, -8, -XOffset]) rotate([0, -90, 0]) TNut();
//translate([-15, -5, XOffset]) rotate([0, 90, 0]) color("blue") m4_nut(); //translate([-15, -5, XOffset]) rotate([0, 90, 0]) color("blue") m4_nut();
//translate([15, -5, XOffset]) rotate([0, 90, 0]) color("blue") m4_nut(); //translate([15, -5, XOffset]) rotate([0, 90, 0]) color("blue") m4_nut();
}
PART = "lens_assembly_bellows_board"; PART = "lens_assembly_bellows_board";
if (PART == "lens_assembly_bellows_board") { if (PART == "lens_assembly_bellows_board") {
lensAssemblyBellowsBoard(); lensAssemblyBellowsBoard();
} else {
debug();
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.