openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-01-16 21:58:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Revar Desmera 2024-01-19 20:50:29 -08:00 committed by GitHub
commit 36175351f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
joiners.scad
View File

@ -791,7 +791,7 @@ module _pin_shaft(r, lStraight, nub, nubscale, stretch, d, pointed)
function _pin_size(size) = function _pin_size(size) =
is_undef(size) ? [] : is_undef(size) ? [] :
let(sizeok = in_list(size,["tiny", "small","medium", "large", "standard"])) let(sizeok = in_list(size,["tiny", "small","medium", "large", "standard"]))
assert(sizeok,"Pin size must be one of \"tiny\", \"small\", or \"standard\"") assert(sizeok,"Pin size must be one of \"tiny\", \"small\", \"medium\" or \"standard\"")
size=="standard" || size=="large" ? size=="standard" || size=="large" ?
struct_set([], ["length", 10.8, struct_set([], ["length", 10.8,
"diameter", 7, "diameter", 7,
@ -846,7 +846,7 @@ function _pin_size(size) =
// and a modified version at https://www.thingiverse.com/thing:3218332 by acwest // and a modified version at https://www.thingiverse.com/thing:3218332 by acwest
// and distributed under the Creative Commons - Attribution - Share Alike License // and distributed under the Creative Commons - Attribution - Share Alike License
// Arguments: // Arguments:
// size = text string to select from a list of predefined sizes, one of "standard", "small", or "tiny". // size = text string to select from a list of predefined sizes, one of "standard", "medium", "small", or "tiny".
// --- // ---
// pointed = set to true to get a pointed pin, false to get one with a rounded end. Default: true // pointed = set to true to get a pointed pin, false to get one with a rounded end. Default: true
// r/radius = radius of the pin // r/radius = radius of the pin
@ -917,7 +917,7 @@ module snap_pin(size,r,radius,d,diameter, l,length, nub_depth, snap, thickness,
// The "large" or "standard" size pin has a length of 10.8 and diameter of 7. The "medium" pin has a length of 8 and diameter of 4.6. The "small" pin // The "large" or "standard" size pin has a length of 10.8 and diameter of 7. The "medium" pin has a length of 8 and diameter of 4.6. The "small" pin
// has a length of 6 and diameter of 3.2. The "tiny" pin has a length of 4 and a diameter of 2.5. // has a length of 6 and diameter of 3.2. The "tiny" pin has a length of 4 and a diameter of 2.5.
// Arguments: // Arguments:
// size = text string to select from a list of predefined sizes, one of "standard", "small", or "tiny". // size = text string to select from a list of predefined sizes, one of "standard", "medium", "small", or "tiny".
// --- // ---
// pointed = set to true to get a pointed pin, false to get one with a rounded end. Default: true // pointed = set to true to get a pointed pin, false to get one with a rounded end. Default: true
// r/radius = radius of the pin // r/radius = radius of the pin

2
version.scad
View File

@ -12,8 +12,6 @@
BOSL_VERSION = [2,0,696]; BOSL_VERSION = [2,0,696];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions