mirror of
https://github.com/revarbat/BOSL2.git
synced 2025-08-09 16:58:29 +02:00
remove debug echoes
This commit is contained in:
@@ -467,7 +467,6 @@ module generic_bottle_neck(
|
|||||||
roundover = 0.58 * diamMagMult;
|
roundover = 0.58 * diamMagMult;
|
||||||
lip_roundover_r = (roundover > (neck_d - inner_d) / 2) ? 0 : roundover;
|
lip_roundover_r = (roundover > (neck_d - inner_d) / 2) ? 0 : roundover;
|
||||||
h = height + support_width;
|
h = height + support_width;
|
||||||
echo(h=h);
|
|
||||||
threadbase_d = neck_d - 0.8 * diamMagMult;
|
threadbase_d = neck_d - 0.8 * diamMagMult;
|
||||||
|
|
||||||
$fn = segs(33 / 2);
|
$fn = segs(33 / 2);
|
||||||
@@ -693,14 +692,12 @@ module bottle_adapter_neck_to_cap(
|
|||||||
: neck_support_od;
|
: neck_support_od;
|
||||||
cap_neck_id = default(cap_neck_id,neck_id);
|
cap_neck_id = default(cap_neck_id,neck_id);
|
||||||
wall = default(wall, neck_support_od + neck_d + cap_od + neck_id - 2*tolerance);
|
wall = default(wall, neck_support_od + neck_d + cap_od + neck_id - 2*tolerance);
|
||||||
echo(wall=wall);
|
|
||||||
|
|
||||||
$fn = segs(33 / 2);
|
$fn = segs(33 / 2);
|
||||||
wallt1 = min(wall, (max(neck_support_od, neck_d) - neck_id) / 2);
|
wallt1 = min(wall, (max(neck_support_od, neck_d) - neck_id) / 2);
|
||||||
wallt2 = min(wall, (cap_od + 2 * cap_wall - cap_neck_id) / 2);
|
wallt2 = min(wall, (cap_od + 2 * cap_wall - cap_neck_id) / 2);
|
||||||
|
|
||||||
top_h = neck_h + max(1,neck_h/17)*sign(neck_support_od);
|
top_h = neck_h + max(1,neck_h/17)*sign(neck_support_od);
|
||||||
echo(top_h=top_h);
|
|
||||||
bot_h = cap_h + cap_wall;
|
bot_h = cap_h + cap_wall;
|
||||||
attachable(anchor=anchor,orient=orient,spin=spin, r=max([neck_id/2+wallt1, cap_neck_id/2+wallt2, neck_support_od/2]), h=top_h+bot_h+d) {
|
attachable(anchor=anchor,orient=orient,spin=spin, r=max([neck_id/2+wallt1, cap_neck_id/2+wallt2, neck_support_od/2]), h=top_h+bot_h+d) {
|
||||||
zmove((bot_h-top_h)/2)
|
zmove((bot_h-top_h)/2)
|
||||||
@@ -1298,7 +1295,6 @@ module sp_cap(diam,type,wall,style="L",top_adj=0, bot_adj=0, texture="none", anc
|
|||||||
|
|
||||||
twist = struct_val(_sp_twist, type);
|
twist = struct_val(_sp_twist, type);
|
||||||
|
|
||||||
echo(top_adj=top_adj,bot_adj=bot_adj);
|
|
||||||
dum3=assert(top_adj<S+0.75*a, str("The top_adj value is too large so the thread won't fit. It must be smaller than ",S+0.75*a));
|
dum3=assert(top_adj<S+0.75*a, str("The top_adj value is too large so the thread won't fit. It must be smaller than ",S+0.75*a));
|
||||||
oprofile = _sp_thread_profile(tpi,a,S+0.75*a-top_adj,style,flip=true);
|
oprofile = _sp_thread_profile(tpi,a,S+0.75*a-top_adj,style,flip=true);
|
||||||
bounds=pointlist_bounds(oprofile);
|
bounds=pointlist_bounds(oprofile);
|
||||||
|
@@ -220,7 +220,6 @@ function mask2d_roundover(r, inset=0, mask_angle=90, excess=0.01, clip_angle, fl
|
|||||||
:
|
:
|
||||||
let(
|
let(
|
||||||
cutind = [for(i=idx(basic)) if (basic[i].y-inset.y < clipshift.y) i],
|
cutind = [for(i=idx(basic)) if (basic[i].y-inset.y < clipshift.y) i],
|
||||||
,dsa= echo(cutind=cutind),
|
|
||||||
ipt = line_intersection([basic[cutind[0]-1],basic[cutind[0]]], [[0,clipshift.y+inset.y],[1,clipshift.y+inset.y]])
|
ipt = line_intersection([basic[cutind[0]-1],basic[cutind[0]]], [[0,clipshift.y+inset.y],[1,clipshift.y+inset.y]])
|
||||||
)
|
)
|
||||||
move(-clipshift, [ each select(basic, 0,cutind[0]), ipt]),
|
move(-clipshift, [ each select(basic, 0,cutind[0]), ipt]),
|
||||||
@@ -651,7 +650,7 @@ function mask2d_chamfer(edge, angle, inset=0, excess=0.01, mask_angle=90, flat_t
|
|||||||
: is_def(x) ? assert(num_defined([y,edge,angle])<=1, "Conflicting values of x, y, height, edge and angle given")
|
: is_def(x) ? assert(num_defined([y,edge,angle])<=1, "Conflicting values of x, y, height, edge and angle given")
|
||||||
(
|
(
|
||||||
is_def(y) ? [x,y]
|
is_def(y) ? [x,y]
|
||||||
: is_def(edge) ? let(yopt=quadratic_roots(1,-2*x*cos(mask_angle), x^2-edge^2,real=true),fff=echo(yopt))
|
: is_def(edge) ? let(yopt=quadratic_roots(1,-2*x*cos(mask_angle), x^2-edge^2,real=true))
|
||||||
assert(yopt!=[] && max(yopt)>0, "edge too short for x value")
|
assert(yopt!=[] && max(yopt)>0, "edge too short for x value")
|
||||||
[x,max(yopt)]
|
[x,max(yopt)]
|
||||||
: let(angle=default(angle,mask_angle/2))
|
: let(angle=default(angle,mask_angle/2))
|
||||||
|
Reference in New Issue
Block a user