……

HeatSink.scad

@@ -261,7 +261,7 @@ module splitFunnel() {
     
   y_off = hs_w/2 - fu_outlet_w/2;
   
-  alpha = 60;  // curve angle
+  alpha = 56;  // curve angle
     
   module half() {
 
@@ -291,7 +291,7 @@ module splitFunnel() {
   
   sp_len = 20;
 
-  module _straight(inner=false, outer=false) {
+  module _straight(x_off=0, inner=false, outer=false) {
     // connecting a straight pipe to the end of a curve in a fully generic way
     //
     // step 1: move to a very specific point beneath origin
@@ -301,8 +301,8 @@ module splitFunnel() {
     for (signum=[-1, 1])
     translate([hs_l/2, (-y_off + fu_outlet_w/2) * signum, hs_h/2 + d])         // step 3
       rotate([0, 0, -alpha * signum])                                        // step 2
-      translate([-1, -fu_outlet_w/2 * signum, 0]) rotate([90, 0, -90])        // step 1
-      straightPipe(fu_outlet_w, hs_h, sp_len, fu_r, fu_str, inner=inner, outer=outer);
+      translate([-1 + x_off, -fu_outlet_w/2 * signum, 0]) rotate([90, 0, -90])        // step 1
+      straightPipe(fu_outlet_w, hs_h, sp_len + 2*x_off, fu_r, fu_str, inner=inner, outer=outer);
 
     // }  // debugging stuff
   }
@@ -319,10 +319,10 @@ module splitFunnel() {
         _straight(outer=true);
       }
       
-      translate([hs_l/2 - f_wh/2, 0, d]) rotate([0, 0, 45]) cylinder(d=30, h=hs_h);
+      translate([hs_l/2 - f_wh/2, 0, d + fu_str]) rotate([0, 0, 45]) cylinder(d=30, h=hs_h - fu_str);
 
 
-      _straight(inner=true);
+      _straight(x_off=1, inner=true);
     }
 
 
@@ -356,8 +356,8 @@ module HeatSinkMainModule() {
 
   } else {
 
-    $fs = 0.2;
-    $fa = 1.0;
+    $fs = 0.35;
+    $fa = 2.0;
     
     // TODO: 3D-Print positioning!