diff --git a/mendel/bom/bom.txt b/mendel/bom/bom.txt index d5ed138..2309002 100644 --- a/mendel/bom/bom.txt +++ b/mendel/bom/bom.txt @@ -51,9 +51,9 @@ Vitamins: | | | | | | 1| | | 1| 1| | | | | | | | 3 Nut M8 2| | | | | | | | 2| 2| 6| 4|16| | | 2| 1|10| 45 Nyloc nut M3 | | 4| | | | | | | 1| | | | 1| | | | | 6 Nyloc nut M4 - | | | | | | | 1| | | | | | | | | | | 1 Polypropylene strip 402mm x 17mm x 0.5mm - | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 320mm x 27mm x 0.5mm - | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 275mm x 29mm x 0.5mm + | | | | | | | 1| | | | | | | | | | | 1 Polypropylene strip 402mm x 16mm x 0.5mm + | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 320mm x 26mm x 0.5mm + | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 275mm x 28mm x 0.5mm | | | | | | 3| | | | 3| | | | 4| | | 8| 18 M3 pan screw x 8mm | | | |28| | | | | | | | | | | 4| 2| 4| 38 M4 pan screw x 12mm | | | |11| | | | | | | 8| | 1| 4| | | | 24 M4 pan screw x 16mm @@ -77,7 +77,7 @@ Vitamins: | | | | | | | | 2| | | | | | | | | | 2 Wingnut M4 | | | | | | | | | | | | | | | | 2| | 2 Rubber washer M3 x 10mm x 1.5mm | | | 8| | | 3| | | | 3| | | | 4| | | 8| 26 Star washer M3 x 7mm x 0.5mm - | | | |30| | | | | | | 8| | 1| 4| 4| 2| 4| 53 Star washer M4 x 9mm x 0.9mm + | | | |39| | | | | | | 8| | 1| 4| 4| 2| 4| 62 Star washer M4 x 9mm x 0.9mm | | | | | | | | 3| | | | 3| | | | | | 6 Ziptie 87mm min length Printed: diff --git a/mendel/bom/frame_assembly.txt b/mendel/bom/frame_assembly.txt index c5d5a51..e612ef9 100644 --- a/mendel/bom/frame_assembly.txt +++ b/mendel/bom/frame_assembly.txt @@ -3,12 +3,12 @@ Vitamins: 1 Acrylic sheet 468mm x 432mm x 10mm 2 Acrylic sheet 170mm x 324mm x 6mm 1 Acrylic sheet 468mm x 324mm x 6mm - 1 Polypropylene strip 320mm x 27mm x 0.5mm - 1 Polypropylene strip 275mm x 29mm x 0.5mm + 1 Polypropylene strip 320mm x 26mm x 0.5mm + 1 Polypropylene strip 275mm x 28mm x 0.5mm 28 M4 pan screw x 12mm 11 M4 pan screw x 16mm 39 Washer M4 x 9mm x 0.9mm - 30 Star washer M4 x 9mm x 0.9mm + 39 Star washer M4 x 9mm x 0.9mm Printed: 2 cable_clip_AB.stl diff --git a/mendel/bom/x_axis_assembly.txt b/mendel/bom/x_axis_assembly.txt index 0b67197..c2371f6 100644 --- a/mendel/bom/x_axis_assembly.txt +++ b/mendel/bom/x_axis_assembly.txt @@ -1,7 +1,7 @@ x_axis_assembly: Vitamins: 1 Belt T5 x 6mm x 866mm - 1 Polypropylene strip 402mm x 17mm x 0.5mm + 1 Polypropylene strip 402mm x 16mm x 0.5mm 2 Smooth rod 8mm x 382mm Printed: diff --git a/scad/cable_clip.scad b/scad/cable_clip.scad index 44480c4..7f07e3d 100644 --- a/scad/cable_clip.scad +++ b/scad/cable_clip.scad @@ -69,7 +69,7 @@ module cable_clip_assembly(screw, screw_length, cable1, cable2 = 0) { cable_clip(screw, cable1, cable2); translate([0, 0, max(cable_clip_height(cable1), cable_clip_height(cable2))]) - screw_and_washer(screw, screw_length); + screw_and_washer(screw, screw_length, true); } module cable_clip_AB_stl() cable_clip(base_clip_screw, endstop_wires, motor_wires); diff --git a/scad/main.scad b/scad/main.scad index ce8991b..305e9d9 100644 --- a/scad/main.scad +++ b/scad/main.scad @@ -64,7 +64,7 @@ module x_axis_assembly(show_extruder) { } - elliptical_cable_strip(ribbon_clamp_slot(extruder_ways) - 1, + elliptical_cable_strip(ribbon_clamp_slot(extruder_ways), [motor_end, 0, Z + Z0] + x_end_extruder_ribbon_clamp_offset(), [-X + X_origin, 0, Z + Z0 + x_carriage_offset()] + extruder_connector_offset(), [-X_travel / 2 + X_origin, 0, Z + Z0 + x_carriage_offset()] + extruder_connector_offset()); @@ -696,7 +696,7 @@ module frame_assembly(show_gantry = true) { translate([0, ribbon_clamp_width(frame_screw) / 2, 0]) rotate([90, 0, 90]) - cable_strip(ribbon_clamp_slot(x_end_ways) - 1, gantry_setback - x_end_ribbon_clamp_y(), + cable_strip(ribbon_clamp_slot(x_end_ways), gantry_setback - x_end_ribbon_clamp_y(), (Z_travel + (ribbon_clamp_z - (Z_travel + Z0 + x_end_ribbon_clamp_z()))) * 2, Z + Z0 + x_end_ribbon_clamp_z() - ribbon_clamp_z, 50); } @@ -706,7 +706,7 @@ module frame_assembly(show_gantry = true) { translate([0, ribbon_clamp_width(base_screw), 0]) rotate([90, 0, 90]) - cable_strip(ribbon_clamp_slot(bed_ways) - 1, Y_carriage_height - sheet_thickness(Y_carriage) / 2, Y_travel, Y); + cable_strip(ribbon_clamp_slot(bed_ways), Y_carriage_height - sheet_thickness(Y_carriage) / 2, Y_travel, Y); } place_cable_clips(); diff --git a/scad/ribbon_clamp.scad b/scad/ribbon_clamp.scad index 0c763be..598fd80 100644 --- a/scad/ribbon_clamp.scad +++ b/scad/ribbon_clamp.scad @@ -57,7 +57,7 @@ module ribbon_clamp_assembly(ways, screw_type, screw_length, panel_thickness = 0 translate([0,0, thickness]) ribbon_clamp_holes(ways, screw_type) - screw_and_washer(screw_type, screw_length); + screw_and_washer(screw_type, screw_length, panel_thickness == 0); if(panel_thickness != 0) translate([0,0, - panel_thickness]) diff --git a/scad/vitamins/cable_strip.scad b/scad/vitamins/cable_strip.scad index fdd2c2c..80ed2b9 100644 --- a/scad/vitamins/cable_strip.scad +++ b/scad/vitamins/cable_strip.scad @@ -19,7 +19,7 @@ module cable_strip(width, depth, travel, x, extra = 15) { length = max(top, bottom); total = ceil(top + bottom + PI * depth); - w = ceil(width); + w = floor(width - 1); vitamin(str("PP", thickness * 10, w, total,": Polypropylene strip ", total, "mm x ", w, "mm x ", thickness, "mm")); @@ -57,7 +57,7 @@ module ellipse(xr, yr, center = true) module elliptical_cable_strip(width, p1, p2, pmax, extra = 15) { thickness = 0.5; - w = ceil(width); + w = floor(width - 1); max_delta = pmax - p1; delta = p2 - p1; diff --git a/sturdy/bom/bom.txt b/sturdy/bom/bom.txt index c89d3e5..a9296fb 100644 --- a/sturdy/bom/bom.txt +++ b/sturdy/bom/bom.txt @@ -54,9 +54,9 @@ Vitamins: | | | | | | 1| | | 1| 1| | | | | | | | 3 Nut M8 2| | | | | | | | 2| | 4| | 8| | | | 1| 8| 25 Nyloc nut M3 | | 4| | | | | | | 3| 2| 4| 8| 1| | 2| | 2| 26 Nyloc nut M4 - | | | | | | | 1| | | | | | | | | | | 1 Polypropylene strip 416mm x 17mm x 0.5mm - | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 354mm x 27mm x 0.5mm - | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 284mm x 29mm x 0.5mm + | | | | | | | 1| | | | | | | | | | | 1 Polypropylene strip 416mm x 16mm x 0.5mm + | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 354mm x 26mm x 0.5mm + | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 284mm x 28mm x 0.5mm | | | | | | 3| | | | 3| | | | 4| | | 8| 18 M3 pan screw x 8mm 4| | | | | | | | | | 2| 2| | | | 2| 2| | 12 No2 pan wood screw x 13mm | | | |39| | | | | | | 8| | 1| 4| 4| 2| 4| 62 No6 pan wood screw x 16mm @@ -79,7 +79,7 @@ Vitamins: | | | | | | | | 2| | | | | | | | | | 2 Wingnut M4 | | | | | | | | | | | | | | | | 2| | 2 Rubber washer M3 x 10mm x 1.5mm | | | 8| | | 3| | | | 3| | | | 4| | | 8| 26 Star washer M3 x 7mm x 0.5mm - | | | |30| | | | | | | 8| | 1| 4| 4| 2| 4| 53 Star washer M4 x 9mm x 0.9mm + | | | |39| | | | | | | 8| | 1| 4| 4| 2| 4| 62 Star washer M4 x 9mm x 0.9mm | | | | | | | | 3| | | | 3| | | | | | 6 Ziptie 100mm min length Printed: diff --git a/sturdy/bom/frame_assembly.txt b/sturdy/bom/frame_assembly.txt index 049db9a..d5ff961 100644 --- a/sturdy/bom/frame_assembly.txt +++ b/sturdy/bom/frame_assembly.txt @@ -3,11 +3,11 @@ Vitamins: 2 MDF sheet 169mm x 330mm x 12mm 1 MDF sheet 486mm x 330mm x 12mm 1 MDF sheet 486mm x 450mm x 12mm - 1 Polypropylene strip 354mm x 27mm x 0.5mm - 1 Polypropylene strip 284mm x 29mm x 0.5mm + 1 Polypropylene strip 354mm x 26mm x 0.5mm + 1 Polypropylene strip 284mm x 28mm x 0.5mm 39 No6 pan wood screw x 16mm 39 Washer M4 x 9mm x 0.9mm - 30 Star washer M4 x 9mm x 0.9mm + 39 Star washer M4 x 9mm x 0.9mm Printed: 2 cable_clip_AB.stl diff --git a/sturdy/bom/x_axis_assembly.txt b/sturdy/bom/x_axis_assembly.txt index aa86022..bb24384 100644 --- a/sturdy/bom/x_axis_assembly.txt +++ b/sturdy/bom/x_axis_assembly.txt @@ -1,7 +1,7 @@ x_axis_assembly: Vitamins: 1 Belt T5 x 6mm x 902mm - 1 Polypropylene strip 416mm x 17mm x 0.5mm + 1 Polypropylene strip 416mm x 16mm x 0.5mm 2 Smooth rod 10mm x 400mm Printed: