diff --git a/libtest.png b/libtest.png index 27b3f38..c51cd96 100644 Binary files a/libtest.png and b/libtest.png differ diff --git a/tests/png/hot_ends.png b/tests/png/hot_ends.png index 621dfbf..e3959a7 100644 Binary files a/tests/png/hot_ends.png and b/tests/png/hot_ends.png differ diff --git a/vitamins/hot_ends.scad b/vitamins/hot_ends.scad index dd451a7..439fe4d 100644 --- a/vitamins/hot_ends.scad +++ b/vitamins/hot_ends.scad @@ -33,8 +33,7 @@ // h t s t t t // h // -JHeadMk4 = ["JHeadMk4", jhead, "JHead MK4", 64, 5.1, 16, 50, grey(20), 12, 4.64, 14, [0, 2.94, -5], 20, 20]; -JHeadMk5 = ["JHeadMk5", jhead, "JHead MK5", 51.2, 5.1, 16, 40, grey(20), 12, 4.64, 13, [0, 2.38, -5], 20, 20]; +JHeadMk5 = ["JHeadMk5", jhead, "JHead MK5", 51.2, 4.75,16, 40, grey(20), 12, 4.64, 13, [0, 2.38, -5], 20, 20]; E3Dv5 = ["E3Dv5", e3d, "E3D V5 direct", 70, 3.7, 16, 50.1, "silver", 12, 6, 15, [1, 5, -4.5], 14.5, 28]; E3Dv6 = ["E3Dv6", e3d, "E3D V6 direct", 62, 3.7, 16, 42.7, "silver", 12, 6, 15, [1, 5, -4.5], 14, 21]; E3D_clone = ["E3D_clone", e3d, "E3D clone aliexpress",66, 6.8, 16, 46, "silver", 12, 5.6, 15, [1, 5, -4.5], 14.5, 21]; diff --git a/vitamins/jhead.scad b/vitamins/jhead.scad index e404853..ea0f5db 100644 --- a/vitamins/jhead.scad +++ b/vitamins/jhead.scad @@ -29,7 +29,6 @@ include use use <../utils/tube.scad> -MK4_heater = [ 12.76, 15.88, 8.22, (15.88 / 2 - 4.5), (12.76 / 2 - 0.5 - 2.5 / 2), (-15.88 / 2 + 5), 9.5, 3]; MK5_heater = [ 12.76, 12.76, 8.22, (12.76 / 2 - 3.75), (12.76 / 2 - 0.5 - 2.5 / 2), (-12.76 / 2 + 4), 8, 2]; function heater_width(type) = type[0]; @@ -71,7 +70,7 @@ module heater_block(type, resistor, thermistor) { cone_start_r = nozzle_cone(type) / 2; straight = 1; nozzle_r = 0.4 / 2; - translate_z(-h / 2) vflip() + translate([nozzle_x(type), 0, -h / 2]) vflip() rotate_extrude() polygon([ [nozzle_r, 0], @@ -86,7 +85,7 @@ module heater_block(type, resistor, thermistor) { module jhead_hot_end(type, filament) { resistor = RIE1212UB5C5R6; thermistor = Epcos; - heater = type == JHeadMk4 ? MK4_heater : MK5_heater; + heater = MK5_heater; insulator_length = hot_end_insulator_length(type); inset = hot_end_inset(type); @@ -106,7 +105,7 @@ module jhead_hot_end(type, filament) { square([hot_end_insulator_diameter(type) / 2 - chamfer, insulator_length]); } - square([3.2 / 2, insulator_length]); + square([(filament + 0.2) / 2, insulator_length]); translate([hot_end_groove_dia(type) / 2, insulator_length - hot_end_inset(type) - hot_end_groove(type)]) square([100, hot_end_groove(type)]); @@ -122,7 +121,7 @@ module jhead_hot_end(type, filament) { module jhead_hot_end_assembly(type, filament, naked = false) { //! Assembly with resistor, thermistor, tape, sleaving and ziptie resistor = RIE1212UB5C5R6; thermistor = Epcos; - heater = type == JHeadMk4 ? MK4_heater : MK5_heater; + heater = MK5_heater; insulator_length = hot_end_insulator_length(type); inset = hot_end_inset(type);