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

Merge branch 'master' into Execute_attributes

This commit is contained in:
Chris Palmer 2019-08-18 18:42:42 +01:00
parent 3a087be0e9 e35fb695a2
commit 6f4859a4b5
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
readme.md
View File

@ -846,7 +846,7 @@ Needs updating as mostly obsolete versions.
| 1 | | Tape self amalgamating silicone 110mm x 25mm | | 1 | | Tape self amalgamating silicone 110mm x 25mm |
| 1 | ```resistor(Epcos)``` | Thermistor Epcos B57560G104F 100K 1% | | 1 | ```resistor(Epcos)``` | Thermistor Epcos B57560G104F 100K 1% |
| 2 | | Wire Red PTFE 16/0.2mm strands, length 170mm | | 2 | | Wire Red PTFE 16/0.2mm strands, length 170mm |
| 4 | ```ziptie(small_ziptie, 8)``` | Ziptie 100mm min length | | 4 | ```ziptie(small_ziptie, 8)``` | Ziptie 2.5mm x 100mm min length |
<a href="#top">Top</a> <a href="#top">Top</a>
@ -1824,9 +1824,9 @@ Pin headers and sockets, etc.
### Vitamins ### Vitamins
| Qty | Module call | BOM entry | | Qty | Module call | BOM entry |
| ---:|:--- |:---| | ---:|:--- |:---|
| 1 | ```box_header(2p54header102)``` | Box header 10 x 2 |
| 1 | ```idc_transition(2p54header, 10)``` | IDC transition header 10 x 2 | | 1 | ```idc_transition(2p54header, 10)``` | IDC transition header 10 x 2 |
| 1 | ```pin_header(2p54header102)``` | Pin header 10 x 2 | | 1 | ```pin_header(2p54header102)``` | Pin header 10 x 2 |
| 1 | ```box_header(2p54header102)``` | Pin header 10 x 2 |
| 1 | ```pin_socket(2p54header, 10, 2)``` | Pin socket 10 x 2 | | 1 | ```pin_socket(2p54header, 10, 2)``` | Pin socket 10 x 2 |
| 1 | ```pin_socket(2p54header, 10, 2, right_angle = true)``` | Pin socket 10 x 2 right_angle | | 1 | ```pin_socket(2p54header, 10, 2, right_angle = true)``` | Pin socket 10 x 2 right_angle |
@ -3006,7 +3006,7 @@ Just a BOM entry at the moment and cable bundle size functions for holes, plus c
| 1 | | Wire orange 7/0.2mm strands, length 90mm | | 1 | | Wire orange 7/0.2mm strands, length 90mm |
| 1 | | Wire red 7/0.2mm strands, length 90mm | | 1 | | Wire red 7/0.2mm strands, length 90mm |
| 1 | | Wire yellow 7/0.2mm strands, length 90mm | | 1 | | Wire yellow 7/0.2mm strands, length 90mm |
| 1 | ```ziptie(small_ziptie, 2.1)``` | Ziptie 100mm min length | | 1 | ```ziptie(small_ziptie, 2.1)``` | Ziptie 2.5mm x 100mm min length |
<a href="#top">Top</a> <a href="#top">Top</a>
@ -3042,9 +3042,9 @@ Cable zipties.
### Vitamins ### Vitamins
| Qty | Module call | BOM entry | | Qty | Module call | BOM entry |
| ---:|:--- |:---| | ---:|:--- |:---|
| 1 | ```ziptie(small_ziptie, 5)``` | Ziptie 100mm min length | | 1 | ```ziptie(small_ziptie, 5)``` | Ziptie 2.5mm x 100mm min length |
| 1 | ```ziptie(ziptie_3mm, 5)``` | Ziptie 100mm min length | | 1 | ```ziptie(ziptie_3p6mm, 5)``` | Ziptie 3.6mm x 100mm min length |
| 1 | ```ziptie(ziptie_3p6mm, 5)``` | Ziptie 100mm min length | | 1 | ```ziptie(ziptie_3mm, 5)``` | Ziptie 3mm x 100mm min length |
<a href="#top">Top</a> <a href="#top">Top</a>
@ -3838,7 +3838,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
| 4 | ```screw(M3_cap_screw, 10)``` | Screw M3 cap x 10mm | | 4 | ```screw(M3_cap_screw, 10)``` | Screw M3 cap x 10mm |
| 4 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm | | 4 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm |
| 4 | ```star_washer(M3_washer)``` | Washer star M3 x 0.5mm | | 4 | ```star_washer(M3_washer)``` | Washer star M3 x 0.5mm |
| 2 | ```ziptie(small_ziptie, 3)``` | Ziptie 100mm min length | | 2 | ```ziptie(small_ziptie, 3)``` | Ziptie 2.5mm x 100mm min length |
### Printed ### Printed
| Qty | Filename | | Qty | Filename |
@ -4035,7 +4035,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
| 4 | ```screw(M3_cap_screw, 10)``` | Screw M3 cap x 10mm | | 4 | ```screw(M3_cap_screw, 10)``` | Screw M3 cap x 10mm |
| 4 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm | | 4 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm |
| 4 | ```star_washer(M3_washer)``` | Washer star M3 x 0.5mm | | 4 | ```star_washer(M3_washer)``` | Washer star M3 x 0.5mm |
| 4 | ```ziptie(small_ziptie, 3)``` | Ziptie 100mm min length | | 4 | ```ziptie(small_ziptie, 3)``` | Ziptie 2.5mm x 100mm min length |
### Printed ### Printed
| Qty | Filename | | Qty | Filename |

2
vitamins/pin_header.scad
View File

@ -80,7 +80,7 @@ module box_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! D
if(cutout) if(cutout)
dogbone_rectangle([cols * pitch + 2 * panel_clearance, rows * pitch + 2 * panel_clearance, 100], center = false); dogbone_rectangle([cols * pitch + 2 * panel_clearance, rows * pitch + 2 * panel_clearance, 100], center = false);
else else
vitamin(str("box_header(", type[0], cols, rows, arg(smt, false, "smt"), "): Pin header ", cols, " x ", rows)); vitamin(str("box_header(", type[0], cols, rows, arg(smt, false, "smt"), "): Box header ", cols, " x ", rows));
translate_z(smt ? 3.5 - h : 0) { translate_z(smt ? 3.5 - h : 0) {
for(x = [0 : cols - 1], y = [0 : rows - 1]) for(x = [0 : cols - 1], y = [0 : rows - 1])

5
vitamins/ziptie.scad
View File

@ -48,11 +48,12 @@ module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius ``
tangents = rounded_polygon_tangents(outside_path); tangents = rounded_polygon_tangents(outside_path);
length = ceil(rounded_polygon_length(outside_path, tangents) + ziptie_tail(type) + latch.z + 1); length = ceil(rounded_polygon_length(outside_path, tangents) + ziptie_tail(type) + latch.z + 1);
len = length <= 100 ? 100 : length; len = length <= 100 ? 100 : length;
width = ziptie_width(type);
vitamin(str("ziptie(", type[0], ", ", r, "): Ziptie ", len, "mm min length")); vitamin(str("ziptie(", type[0], ", ", r, "): Ziptie ", width, "mm x ", len, "mm min length"));
color(ziptie_colour(type)){ color(ziptie_colour(type)){
linear_extrude(height = ziptie_width(type), center = true) linear_extrude(height = width, center = true)
difference() { difference() {
rounded_polygon(outside_path, tangents); rounded_polygon(outside_path, tangents);
rounded_polygon(inside_path); rounded_polygon(inside_path);