grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-04-11 18:55:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

undef fixes for screws.scad

Browse source
This commit is contained in:
Adrian Mariano 2021-01-06 22:29:11 -05:00
parent db65b14410
commit e87b9cd6f0
1 changed files with 3 additions and 3 deletions

6
screws.scad
View file

@ -37,7 +37,7 @@ function _parse_screw_name(name) =
let(val=str_num(type))
val == floor(val) && val>=0 && val<=12 ? str("#",type) : val
)
["english", diam, thread, 25.4*length];
["english", diam, thread, u_mul(25.4,length)];
// drive can be "hex", "phillips", "slot", "torx", or "none"
@ -165,7 +165,7 @@ function screw_info(name, head, thread="coarse", drive, drive_size=undef, oversi
is_def(type[3]) ? ["length",type[3]] : [],
is_def(drive_info[1]) ? ["drive_size", drive_info[1]] : [],
["diameter", oversize+struct_val(screwdata,"diameter"),
"head_size", oversize+struct_val(screwdata,"head_size")]
"head_size", u_add(oversize,struct_val(screwdata,"head_size"))]
)
)
struct_set(screwdata, over_ride);
@ -307,7 +307,7 @@ function _screw_info_english(diam, threadcount, head, thread, drive) =
[2, [ 3, 1.5, undef, undef, undef]],
],
entry = struct_val(UTS_socket, diam),
hexdepth = first_defined([entry[3], diam/2]),
hexdepth = is_def(entry[3]) ? entry[3] : if_def(diam) ? diam/2 : undef,
drive_size = drive=="hex" ? [["drive_size",inch*entry[1]], ["drive_depth",inch*hexdepth]] :
drive=="torx" ? [["drive_size",entry[2]],["drive_depth",inch*entry[4]]] : []
)