djsundog
/
NopSCADlib
mirror of https://github.com/DJSundog/NopSCADlib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Can now force fan screws to be the full depth and nuts then get washers.

This commit is contained in:
Chris Palmer 2019-10-22 16:21:05 +01:00
parent 9f27f26894
commit ad62ce362c
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
readme.md
View File

@ -616,16 +616,11 @@ Can draw three styles: solid, open frame and open frame with screw bosses.
| ```fan_thickness(type)``` | Thickness of the frame | | ```fan_thickness(type)``` | Thickness of the frame |
| ```fan_width(type)``` | Width of square | | ```fan_width(type)``` | Width of square |
### Functions
| Function | Description |
|:--- |:--- |
| ```fan_screw_length(type, thickness)``` | Screw length required |
### Modules ### Modules
| Module | Description | | Module | Description |
|:--- |:--- | |:--- |:--- |
| ```fan(type)``` | Draw specified fan, origin in the centre | | ```fan(type)``` | Draw specified fan, origin in the centre |
| ```fan_assembly(type, thickness, include_fan = true, screw = false)``` | Fan with its fasteners | | ```fan_assembly(type, thickness, include_fan = true, screw = false, full_depth = false)``` | Fan with its fasteners |
| ```fan_hole_positions(type, z = undef)``` | Position children at the screw hole positions | | ```fan_hole_positions(type, z = undef)``` | Position children at the screw hole positions |
| ```fan_holes(type, poly = false, screws = true, h = 100)``` | Make all the holes for the fan, or just the aperture if ```screws``` is false. Set ```poly``` true for poly_holes. | | ```fan_holes(type, poly = false, screws = true, h = 100)``` | Make all the holes for the fan, or just the aperture if ```screws``` is false. Set ```poly``` true for poly_holes. |
@ -652,9 +647,9 @@ Can draw three styles: solid, open frame and open frame with screw bosses.
| 20 | ```screw(M4_dome_screw, 16)``` | Screw M4 dome x 16mm | | 20 | ```screw(M4_dome_screw, 16)``` | Screw M4 dome x 16mm |
| 4 | ```screw(M4_dome_screw, 25)``` | Screw M4 dome x 25mm | | 4 | ```screw(M4_dome_screw, 25)``` | Screw M4 dome x 25mm |
| 4 | ```screw(M4_dome_screw, 30)``` | Screw M4 dome x 30mm | | 4 | ```screw(M4_dome_screw, 30)``` | Screw M4 dome x 30mm |
| 4 | ```washer(M2p5_washer)``` | Washer M2.5 x 5.9mm x 0.5mm | | 8 | ```washer(M2p5_washer)``` | Washer M2.5 x 5.9mm x 0.5mm |
| 8 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm | | 12 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm |
| 28 | ```washer(M4_washer)``` | Washer M4 x 9mm x 0.8mm | | 32 | ```washer(M4_washer)``` | Washer M4 x 9mm x 0.8mm |
<a href="#top">Top</a> <a href="#top">Top</a>
@ -1683,6 +1678,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
### Functions ### Functions
| Function | Description | | Function | Description |
|:--- |:--- | |:--- |:--- |
| ```pcb_component_position(type, name)``` | Return x y position of specified component |
| ```pcb_coord(type, p)``` | Convert offsets from the edge to coordinates relative to the centre | | ```pcb_coord(type, p)``` | Convert offsets from the edge to coordinates relative to the centre |
| ```pcb_screw(type, cap = hs_cap)``` | Mounting screw type | | ```pcb_screw(type, cap = hs_cap)``` | Mounting screw type |

BIN
tests/png/fans.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

22
vitamins/fan.scad
View File

@ -147,11 +147,16 @@ module fan_holes(type, poly = false, screws = true, h = 100) { //! Make all the
} }
} }
function nut_and_washer_thickness(screw, nyloc) = washer_thickness(screw_washer(screw)) + nut_thickness(screw_nut(screw), nyloc); function fan_screw_depth(type, full_depth = false) = fan_boss_d(type) || full_depth ? fan_depth(type) : fan_thickness(type);
function fan_screw_depth(type) = fan_boss_d(type) ? fan_depth(type) : fan_thickness(type);
function fan_screw_length(type, thickness) = screw_longer_than(thickness + fan_screw_depth(type) + nut_and_washer_thickness(fan_screw(type), true)); //! Screw length required
module fan_assembly(type, thickness, include_fan = true, screw = false) { //! Fan with its fasteners function fan_screw_length(type, thickness, full_depth = false) =
let(depth = fan_screw_depth(type, full_depth),
washers = depth == fan_depth(type) ? 2 : 1,
washer = screw_washer(fan_screw(type)),
nut = screw_nut(fan_screw(type)))
screw_longer_than(thickness + depth + washer_thickness(washer) * washers + nut_thickness(nut, true)); //! Screw length required
module fan_assembly(type, thickness, include_fan = true, screw = false, full_depth = false) { //! Fan with its fasteners
translate_z(-fan_depth(type) / 2) { translate_z(-fan_depth(type) / 2) {
if(include_fan) if(include_fan)
fan(type); fan(type);
@ -160,11 +165,14 @@ module fan_assembly(type, thickness, include_fan = true, screw = false) { //! Fa
nut = screw_nut(Screw); nut = screw_nut(Screw);
fan_hole_positions(type) { fan_hole_positions(type) {
translate_z(thickness) translate_z(thickness)
screw_and_washer(Screw, fan_screw_length(type, thickness)); screw_and_washer(Screw, fan_screw_length(type, thickness, full_depth));
translate_z(include_fan ? -fan_screw_depth(type) : 0) translate_z(include_fan ? -fan_screw_depth(type, full_depth) : 0)
vflip() vflip()
nut(nut, true); if(fan_screw_depth(type, full_depth) == fan_depth(type))
nut_and_washer(nut, true);
else
nut(nut, true);
} }
} }
} }