bug fix for UTS heads

This commit is contained in:
Adrian Mariano 2021-02-20 16:03:49 -05:00
parent 852eed292d
commit 2b7b0b531b

View file

@ -307,7 +307,9 @@ function _screw_info_english(diam, threadcount, head, thread, drive) =
[2, [ 3, 1.5, undef, undef, undef]], [2, [ 3, 1.5, undef, undef, undef]],
], ],
entry = struct_val(UTS_socket, diam), entry = struct_val(UTS_socket, diam),
hexdepth = is_def(entry[3]) ? entry[3] : if_def(diam) ? diam/2 : undef, hexdepth = is_def(entry[3]) ? entry[3]
: is_def(diam) ? diam/2
: undef,
drive_size = drive=="hex" ? [["drive_size",inch*entry[1]], ["drive_depth",inch*hexdepth]] : drive_size = drive=="hex" ? [["drive_size",inch*entry[1]], ["drive_depth",inch*hexdepth]] :
drive=="torx" ? [["drive_size",entry[2]],["drive_depth",inch*entry[4]]] : [] drive=="torx" ? [["drive_size",entry[2]],["drive_depth",inch*entry[4]]] : []
) )
@ -854,47 +856,47 @@ module screw_head(screw_info,details=false) {
// screw("M5", head="hex", length=12); // screw("M5", head="hex", length=12);
// } // }
// Example: Demonstration of all head types for UTS screws (using pitch zero for fast preview) // Example: Demonstration of all head types for UTS screws (using pitch zero for fast preview)
// xdistribute(spacing=15){ xdistribute(spacing=15){
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="none", drive="hex"); screw("1/4", thread=0,length=8, anchor=TOP, head="none", drive="hex");
// screw("1/4", thread=0,length=8, anchor=TOP, head="none", drive="torx"); screw("1/4", thread=0,length=8, anchor=TOP, head="none", drive="torx");
// screw("1/4", thread=0,length=8, anchor=TOP, head="none"); screw("1/4", thread=0,length=8, anchor=TOP, head="none");
// } }
// screw("1/4", thread=0, length=8, anchor=TOP, head="hex"); screw("1/4", thread=0, length=8, anchor=TOP, head="hex");
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="socket", drive="hex"); screw("1/4", thread=0,length=8, anchor=TOP, head="socket", drive="hex");
// screw("1/4", thread=0,length=8, anchor=TOP, head="socket", drive="torx"); screw("1/4", thread=0,length=8, anchor=TOP, head="socket", drive="torx");
// screw("1/4", thread=0,length=8, anchor=TOP, head="socket"); screw("1/4", thread=0,length=8, anchor=TOP, head="socket");
// } }
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="button", drive="hex"); screw("1/4", thread=0,length=8, anchor=TOP, head="button", drive="hex");
// screw("1/4", thread=0,length=8, anchor=TOP, head="button", drive="torx"); screw("1/4", thread=0,length=8, anchor=TOP, head="button", drive="torx");
// screw("1/4", thread=0,length=8, anchor=TOP, head="button"); screw("1/4", thread=0,length=8, anchor=TOP, head="button");
// } }
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="round", drive="slot"); screw("1/4", thread=0,length=8, anchor=TOP, head="round", drive="slot");
// screw("1/4", thread=0,length=8, anchor=TOP, head="round", drive="phillips"); screw("1/4", thread=0,length=8, anchor=TOP, head="round", drive="phillips");
// screw("1/4", thread=0,length=8, anchor=TOP, head="round"); screw("1/4", thread=0,length=8, anchor=TOP, head="round");
// } }
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="fillister", drive="slot"); screw("1/4", thread=0,length=8, anchor=TOP, head="fillister", drive="slot");
// screw("1/4", thread=0,length=8, anchor=TOP, head="fillister", drive="phillips"); screw("1/4", thread=0,length=8, anchor=TOP, head="fillister", drive="phillips");
// screw("1/4", thread=0,length=8, anchor=TOP, head="fillister"); screw("1/4", thread=0,length=8, anchor=TOP, head="fillister");
// } }
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="slot"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="slot");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="phillips"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="phillips");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="hex"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="hex");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="torx"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat", drive="torx");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat large"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat large");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat small"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat small");
// } }
// ydistribute(spacing=15){ ydistribute(spacing=15){
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat undercut", drive="slot"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat undercut", drive="slot");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat undercut", drive="phillips"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat undercut", drive="phillips");
// screw("1/4", thread=0,length=8, anchor=TOP, head="flat undercut"); screw("1/4", thread=0,length=8, anchor=TOP, head="flat undercut");
// } }
// } }
// Example: Demonstration of all head types for metric screws without threading. // Example: Demonstration of all head types for metric screws without threading.
// xdistribute(spacing=15){ // xdistribute(spacing=15){
// ydistribute(spacing=15){ // ydistribute(spacing=15){