Update MCAD submodule.

gsohler · Mar 24, 2021 · 20dfb43 · 20dfb43
1 parent df36a1e
commit 20dfb43
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 121 deletions.
diff --git a/libraries/MCAD b/libraries/MCAD
diff --git a/tests/regression/astdumptest/include-tests-expected.ast b/tests/regression/astdumptest/include-tests-expected.ast
@@ -23,6 +23,34 @@ module test6() {
 module test7() {
 	cube([0.5, 0.5, 1], center = true);
 }
+module towerprosg90(position = undef, rotation = undef, screws = 0, axle_length = 0, cables = 0) {
+	translate(position) rotate(rotation) {
+		difference() {
+			union() {
+				translate([-5.9, (-11.8 / 2), 0]) cube([22.5, 11.8, 22.7]);
+				translate([0, 0, (22.7 - 0.1)]) {
+					cylinder(d = 11.8, h = (4 + 0.1));
+					hull() {
+						translate([(8.8 - (5 / 2)), 0, 0]) cylinder(d = 5, h = (4 + 0.1));
+						cylinder(d = 5, h = (4 + 0.1));
+					}
+					translate([0, 0, 4]) cylinder(d = 4.6, h = 3.2);
+				}
+				translate([(-4.7 - 5.9), (-11.8 / 2), 15.9]) cube([(22.5 + (4.7 * 2)), 11.8, 2.5]);
+			}
+			translate([(-2.3 - 5.9), 0, (15.9 + 1.25)]) cylinder(d = 2, h = 5, center = true);
+			translate([((-2.3 - 5.9) - 2), 0, (15.9 + 1.25)]) cube([3, 1.3, 5], center = true);
+			translate([((2.3 + 22.5) - 5.9), 0, (15.9 + 1.25)]) cylinder(d = 2, h = 5, center = true);
+			translate([(((2.3 + 22.5) - 5.9) + 2), 0, (15.9 + 1.25)]) cube([3, 1.3, 5], center = true);
+		}
+		if((axle_length > 0)) color("red", 0.3) translate([0, 0, (29.9 / 2)]) cylinder(r = 1, h = (29.9 + axle_length), center = true);
+		if((cables > 0)) color("red", 0.3) translate([-12.4, -1.8, 4.5]) cube([10, 3.6, 1.2]);
+		if((screws > 0)) color("red", 0.3) {
+			translate([(-2.3 - 5.9), 0, (15.9 + 1.25)]) cylinder(d = 2, h = 10, center = true);
+			translate([((2.3 + 22.5) - 5.9), 0, (15.9 + 1.25)]) cylinder(d = 2, h = 10, center = true);
+		}
+	}
+}
 module alignds420(position, rotation, screws = 0, axle_lenght = 0) {
 	translate(position) rotate(rotation) {
 		union() {
+157 −123		2Dshapes.scad
+2 −2		3d_triangle.scad
+1 −1		README.markdown
+114 −0		array.scad
+14 −0		bearing.scad
+26 −29		bitmap/name_tag.scad
+19 −0		bitmap/test_name_tag.scad
+29 −26		boxes.scad
+229 −4		fonts.scad
+23 −2		gears.scad
+1 −5		gridbeam.scad
+89 −36		involute_gears.scad
+2 −2		layouts.scad
+98 −0		linear_bearing.scad
+16 −15		multiply.scad
+5 −2		nuts_and_bolts.scad
+29 −26		polyholes.scad
+89 −0		profiles.scad
+15 −13		regular_shapes.scad
+1 −1		screw.scad
+44 −0		servos.scad
+43 −38		shapes.scad
+7 −7		stepper.scad
+12 −0		teardrop.scad
+1 −1		transformations.scad
+1 −1		utilities.scad