djsundog/NopSCADlib
1
0
Fork 0
mirror of https://github.com/DJSundog/NopSCADlib.git synced 2024-11-30 02:30:03 -05:00
Code Issues Projects Releases Wiki Activity

Fixed bugs in poly_ring() and insert_boss().

Browse Source 
IEC screw length fixed at 10 if inserts used.
This commit is contained in:
Chris Palmer 2019-06-16 17:07:02 +01:00
parent 7eaace0194
commit 757e88ed0c
13 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/MainsBreakOutBox/bom/bom.json
View File

@ -26,7 +26,7 @@
"vitamins": {
"washer(M3_washer): Washer M3 x 7mm x 0.5mm": 8,
"screw(M3_dome_screw, 10): Screw M3 dome x 10mm": 4,
"nut(M3_nut, nyloc = true): Nut M3 nyloc": 4
"nut(M3_nut, nyloc = true): Nut M3 x 2.4mm nyloc": 4
},
"printed": {
"foot.stl": 4
@ -42,7 +42,7 @@
"iec(IEC_inlet_atx): IEC inlet for ATX": 1,
"screw(M3_cs_cap_screw, 12): Screw M3 cs cap x 12mm": 2,
"washer(M3_washer): Washer M3 x 7mm x 0.5mm": 2,
"nut(M3_nut, nyloc = true): Nut M3 nyloc": 2
"nut(M3_nut, nyloc = true): Nut M3 x 2.4mm nyloc": 2
},
"printed": {},
"routed": {}

2
examples/MainsBreakOutBox/bom/bom.txt
View File

@ -17,7 +17,7 @@ Vitamins:
| | 1| | 1 4mm shielded jack socket brown
| | 2| | 2 4mm shielded jack socket green
| | 1| | 1 Mains socket 13A
| 4| | 2| 6 Nut M3 nyloc
| 4| | 2| 6 Nut M3 x 2.4mm nyloc
| | | 2| 2 Screw M3 cs cap x 12mm
| | 2| | 2 Screw M3 cs cap x 20mm
| 4| | | 4 Screw M3 dome x 10mm

2
examples/MainsBreakOutBox/bom/feet_assembly.txt
View File

@ -1,6 +1,6 @@
feet_assembly:
Vitamins:
4 Nut M3 nyloc
4 Nut M3 x 2.4mm nyloc
4 Screw M3 dome x 10mm
8 Washer M3 x 7mm x 0.5mm

2
examples/MainsBreakOutBox/bom/mains_in_assembly.txt
View File

@ -4,7 +4,7 @@ Vitamins:
2 Wire brown 30/0.25mm strands, length 150mm - not shown
1 Wire green & yellow 30/0.25mm strands, length 150mm - not shown
1 IEC inlet for ATX
2 Nut M3 nyloc
2 Nut M3 x 2.4mm nyloc
2 Screw M3 cs cap x 12mm
3 Heatshrink sleeving ID 3.2mm x 15mm - not shown
2 Washer M3 x 7mm x 0.5mm

6
examples/MainsBreakOutBox/readme.md
View File

@ -39,7 +39,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
|   .  |   .  |   3  |   5  |   8  |    Heatshrink sleeving ID 3.2mm x 15mm - not shown |
|   .  |   .  |   1  |   .  |   1  |    IEC inlet for ATX |
|   .  |   .  |   .  |   1  |   1  |    Mains socket 13A |
|   .  |   4  |   2  |   .  |   6  |    Nut M3 nyloc |
|   .  |   4  |   2  |   .  |   6  |    Nut M3 x 2.4mm nyloc |
|   .  |   .  |   2  |   .  |   2  |    Screw M3 cs cap x 12mm |
|   .  |   .  |   .  |   2  |   2  |    Screw M3 cs cap x 20mm |
|   .  |   4  |   .  |   .  |   4  |    Screw M3 dome x 10mm |
@ -88,7 +88,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
|--:|:----------|
|8| Washer M3 x 7mm x 0.5mm|
|4| Screw M3 dome x 10mm|
|4| Nut M3 nyloc|
|4| Nut M3 x 2.4mm nyloc|
### 3D Printed parts
@ -129,7 +129,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
|1| IEC inlet for ATX|
|2| Screw M3 cs cap x 12mm|
|2| Washer M3 x 7mm x 0.5mm|
|2| Nut M3 nyloc|
|2| Nut M3 x 2.4mm nyloc|
### Sub-assemblies

6
readme.md
View File

