scad/common.scad

@@ -34,10 +34,6 @@ module trap_cube(height = 19, top_x = 30, top_y = 34, bottom_x = 45, bottom_y =
 echo("common.scad - R()");
 function R (diameter) = diameter / 2.0;
 
-module hex (diag = 10, h = 1) {
-    cylinder(r = diag / 2, h = h, center = true, $fn = 6);
-}
-
 echo("common.scad - m3_nut");
 module m3_nut (H = 5) {
     cylinder(r=R(6.6), h=H, center=true, $fn=6);
@@ -49,11 +45,6 @@ module m4_nut (H = 5, DIAG = 8.1) {
     hex(diag = DIAG, h = H);
 }
 
-echo("common.scad - m5_nut");
-module m5_nut (H = 5, DIAG = 9.1) {
-    hex(diag = DIAG, h = H);
-}
-
 module opto_endstop(){
  difference(){
   union(){
@@ -82,10 +73,14 @@ module optoswitch() {
             color("gray")translate([6.63,0,0]) cube([4.45,11.3,6.3]);
             color("gray")translate([13.63,0,0]) cube([4.45,11.3,6.3]);
         }
-        for ( hole = [2.75,24.5-2.75] ){
+       for ( hole = [2.75,24.5-2.75] ){
            rotate([90,0,0]) translate([hole,6.4/2,-4]) cylinder(r=1.5, h=4.5,$fn=40);
-        }	
-    }
+       }	
+     }
+ }
+ 
+ module hex (diag = 10, h = 1) {
+    cylinder(r = diag / 2, h = h, center = true, $fn = 6);
 }
 
 module NEMA17_motor_shaft (L = 22.75) {

scad/jk_lens_assembly.scad

@@ -224,56 +224,13 @@ module lensAssemblyLinearZ () {
 	}
 }
 
-module m5_nut_bolt () {
-    cylinder(r = R(4.95), h = 30, center = true, $fn = 30);
-    translate([0, 0, 20/2]) rotate([0, 0, 30]) m5_nut();
-}
-
 module lensAssemblyBaseZ () {
-    H = 22 + 12 + 12;
-    TOP_X = 74;
-    BOTTOM_X = 88;
-    Z_OFFSET = (12/2)+(22/2);
-	translate([0, 0, Z_OFFSET]) difference () {
-		translate([0, 6, -(24 / 2)]) cube([150, 45 + 12, H], center = true);
+	difference () {
+		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, 0]) threadedRod(50, 0.5);
         translate([ZOffset/2+10, 0, 3]) rotate([0, 90, 0]) m4BoltNut(20, -1);
-        //shelf void
-        translate([0, 12, -17]) cube([160 + 1, 45 + 0.1, 12], center = true);
-        //top corner voids
-        translate([(150 / 2) + (TOP_X / 2), 6 + (45 + 12) - 20, -(24 / 2) + 12]) cube([150, 45 + 12, H], center = true);
-        translate([-(150 / 2) - (TOP_X / 2), 6 + (45 + 12) - 20, -(24 / 2) + 12]) cube([150, 45 + 12, H], center = true);
-        //bottom voids
-        translate([(150 / 2) + (BOTTOM_X / 2), 6, -(24 / 2) - 22 - 12]) cube([150, 45 + 12 + 1, H], center = true);
-        translate([-(150 / 2) - (BOTTOM_X / 2), 6, -(24 / 2) - 22 - 12]) cube([150, 45 + 12 + 1, H], center = true);
-        
-        //bottom bolts
-        translate([25, 25, -18 - Z_OFFSET]) m5_nut_bolt();
-        translate([-25, 25, -18 - Z_OFFSET]) m5_nut_bolt();
-        translate([25, -5, -18 - Z_OFFSET]) m5_nut_bolt();
-        translate([-25, -5, -18 - Z_OFFSET]) m5_nut_bolt();
-        
-        //top bolts
-        translate([25, 25, 17.5 - Z_OFFSET]) {
-            rotate([180, 0, 0]) m5_nut_bolt();
-            translate([0, 0, 10]) rotate([0, 0, 30]) cylinder(r = R(20), h = 20, center = true, $fn = 6);
-        }
-        translate([-25, 25, 17.5 - Z_OFFSET]) {
-            rotate([180, 0, 0]) m5_nut_bolt();
-            translate([0, 0, 10]) rotate([0, 0, 30]) cylinder(r = R(20), h = 20, center = true, $fn = 6);
-        }
-        translate([25, -5, 17.5 - Z_OFFSET]) {
-            rotate([180, 0, 0]) m5_nut_bolt();
-            translate([0, 0, 10]) rotate([0, 0, 30]) cylinder(r = R(20), h = 20, center = true, $fn = 6);
-        }
-        translate([-25, -5, 17.5 - Z_OFFSET]) {
-            rotate([180, 0, 0]) m5_nut_bolt();
-            translate([0, 0, 10]) rotate([0, 0, 30]) cylinder(r = R(20), h = 20, center = true, $fn = 6);
-        }
 	}
-    
-    //translate([0, 12, 0]) color("green") cube([160, 45, 12], center = true);
 }
 
 module lensAssemblyTopZ () {
@@ -349,7 +306,7 @@ module debug () {
     }
 }
 
-PART = "lens_assembly_base_z";
+PART = "lens_assembly_camera_bellows_board";
 
 if (PART == "lens_assembly_camera_bellows_board") {
     bellows_camera_board();