From d041b180250488b9c8be0577f0269193c85b0109 Mon Sep 17 00:00:00 2001 From: Eddy Pronk Date: Mon, 21 Oct 2019 17:51:19 +0200 Subject: [PATCH] Adds an option resistor_wire_rotate --- vitamins/e3d.scad | 28 ++++++++++++++++------------ vitamins/hot_end.scad | 4 ++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/vitamins/e3d.scad b/vitamins/e3d.scad index a703251..f0b5964 100644 --- a/vitamins/e3d.scad +++ b/vitamins/e3d.scad @@ -61,30 +61,34 @@ heater_y = heater_width / 2; fan_x_offset = rad_dia / 2 + 4; -module e3d_resistor(type) { +module e3d_resistor(type, resistor_wire_rotate = [0,0,0]) { translate([11 - heater_x, -3 - heater_y, heater_height / 2 + nozzle_h]) { color("grey") rotate([-90, 0, 0]) cylinder(r = resistor_dia / 2, h = resistor_len); color("red") - translate([-3.5/2, resistor_len + 3.5/2 + 1, 0]) { - cylinder(d = 3.5, h = 36); + translate([0, resistor_len + 3.5/2 + 1, 0]) { + rotate(resistor_wire_rotate) { + translate([-3.5/2, 0, 0]) { + cylinder(d = 3.5, h = 36); - translate([3.5, 0, 0]) - cylinder(r = 3.5 / 2, h = 36); - } + translate([3.5, 0, 0]) + cylinder(r = 3.5 / 2, h = 36); + } + } + } } } -module heater_block(type) { +module heater_block(type, resistor_wire_rotate = [0,0,0]) { translate_z(-hot_end_length(type)) { translate_z(nozzle_h) color("lightgrey") translate([-heater_x, -heater_y, 0]) cube([heater_length, heater_width, heater_height]); - e3d_resistor(type); + e3d_resistor(type, resistor_wire_rotate); e3d_nozzle(type); } } @@ -118,7 +122,7 @@ module e3d_fan(type) { fan(fan30x10); } -module e3d_hot_end(type, filament, naked = false) { +module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) { insulator_length = hot_end_insulator_length(type); inset = hot_end_inset(type); h_ailettes = rad_len / (2 * rad_nb_ailettes - 1); @@ -146,17 +150,17 @@ module e3d_hot_end(type, filament, naked = false) { } rotate(90) - heater_block(type); + heater_block(type, resistor_wire_rotate); if(!naked) translate_z(inset - insulator_length) e3d_fan(); } -module e3d_hot_end_assembly(type, filament, naked = false) { +module e3d_hot_end_assembly(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) { bundle = 3.2; - e3d_hot_end(type, filament, naked); + e3d_hot_end(type, filament, naked, resistor_wire_rotate); // Wire and ziptie if(!naked) diff --git a/vitamins/hot_end.scad b/vitamins/hot_end.scad index 0132d76..16e2f5e 100644 --- a/vitamins/hot_end.scad +++ b/vitamins/hot_end.scad @@ -44,10 +44,10 @@ function hot_end_length(type) = hot_end_total_length(type) - hot_end_inset(type) use use -module hot_end(type, filament, naked = false) { //! Draw specified hot end +module hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) { //! Draw specified hot end if(hot_end_style(type) == jhead) jhead_hot_end_assembly(type, filament, naked); if(hot_end_style(type) == e3d) - e3d_hot_end_assembly(type, filament, naked); + e3d_hot_end_assembly(type, filament, naked, resistor_wire_rotate); }