From 178f67f815dca6edc65651c0b9cfb9d670c349ae Mon Sep 17 00:00:00 2001 From: Jan Giebels Date: Sun, 6 Oct 2024 14:46:40 +0200 Subject: [PATCH] added more pipes and some cleanup --- tests/ht_pipes.scad | 8 +++--- vitamins/ht_pipe.scad | 30 +++++++++------------ vitamins/ht_pipes.scad | 61 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 23 deletions(-) diff --git a/tests/ht_pipes.scad b/tests/ht_pipes.scad index f5b5dec..63d5ac6 100644 --- a/tests/ht_pipes.scad +++ b/tests/ht_pipes.scad @@ -20,9 +20,10 @@ use <../utils/layout.scad> include <../vitamins/ht_pipes.scad> module ht_pipes() - layout([for(p = ht_pipes) 100]) + color("grey") + layout([for(p = ht_pipes) 40 + p[2]]) translate([0, 0, 0]) { - rotate(180) { + // rotate(0) { if (ht_pipes[$i][4] <= 34) translate([0, 0, ht_pipes[$i][4]]) ht_cap(ht_pipes[$i]); @@ -30,8 +31,7 @@ module ht_pipes() ht_pipe(ht_pipes[$i]); if (ht_pipes[$i][4] == 100) ht_tpipe(ht_pipes[$i]); - } - + // } } if($preview) diff --git a/vitamins/ht_pipe.scad b/vitamins/ht_pipe.scad index bca81f4..b1b1be3 100644 --- a/vitamins/ht_pipe.scad +++ b/vitamins/ht_pipe.scad @@ -47,7 +47,7 @@ module ht_pipe(type) { //! Draw specified pipe tube_id = pipe_od(type) - pipe_wall(type) * 2; difference() { union() { - translate([0, 0, pipe_length(type) + tube_id - pipe_wall(type)]) + translate([0, 0, pipe_length(type)]) HTpipeFitting(pipe_od(type)); cylinder(pipe_length(type), tube_id/2 + pipe_wall(type), tube_id/2 + pipe_wall(type)); } @@ -61,10 +61,10 @@ module ht_tpipe(type) { //! Draw specified T-pipe tube_t_id = pipe_td(type) - pipe_wall(type) * 2; difference() { union() { - translate([0, 0, pipe_length(type) + tube_id - pipe_wall(type)]) + translate([0, 0, pipe_length(type)]) HTpipeFitting(pipe_od(type)); cylinder(pipe_length(type), tube_id/2 + pipe_wall(type), tube_id/2 + pipe_wall(type)); - translate([0, -70, pipe_length(type) - 25]) + translate([0, -25, pipe_length(type) - 25]) rotate ([90, 0, 0]) HTpipeFitting(pipe_td(type)); } @@ -76,18 +76,14 @@ module ht_tpipe(type) { //! Draw specified T-pipe } module HTpipeFitting(fit_dia) { - difference() { - union() { - cylinder(12, fit_dia/2 + 5, fit_dia/2 + 5); - translate([0, 0, 12]) - cylinder(3.7, fit_dia/2, fit_dia/2); - translate([0, 0, -fit_dia + 12]) - cylinder(fit_dia, fit_dia/2 + 2.6, fit_dia/2 + 2.6); - translate([0, 0, -fit_dia + 2]) - cylinder(10, fit_dia/2, fit_dia/2 + 2.6); - - translate([0, 0, -fit_dia - 15]) - cylinder(fit_dia, fit_dia/2, fit_dia/2); - } - } + fitting_height = min(55, fit_dia * 0.8); + cylinder(10, fit_dia/2, fit_dia/2 + 2.6); + translate([0, 0, 10]) + cylinder(fitting_height, fit_dia/2 + 2.6, fit_dia/2 + 2.6); + translate([0, 0, fitting_height]) + cylinder(12, fit_dia/2 + 5, fit_dia/2 + 5); + translate([0, 0, fitting_height + 12]) + cylinder(3.7, fit_dia/2, fit_dia/2); + translate([0, 0, -30]) + cylinder(30, fit_dia/2, fit_dia/2); } diff --git a/vitamins/ht_pipes.scad b/vitamins/ht_pipes.scad index bd90ed7..f6d2d59 100644 --- a/vitamins/ht_pipes.scad +++ b/vitamins/ht_pipes.scad @@ -18,27 +18,84 @@ // // definition name diameter wall length t-diameter + +HT_32_cap = ["HT_32_cap", "HT 32 cap", 32, 2.1, 34]; +HT_32_pipe_150 = ["HT_32_pipe_150", "HT 32 pipe 150 mm", 32, 2.1, 150]; +HT_32_pipe_250 = ["HT_32_pipe_250", "HT 32 pipe 250 mm", 32, 2.1, 250]; +HT_32_pipe_500 = ["HT_32_pipe_500", "HT 32 pipe 500 mm", 32, 2.1, 500]; +HT_32_pipe_1000 = ["HT_32_pipe_1000", "HT 32 pipe 1000 mm", 32, 2.1, 1000]; +HT_32_pipe_1500 = ["HT_32_pipe_1500", "HT 32 pipe 1500 mm", 32, 2.1, 1500]; +HT_32_pipe_2000 = ["HT_32_pipe_2000", "HT 32 pipe 2000 mm", 32, 2.1, 2000]; + HT_40_cap = ["HT_40_cap", "HT 40 cap", 40, 2.1, 34]; +HT_40_pipe_150 = ["HT_40_pipe_150", "HT 40 pipe 150 mm", 40, 2.1, 150]; HT_40_pipe_250 = ["HT_40_pipe_250", "HT 40 pipe 250 mm", 40, 2.1, 250]; HT_40_pipe_500 = ["HT_40_pipe_500", "HT 40 pipe 500 mm", 40, 2.1, 500]; HT_40_pipe_1000 = ["HT_40_pipe_1000", "HT 40 pipe 1000 mm", 40, 2.1, 1000]; +HT_40_pipe_1500 = ["HT_40_pipe_1500", "HT 40 pipe 1500 mm", 40, 2.1, 1500]; HT_40_pipe_2000 = ["HT_40_pipe_2000", "HT 40 pipe 2000 mm", 40, 2.1, 2000]; HT_50_cap = ["HT_50_cap", "HT 50 cap", 50, 2.1, 34]; +HT_50_pipe_150 = ["HT_50_pipe_150", "HT 50 pipe 150 mm", 50, 2.1, 150]; HT_50_pipe_250 = ["HT_50_pipe_250", "HT 50 pipe 250 mm", 50, 2.1, 250]; HT_50_pipe_500 = ["HT_50_pipe_500", "HT 50 pipe 500 mm", 50, 2.1, 500]; HT_50_pipe_1000 = ["HT_50_pipe_1000", "HT 50 pipe 1000 mm", 50, 2.1, 1000]; +HT_50_pipe_1500 = ["HT_50_pipe_1500", "HT 50 pipe 1500 mm", 50, 2.1, 1500]; HT_50_pipe_2000 = ["HT_50_pipe_2000", "HT 50 pipe 2000 mm", 50, 2.1, 2000]; HT_50_tpipe = ["HT_50_tpipe", "HT 50 T pipe", 50, 2.1, 100, 50]; HT_50_40_tpipe = ["HT_50_40_tpipe", "HT 50/40 T pipe", 50, 2.1, 100, 40]; HT_75_cap = ["HT_75_cap", "HT 75 cap", 75, 2.1, 34]; +HT_75_pipe_150 = ["HT_75_pipe_150", "HT 75 pipe 150 mm", 75, 2.1, 150]; HT_75_pipe_250 = ["HT_75_pipe_250", "HT 75 pipe 250 mm", 75, 2.1, 250]; HT_75_pipe_500 = ["HT_75_pipe_500", "HT 75 pipe 500 mm", 75, 2.1, 500]; HT_75_pipe_1000 = ["HT_75_pipe_1000", "HT 75 pipe 1000 mm", 75, 2.1, 1000]; +HT_75_pipe_1500 = ["HT_75_pipe_1500", "HT 75 pipe 1500 mm", 75, 2.1, 1500]; HT_75_pipe_2000 = ["HT_75_pipe_2000", "HT 75 pipe 2000 mm", 75, 2.1, 2000]; -ht_pipes = [HT_40_cap, HT_40_pipe_250, HT_40_pipe_500, HT_40_pipe_1000, HT_40_pipe_2000, HT_50_cap, HT_50_pipe_250, HT_50_pipe_500, HT_50_pipe_1000, HT_50_pipe_2000, HT_50_tpipe, HT_50_40_tpipe, HT_75_cap, HT_75_pipe_250, HT_75_pipe_500, HT_75_pipe_1000, HT_75_pipe_2000]; +HT_90_cap = ["HT_90_cap", "HT 90 cap", 90, 2.1, 34]; +HT_90_pipe_150 = ["HT_90_pipe_150", "HT 90 pipe 150 mm", 90, 2.1, 150]; +HT_90_pipe_250 = ["HT_90_pipe_250", "HT 90 pipe 250 mm", 90, 2.1, 250]; +HT_90_pipe_500 = ["HT_90_pipe_500", "HT 90 pipe 500 mm", 90, 2.1, 500]; +HT_90_pipe_1000 = ["HT_90_pipe_1000", "HT 90 pipe 1000 mm", 90, 2.1, 1000]; +HT_90_pipe_1500 = ["HT_90_pipe_1500", "HT 90 pipe 1500 mm", 90, 2.1, 1500]; +HT_90_pipe_2000 = ["HT_90_pipe_2000", "HT 90 pipe 2000 mm", 90, 2.1, 2000]; -use \ No newline at end of file +HT_110_cap = ["HT_110_cap", "HT 110 cap", 110, 2.1, 34]; +HT_110_pipe_150 = ["HT_110_pipe_150", "HT 110 pipe 150 mm", 110, 2.1, 150]; +HT_110_pipe_250 = ["HT_110_pipe_250", "HT 110 pipe 250 mm", 110, 2.1, 250]; +HT_110_pipe_500 = ["HT_110_pipe_500", "HT 110 pipe 500 mm", 110, 2.1, 500]; +HT_110_pipe_1000 = ["HT_110_pipe_1000", "HT 110 pipe 1000 mm", 110, 2.1, 1000]; +HT_110_pipe_1500 = ["HT_110_pipe_1500", "HT 110 pipe 1500 mm", 110, 2.1, 1500]; +HT_110_pipe_2000 = ["HT_110_pipe_2000", "HT 110 pipe 2000 mm", 110, 2.1, 2000]; + +HT_125_cap = ["HT_125_cap", "HT 125 cap", 125, 2.1, 34]; +HT_125_pipe_150 = ["HT_125_pipe_150", "HT 125 pipe 150 mm", 125, 2.1, 150]; +HT_125_pipe_250 = ["HT_125_pipe_250", "HT 125 pipe 250 mm", 125, 2.1, 250]; +HT_125_pipe_500 = ["HT_125_pipe_500", "HT 125 pipe 500 mm", 125, 2.1, 500]; +HT_125_pipe_1000 = ["HT_125_pipe_1000", "HT 125 pipe 1000 mm", 125, 2.1, 1000]; +HT_125_pipe_1500 = ["HT_125_pipe_1500", "HT 125 pipe 1500 mm", 125, 2.1, 1500]; +HT_125_pipe_2000 = ["HT_125_pipe_2000", "HT 125 pipe 2000 mm", 125, 2.1, 2000]; + +HT_160_cap = ["HT_160_cap", "HT 160 cap", 160, 2.1, 34]; +HT_160_pipe_150 = ["HT_160_pipe_150", "HT 160 pipe 150 mm", 160, 2.1, 150]; +HT_160_pipe_250 = ["HT_160_pipe_250", "HT 160 pipe 250 mm", 160, 2.1, 250]; +HT_160_pipe_500 = ["HT_160_pipe_500", "HT 160 pipe 500 mm", 160, 2.1, 500]; +HT_160_pipe_1000 = ["HT_160_pipe_1000", "HT 160 pipe 1000 mm", 160, 2.1, 1000]; +HT_160_pipe_1500 = ["HT_160_pipe_1500", "HT 160 pipe 1500 mm", 160, 2.1, 1500]; +HT_160_pipe_2000 = ["HT_160_pipe_2000", "HT 160 pipe 2000 mm", 160, 2.1, 2000]; + +ht_pipes = [ + HT_32_cap, HT_32_pipe_150, HT_32_pipe_250, HT_32_pipe_500, HT_32_pipe_1000, HT_32_pipe_1500, HT_32_pipe_2000, + HT_40_cap, HT_40_pipe_150, HT_40_pipe_250, HT_40_pipe_500, HT_40_pipe_1000, HT_40_pipe_1500, HT_40_pipe_2000, + HT_50_cap, HT_50_pipe_150, HT_50_pipe_250, HT_50_pipe_500, HT_50_pipe_1000, HT_50_pipe_1500, HT_50_pipe_2000, + HT_50_tpipe, HT_50_40_tpipe, + HT_75_cap, HT_75_pipe_150, HT_75_pipe_250, HT_75_pipe_500, HT_75_pipe_1000, HT_75_pipe_1500, HT_75_pipe_2000, + HT_90_cap, HT_90_pipe_150, HT_90_pipe_250, HT_90_pipe_500, HT_90_pipe_1000, HT_90_pipe_1500, HT_90_pipe_2000, + HT_110_cap, HT_110_pipe_150, HT_110_pipe_250, HT_110_pipe_500, HT_110_pipe_1000, HT_110_pipe_1500, HT_110_pipe_2000, + HT_125_cap, HT_125_pipe_150, HT_125_pipe_250, HT_125_pipe_500, HT_125_pipe_1000, HT_125_pipe_1500, HT_125_pipe_2000, + HT_160_cap, HT_160_pipe_150, HT_160_pipe_250, HT_160_pipe_500, HT_160_pipe_1000, HT_160_pipe_1500, HT_160_pipe_2000, + ]; + +use