Merge pull request #11 from martinbudden/e3d_naked

E3d Resistor wire drawn even if naked=true.

readme.md

@@ -2164,7 +2164,7 @@ Ring terminals and earth assemblies for DiBond panels.
 ---
 <a name="Rockers"></a>
 ## Rockers
-Rocket switch. Also used for neon indicator in the same form factor.
+Rocker switch. Also used for neon indicator in the same form factor.
 
 
 [vitamins/rockers.scad](vitamins/rockers.scad) Object definitions.

vitamins/e3d.scad

@@ -61,34 +61,35 @@ heater_y = heater_width / 2;
 
 fan_x_offset = rad_dia / 2 + 4;
 
-module e3d_resistor(type, resistor_wire_rotate = [0,0,0]) {
+module e3d_resistor(type, naked = false, 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([0, resistor_len + 3.5/2 + 1, 0]) {
-				rotate(resistor_wire_rotate) {
-					translate([-3.5/2, 0, 0]) {
-						cylinder(d = 3.5, h = 36);
+        if(!naked)
+            color("red")
+                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, resistor_wire_rotate = [0,0,0]) {
+module heater_block(type, naked = false, 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, resistor_wire_rotate);
+        e3d_resistor(type, naked, resistor_wire_rotate);
         e3d_nozzle(type);
     }
 }
@@ -150,7 +151,7 @@ module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]
             }
 
     rotate(90)
-        heater_block(type, resistor_wire_rotate);
+        heater_block(type, naked, resistor_wire_rotate);
 
     if(!naked)
         translate_z(inset - insulator_length)

vitamins/pillars.scad

@@ -31,7 +31,7 @@
 //
 M2x16_brass_pillar     = ["M2x16_brass_pillar",     "nurled",    2, 16, 3.17,      3.17,       0, 0, brass,     brass,    3,-3];
 M3x13_hex_pillar       = ["M3x13_hex_pillar",       "hex",       3, 13, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -6, 6];
-M3x20_hex_pillar       = ["M3x20_hex_pillar",       "hex",       3, 20, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -6, 6];
+M3x20_hex_pillar       = ["M3x20_hex_pillar",       "hex",       3, 20, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -8, 8];
 M3x20_nylon_pillar     = ["M3x20_nylon_pillar",     "nylon",     3, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
 M4x17_nylon_pillar     = ["M4x17_nylon_pillar",     "nylon",     4, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
 M3x20_nylon_hex_pillar = ["M3x20_nylon_hex_pillar", "hex nylon", 3, 20, 8/cos(30), 8/cos(30),  6, 6,  grey20,   grey20,  -6, 6];

vitamins/rocker.scad

@@ -18,7 +18,7 @@
 //
 
 //
-//! Rocket switch. Also used for neon indicator in the same form factor.
+//! Rocker switch. Also used for neon indicator in the same form factor.
 //
 include <../core.scad>
 use <spade.scad>

vitamins/screws.scad

@@ -110,7 +110,7 @@ screw_lists = [
 [ M2_cap_screw, M2p5_cap_screw, M3_cap_screw, M4_cap_screw, M5_cap_screw, M6_cap_screw, M8_cap_screw],
 [ 0,            0,              M3_low_cap_screw],
 [ 0,            0,              M3_hex_screw, M4_hex_screw, M5_hex_screw, M6_hex_screw, M8_hex_screw],
-[ 0,            M2p5_pan_screw, M3_pan_screw, M4_pan_screw, No632_pan_screw, M5_pan_screw, M6_pan_screw],
+[ 0,            M2p5_pan_screw, M3_pan_screw, M4_pan_screw, M5_pan_screw, M6_pan_screw, No632_pan_screw],
 [ 0,            No2_screw,      No4_screw,    No6_screw,    No6_cs_screw],
 [ 0,            M2_cs_cap_screw,M3_cs_cap_screw, M4_cs_cap_screw],
 [ 0,            0,              M3_dome_screw, M4_dome_screw],