Skip to content

Commit 80eb5eb

Browse files
nopheadnophead
committed
Merge branch 'elliotf-makerbeam-extrusions'
2 parents 185bb8d + d15cf6c commit 80eb5eb

File tree

8 files changed

+34
-30
lines changed

8 files changed

+34
-30
lines changed

‎libtest.png‎

685 Bytes
Loading

‎libtest.scad‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ translate([x3 + 10, hot_ends_y])
473473
translate([x2, panel_meters_y])
474474
panel_meters();
475475

476-
translate([x2, extrusions_y])
476+
translate([x2 - 15, extrusions_y])
477477
extrusions();
478478

479479
translate([x2, box_sections_y])

‎readme.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,24 +1210,26 @@ Aluminium extrusion.
12101210
### Modules
12111211
| Module | Description |
12121212
|:--- |:--- |
1213-
| `extrusion(type, length, center = true, cornerHole = false)` | Draw the specified extrusion |
1213+
| `extrusion(type, length, center = true, cornerHole = true)` | Draw the specified extrusion |
12141214

12151215
![extrusions](tests/png/extrusions.png)
12161216

12171217
### Vitamins
12181218
| Qty | Module call | BOM entry |
12191219
| ---:|:--- |:---|
1220-
| 1 | `extrusion(E1515, 80)` | Extrusion E1515 x 80mm |
1221-
| 1 | `extrusion(E2020, 80)` | Extrusion E2020 x 80mm |
1222-
| 1 | `extrusion(E2020t, 80)` | Extrusion E2020t x 80mm |
1223-
| 1 | `extrusion(E2040, 80)` | Extrusion E2040 x 80mm |
1224-
| 1 | `extrusion(E2060, 80)` | Extrusion E2060 x 80mm |
1225-
| 1 | `extrusion(E2080, 80)` | Extrusion E2080 x 80mm |
1220+
| 1 | `extrusion(E1515, 80, cornerHole = true)` | Extrusion E1515 x 80mm |
1221+
| 1 | `extrusion(E2020, 80, cornerHole = true)` | Extrusion E2020 x 80mm |
1222+
| 1 | `extrusion(E2020t, 80, cornerHole = true)` | Extrusion E2020t x 80mm |
1223+
| 1 | `extrusion(E2040, 80, cornerHole = true)` | Extrusion E2040 x 80mm |
1224+
| 1 | `extrusion(E2060, 80, cornerHole = true)` | Extrusion E2060 x 80mm |
1225+
| 1 | `extrusion(E2080, 80, cornerHole = true)` | Extrusion E2080 x 80mm |
12261226
| 1 | `extrusion(E3030, 80, cornerHole = true)` | Extrusion E3030 x 80mm |
12271227
| 1 | `extrusion(E3060, 80, cornerHole = true)` | Extrusion E3060 x 80mm |
12281228
| 1 | `extrusion(E4040, 80, cornerHole = true)` | Extrusion E4040 x 80mm |
12291229
| 1 | `extrusion(E4040t, 80, cornerHole = true)` | Extrusion E4040t x 80mm |
12301230
| 1 | `extrusion(E4080, 80, cornerHole = true)` | Extrusion E4080 x 80mm |
1231+
| 1 | `extrusion(Makerbeam, 80, cornerHole = true)` | Extrusion Makerbeam x 80mm |
1232+
| 1 | `extrusion(MakerbeamXL, 80, cornerHole = true)` | Extrusion MakerbeamXL x 80mm |
12311233

12321234

12331235
<a href="#top">Top</a>
@@ -4303,8 +4305,8 @@ SK shaft support brackets
43034305
### Vitamins
43044306
| Qty | Module call | BOM entry |
43054307
| ---:|:--- |:---|
4306-
| 2 | `extrusion(E2020, 20)` | Extrusion E2020 x 20mm |
4307-
| 2 | `extrusion(E3030, 20)` | Extrusion E3030 x 20mm |
4308+
| 2 | `extrusion(E2020, 20, cornerHole = true)` | Extrusion E2020 x 20mm |
4309+
| 2 | `extrusion(E3030, 20, cornerHole = true)` | Extrusion E3030 x 20mm |
43084310
| 2 | `sliding_t_nut(M4_hammer_nut)` | Nut M4 hammer |
43094311
| 2 | `sliding_t_nut(M4_sliding_t_nut)` | Nut M4 sliding T |
43104312
| 2 | `sliding_t_nut(M5_sliding_t_nut)` | Nut M5 sliding T |

‎tests/extrusions.scad‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ module extrusions()
3535
rotate(90)
3636
layout(heights, gap)
3737
rotate(-90)
38-
extrusion(list[$i], 80, cornerHole = extrusion_width(list[$i]) > 20);
38+
extrusion(list[$i], 80);
3939
}
4040
else
41-
extrusion(e, 80, cornerHole = extrusion_width(e) > 20);
41+
extrusion(e, 80);
4242

4343
if ($preview)
4444
extrusions();

‎tests/png/extrusions.png‎

3.43 KB
Loading

‎tests/png/sk_brackets.png‎

2.23 KB
Loading

