Merge in 9 months of work on capper branch #71

Merged
mattmcw merged 95 commits from capper into main 2023-02-19 05:28:46 +00:00
1 changed files with 12 additions and 7 deletions
Showing only changes of commit d0fe54b429 - Show all commits

View File

@ -34,6 +34,10 @@ module trap_cube(height = 19, top_x = 30, top_y = 34, bottom_x = 45, bottom_y =
echo("common.scad - R()"); echo("common.scad - R()");
function R (diameter) = diameter / 2.0; function R (diameter) = diameter / 2.0;
module hex (diag = 10, h = 1) {
cylinder(r = diag / 2, h = h, center = true, $fn = 6);
}
echo("common.scad - m3_nut"); echo("common.scad - m3_nut");
module m3_nut (H = 5) { module m3_nut (H = 5) {
cylinder(r=R(6.6), h=H, center=true, $fn=6); cylinder(r=R(6.6), h=H, center=true, $fn=6);
@ -45,6 +49,11 @@ module m4_nut (H = 5, DIAG = 8.1) {
hex(diag = DIAG, h = H); hex(diag = DIAG, h = H);
} }
echo("common.scad - m5_nut");
module m5_nut (H = 5, DIAG = 9.1) {
hex(diag = DIAG, h = H);
}
module opto_endstop(){ module opto_endstop(){
difference(){ difference(){
union(){ union(){
@ -77,10 +86,6 @@ module optoswitch() {
rotate([90,0,0]) translate([hole,6.4/2,-4]) cylinder(r=1.5, h=4.5,$fn=40); rotate([90,0,0]) translate([hole,6.4/2,-4]) cylinder(r=1.5, h=4.5,$fn=40);
} }
} }
}
module hex (diag = 10, h = 1) {
cylinder(r = diag / 2, h = h, center = true, $fn = 6);
} }
module NEMA17_motor_shaft (L = 22.75) { module NEMA17_motor_shaft (L = 22.75) {