From 83b4db5c0d1a5555b1e82da5bb1c94666a8ff59b Mon Sep 17 00:00:00 2001
From: Jochen Vothknecht <jochen3120@gmail.com>
Date: Sat, 25 Sep 2021 06:45:03 +0200
Subject: [PATCH] Begin funnel development (second time)
---
.gitmodules | 3 +++
HeatSink.scad | 24 +++++++++++++++++++-----
WebWeaver | 1 +
3 files changed, 23 insertions(+), 5 deletions(-)
create mode 160000 WebWeaver
diff --git a/.gitmodules b/.gitmodules
index e47084e..def3a58 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "TripwireHook"]
path = TripwireHook
url = git@git.c3pb.de:fxk8y/tripwirehook.git
+[submodule "WebWeaver"]
+ path = WebWeaver
+ url = git@git.services.c3pb.de:fxk8y/WebWeaver.git
diff --git a/HeatSink.scad b/HeatSink.scad
index 2a54a7a..f75fa45 100644
--- a/HeatSink.scad
+++ b/HeatSink.scad
@@ -3,6 +3,10 @@ $fs = 0.2;
$fa = $fs;
+use <WebWeaver/scad/Util.scad>;
+use <WebWeaver/scad/Piping.scad>;
+
+
// Material definitions
GreenPLA = [28/255, 1.0, 47/255, 132/255];
@@ -22,6 +26,7 @@ hs_fin_d = 11; // depth
hs_fin_cnt = 10;
hs_fin_spacing = 3.5;
+
/**
*
* TODO: Moar documentation!
@@ -213,13 +218,22 @@ module funnelFins(
-
+fu_str = 1.6;
module funnel() {
color(GreenPLA) {
- // TODO: implement!
+ hs_h = hs_baseplate + hs_fin_d;
+
+ d = 5;
+
+ y_off = hs_w/2 - fu_outlet_w/2;
+ z_off = 0;
+ for (ty=[-y_off, y_off]) translate([hs_l/2, ty, z_off]) rotate([90, 90, 0]) cornerPipe(hs_h, fu_outlet_w, d, 180, 2, fu_str, center=true);
+
+
+
+
- linear_extrude(1) funnel2D();
}
}
@@ -239,10 +253,10 @@ module funnel() {
module preview() {
- // funnel();
+ translate([0, 0, 0]) funnel();
// color([0, 0, 1.0, 1.0]) translate([0, 0, 1]) linear_extrude(1) funnelFins();
- // rotate([180, 0, 0]) symmetricHeatsink();
+ rotate([180, 0, 0]) symmetricHeatsink();
}
diff --git a/WebWeaver b/WebWeaver
new file mode 160000
index 0000000..ab46123
--- /dev/null
+++ b/WebWeaver
@@ -0,0 +1 @@
+Subproject commit ab46123fdfbcfbf9d2d896d7def54a9d737839af
--
GitLab