@ -781,12 +781,18 @@ IEC mains inlets and outlet.
| ```iec_spades(type)``` | Spade type |
| ```iec_width(type)``` | Widest part including the lugs |
### Functions
| Function | Description |
|:--- |:--- |
| ```iec_insert_screw_length()``` | Screw length used for inserts |
### Modules
| Module | Description |
|:--- |:--- |
| ```iec(type)``` | Draw specified IEC connector |
| ```iec_assembly(type, thickness)``` | Assembly with fasteners given panel thickness |
| ```iec_holes(type, h = 100, poly = false, horizontal = false, insert = false)``` | Drill the required panel holes |
| ```iec_inserts(type)``` | Place the inserts |
| ```iec_screw_positions(type)``` | Position children at the screw holes |
![iecs](tests/png/iecs.png)

BIN
tests/png/pcbs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 143 KiB

BIN
tests/png/spheres.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 104 KiB

BIN
tests/png/veroboard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 144 KiB

BIN
tests/png/washers.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 92 KiB

4
utils/core/polyholes.scad
View File

@ -38,8 +38,8 @@ module poly_cylinder(r, h, center = false, sides = 0) //! Make a cylinder adjust
module poly_ring(or, ir) { //! Make a 2D ring adjusted to have the correct internal radius
cir = corrected_radius(ir);
filaments = floor((or - cir) / extrusion_width);
if(filaments > 3)
filaments = (or - cir) / extrusion_width;
if(filaments > 3 + eps)
difference() {
circle(or);

28
vitamins/iec.scad
View File

@ -46,7 +46,8 @@ function iec_depth(type) = type[16]; //! Depth of the body below the flange
function iec_spades(type) = type[17]; //! Spade type
function iec_male(type) = type[18]; //! True for an outlet
insert_overlap = 1.1; // chosen to make cap screws 10mm long.
insert_screw_length = 10;
function iec_insert_screw_length() = insert_screw_length; //! Screw length used for inserts
module iec(type) { //! Draw specified IEC connector
vitamin(str("iec(", type[0], "): ", iec_part(type)));
@ -181,18 +182,24 @@ module iec_screw_positions(type) //! Position children at the screw holes
module iec_holes(type, h = 100, poly = false, horizontal = false, insert = false) { //! Drill the required panel holes
clearance = 0.2;
screw = iec_screw(type);
insert_type = screw_insert(screw);
insert_overlap = max(0, insert_screw_length + clearance - iec_flange_t(type) - insert_hole_length(insert_type));
iec_screw_positions(type)
if(insert)
insert_hole(screw_insert(iec_screw(type)), insert_overlap, horizontal = horizontal);
if(h)
insert_hole(insert_type, insert_overlap, horizontal = horizontal);
else
poly_circle(insert_hole_radius(insert_type));
else
if(horizontal)
teardrop_plus(r = screw_clearance_radius(iec_screw(type)), h = h);
teardrop_plus(r = screw_clearance_radius(screw), h = h);
else
if(poly)
poly_cylinder(r = screw_clearance_radius(iec_screw(type)), h = h, center = true);
poly_cylinder(r = screw_clearance_radius(screw), h = h, center = true);
else
drill(screw_clearance_radius(iec_screw(type)), h);
drill(screw_clearance_radius(screw), h);
extrude_if(h)
hull()
@ -204,13 +211,20 @@ module iec_holes(type, h = 100, poly = false, horizontal = false, insert = false
drill(iec_slot_r(type) + clearance / 2, 0);
}
module iec_inserts(type) { //! Place the inserts
insert = screw_insert(iec_screw(type));
iec_screw_positions(type)
insert(insert);
}
module iec_assembly(type, thickness) { //! Assembly with fasteners given panel thickness
screw = iec_screw(type);
washer = screw_washer(screw);
nut = screw_nut(screw);
insert = screw_insert(screw);
screw_length = thickness ? screw_longer_than(iec_flange_t(type) + thickness + washer_thickness(washer) + nut_thickness(nut, true))
: screw_shorter_than(iec_flange_t(type) + insert_hole_length(insert) + insert_overlap);
: insert_screw_length;
iec(type);
@ -222,7 +236,5 @@ module iec_assembly(type, thickness) { //! Assembly with fasteners given panel t
translate_z(-thickness)
vflip()
nut_and_washer(nut, true);
else
insert(insert);
}
}

4
vitamins/insert.scad
View File

@ -94,10 +94,12 @@ module insert_hole(type, counterbore = 0, horizontal = false) { //! Make a hole
}
module insert_boss(type, z, wall = 2 * extrusion_width) { //! Make a boss to take an insert
render(convexity = 3)
difference() {
ir = insert_hole_radius(type);
linear_extrude(height = z)
poly_ring(corrected_radius(ir) + wall, insert_screw_diameter(type) / 2 + 0.1);
hull()
poly_ring(corrected_radius(ir) + wall, ir);
translate_z(z)
insert_hole(type, max(0, z - insert_hole_length(type) - 2 * layer_height));