‎vitamins/extrusion.scad‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function extrusion_center_hole(type) = abs(extrusion_center_hole_wd(t
3737
function extrusion_corner_hole(type) = abs(extrusion_corner_hole_wd(type)); //! Diameter of corner hole or side if square
3838
function extrusion_center_square(type) = abs(extrusion_center_square_wd(type)); //! Size of center square or tube
3939

40-
module extrusion_cross_section(type, cornerHole) {
40+
module extrusion_cross_section(type, cornerHole=true) {
4141
width = extrusion_width(type);
4242
height = extrusion_height(type);
4343
centerSquare = extrusion_center_square(type);
@@ -54,7 +54,7 @@ module extrusion_cross_section(type, cornerHole) {
5454
if(d < 0)
5555
circle(d = -d);
5656

57-
module extrusion_corner(type, cornerHole) {
57+
module extrusion_corner(type) {
5858
fillet = extrusion_fillet(type);
5959
cornerSize = (width - channelWidth) / 2;
6060
cornerHoleDiameter = abs(extrusion_corner_hole(type));
@@ -74,7 +74,7 @@ module extrusion_cross_section(type, cornerHole) {
7474
translate([fillet, fillet])
7575
square([cornerSquare - fillet, cornerSquare - fillet]);
7676
}
77-
if(cornerHole)
77+
if(cornerHole && cornerHoleDiameter)
7878
translate([cornerSquare / 2, cornerSquare / 2])
7979
squircle(extrusion_corner_hole_wd(type));
8080
}
@@ -117,7 +117,7 @@ module extrusion_cross_section(type, cornerHole) {
117117
translate([0, side * (width - height) / 2])
118118
for(angle = [0, 90])
119119
rotate(angle + (side < 0 ? 180 : 0))
120-
extrusion_corner(type, cornerHole);
120+
extrusion_corner(type);
121121

122122
if(count >= 1)
123123
for(i = [1 : count])
@@ -133,7 +133,7 @@ module extrusion_cross_section(type, cornerHole) {
133133
}
134134
}
135135

136-
module extrusion(type, length, center = true, cornerHole = false) { //! Draw the specified extrusion
136+
module extrusion(type, length, center = true, cornerHole = true) { //! Draw the specified extrusion
137137

138138
vitamin(str("extrusion(", type[0], ", ", length, arg(cornerHole, false, "cornerHole"), "): Extrusion ", type[0], " x ", length, "mm"));
139139

‎vitamins/extrusions.scad‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
//
2020
// Extrusion
2121
//
22-
// W H d1 d2 sq cw cwi t st f recess
23-
E1515 = [ "E1515", 15, 15, -3.3, 0, 5.5, 6.2, 9.5, 1.0, 0.9, 0.5, false ];
24-
E2020 = [ "E2020", 20, 20, -4.2, -3, 8, 6, 12.0, 2, 2, 1, false ];
25-
E2020t = [ "E2020t",20, 20, -5.0, -3, 7.8, 6.2, 11.0, 1.8, 1.5, 1.5, [7.2, 0.5] ];
26-
E2040 = [ "E2040", 20, 40, -4.2, -3, 8, 6, 12.0, 2, 2, 1, false ];
27-
E2060 = [ "E2060", 20, 60, -4.2, -3, 8, 6, 12.0, 2, 2, 1, false ];
28-
E2080 = [ "E2080", 20, 80, -4.2, -3, 8, 6, 12.0, 2, 2, 1, false ];
29-
E3030 = [ "E3030", 30, 30, -6.8, -4.2, 12, 8, 16.5, 2, 2, 1, false ];
30-
E3060 = [ "E3060", 30, 60, -6.8, -4.2, 12, 8, 16.5, 2, 2, 1, false ];
31-
E4040 = [ "E4040", 40, 40, -10.5, -6.0, 15, 10, 20.0, 5.5, 3, 1, false ];
32-
E4040t = [ "E4040t",40, 40, -10, 6.8, -16, 10, 20.0, 4.0, 2.4, 1.5, [12, 1] ];
33-
E4080 = [ "E4080", 40, 80, -10.5, -6.0, 15, 10, 20.0, 5.5, 3, 1, false ];
22+
// W H d1 d2 sq cw cwi t st f recess
23+
Makerbeam = [ "Makerbeam", 10, 10, -2.5, 0, 4, 3, 6.5, 1, 1, 0.25, false ];
24+
MakerbeamXL = [ "MakerbeamXL", 15, 15, -2.55, -2.55, 5, 3, 5.7, 1.1, 2, 0.25, false ];
25+
E1515 = [ "E1515", 15, 15, -3.3, 0, 5.5, 6.2, 9.5, 1.0, 0.9, 0.5, false ];
26+
E2020 = [ "E2020", 20, 20, -4.2, 0, 8, 6, 12.0, 2, 2, 1, false ];
27+
E2020t = [ "E2020t", 20, 20, -5.0, 0, 7.8, 6.2, 11.0, 1.8, 1.5, 1.5, [7.2, 0.5] ];
28+
E2040 = [ "E2040", 20, 40, -4.2, 0, 8, 6, 12.0, 2, 2, 1, false ];
29+
E2060 = [ "E2060", 20, 60, -4.2, 0, 8, 6, 12.0, 2, 2, 1, false ];
30+
E2080 = [ "E2080", 20, 80, -4.2, 0, 8, 6, 12.0, 2, 2, 1, false ];
31+
E3030 = [ "E3030", 30, 30, -6.8, -4.2, 12, 8, 16.5, 2, 2, 1, false ];
32+
E3060 = [ "E3060", 30, 60, -6.8, -4.2, 12, 8, 16.5, 2, 2, 1, false ];
33+
E4040 = [ "E4040", 40, 40, -10.5, -6.0, 15, 10, 20.0, 5.5, 3, 1, false ];
34+
E4040t = [ "E4040t", 40, 40, -10, 6.8, -16, 10, 20.0, 4.0, 2.4, 1.5, [12, 1] ];
35+
E4080 = [ "E4080", 40, 80, -10.5, -6.0, 15, 10, 20.0, 5.5, 3, 1, false ];
3436

35-
extrusions = [E1515, [E2020t, E2020], E2040, E2060, E2080, E3030, E3060, [E4040t, E4040], E4080];
37+
extrusions = [Makerbeam, [E1515, MakerbeamXL], [E2020t, E2020], E2040, E2060, E2080, E3030, E3060, [E4040t, E4040], E4080];
3638

3739
use <extrusion.scad>

0 commit comments

Comments
 (0)