openscad/NopSCADlib
1
0
Fork 0
mirror of https://github.com/nophead/NopSCADlib.git synced 2025-01-16 21:18:15 +01:00
Code Issues Releases Wiki Activity

Fixed incorrect parameters passed to tube() in ht_pipe().

Browse Source 
Fixed lib.scad to include ht_pipes.scad instead of using it.
This commit is contained in:
Chris Palmer 2024-10-07 17:50:20 +01:00
parent 8cdc04b87b
commit 9e45dbad04
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib.scad
View File

@ -41,6 +41,7 @@ include <vitamins/fastons.scad>
include <vitamins/gear_motors.scad> include <vitamins/gear_motors.scad>
include <vitamins/geared_steppers.scad> include <vitamins/geared_steppers.scad>
include <vitamins/hot_ends.scad> include <vitamins/hot_ends.scad>
include <vitamins/ht_pipes.scad>
include <vitamins/inserts.scad> include <vitamins/inserts.scad>
include <vitamins/ldrs.scad> include <vitamins/ldrs.scad>
include <vitamins/leadnuts.scad> include <vitamins/leadnuts.scad>
@ -106,4 +107,3 @@ use <utils/pcb_utils.scad>
use <utils/sector.scad> use <utils/sector.scad>
use <utils/thread.scad> use <utils/thread.scad>
use <vitamins/photo_interrupter.scad> use <vitamins/photo_interrupter.scad>
use <vitamins/ht_pipes.scad>

12
vitamins/ht_pipe.scad
View File

@ -43,7 +43,7 @@ module ht_pipe(type) { //! Draw specified pipe
vitamin(str("ht_pipe(", type[0], "): PVC Waterpipe - ", type[1])); vitamin(str("ht_pipe(", type[0], "): PVC Waterpipe - ", type[1]));
tube_id = pipe_od(type) - pipe_wall(type) * 2; tube_id = pipe_od(type) - pipe_wall(type) * 2;
tube(h = pipe_length(type), or = tube_id/2 + pipe_wall(type), ir = tube_id/2, tube_id/2); tube(h = pipe_length(type), or = tube_id/2 + pipe_wall(type), ir = tube_id/2, center = false);
translate_z(pipe_length(type)) translate_z(pipe_length(type))
HTpipeFitting(pipe_od(type), tube_id); HTpipeFitting(pipe_od(type), tube_id);
@ -55,7 +55,7 @@ module ht_tpipe(type) { //! Draw specified T-pipe
tube_t_id = pipe_td(type) - pipe_wall(type) * 2; tube_t_id = pipe_td(type) - pipe_wall(type) * 2;
translate_z(pipe_length(type)) translate_z(pipe_length(type))
HTpipeFitting(pipe_od(type), tube_id, 0); HTpipeFitting(pipe_od(type), tube_id);
render(convexity = 5) render(convexity = 5)
difference() { difference() {
@ -69,7 +69,7 @@ module ht_tpipe(type) { //! Draw specified T-pipe
or = pipe_od(type) / 2; or = pipe_od(type) / 2;
translate([0, -or, pipe_length(type) - or]) translate([0, -or, pipe_length(type) - or])
rotate ([90, 0, 0]) { rotate ([90, 0, 0]) {
HTpipeFitting(pipe_td(type), tube_t_id, 0); HTpipeFitting(pipe_td(type), tube_t_id);
translate_z(-or) translate_z(-or)
render(convexity = 5) render(convexity = 5)
@ -82,7 +82,7 @@ module ht_tpipe(type) { //! Draw specified T-pipe
} }
} }
module HTpipeFitting(tube_od, tube_id, length = 30) { module HTpipeFitting(tube_od, tube_id) {
fitting_height = min(55, tube_od * 0.8); fitting_height = min(55, tube_od * 0.8);
tube_ir = tube_id / 2; tube_ir = tube_id / 2;
@ -91,7 +91,6 @@ module HTpipeFitting(tube_od, tube_id, length = 30) {
rotate_extrude() rotate_extrude()
polygon([ polygon([
[tube_ir, -length],
[tube_ir, 0], [tube_ir, 0],
[fit_ir, 10], [fit_ir, 10],
[fit_ir, fitting_height + 12 + 3.7], [fit_ir, fitting_height + 12 + 3.7],
@ -101,7 +100,6 @@ module HTpipeFitting(tube_od, tube_id, length = 30) {
[fit_ir + 6.5, fitting_height], [fit_ir + 6.5, fitting_height],
[fit_or, fitting_height], [fit_or, fitting_height],
[fit_or, 10], [fit_or, 10],
[fit_ir, 0], [fit_ir, 0]
[fit_ir, -length],
]); ]);
} }