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

This commit is contained in:
Matt McWilliams 2023-01-14 12:38:55 -05:00
commit c0b02a900a
2 changed files with 14 additions and 14 deletions

View File

@ -104,7 +104,7 @@ module filter_holder () {
} }
module filter_reinforcement () { module filter_reinforcement () {
Z = 19.5 + 7.83; Z = 19.5 + 7.83-5.75;
X = AX; X = AX;
difference () { difference () {
cube([X, 15.5, Z], center = true); cube([X, 15.5, Z], center = true);
@ -130,7 +130,7 @@ module jk_takeup () {
union () { union () {
block(); block();
translate([0, 0, -27.5]) filter_holder(); translate([0, 0, -27.5]) filter_holder();
translate([0, -1.1, -16]) filter_reinforcement(); translate([0, -1.1, -16+(5.75/2)]) filter_reinforcement();
} }
roller_bolts(); roller_bolts();
} }
@ -164,6 +164,6 @@ module jk_takeup_halves (HALF = "A") {
//translate([0, 0, 40]) color("red") original_takeup(); //translate([0, 0, 40]) color("red") original_takeup();
//jk_takeup(); //jk_takeup();
//jk_takeup_halves(); jk_takeup_halves();
color("blue") jk_takeup_halves("B"); //color("blue") jk_takeup_halves("B");
//m5_nut(); //m5_nut();

View File

@ -10,8 +10,8 @@ MOTOR_SHAFT_D = 6;
MOTOR_SHAFT_H = 16; MOTOR_SHAFT_H = 16;
MOTOR_SHAFT_HOBBLE = 1; MOTOR_SHAFT_HOBBLE = 1;
MOTOR_MOUNT_X = 32.5; MOTOR_MOUNT_X = 32.5 + 0.1;
MOTOR_MOUNT_Y = 17.5; MOTOR_MOUNT_Y = 17.5 + 0.1;
M4 = 4.1; M4 = 4.1;
@ -119,7 +119,7 @@ module daylight_spool_insert () {
module motor_mount_void (D, Z) { module motor_mount_void (D, Z) {
cylinder(r = R(D), h = Z, center = true, $fn = 40); cylinder(r = R(D), h = Z, center = true, $fn = 40);
//bolt void //bolt void
translate([0, 0, 5]) cylinder(r = R(3.25), h = Z + 10, center = true, $fn = 40); translate([0, 0, 5]) cylinder(r = R(3.25 + 0.2), h = Z + 10, center = true, $fn = 40);
translate([0, 0, 4.75]) cylinder(r = R(6), h = 3.5, center = true, $fn = 40); translate([0, 0, 4.75]) cylinder(r = R(6), h = 3.5, center = true, $fn = 40);
} }
@ -149,27 +149,27 @@ module mount_plate () {
translate([0, 0, 3.26 - .5]) cube([X, Y, 7], center = true); translate([0, 0, 3.26 - .5]) cube([X, Y, 7], center = true);
//motor void (centered) //motor void (centered)
translate([7, 0, 0]) { translate([7-0.5, 0, 0]) {
translate([-(46 / 2) + 15 + 1, 0, 0]) cylinder(r = R(15), h = 20, center = true, $fn = 60); translate([-(46 / 2) + 15 + 1 + 0.5, 0, 0]) cylinder(r = R(15), h = 20, center = true, $fn = 60);
translate([(MOTOR_MOUNT_X / 2)+1, (MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z); translate([(MOTOR_MOUNT_X / 2)+1, (MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z);
translate([-(MOTOR_MOUNT_X / 2)+1, (MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z); translate([-(MOTOR_MOUNT_X / 2)+1, (MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z);
translate([(MOTOR_MOUNT_X / 2)+1, -(MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z); translate([(MOTOR_MOUNT_X / 2)+1, -(MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z);
translate([-(MOTOR_MOUNT_X / 2)+1, -(MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z); translate([-(MOTOR_MOUNT_X / 2)+1, -(MOTOR_MOUNT_Y / 2), 0]) motor_mount_void(D, Z);
//pad void
translate([-8 + 12.5 + 1, 0, 0]) cube([7.5, 17, Z], center = true); translate([-8 + 12.5 + 1, 0, 0]) cube([8, 17, Z], center = true);
} }
translate([MOUNT_X / 2, MOUNT_Y / 2, 0]) mount_plate_void(); translate([MOUNT_X / 2, MOUNT_Y / 2, 0]) mount_plate_void();
translate([-MOUNT_X / 2, MOUNT_Y / 2, 0]) mount_plate_void(); translate([-MOUNT_X / 2, MOUNT_Y / 2, 0]) mount_plate_void();
translate([MOUNT_X / 2, -MOUNT_Y / 2, 0]) mount_plate_void(); translate([MOUNT_X / 2, -MOUNT_Y / 2, 0]) mount_plate_void();
translate([-MOUNT_X / 2,-MOUNT_Y / 2, 0]) mount_plate_void(); translate([-MOUNT_X / 2,-MOUNT_Y / 2, 0]) mount_plate_void();
translate([X_CORNER, Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true); translate([X_CORNER, Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true);
translate([-X_CORNER, Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true); translate([-X_CORNER, Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true);
translate([X_CORNER, -Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true); translate([X_CORNER, -Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true);
translate([-X_CORNER, -Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true); translate([-X_CORNER, -Y_CORNER, 3.26 - .5]) cube([CORNER, CORNER, 8], center = true);
} }
translate([X_CORNER - (CORNER / 2), Y_CORNER - (CORNER / 2), 3.26 - .5]) cylinder(r = CORNER, h = 7, center = true, $fn = 40); translate([X_CORNER - (CORNER / 2), Y_CORNER - (CORNER / 2), 3.26 - .5]) cylinder(r = CORNER, h = 7, center = true, $fn = 40);
translate([-X_CORNER + (CORNER / 2), Y_CORNER - (CORNER / 2), 3.26 - .5]) cylinder(r = CORNER, h = 7, center = true, $fn = 40); translate([-X_CORNER + (CORNER / 2), Y_CORNER - (CORNER / 2), 3.26 - .5]) cylinder(r = CORNER, h = 7, center = true, $fn = 40);
translate([X_CORNER - (CORNER / 2), -Y_CORNER + (CORNER / 2), 3.26 - .5]) cylinder(r = CORNER, h = 7, center = true, $fn = 40); translate([X_CORNER - (CORNER / 2), -Y_CORNER + (CORNER / 2), 3.26 - .5]) cylinder(r = CORNER, h = 7, center = true, $fn = 40);
@ -250,7 +250,7 @@ module debug_assembled () {
color("red") translate([0, 0, 34]) daylight_spool_insert(); color("red") translate([0, 0, 34]) daylight_spool_insert();
} }
PART = "daylight_spool_insert_reinforced_nut"; PART = "mount_plate";
if (PART == "slip_coupling") { if (PART == "slip_coupling") {
slip_coupling(); slip_coupling();