From 0e58e92fbc50a9f3ad39960d4ccab3bfe4d74bb1 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Tue, 25 Feb 2020 21:01:04 +0000
Subject: [PATCH] Allowed parameterised green terminals on PCBs.

---
 tests/pcb.scad    | 16 ++++++++++------
 vitamins/pcb.scad |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/pcb.scad b/tests/pcb.scad
index 83a58e3..e667c5f 100644
--- a/tests/pcb.scad
+++ b/tests/pcb.scad
@@ -22,10 +22,11 @@ use <../vitamins/pcb.scad>
 include <../vitamins/microswitches.scad>
 include <../vitamins/d_connectors.scad>
 
-
+gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,1.5,     1,  3,   6,     0,  0,   0];
+gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,1.5,   1,2.5,   6,     0,  0,   0];
 
 test_pcb = ["TestPCB", "Test PCB",
-    40, 480, 1.6, // length, width, thickness
+    50, 480, 1.6, // length, width, thickness
     3,      // Corner radius
     2.75,   // Mounting hole diameter
     6,      // Pad around mounting hole
@@ -36,10 +37,10 @@ test_pcb = ["TestPCB", "Test PCB",
     // components
     [
         [ 10,  10,  0, "2p54header", 3, 1],
-        [ 20,  10,  0, "2p54header", 3, 1, undef, "blue" ],
+        [ 25,  10,  0, "2p54header", 3, 1, undef, "blue" ],
         [ 10,  20,  0, "2p54boxhdr", 2, 1],
         [ 10,  30,  0, "2p54socket", 2, 1],
-        [ 20,  30,  0, "2p54socket", 3, 1, undef, undef, undef, "red" ],
+        [ 25,  30,  0, "2p54socket", 3, 1, undef, undef, undef, "red" ],
         [ 10,  40,  0, "chip", 5, 10, 1, grey20],             // E2 stop
         [ 10,  60,  0, "rj45"],
         [ 10,  80,  0, "usb_A"],
@@ -58,11 +59,14 @@ test_pcb = ["TestPCB", "Test PCB",
         [ 10, 300,  0, "molex_hdr", 2],
         [ 10, 310,  0, "jst_xh", 2],
         [ 10, 320,  0, "term254", 3],
-        [ 10, 340,  0, "gterm35", 4],
+        [ 10, 340,  0, "gterm35", 4, [1,2]],
+        [ 25, 340,  0, "gterm", gt_5x11, 3],
         [ 10, 360,  0, "gterm635", 2],
+        [ 25, 360,  0, "gterm", gt_5x17, 2, undef, grey20],
+        [ 40, 360,  0, "gterm", gt_5x17, 3, [1], "red"],
         [ 10, 380,  0, "term35", 4],
         [ 10, 400,  0, "transition", 5],
-        [ 10, 410,  0, "block", 10,5, 8],
+        [ 10, 410,  0, "block", 10, 5, 8, "orange"],
         [ 10, 420,  0, "button_6mm"],
         [ 10, 435,  0, "microswitch", small_microswitch],
         //[ 10, 440,  0, "pcb"],
diff --git a/vitamins/pcb.scad b/vitamins/pcb.scad
index 537fdf8..cb65afa 100644
--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -758,6 +758,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "molex_hdr")) if(!cutouts) molex_254(comp[4]);
         if(show(comp, "jst_xh")) if(!cutouts) jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
         if(show(comp, "term254")) if(!cutouts) green_terminal(gt_2p54,comp[4], comp[5]);
+        if(show(comp, "gterm")) if(!cutouts) green_terminal(comp[4], comp[5], comp[6], param(7,"lime"));
         if(show(comp, "gterm35")) if(!cutouts) green_terminal(gt_3p5, comp[4], comp[5]);
         if(show(comp, "gterm635")) if(!cutouts) green_terminal(gt_6p35, comp[4], comp[5]);
         if(show(comp, "term35")) if(!cutouts) terminal_35(comp[4]);