FR4 veroboard made the correct colour.

veroboard track cuts made slightly bigger.

CHANGELOG.md

@@ -3,6 +3,11 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+## [v17.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v16.2.0...v17.0.0 "diff with v16.2.0")
+*   2021-09-28 [`a5c4bf0`](https://github.com/nophead/NopSCADlib/commit/a5c4bf05adbf53cb7eb113db1139b65eb616a2e0 "show commit") [M.B.](# "Martin Budden") Added hot end style string literals following discussion.
+
+*   2021-09-28 [`a65add6`](https://github.com/nophead/NopSCADlib/commit/a65add65acdfeb97a657e03b9398d5376f497e85 "show commit") [M.B.](# "Martin Budden") Removed hotend global enums.
+
 ### [v16.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v16.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v16.1.0...v16.2.0 "diff with v16.1.0")
 *   2021-09-29 [`bab4c8e`](https://github.com/nophead/NopSCADlib/commit/bab4c8e8afcc9e96ada5ae8d7636f3f203c36a2c "show commit") [C.P.](# "Chris Palmer") `TO247_size()` now also returns lead height and the length of the wide bit.
 TO247 leads fixed at 3.

printed/box.scad

@@ -31,9 +31,11 @@
 //!
 //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/insert.scad>
+use <../vitamins/screw.scad>
+use <../vitamins/washer.scad>
 use <../utils/quadrant.scad>
 use <../utils/round.scad>
 
@@ -52,8 +54,8 @@ function box_width(type)       = type[7]; //! Internal width
 function box_depth(type)       = type[8]; //! Internal depth
 function box_height(type)      = type[9]; //! Internal height
 
-function box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = M3_dome_screw) = //! Construct a property list for a box.
- concat([screw, shelf_screw, wall, sheets, top_sheet, base_sheet, feet], size);
+function box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = undef) = //! Construct a property list for a box.
+ concat([screw, is_undef(shelf_screw) ? screw : shelf_screw, wall, sheets, top_sheet, base_sheet, feet], size);
 
 function box_bezel_clearance(type) = bezel_clearance;
 

printed/press_fit.scad

@@ -22,7 +22,7 @@
 //!
 //! Add solvent or glue to make a permanent fixture.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 interference = 0.0;
 

printed/printed_box.scad

@@ -26,7 +26,9 @@
 //!
 //! It can also have printed feet on the base with the screws doubling up to hold the base on.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
+use <../vitamins/screw.scad>
+use <../vitamins/washer.scad>
 use <../vitamins/insert.scad>
 use <foot.scad>
 

printed/printed_pulleys.scad

@@ -21,8 +21,8 @@
 //! Creative Commons - Attribution - Share Alike license (see <https://creativecommons.org/licenses/by-sa/3.0/>)
 //
 
-include <../core.scad>
-include <../vitamins/pulleys.scad>
+include <../utils/core/core.scad>
+use <../vitamins/pulley.scad>
 
 printed_pulley_GT2_profile = [[0.747183,-0.5],[0.747183,0],[0.647876,0.037218],[0.598311,0.130528],[0.578556,0.238423],[0.547158,0.343077],[0.504649,0.443762],[0.451556,0.53975],[0.358229,0.636924],[0.2484,0.707276],[0.127259,0.750044],[0,0.76447],[-0.127259,0.750044],[-0.2484,0.707276],[-0.358229,0.636924],[-0.451556,0.53975],[-0.504797,0.443762],[-0.547291,0.343077],[-0.578605,0.238423],[-0.598311,0.130528],[-0.648009,0.037218],[-0.747183,0],[-0.747183,-0.5]];
 

readme.md

@@ -2543,7 +2543,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(ESP32_DOIT_V1)` |  ESP32 DOIT DEV KIT V1 |
 |   1 | `pcb(EnviroPlus)` |  Enviro+ |
 |   1 | `pcb(ExtruderPCB)` |  Extruder connection PCB - not shown |
-|   1 | `pcb(KY_040)` |  KY_-040 rotart encoder breakout |
+|   1 | `pcb(KY_040)` |  KY-040 rotart encoder breakout |
 |   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board - not shown |
 |   1 | `pcb(LIPO_fuel_gauge)` |  LIPO fuel gauge |
 |   1 | `pcb(MP1584EN)` |  MP1584EN 3A buck converter |
@@ -4410,7 +4410,7 @@ Normally the side sheets are the same type but they can be overridden individual
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = M3_dome_screw)` | Construct a property list for a box. |
+| `box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = undef)` | Construct a property list for a box. |
 | `box_bezel_height(type, bottom)` | Bezel height for top or bottom |
 | `box_corner_gap(type)` | Gap between box_sheets at the corners to connect inside and outside profiles |
 | `box_inset(type)` | How much the bezel intrudes on the specified width and length, away from the corners |

tests/7_segments.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/7_segments.scad>

tests/DIP.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/dip.scad>
 
 dips = [[6, "OPTO"], [8, "NE555"], [14, "74HC00"], [16, "ULN2003"], [18, "ULN2803"], [20, "74HC245"], [28, "ATMEGA328"]];

tests/LDRs.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 include <../vitamins/ldrs.scad>
 
 use <../utils/layout.scad>

tests/SSR_shroud.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 include <../vitamins/ssrs.scad>
 
 use <../utils/layout.scad>

tests/ball_bearings.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/ball_bearings.scad>

tests/camera_housing.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 use <../printed/camera_housing.scad>

tests/core_xy.scad

@@ -19,7 +19,6 @@
 
 include <../core.scad>
 include <../vitamins/pulleys.scad>
-include <../vitamins/screws.scad>
 include <../vitamins/stepper_motors.scad>
 include <../vitamins/washers.scad>
 

tests/microview.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/microview.scad>
 
 microview(!$preview);

tests/press_fit.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/press_fit.scad>
 
 module press_fits()

utils/core_xy.scad

@@ -29,7 +29,7 @@
 //! 4. The drive pulleys may be offset in the X and Y directions. If this is done, extra idler pulleys are added. This
 //! allows flexible positioning of the motors.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 include <../vitamins/belts.scad>
 include <../vitamins/pulleys.scad>
 

vitamins/component.scad

@@ -54,9 +54,9 @@ module resistor(type) { //! Draw specified type of resitor
             for(side= [-1,1])
                 translate([side *  dia / 6, 0, length / 2])
                     rotate([0, splay_angle * side, 0])
-                        cylinder(r = resistor_wire_diameter(type) / 2, h = resistor_wire_length(type), center = false);
+                        cylinder(r = resistor_wire_diameter(type) / 2, h = resistor_wire_length(type), center = false, $fn = 16);
         else
-            cylinder(r = resistor_wire_diameter(type) / 2, h = length + 2 * resistor_wire_length(type), center = true);
+            cylinder(r = resistor_wire_diameter(type) / 2, h = length + 2 * resistor_wire_length(type), center = true, $fn = 16);
     //
     // Sleeving
     //
@@ -66,7 +66,7 @@ module resistor(type) { //! Draw specified type of resitor
                 for(side= [-1, 1])
                     translate([side *  resistor_diameter(type) / 6, 0, length / 2]) {
                         rotate([0, splay_angle * side, 0])
-                            cylinder(r = resistor_wire_diameter(type) / 2 + 0.1, h = resistor_wire_length(type) - 5, center = false);                   }
+                            cylinder(r = resistor_wire_diameter(type) / 2 + 0.1, h = resistor_wire_length(type) - 5, center = false, $fn = 16);                   }
     //
     // Body
     //

vitamins/components.scad

@@ -27,7 +27,7 @@ RIE1212UB5C5R6 = [ "RIE1212UB5C5R6", "Resistor UB5C 5R6F 5R6 3W vitreous enamel"
 //
 Honewell       = [ "Honewell",  "Thermistor Honeywell 135-104LAC-J01 100K 1%",   4.75, 1.8, 0.5,  28.6,  2, "red",                        false];
 Epcos          = [ "Epcos",     "Thermistor Epcos B57560G104F 100K 1%",          4.6,  2.5, 0.3,  67,  2.5, [0.8, 0.8, 0.8, 0.25], true,  false];
-EpcosBlue      = [ "EpcosBlue", "Thermistor Epcos B57861S104F40 100K 1%",        6.5,  2.41,0.25, 43.5,2.5, "black",               true,  true];
+EpcosBlue      = [ "EpcosBlue", "Thermistor Epcos B57861S104F40 100K 1%",        4.5,  2.41,0.25, 43.5,2.5, "black",               true,  true];
 
 resistors = [Honewell, Epcos, EpcosBlue, RWM04106R80J, RIE1212UB5C5R6];
 //

vitamins/iec.scad

@@ -20,7 +20,7 @@
 //
 //! IEC mains inlets and outlet.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <screw.scad>
 use <nut.scad>
 use <washer.scad>

vitamins/module.scad

@@ -20,7 +20,9 @@
 //
 //! Random screw down modules. Currently just DROK buck converters.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
+use <screw.scad>
+use <nut.scad>
 
 function mod_part(type)   = type[1];        //! Description
 function mod_length(type) = type[2];        //! Body length

vitamins/pcbs.scad

@@ -868,7 +868,7 @@ ArduinoNano = let(l = 43.18, w = 17.78, pitch = inch(0.6), pins = 15, poffset =
     [(l - inch(pins - 1) / 10) / 2 + poffset, (w - pitch) / 2, pins, 2, silver, 2.54, pitch], // 15x2 grid of holes
 ];
 
-KY_040 = ["KY_040", "KY_-040 rotart encoder breakout",
+KY_040 = ["KY_040", "KY-040 rotart encoder breakout",
     26.3, 19.5, 1.6, 0, 3, 0, grey(20),  false,
     [
      [3.23 + 1.5, 1.3 + 1.5],

vitamins/servo_motor.scad

@@ -19,7 +19,7 @@
 //! BLDC servos for CNC machines
 //
 
-include <../core.scad>
+include <../utils/core/core.scad>
 include <../utils/tube.scad>
 include <../utils/round.scad>
 include <../utils/quadrant.scad>

vitamins/sk_bracket.scad

@@ -20,9 +20,8 @@
 //! SK shaft support brackets
 //
 include <../core.scad>
-include <../utils/fillet.scad>
+use <../utils/fillet.scad>
 
-use <washer.scad>
 
 sk_bracket_colour = grey(70);
 

vitamins/stepper_motor.scad

@@ -27,7 +27,6 @@ include <../vitamins/pin_headers.scad>
 use <../utils/tube.scad>
 use <../utils/thread.scad>
 use <../utils/round.scad>
-use <washer.scad>
 use <rod.scad>
 
 function NEMA_width(type)        = type[1]; //! Width of the square face

vitamins/veroboard.scad

@@ -82,7 +82,7 @@ module veroboard(type) { //! Draw specified veroboard with missing tracks and tr
     width = strips * pitch;
     hole_d = 1;
     tw = vero_track_width(type);
-    colour = vero_fr4(type) ? "green" : "goldenrod";
+    colour = vero_fr4(type) ? "#BEB564" : "goldenrod";
     tc = vero_fr4(type) ? "silver" : copper;
     no_track = vero_no_track(type);
 
@@ -124,9 +124,9 @@ module veroboard(type) { //! Draw specified veroboard with missing tracks and tr
                 for(p = vero_breaks(type))
                     vero_grid_pos(type, p.x, p.y)
                         if(ceil(p.x) == p.x)
-                            circle(d = pitch);
+                            circle(d = pitch * 1.1);
                         else
-                            square([pitch * 0.2, pitch], center = true);
+                            square([pitch * 0.3, pitch], center = true);
             }
         }
 }