add fan holes, implement rounded hole holders

1 files changed, 43 insertions, 4 deletions

diff --git a/body/body.scad b/body/body.scad
index a3ec753..127d005 100644
--- a/body/body.scad
+++ b/body/body.scad
@@ -23,6 +23,9 @@ $wawt = -$scannerBodyFrontWallOffsetMm + $scannerBodyWallThicknessMm;
 wt = $scannerBodyWallThicknessMm;
 wzo = $scannerBodyFrontWallOffsetMm;
 
+// scanner coords
+fan_y_offset = 80;
+
 module cam_and_lense_new()
 {
     lhs = laser_holder_size();
@@ -562,8 +565,8 @@ module scanner_main_frame()
 
     // chinese fan
     //translate([0, -$scannerBodyFrontWallOffsetMm, 40])
-    translate([0, ld3007ms_t - wzo - id, 80])
-    *ld3007ms();
+    translate([0, -wzo - id, fan_y_offset])
+    ld3007ms();
 }
 
 module m12_connectors()
@@ -590,10 +593,17 @@ module laser_with_holder()
     translate([0, -$laserZOffsetMm, 0])
     {
         %laser_body();
-        %laser_holder();
+        laser_holder();
     }
 }
 
+module body_fan_holes()
+{
+    id = main_frame_depth_z;
+    translate([0, -wzo - id, fan_y_offset])
+    ld3007ms_holes();
+}
+
 module radxa()
 {
     translate([0, 0, 20])
@@ -627,12 +637,34 @@ module other()
 
 // visual block
 
+// visualize camera
+union()
+{
+    translate([0, 0, $lenseYPosMm])
+    %rotate([-$opticalAxisAngleDegrees, 0, 0])
+    {
+        //color("orange", 0.6)
+        m12_lense_holder();
+        %m12_lense();
+        //color("red", 0.3)
+        //%m12_lense_circle();
+
+        translate([0, -$lenseSensorDistanceMm, 0])
+        rotate([$sensorLenseAngleDegrees, 0, 0])
+        {
+            //color("yellow", 0.3)
+            veye_imx287_natural();
+        }
+    }
+}
+
 union()
 {
-    *other();
+    other();
 
     *cam_lense_holder_screw_holes();
 
+    color("green", 0.1)
     difference()
     {
         scanner_main_frame();
@@ -641,6 +673,7 @@ union()
         laser_holder_screw_holes();
         m12_connectors();
         cam_lense_holder_screw_holes();
+        body_fan_holes();
     }
 }
 
@@ -664,4 +697,10 @@ union()
     laser_glass_hole();
     laser_holder_screw_holes();
     m12_connectors();
+}
+
+*translate([0, -$laserZOffsetMm, 0])
+{
+    %laser_body();
+    laser_holder();
 }
\ No newline at end of file