Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Matthew McWilliams 2022-09-17 20:50:54 -04:00
commit 48c9824b84
1 changed files with 7 additions and 12 deletions

View File

@ -661,10 +661,9 @@ module motor_set_screw_120_alt () {
}
module hobbled_rod_120 (h = 10) {
d = 4.00;
d = 4.25;
diff = 3.33;
difference () {
cylinder(r = d/2, h = h, center = true, $fn = 60);
translate([d/2 + ((d/2) - (d - diff)), 0, 0]) cube([d, d, h + 1], center = true);
}
@ -1135,17 +1134,14 @@ module key_cap () {
module bearing_reinforcement () {
$fn = 60;
outerD = 22.1;
outerD2 = 30;
fuzz = 0.1;
difference () {
union () {
cylinder(r = outerD / 2 + fuzz + 2, h = 4, center = true);
translate([0, 0, -1]) cylinder(r = outerD2 / 2, h = 2, center = true);
translate([0, 0, -1]) cylinder(r = 30 / 2, h = 2, center = true);
}
cylinder(r = outerD / 2, h = 16, center = true);
translate([-outerD2+2.5, 0, 0]) cube([outerD2, outerD2, outerD2], center = true);
}
}
module motor_cap (DECOYS = false, HALF = false) {
@ -1234,7 +1230,6 @@ module exploded_view () {
translate([one_to_one_x, one_to_one_y, 50]) geared_motor_mount();
translate([one_to_one_x, one_to_one_y, 50]) motor_cap(false);
translate([0, 0, 60]) intval_laser_panel_cover(false, ALL_RED=true);
translate([one_to_one_x, one_to_one_y, 0]) rotate([0, 180, 0]) bearing_reinforcement();
}
//bolt_guide();
@ -1326,12 +1321,12 @@ module exploded_view () {
//motor_key_reinforced_roller();
//motor_key_120();
//motor_key_120_reinforced();
//motor_key_120_reinforced_roller();
motor_key_120_reinforced_roller();
//plunger_plate();
//motor_cap(false);
//motor_cap_120(false);
//bearing_reinforcement();
exploded_view();
//exploded_view();
//stl_plate();
//dxf_plate();