diff --git a/.gitignore b/.gitignore index 78fde419..a9c6d62c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *.pyc *.log -*.gcode scad/conf/machine.scad scad/stl.scad dummy.csg diff --git a/Settings/.skeinforge/alterations/end.gcode b/Settings/.skeinforge/alterations/end.gcode new file mode 100644 index 00000000..1e6a2770 --- /dev/null +++ b/Settings/.skeinforge/alterations/end.gcode @@ -0,0 +1,12 @@ +M104 S0 ; turn off extruder +M140 S0 ; bed off +M107 ; carriage fan off +G1 E-1 F1200 ; extra retract +;G1 X-100 Y 100 F9000 ; go to back +;M42 P28 S255 ;bed fan on +G1 Z200 X-100 F9000 ; go to top +;G4 P300000 +;M42 P28 S0 ;bed fan off +G1 Y-100 ;bed to front +M84 ; disable motors +M0 ; end diff --git a/Settings/.skeinforge/alterations/start_ABS.gcode b/Settings/.skeinforge/alterations/start_ABS.gcode new file mode 100644 index 00000000..a214995d --- /dev/null +++ b/Settings/.skeinforge/alterations/start_ABS.gcode @@ -0,0 +1,14 @@ +M83 ; use relative distances for extrusion +G28 ; home axes +G1 X5 Y98 F9000 ; go to front of bed +G1 Z0.05 ; use the bed to block the nozzle to prevent ooze +M190 S110 ; heat the bed part way +M104 S240 ; start the nozzle heating +M190 S130 ; finish heating the bed +M109 S240 ; wait for nozzle to heat +G92 E0 ; zero the extruder +G1 E3 F50 ; make a blob +G1 E-1 F1200 ; retract +G1 X40 F4000 ; wipe along the edge of the bed +G1 Z0.3 ; lift before move to center + diff --git a/Settings/.skeinforge/alterations/start_PLA.gcode b/Settings/.skeinforge/alterations/start_PLA.gcode new file mode 100644 index 00000000..b4955053 --- /dev/null +++ b/Settings/.skeinforge/alterations/start_PLA.gcode @@ -0,0 +1,11 @@ +M83 ; use relative distances for extrusion +G28 ; home +G1 X0 Y98 F9000 ; Go to the middle of the front +G1Z0.05 ; close to the bed +M104 S185 ; set extruder temp +M190 S70 ; set bed temp & wait +M109 S185 ; wait for extruder temp +G92 E0 +G1 X50 E5 F200 ; make a thick line to prime extruder +G1 E-1 F1200 +G1Z0.3 ;lift Z diff --git a/dibond/bom/bom.txt b/dibond/bom/bom.txt index 3c703b40..22d690bb 100644 --- a/dibond/bom/bom.txt +++ b/dibond/bom/bom.txt @@ -74,7 +74,7 @@ Vitamins: | | | | | | | | | | 4| | | | | | | | | | | | 4 Nyloc nut M8 | | | | | | | | | | | | | | | 2| | | | | | | 2 Nitrile O-ring 2.5mm x 1.6mm | | | 1| | | | | | | | | | | | | | | | | | | 1 Extruder connection PCB - | | | | | | | | | | 1| | | | | | | | | | | | 1 PLA sample 3mm ~20m + | | | | | | | | | | 1| | | | | | | | | | | | 1 PLA sample 3mm ~50m | | | | | | | | | | | | | | | 1| | | | | | | 1 Polypropylene strip 394mm x 18mm x 0.5mm | | | | | | | | | | | | | | | 1| | | | | | | 1 Polypropylene strip 456mm x 25mm x 0.5mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 271mm x 33mm x 0.5mm @@ -95,6 +95,7 @@ Vitamins: | | | | | | | | | | | | | | | 1| 1| | | | 1| | 3 Microswitch | | 2| | | | | | | | | | | | | | | | | | | | 2 Spring 7mm OD, 1mm gauge x 10mm long | | | | | 2| | | | | | | | | | | | | | | | | 2 AL square tube 12.7 x 12.7 x 1.63 x 400mm + | | | | | | 1| | | | | | | | | | | | | | | | 1 110mm x 25mm self amalgamating silicone tape | | | | | | | | | | | | | | | | | | | | 2| | 2 Threaded rod M6 x 296mm | | | | | | | | | 1| | | | | | | | | | | | | 1 Heatshrink sleeving ID 10mm x 15mm | | | | | | 2| | | | | | | | | | | | | | | | 2 PTFE sleeving OD 1.2mm ID 0.71mm x 62mm @@ -117,7 +118,7 @@ Vitamins: | | | | | | | | | |12| | | | | | | | | | | | 12 Washer M8 x 17mm x 1.6mm | | | | | | | | | | 4| | | | | | | | | | | | 4 Washer M8 x 30mm x 1.5mm | | | | | | | | | | | 2| | | | | | | | | | | 2 Wingnut M4 - | | | | | | 2| | | | | | | | | | | | | | | | 2 Red wire 16/0.2 length 170mm + | | | | | | 2| | | | | | | | | | | | | | | | 2 Red PTFE wire 16/0.2 length 170mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Black wire 32/0.2 length 635mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Red wire 32/0.2 length 620mm | | 6| | | | | | | | | | | | | 2| | | | 4| | 8| 20 Star washer M3 x 0.5mm diff --git a/dibond/bom/hot_end_assembly.txt b/dibond/bom/hot_end_assembly.txt index 2dfcc8b8..7ef56024 100644 --- a/dibond/bom/hot_end_assembly.txt +++ b/dibond/bom/hot_end_assembly.txt @@ -1,11 +1,12 @@ hot_end_assembly: Vitamins: 1 JHead MK5 hot end + 1 110mm x 25mm self amalgamating silicone tape 2 PTFE sleeving OD 1.2mm ID 0.71mm x 62mm 2 Heatshrink sleeving ID 1.6mm x 15mm 2 PTFE sleeving OD 2.6mm ID 2mm x 45mm 1 Heatshrink sleeving ID 6.4mm x 60mm - 2 Red wire 16/0.2 length 170mm + 2 Red PTFE wire 16/0.2 length 170mm 1 Ziptie 100mm min length Printed: diff --git a/dibond/bom/spool_holder_assembly.txt b/dibond/bom/spool_holder_assembly.txt index b18e29ae..6910839b 100644 --- a/dibond/bom/spool_holder_assembly.txt +++ b/dibond/bom/spool_holder_assembly.txt @@ -6,7 +6,7 @@ Vitamins: 1 Foam sponge 20mm x 20mm x 20mm 2 Nyloc nut M4 4 Nyloc nut M8 - 1 PLA sample 3mm ~20m + 1 PLA sample 3mm ~50m 1 PTFE tubing OD 4.6mm ID 3.84mm x 750mm 2 Washer M4 x 9mm x 0.8mm 12 Washer M8 x 17mm x 1.6mm diff --git a/dibond/manual/Mendel90_Dibond.odt b/dibond/manual/Mendel90_Dibond.odt index 7bb22755..be0e784f 100644 Binary files a/dibond/manual/Mendel90_Dibond.odt and b/dibond/manual/Mendel90_Dibond.odt differ diff --git a/dibond/manual/Mendel90_Dibond.pdf b/dibond/manual/Mendel90_Dibond.pdf index a963a9f6..5279eab2 100644 Binary files a/dibond/manual/Mendel90_Dibond.pdf and b/dibond/manual/Mendel90_Dibond.pdf differ diff --git a/dibond/manual/bed_fan_assembly.png b/dibond/manual/bed_fan_assembly.png deleted file mode 100644 index d71f84bb..00000000 Binary files a/dibond/manual/bed_fan_assembly.png and /dev/null differ diff --git a/dibond/manual/extruder_assembled.png b/dibond/manual/extruder_assembled.png deleted file mode 100644 index a53f7b78..00000000 Binary files a/dibond/manual/extruder_assembled.png and /dev/null differ diff --git a/dibond/manual/extruder_assembly.png b/dibond/manual/extruder_assembly.png deleted file mode 100644 index c8b839e3..00000000 Binary files a/dibond/manual/extruder_assembly.png and /dev/null differ diff --git a/dibond/manual/extruder_hot_end_assembly.png b/dibond/manual/extruder_hot_end_assembly.png deleted file mode 100644 index 179e6580..00000000 Binary files a/dibond/manual/extruder_hot_end_assembly.png and /dev/null differ diff --git a/dibond/manual/hot_end_assembled.JPG b/dibond/manual/hot_end_assembled.JPG index b5f30faf..14d2dfc5 100644 Binary files a/dibond/manual/hot_end_assembled.JPG and b/dibond/manual/hot_end_assembled.JPG differ diff --git a/dibond/manual/hot_end_assembly.png b/dibond/manual/hot_end_assembly.png deleted file mode 100644 index 8ae2a5c8..00000000 Binary files a/dibond/manual/hot_end_assembly.png and /dev/null differ diff --git a/dibond/manual/x_carriage_assembled.png b/dibond/manual/x_carriage_assembled.png deleted file mode 100644 index d1d014f5..00000000 Binary files a/dibond/manual/x_carriage_assembled.png and /dev/null differ diff --git a/dibond/views/bed_fan_assembly.png b/dibond/views/bed_fan_assembly.png new file mode 100644 index 00000000..719d1564 Binary files /dev/null and b/dibond/views/bed_fan_assembly.png differ diff --git a/dibond/views/extruder_assembled.png b/dibond/views/extruder_assembled.png new file mode 100644 index 00000000..71eb18c3 Binary files /dev/null and b/dibond/views/extruder_assembled.png differ diff --git a/dibond/views/extruder_assembly.png b/dibond/views/extruder_assembly.png new file mode 100644 index 00000000..5c3418bd Binary files /dev/null and b/dibond/views/extruder_assembly.png differ diff --git a/dibond/views/extruder_hot_end_assembly.png b/dibond/views/extruder_hot_end_assembly.png new file mode 100644 index 00000000..b781dbdd Binary files /dev/null and b/dibond/views/extruder_hot_end_assembly.png differ diff --git a/dibond/manual/extruder_motor_assembled.png b/dibond/views/extruder_motor_assembled.png similarity index 100% rename from dibond/manual/extruder_motor_assembled.png rename to dibond/views/extruder_motor_assembled.png diff --git a/dibond/manual/extruder_motor_assembly.png b/dibond/views/extruder_motor_assembly.png similarity index 100% rename from dibond/manual/extruder_motor_assembly.png rename to dibond/views/extruder_motor_assembly.png diff --git a/dibond/manual/frame_assembly.png b/dibond/views/frame_assembly.png similarity index 100% rename from dibond/manual/frame_assembly.png rename to dibond/views/frame_assembly.png diff --git a/dibond/manual/frame_assembly_bar_front.png b/dibond/views/frame_assembly_bar_front.png similarity index 100% rename from dibond/manual/frame_assembly_bar_front.png rename to dibond/views/frame_assembly_bar_front.png diff --git a/dibond/manual/frame_assembly_front.png b/dibond/views/frame_assembly_front.png similarity index 100% rename from dibond/manual/frame_assembly_front.png rename to dibond/views/frame_assembly_front.png diff --git a/dibond/views/front_page.png b/dibond/views/front_page.png new file mode 100644 index 00000000..c1f92350 Binary files /dev/null and b/dibond/views/front_page.png differ diff --git a/dibond/manual/heatshield_assembly.png b/dibond/views/heatshield_assembly.png similarity index 99% rename from dibond/manual/heatshield_assembly.png rename to dibond/views/heatshield_assembly.png index e5bc2b50..505d3a8c 100644 Binary files a/dibond/manual/heatshield_assembly.png and b/dibond/views/heatshield_assembly.png differ diff --git a/dibond/views/hot_end_assembly.png b/dibond/views/hot_end_assembly.png new file mode 100644 index 00000000..73b4a320 Binary files /dev/null and b/dibond/views/hot_end_assembly.png differ diff --git a/dibond/manual/print_bed_assembly.png b/dibond/views/print_bed_assembly.png similarity index 100% rename from dibond/manual/print_bed_assembly.png rename to dibond/views/print_bed_assembly.png diff --git a/dibond/manual/psu_assembly.png b/dibond/views/psu_assembly.png similarity index 100% rename from dibond/manual/psu_assembly.png rename to dibond/views/psu_assembly.png diff --git a/dibond/manual/ribbon_clamps.png b/dibond/views/ribbon_clamps.png similarity index 100% rename from dibond/manual/ribbon_clamps.png rename to dibond/views/ribbon_clamps.png diff --git a/dibond/manual/spool_holder_assembly.png b/dibond/views/spool_holder_assembly.png similarity index 100% rename from dibond/manual/spool_holder_assembly.png rename to dibond/views/spool_holder_assembly.png diff --git a/dibond/manual/x_axis_assembly.png b/dibond/views/x_axis_assembly.png similarity index 100% rename from dibond/manual/x_axis_assembly.png rename to dibond/views/x_axis_assembly.png diff --git a/dibond/views/x_carriage_assembled.png b/dibond/views/x_carriage_assembled.png new file mode 100644 index 00000000..0e99914b Binary files /dev/null and b/dibond/views/x_carriage_assembled.png differ diff --git a/dibond/views/x_carriage_assembly.png b/dibond/views/x_carriage_assembly.png new file mode 100644 index 00000000..7d39ea0f Binary files /dev/null and b/dibond/views/x_carriage_assembly.png differ diff --git a/dibond/manual/x_carriage_fan_assembled.png b/dibond/views/x_carriage_fan_assembled.png similarity index 100% rename from dibond/manual/x_carriage_fan_assembled.png rename to dibond/views/x_carriage_fan_assembled.png diff --git a/dibond/manual/x_carriage_fan_assembly.png b/dibond/views/x_carriage_fan_assembly.png similarity index 100% rename from dibond/manual/x_carriage_fan_assembly.png rename to dibond/views/x_carriage_fan_assembly.png diff --git a/dibond/manual/x_idler_assembled.png b/dibond/views/x_idler_assembled.png similarity index 100% rename from dibond/manual/x_idler_assembled.png rename to dibond/views/x_idler_assembled.png diff --git a/dibond/manual/x_idler_assembly.png b/dibond/views/x_idler_assembly.png similarity index 100% rename from dibond/manual/x_idler_assembly.png rename to dibond/views/x_idler_assembly.png diff --git a/dibond/manual/x_motor_assembled.png b/dibond/views/x_motor_assembled.png similarity index 100% rename from dibond/manual/x_motor_assembled.png rename to dibond/views/x_motor_assembled.png diff --git a/dibond/manual/x_motor_assembly.png b/dibond/views/x_motor_assembly.png similarity index 100% rename from dibond/manual/x_motor_assembly.png rename to dibond/views/x_motor_assembly.png diff --git a/dibond/manual/x_motor_back_assembly.png b/dibond/views/x_motor_back_assembly.png similarity index 100% rename from dibond/manual/x_motor_back_assembly.png rename to dibond/views/x_motor_back_assembly.png diff --git a/dibond/manual/y_axis_assembly.png b/dibond/views/y_axis_assembly.png similarity index 100% rename from dibond/manual/y_axis_assembly.png rename to dibond/views/y_axis_assembly.png diff --git a/dibond/manual/y_carriage_assembled.png b/dibond/views/y_carriage_assembled.png similarity index 100% rename from dibond/manual/y_carriage_assembled.png rename to dibond/views/y_carriage_assembled.png diff --git a/dibond/manual/y_carriage_assembly.png b/dibond/views/y_carriage_assembly.png similarity index 100% rename from dibond/manual/y_carriage_assembly.png rename to dibond/views/y_carriage_assembly.png diff --git a/dibond/manual/y_idler_assembled.png b/dibond/views/y_idler_assembled.png similarity index 100% rename from dibond/manual/y_idler_assembled.png rename to dibond/views/y_idler_assembled.png diff --git a/dibond/manual/y_idler_assembly.png b/dibond/views/y_idler_assembly.png similarity index 100% rename from dibond/manual/y_idler_assembly.png rename to dibond/views/y_idler_assembly.png diff --git a/dibond/manual/y_motor_assembled.png b/dibond/views/y_motor_assembled.png similarity index 100% rename from dibond/manual/y_motor_assembled.png rename to dibond/views/y_motor_assembled.png diff --git a/dibond/manual/y_motor_assembly.png b/dibond/views/y_motor_assembly.png similarity index 100% rename from dibond/manual/y_motor_assembly.png rename to dibond/views/y_motor_assembly.png diff --git a/dibond/manual/z_axis_assembly.png b/dibond/views/z_axis_assembly.png similarity index 100% rename from dibond/manual/z_axis_assembly.png rename to dibond/views/z_axis_assembly.png diff --git a/dibond/manual/z_motor_assembled.png b/dibond/views/z_motor_assembled.png similarity index 100% rename from dibond/manual/z_motor_assembled.png rename to dibond/views/z_motor_assembled.png diff --git a/dibond/manual/z_motor_assembly.png b/dibond/views/z_motor_assembly.png similarity index 100% rename from dibond/manual/z_motor_assembly.png rename to dibond/views/z_motor_assembly.png diff --git a/mendel/bom/bom.txt b/mendel/bom/bom.txt index 4dd5cdf4..e646b0aa 100644 --- a/mendel/bom/bom.txt +++ b/mendel/bom/bom.txt @@ -73,7 +73,7 @@ Vitamins: | | | | | | | | | | 4| | | | | | | | | | | | 4 Nyloc nut M8 | | | | | | | | | | | | | | | 2| | | | | | | 2 Nitrile O-ring 2.5mm x 1.6mm | | | 1| | | | | | | | | | | | | | | | | | | 1 Extruder connection PCB - | | | | | | | | | | 1| | | | | | | | | | | | 1 PLA sample 3mm ~20m + | | | | | | | | | | 1| | | | | | | | | | | | 1 PLA sample 3mm ~50m | | | | | | | | | | | | | | | 1| | | | | | | 1 Polypropylene strip 395mm x 18mm x 0.5mm | | | | | | | | | | | | | | | 1| | | | | | | 1 Polypropylene strip 475mm x 25mm x 0.5mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 271mm x 33mm x 0.5mm @@ -94,6 +94,7 @@ Vitamins: | 1| | | | | | | | | | | | | | | | | | | | | 1 Micro SD to USB adapter | | | | | | | | | | | | | | | 1| 1| | | | 1| | 3 Microswitch | | 2| | | | | | | | | | | | | | | | | | | | 2 Spring 7mm OD, 1mm gauge x 10mm long + | | | | | | 1| | | | | | | | | | | | | | | | 1 110mm x 25mm self amalgamating silicone tape | | | | | | | | | | | | | | | | | | | | 2| | 2 Threaded rod M8 x 300mm | | | | | | | | | 1| | | | | | | | | | | | | 1 Heatshrink sleeving ID 10mm x 15mm | | | | | | 2| | | | | | | | | | | | | | | | 2 PTFE sleeving OD 1.2mm ID 0.71mm x 62mm @@ -116,7 +117,7 @@ Vitamins: | | | | | | | | | |12| | | | | | | | | | | | 12 Washer M8 x 17mm x 1.6mm | | | | | | | | | | 4| | | | | | | | | | | | 4 Washer M8 x 30mm x 1.5mm | | | | | | | | | | | 2| | | | | | | | | | | 2 Wingnut M4 - | | | | | | 2| | | | | | | | | | | | | | | | 2 Red wire 16/0.2 length 170mm + | | | | | | 2| | | | | | | | | | | | | | | | 2 Red PTFE wire 16/0.2 length 170mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Black wire 32/0.2 length 635mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Red wire 32/0.2 length 620mm | 4| 6| | | | | | | | | | | | | 2| | | | 4| | 8| 24 Star washer M3 x 0.5mm diff --git a/mendel/bom/hot_end_assembly.txt b/mendel/bom/hot_end_assembly.txt index 2dfcc8b8..7ef56024 100644 --- a/mendel/bom/hot_end_assembly.txt +++ b/mendel/bom/hot_end_assembly.txt @@ -1,11 +1,12 @@ hot_end_assembly: Vitamins: 1 JHead MK5 hot end + 1 110mm x 25mm self amalgamating silicone tape 2 PTFE sleeving OD 1.2mm ID 0.71mm x 62mm 2 Heatshrink sleeving ID 1.6mm x 15mm 2 PTFE sleeving OD 2.6mm ID 2mm x 45mm 1 Heatshrink sleeving ID 6.4mm x 60mm - 2 Red wire 16/0.2 length 170mm + 2 Red PTFE wire 16/0.2 length 170mm 1 Ziptie 100mm min length Printed: diff --git a/mendel/bom/spool_holder_assembly.txt b/mendel/bom/spool_holder_assembly.txt index 9aa46a39..e2877f38 100644 --- a/mendel/bom/spool_holder_assembly.txt +++ b/mendel/bom/spool_holder_assembly.txt @@ -4,7 +4,7 @@ Vitamins: 4 M8 cap screw x 30mm 1 Foam sponge 20mm x 20mm x 20mm 4 Nyloc nut M8 - 1 PLA sample 3mm ~20m + 1 PLA sample 3mm ~50m 2 M4 pan screw x 12mm 1 PTFE tubing OD 4.6mm ID 3.84mm x 750mm 2 Washer M4 x 9mm x 0.8mm diff --git a/scad/main.scad b/scad/main.scad index a10411eb..e1214953 100644 --- a/scad/main.scad +++ b/scad/main.scad @@ -769,12 +769,12 @@ module frame_stay(left, bodge = 0) { } } -module bed_fan_assembly() { +module bed_fan_assembly(show_fan = false) { assembly("bed_fan_assembly"); translate([left_stay_x, fan_y, fan_z]) rotate([0, -90, 0]) { translate([0, 0, -(sheet_thickness(frame) + fan_depth(case_fan)) / 2]) - fan_assembly(case_fan, sheet_thickness(frame) + fan_guard_thickness(), include_fan); + fan_assembly(case_fan, sheet_thickness(frame) + fan_guard_thickness(), include_fan || show_fan); translate([0, 0, sheet_thickness(frame) / 2]) color(fan_guard_color) render() fan_guard(case_fan); diff --git a/scad/spool_holder.scad b/scad/spool_holder.scad index 69d1d7fe..6ef78d28 100644 --- a/scad/spool_holder.scad +++ b/scad/spool_holder.scad @@ -390,7 +390,7 @@ module spool_assembly(show_spool = true) { } - vitamin("PLA3020: PLA sample 3mm ~20m"); + vitamin("PLA3040: PLA sample 3mm ~50m"); end("spool_holder_assembly"); } diff --git a/scad/vitamins/jhead_hot_end.scad b/scad/vitamins/jhead_hot_end.scad index 08acdfb4..5780bd65 100644 --- a/scad/vitamins/jhead_hot_end.scad +++ b/scad/vitamins/jhead_hot_end.scad @@ -55,8 +55,27 @@ module jhead_hot_end(type, exploded = exploded) { cone_end = 1; cone_start = nozzle_cone(heater); bundle = 3.2; + tape_width = 25; + tape_overlap = 10; + tape_thickness = 0.8; vitamin(hot_end_part(type)); + vitamin("ST25110: 110mm x 25mm self amalgamating silicone tape"); + + color("red") + if(exploded) + translate([0, max(hot_end_insulator_diameter(type) / 2, heater_length(heater) / 2 - nozzle_x(heater)), + -tape_width + tape_overlap + inset - insulator_length]) + cube([110, tape_thickness, tape_width]); + else + hull() { + translate([0, 0, + inset - insulator_length]) + cylinder(r = hot_end_insulator_diameter(type) / 2 + 2 * tape_thickness, h = tape_overlap); + + translate([0, -nozzle_x(heater), -hot_end_length(type) + cone_length + 1 + heater_height(heater) / 2 + eta]) + cube([heater_width(heater) + 4 * tape_thickness, + heater_length(heater) + 4 * tape_thickness, heater_height(heater)], center = true); + } translate([0, 0, inset - insulator_length]) { color(hot_end_insulator_colour(type)) render(convexity = 10) @@ -84,24 +103,34 @@ module jhead_hot_end(type, exploded = exploded) { translate([0, -hot_end_insulator_diameter(type) / 2 - bundle / 2, 20]) scale([0.7, bundle / 6.4]) - tubing(HSHRNK64, 60); + difference() { + tubing(HSHRNK64, 60); + if(!exploded) + translate([0, 0, 20]) + cube([10, 10, 60], center = true); + } } - wire("Red", 16, 170); - wire("Red", 16, 170); + wire("Red PTFE", 16, 170); + wire("Red PTFE", 16, 170); rotate([0, 0, 90]) translate([-nozzle_x(heater), 0, -hot_end_length(type) + cone_length + 1 + heater_height(heater) / 2]) { heater_block(heater, resistor, thermistor); - translate([resistor_x(heater), -exploded * 15, 0]) - rotate([90, 0, 0]) - sleeved_resistor(resistor, PTFE20, bare = - 10, on_bom = false, exploded = exploded); - - translate([-heater_length(heater) / 2 + resistor_length(thermistor) / 2 - exploded * 10, thermistor_y(heater), 0]) - rotate([90, 0, -90]) - sleeved_resistor(thermistor, PTFE07, on_bom = false, heatshrink = HSHRNK16, exploded = exploded); - + intersection() { + group() { + translate([resistor_x(heater), -exploded * 15, 0]) + rotate([90, 0, 0]) + sleeved_resistor(resistor, PTFE20, bare = - 10, on_bom = false, exploded = exploded); + + translate([-heater_length(heater) / 2 + resistor_length(thermistor) / 2 - exploded * 10, thermistor_y(heater), 0]) + rotate([90, 0, -90]) + sleeved_resistor(thermistor, PTFE07, on_bom = false, heatshrink = HSHRNK16, exploded = exploded); + } + if(!exploded) + cube(1, true); // hide the wires when not exploded + } } } diff --git a/scad/wade.scad b/scad/wade.scad index 69d1a4de..07099254 100644 --- a/scad/wade.scad +++ b/scad/wade.scad @@ -473,21 +473,13 @@ module wades_assembly(show_connector = true, show_drive = true) { // assembly("hot_end_assembly"); translate([filament_x, -extension, filament_z]) - rotate([-90, 0, 0]) difference() { - union() { - if(hot_end_style(hot_end) == m90) - m90_hot_end(hot_end); - if(hot_end_style(hot_end) == Stoffel) - stoffel_hot_end(hot_end); - if(hot_end_style(hot_end) == jhead) - jhead_hot_end(hot_end, exploded = 0, show_wires = false); - } - rotate([180, 0, 180]) - translate([0, 0, hot_end_length(hot_end)] + hot_end_duct_offset(hot_end)) // trim the wires - tube(or = 100, ir = hot_end_duct_radius(hot_end) - 1, h = 30, center = true); - - translate([0, 0, 60]) - cube(100, center = true); + rotate([-90, 0, 0]) { + if(hot_end_style(hot_end) == m90) + m90_hot_end(hot_end); + if(hot_end_style(hot_end) == Stoffel) + stoffel_hot_end(hot_end); + if(hot_end_style(hot_end) == jhead) + jhead_hot_end(hot_end, exploded = 0); } end("hot_end_assembly"); diff --git a/scad/x-end.scad b/scad/x-end.scad index 0929cb50..7af722f2 100644 --- a/scad/x-end.scad +++ b/scad/x-end.scad @@ -330,7 +330,7 @@ module x_end_bracket(motor_end, integral_support = false){ if(integral_support) translate([-z_bar_offset(), 0, nut_shelf]) - cylinder(r = Z_nut_radius + 1, h = layer_height); + cylinder(r = Z_nut_radius + 1, h = 2 * layer_height, center = true); } translate([-z_bar_offset(), 0, -thickness / 2 - 1]) diff --git a/sturdy/bom/bom.txt b/sturdy/bom/bom.txt index 35717e23..f5616d13 100644 --- a/sturdy/bom/bom.txt +++ b/sturdy/bom/bom.txt @@ -74,7 +74,7 @@ Vitamins: | | | | | | | | | | 4| | | | | | | | | | | | 4 Nyloc nut M8 | | | | | | | | | | | | | | | 2| | | | | | | 2 Nitrile O-ring 2.5mm x 1.6mm | | | 1| | | | | | | | | | | | | | | | | | | 1 Extruder connection PCB - | | | | | | | | | | 1| | | | | | | | | | | | 1 PLA sample 3mm ~20m + | | | | | | | | | | 1| | | | | | | | | | | | 1 PLA sample 3mm ~50m | | | | | | | | | | | | | | | 1| | | | | | | 1 Polypropylene strip 410mm x 18mm x 0.5mm | | | | | | | | | | | | | | | 1| | | | | | | 1 Polypropylene strip 501mm x 25mm x 0.5mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Polypropylene strip 278mm x 33mm x 0.5mm @@ -93,6 +93,7 @@ Vitamins: | 1| | | | | | | | | | | | | | | | | | | | | 1 Micro SD to USB adapter | | | | | | | | | | | | | | | 1| 1| | | | 1| | 3 Microswitch | | 2| | | | | | | | | | | | | | | | | | | | 2 Spring 7mm OD, 1mm gauge x 10mm long + | | | | | | 1| | | | | | | | | | | | | | | | 1 110mm x 25mm self amalgamating silicone tape | | | | | | | | | | | | | | | | | | | | 2| | 2 Threaded rod M8 x 296mm | | | | | | | | | 1| | | | | | | | | | | | | 1 Heatshrink sleeving ID 10mm x 15mm | | | | | | 2| | | | | | | | | | | | | | | | 2 PTFE sleeving OD 1.2mm ID 0.71mm x 62mm @@ -115,7 +116,7 @@ Vitamins: | | | | | | | | | |12| | | | | | | | | | | | 12 Washer M8 x 17mm x 1.6mm | | | | | | | | | | 4| | | | | | | | | | | | 4 Washer M8 x 30mm x 1.5mm | | | | | | | | | | | 2| | | | | | | | | | | 2 Wingnut M4 - | | | | | | 2| | | | | | | | | | | | | | | | 2 Red wire 16/0.2 length 170mm + | | | | | | 2| | | | | | | | | | | | | | | | 2 Red PTFE wire 16/0.2 length 170mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Black wire 32/0.2 length 635mm | | | | | | | | 1| | | | | | | | | | | | | | 1 Red wire 32/0.2 length 620mm | 4| 6| | | | | | | | | | | | | 2| | | | 4| | 8| 24 Star washer M3 x 0.5mm diff --git a/sturdy/bom/hot_end_assembly.txt b/sturdy/bom/hot_end_assembly.txt index 2dfcc8b8..7ef56024 100644 --- a/sturdy/bom/hot_end_assembly.txt +++ b/sturdy/bom/hot_end_assembly.txt @@ -1,11 +1,12 @@ hot_end_assembly: Vitamins: 1 JHead MK5 hot end + 1 110mm x 25mm self amalgamating silicone tape 2 PTFE sleeving OD 1.2mm ID 0.71mm x 62mm 2 Heatshrink sleeving ID 1.6mm x 15mm 2 PTFE sleeving OD 2.6mm ID 2mm x 45mm 1 Heatshrink sleeving ID 6.4mm x 60mm - 2 Red wire 16/0.2 length 170mm + 2 Red PTFE wire 16/0.2 length 170mm 1 Ziptie 100mm min length Printed: diff --git a/sturdy/bom/spool_holder_assembly.txt b/sturdy/bom/spool_holder_assembly.txt index 0fff5ca9..d77e2c66 100644 --- a/sturdy/bom/spool_holder_assembly.txt +++ b/sturdy/bom/spool_holder_assembly.txt @@ -4,7 +4,7 @@ Vitamins: 4 M8 cap screw x 30mm 1 Foam sponge 20mm x 20mm x 20mm 4 Nyloc nut M8 - 1 PLA sample 3mm ~20m + 1 PLA sample 3mm ~50m 2 No6 pan wood screw x 16mm 1 PTFE tubing OD 4.6mm ID 3.84mm x 750mm 2 Washer M4 x 9mm x 0.8mm diff --git a/views/bed_fan_assembly.scad b/views/bed_fan_assembly.scad new file mode 100644 index 00000000..04e43030 --- /dev/null +++ b/views/bed_fan_assembly.scad @@ -0,0 +1,15 @@ +// +// Mendel90 +// +// GNU GPL v2 +// nop.head@gmail.com +// hydraraptor.blogspot.com +// +// Bed fan assembly view +// +// assembly 958 958 -175 101 85 62 0 214 620 +// +use <../scad/main.scad> + +bed_fan_assembly(show_fan = true); +$exploded = 1; diff --git a/views/hot_end_assembly.scad b/views/hot_end_assembly.scad index 2608b91b..1f2d47ed 100644 --- a/views/hot_end_assembly.scad +++ b/views/hot_end_assembly.scad @@ -13,5 +13,6 @@ use <../scad/vitamins/jhead_hot_end.scad> include <../scad/conf/config.scad> -//view([ 14.22, -15.83, -29.08 ], [ 56.40, 0.00, 25.00 ], 762.08) jhead_hot_end(JHeadMk5); + +$exploded = 1; diff --git a/views/x_carriage_assembly.scad b/views/x_carriage_assembly.scad new file mode 100644 index 00000000..48150233 --- /dev/null +++ b/views/x_carriage_assembly.scad @@ -0,0 +1,16 @@ +// +// Mendel90 +// +// GNU GPL v2 +// nop.head@gmail.com +// hydraraptor.blogspot.com +// +// Wade's assembly view +// +// assembly 1123 811 -54 46 -130 37.5 0 40 850 +// assembled 970 904 -26 38 -140 26 0 35 800 +// +use <../scad/x-carriage.scad> + +x_carriage_assembly(show_extruder = false, show_fan = false); +$exploded = 1;