Merge branch 'martinbudden-green_terminals'

readme.md

@@ -1048,10 +1048,12 @@ Parametric green terminal blocks
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `green_terminal(gt_6p35, 2)` |  Terminal block 2 way 0.25" |
-|   1 | `green_terminal(gt_5p08, 3)` |  Terminal block 3 way 0.2" |
-|   1 | `green_terminal(gt_3p5, 4)` |  Terminal block 4 way 3.5mm |
-|   1 | `green_terminal(gt_2p54, 5)` |  Terminal block 5 way 0.1" |
+|   1 | `green_terminal(gt_5x17, 2)` |  Terminal block 2 way 5mm |
+|   1 | `green_terminal(gt_5x11, 3)` |  Terminal block 3 way 5mm |
+|   1 | `green_terminal(gt_6p35, 4)` |  Terminal block 4 way 0.25" |
+|   1 | `green_terminal(gt_5p08, 5)` |  Terminal block 5 way 0.2" |
+|   1 | `green_terminal(gt_3p5, 6)` |  Terminal block 6 way 3.5mm |
+|   1 | `green_terminal(gt_2p54, 7)` |  Terminal block 7 way 0.1" |
 
 
 <a href="#top">Top</a>
@@ -2308,6 +2310,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(DuetE)` |  Duet 2 Ethernet electronics |
 |   1 | `pcb(Duex2)` |  Duex2 expansion board |
 |   1 | `pcb(Duex5)` |  Duex5 expansion board |
+|   1 | `pcb(ESP-01)` |  ESP-01 |
 |   1 | `pcb(EnviroPlus)` |  Enviro+ |
 |   1 | `pcb(ExtruderPCB)` |  Extruder connection PCB |
 |   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board |
@@ -2337,8 +2340,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   2 | `screw(M2p5_cap_screw, 20)` |  Screw M2.5 cap x 20mm |
 |   8 | `screw(M2p5_cap_screw, 25)` |  Screw M2.5 cap x 25mm |
 |   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
-|   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
 |  12 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
+|   4 | `screw(M2p5_pan_screw, 30)` |  Screw M2.5 pan x 30mm |
 |   4 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
 |   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
 |  12 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
@@ -2359,21 +2362,21 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer2070.stl |
 |   4 | pcb_spacer2080.stl |
 |   4 | pcb_spacer2090.stl |
-|   4 | pcb_spacer25110.stl |
 |   4 | pcb_spacer25120.stl |
 |   4 | pcb_spacer25130.stl |
-|   4 | pcb_spacer25140_2.stl |
+|   4 | pcb_spacer25140.stl |
 |   4 | pcb_spacer25150_2.stl |
 |   4 | pcb_spacer25160_2.stl |
-|   4 | pcb_spacer25190.stl |
+|   4 | pcb_spacer25170_2.stl |
 |   4 | pcb_spacer25200.stl |
-|   2 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30170.stl |
+|   4 | pcb_spacer25210.stl |
+|   2 | pcb_spacer2590.stl |
 |   4 | pcb_spacer30180.stl |
+|   4 | pcb_spacer30190.stl |
 |   4 | pcb_spacer3050.stl |
-|   4 | pcb_spacer40210.stl |
 |   4 | pcb_spacer40220.stl |
 |   4 | pcb_spacer40230.stl |
+|   4 | pcb_spacer40240.stl |
 
 
 <a href="#top">Top</a>

scripts/tests.py

@@ -56,7 +56,7 @@ def compare_images(a, b, c):
     with open(log_name, 'w') as output:
         do_cmd(("magick compare -metric AE -fuzz %d%% %s %s %s" % (fuzz, a, b, c)).split(), output = output)
     with open(log_name, 'r') as f:
-        pixels = int(f.read().strip())
+        pixels = int(float(f.read().strip()))
     os.remove(log_name)
     return pixels
 

vitamins/displays.scad

@@ -73,39 +73,54 @@ SSD1963_4p3 = ["SSD1963_4p3", "LCD display SSD1963 4.3\"", 105.5, 67.2, 3.4, SSD
         [[0, -34.5], [12, -31.5]],
         ];
 
+
+/* Dimensions taken from:
+https://github.com/bigtreetech/BIGTREETECH-TFT35-V3.0/blob/master/Hardware/TFT35%20V3.0-SIZE-TOP.pdf
+and
+https://github.com/bigtreetech/BIGTREETECH-TFT35-V3.0/blob/master/Hardware/TFT35%20V3.0-SIZE-BOT.pdf
+*/
+
 BigTreeTech_TFT35v3_0_PCB = ["", "",
-    110, 55.77, 1.6, 0, 3, 0, "green",  false,
-    [ [-3.12, 3.17], [-3.12, -3.17], [3.12, -3.17], [3.12, 3.17] ],
-    [
-        [  10, 7.5,    0, "-button_6mm" ],
-        [   9,  43,    0, "-buzzer", 5, 9 ],
-        [   9,  27,    0, "-potentiometer" ],
-        [ 102,28.82,   0, "uSD", [26.5, 16, 3] ],
-        [16.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [36.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [56.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [82.5,   4,    0, "jst_xh", 5 ],
-        [26.5, 52.8, 180, "jst_xh", 2 ],
-        [39.5, 52.8, 180, "jst_xh", 3 ],
-        [52.5, 52.8, 180, "jst_xh", 3 ],
-        [65.5, 52.8, 180, "jst_xh", 3 ],
-        [78.5, 52.8, 180, "jst_xh", 3 ],
-        [94.5, 52.8, 180, "jst_xh", 5 ],
-        [   8,  43,  180, "usb_A" ],
-        [  97,   4,    0, "chip", 9, 3.5, 1, grey(20) ],
-        // ESP-8266
-        [  23,  28,   90, "2p54socket", 4, 2 ],
+    110, 55.77, 1.6, // size
+     0, // corner radius
+     3, // mounting hole diameter
+     0, // pad around mounting hole
+    "green", // color
+    false, // true if parts should be separate BOM items
+    [ // hole positions
+         [-3.12, 3.17], [-3.12, -3.17], [3.12, -3.17], [3.12, 3.17]
     ],
-    []
+    [ // components
+        [                 9, -( 8.46 + 17.45)/2,    0, "-buzzer", 5, 9 ],
+        [                 9, -(23.76 + 34.94)/2,    0, "-potentiometer" ],
+        [  (6.84 + 12.85)/2, -(45.73 + 51.73)/2,    0, "-button_6mm" ],
+        [               102,  (15.57 + 42.07)/2,    0, "uSD", [26.5, 16, 3] ],
+        [                 8, -( 6.76 + 18.76)/2,  180, "usb_A" ],
+        [                23,  (23.32 + 33.64)/2,   90, "2p54socket", 4, 2 ], // ESP-8266
+
+        [ 16.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 36.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 56.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 82.5,   4,    0, "jst_xh", 5 ],
+        [ 26.5, 52.8, 180, "jst_xh", 2 ],
+        [ 39.5, 52.8, 180, "jst_xh", 3 ],
+        [ 52.5, 52.8, 180, "jst_xh", 3 ],
+        [ 65.5, 52.8, 180, "jst_xh", 3 ],
+        [ 78.5, 52.8, 180, "jst_xh", 3 ],
+        [ 94.5, 52.8, 180, "jst_xh", 5 ],
+        [ 97,    4,     0, "chip", 9, 3.5, 1, grey(20) ],
+    ],
+    [] // accessories
 ];
 
 BigTreeTech_TFT35v3_0 = ["BigTreeTech_TFT35v3_0", "BigTreeTech TFT35 v3.0",
-    84.5, 54.5, 4, BigTreeTech_TFT35v3_0_PCB,
-    [-6, 0, 0],                         // pcb offset
+    84.5, 54.5, 4,                      // size
+    BigTreeTech_TFT35v3_0_PCB,          // pcb
+    [7 - (110 - 84.5)/2, 0, 0],         // pcb offset from center
     [[-40, -26.5], [41.5, 26.5, 0.5]],  // aperture
-    [],                                 // touch screen
-    0,                                  // thread length
-    [],                                 // clearance need for the ts ribbon
+    [],                                 // touch screen position and size
+    0,                                  // length that studs protrude from the PCB holes
+    [],                                 // keep out region for ribbon cable
 ];
 
 

vitamins/green_terminals.scad

@@ -31,7 +31,9 @@ gt_2p54 = ["gt_2p54", 2.54,  6.6,   10, 3,    6, 0.4,  6.4, 1,    1,    0.2, 2,
 gt_3p5  = ["gt_3p5",  3.5,   7.3,  8.5, 4,    5, 0.4,  4,   0,    1.35, 0.4, 1.8, 2,   2,   0,   0,    0];
 gt_5p08 = ["gt_5p08", 5.08,  7.9,   10, 5.0,  7, 0.0,  6.8, 1.45, 1.95, 0.5, 4.0, 5.4, 0.5, 0,   0,    0];
 gt_6p35 = ["gt_6p35", 6.35, 12.6, 17.4, 6.8, 12, 0.4, 11,   2,    2.7,  0.8, 3.4, 4.2, 2,   1.8, 1.1, 21.4];
+gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,  1.5,  1,   2.5, 6,   0,   0,   0,    0];
+gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,    1.5,  1,   3,   6,   0,   0,   0,    0];
 
-green_terminals = [gt_2p54, gt_3p5, gt_5p08, gt_6p35];
+green_terminals = [gt_2p54, gt_3p5, gt_5p08, gt_6p35, gt_5x11, gt_5x17];
 
 use <green_terminal.scad>

vitamins/pcbs.scad

@@ -414,8 +414,33 @@ RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
     ],
     []];
 
+ESP_01 = [
+    "ESP-01", "ESP-01",
+    24.8, 14.6, 1, // size
+    0, // corner radius
+    0, // mounting hole diameter
+    0, // pad around mounting hole
+    grey(25), // color
+    false, // true if parts should be separate BOM items
+    [], // hole positions
+    [ // components
+        [   2.8,   -7.25, 0, "-2p54header", 2, 4 ],
+        [ -14.55, -11.3,  0, "chip", 5.25, 5.25, 2.25, grey(15) ],
+        [ -14,     -5.2,  0, "chip", 4.5,  4.75, 1.1,  grey(15) ],
+        // antenna
+        for (y = [ 2.8  : 2.3 : 7.4  ]) [ -0.7, -y,  0, "block", 0.7, 1.75, 0.1,  gold ],
+        for (y = [ 4    : 2.3 : 10.6 ]) [ -4.3, -y,  0, "block", 0.7, 1.75, 0.1,  gold ],
+        for (y = [ 3.4  : 2.3 : 10.1 ]) [ -2.5, -y,  0, "block", 4.3, 0.7,  0.1,  gold ],
+        for (y = [ 4.55 : 2.3 : 11.2 ]) [ -2.5, -y,  0, "block", 4.3, 0.7,  0.1,  gold ],
 
-pcbs = [MP1584EN, TP4056, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, DuetE, Duex2, Duex5];
+        [ -0.7, -10.85,  0, "block", 0.7,3.75,  0.1,  gold ],
+        [ -6.6,  -5.8,   0, "block", 0.7, 7.5,  0.1,  gold ],
+        [ -4.8,  -2.3,   0, "block", 8.8, 0.7,  0.1,  gold ],
+    ],
+    [] // accessories
+];
+
+pcbs = [MP1584EN, TP4056, ESP_01, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, DuetE, Duex2, Duex5];
 
 perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];