From 536dd7b6d9db367672f2fcdbce24b094ff063ddc Mon Sep 17 00:00:00 2001
From: Jochen Vothknecht <jochen3120@gmail.com>
Date: Thu, 30 Sep 2021 01:18:05 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=B3Curvy=E2=AD=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HeatSink.scad | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/HeatSink.scad b/HeatSink.scad
index 65354fa..24111cc 100644
--- a/HeatSink.scad
+++ b/HeatSink.scad
@@ -262,16 +262,23 @@ module splitFunnel() {
   d = 2;
     
   y_off = hs_w/2 - fu_outlet_w/2;
+  
+  alpha = 45;  // curve angle
     
   module half() {
-    difference() {
-      union() {
-        translate([hs_l/2, -y_off, -hs_h]) rotate([90, 0, 90]) cornerPipeLayOnFace(hs_h, fu_outlet_w, d, 180, fu_r, fu_str, centerX=true);
-    
-      }
 
-      translate([-hs_l/2, 0, 0]) cube([hs_l, hs_w/2, hs_w]);
-    }
+    translate([hs_l/2, -y_off, -hs_h]) rotate([90, 0, 90]) cornerPipeLayOnFace(hs_h, fu_outlet_w, d, 180, fu_r, fu_str, centerX=true);
+
+
+    translate([hs_l/2, -y_off + fu_outlet_w/2 + d/2, d]) rotate([0, 0, 270 - alpha]) cornerPipe(fu_outlet_w, hs_h, d, alpha, fu_r, fu_str);
+
+
+    // the straight pipe after the curve
+
+
+//    difference() {
+//      translate([-hs_l/2, 0, 0]) cube([hs_l, hs_w/2, hs_w]);
+//    }
   }
 
 
@@ -286,6 +293,9 @@ module splitFunnel() {
 
 // Define the main module…
 module HeatSinkMainModule() {
+  
+  epsilon = 0.001;
+  
   if ($preview) {
     
     $fs = 0.5;
@@ -300,9 +310,9 @@ module HeatSinkMainModule() {
 
     // color([0, 0, 1.0, 1.0]) translate([0, 0, 1]) linear_extrude(1) funnelFins();
 
-    translate([7+8 - 72/2, 0, 0.001]) rotate([0, 0, 30]) MockupColor() linear_extrude(1.6) roundNGon(72, 6, 10/2);
+    translate([7+8 - 72/2, 0, epsilon]) rotate([0, 0, 30]) MockupColor() linear_extrude(1.6) roundNGon(72, 6, 10/2);
     
-    translate([12, 0, f_wh/2 + 0.001]) rotate([0, 90, 0]) MockupColor() fan(d=11);
+    // translate([12, 0, f_wh/2 + epsilon]) rotate([0, 90, 0]) MockupColor() fan(d=11);
 
   } else {
 
-- 
GitLab