Added LIPO fuel gauge PCB.

Added SMD capacitors.
Can now put jst_ph connectors on PCBs
2025-09-03 12:22:46 +02:00 · 2021-06-08 08:09:08 +01:00 · 2021-06-08 08:08:35 +01:00 · 2021-06-07 17:32:23 +01:00 · 2021-06-07 17:31:44 +01:00 · 2021-06-07 12:23:29 +01:00
23 changed files with 309 additions and 115 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,20 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.


+#### [v15.16.1](https://github.com/nophead/NopSCADlib/releases/tag/v15.16.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.16.0...v15.16.1 "diff with v15.16.0")
+*   2021-06-04 [`9a4cc7e`](https://github.com/nophead/NopSCADlib/commit/9a4cc7ec42bf440e24ad3dacd88d7055736ae793 "show commit") [C.P.](# "Chris Palmer") Ziptie BOM entries no longer segregated by radius wrapped around.
+
+### [v15.16.0](https://github.com/nophead/NopSCADlib/releases/tag/v15.16.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v15.15.0...v15.16.0 "diff with v15.15.0")
+*   2021-06-04 [`a782d43`](https://github.com/nophead/NopSCADlib/commit/a782d43e67f4091f44bd9018817e7263e2944477 "show commit") [C.P.](# "Chris Palmer") `bom.py` now generates `bom.csv` to allow costed BOMs to be made using a spreadsheet.
+
+### [v15.15.0](https://github.com/nophead/NopSCADlib/releases/tag/v15.15.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v15.14.2...v15.15.0 "diff with v15.14.2")
+*   2021-06-03 [`823f3b9`](https://github.com/nophead/NopSCADlib/commit/823f3b936e6c33897445d3f3272b69237f013537 "show commit") [C.P.](# "Chris Palmer") Add the ability to have a target specific top level module in place of `main_assembly()`.
+
+#### [v15.14.2](https://github.com/nophead/NopSCADlib/releases/tag/v15.14.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.14.1...v15.14.2 "diff with v15.14.1")
+*   2021-06-02 [`749a1f0`](https://github.com/nophead/NopSCADlib/commit/749a1f0648196bd0ae47dbe93ac1b5e3a06d78cd "show commit") [C.P.](# "Chris Palmer") Fixed male thread z-fighting bug.
+
+*   2021-06-01 [`5c898df`](https://github.com/nophead/NopSCADlib/commit/5c898df2172a7e202c9e3d8c6641a0aaf95e5d48 "show commit") [C.P.](# "Chris Palmer") More readable code in `rounded_polygon`.
+
 #### [v15.14.1](https://github.com/nophead/NopSCADlib/releases/tag/v15.14.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.14.0...v15.14.1 "diff with v15.14.0")
 *   2021-06-01 [`20d799a`](https://github.com/nophead/NopSCADlib/commit/20d799a3c115d3d32f101c4419d6e9b57c3be8c7 "show commit") [C.P.](# "Chris Palmer") `IEC_320_C14_switched_fused_inlet` now shows the correct object name in the example.

--- a/docs/usage.md
+++ b/docs/usage.md
@@ -270,6 +270,22 @@ The target config file is selected by generating `target.scad` that includes `co
 The rest of the project includes `target.scad` to use the configuration.
 Additionally all the generated file directories (assemblies, bom, stls, dxfs, etc.) are placed in a sub-directory called `<target_name>`.

+The build system will look for a `<target_name>_assembly` module and use it as the top level module instead of `main_assembly` if it it exists.
+That allows the project description to be target specific if the top level modules are in different scad files.
+The top level assembly instructions and assembly contents could also be different if appropriate.
+
+If the top level module is just a shell wrapper that simply includes one other assembly, with no additional parts, then it is removed from the build instructions and
+the assembly it calls becomes the top level. This allows a different project description for each target but only one set of top level instructions without repeating them.
+
+### Costed BOMs
+
+A costed bill of materials can be made by opening the generated file `bom/bom.csv` in a spreadsheet program using a single quote as the string delimiter and comma as the field separator.
+That gets a list of part descriptions and quantities to which prices can be added to get the total cost and perhaps a URL of where to buy each part.
+
+If a Python file called `parts.py` is found then `bom.py` will attempt to call functions for each part to get a price and URL.
+Any functions not found are printed, so you can see the format expected.
+The function are passed the quantity to allow them to calculate volume discounts, etc.
+
 ### Other libraries

 The build scripts need to be able to locate the source files where the modules to generate the STL files and assemblies reside. They will search all the scad files
--- a/examples/MainsBreakOutBox/bom/bom.csv
+++ b/examples/MainsBreakOutBox/bom/bom.csv
@@ -0,0 +1,16 @@
+'Ferrule for 1.5mm^2 wire - not shown',  3
+'Wire blue 30/0.25mm strands, length 150mm - not shown',  2
+'Wire brown 30/0.25mm strands, length 150mm - not shown',  2
+'Wire green & yellow 30/0.25mm strands, length 150mm - not shown',  2
+'IEC inlet for ATX',  1
+'Heatfit insert M3',  2
+'4mm shielded jack socket blue',  2
+'4mm shielded jack socket brown',  1
+'4mm shielded jack socket green',  2
+'Mains socket 13A',  1
+'Nut M3 x 2.4mm nyloc',  6
+'Screw M3 cs cap x 12mm',  2
+'Screw M3 cs cap x 20mm',  2
+'Screw M3 dome x 10mm',  4
+'Heatshrink sleeving ID 3.2mm x 15mm - not shown',  8
+'Washer  M3 x 7mm x 0.5mm', 10
--- a/global_defs.scad
+++ b/global_defs.scad
@@ -54,9 +54,10 @@ $fs = extrusion_width / 2;
 function round_to_layer(z) = ceil(z / layer_height) * layer_height;
 // Some additional named colours
 function grey(n) = [0.01, 0.01, 0.01] * n;                                          //! Generate a shade of grey to pass to color().
-gold                            = [255/255, 215/255, 0/255];
-brass                           = [255/255, 220/255, 100/255];
 silver                          = [0.75, 0.75, 0.75];
+gold                            = [255, 215,   0] / 255;
+brass                           = [255, 220, 100] / 255;
+copper                          = [230, 140,  51] / 255;

 /*
 * Enums
--- a/libtest.png
+++ b/libtest.png
--- a/readme.md
+++ b/readme.md
@@ -1303,7 +1303,7 @@ Needs updating as mostly obsolete versions.
 |   1 |  |  Tape self amalgamating silicone 110mm x 25mm |
 |   1 | `resistor(Epcos)` |  Thermistor Epcos B57560G104F 100K 1% - not shown |
 |   2 |  |  Wire Red PTFE 16/0.2mm strands, length 170mm |
-|   4 | `ziptie(small_ziptie, 8)` |  Ziptie 2.5mm x 100mm min length |
+|   4 | `ziptie(small_ziptie)` |  Ziptie 2.5mm x 100mm min length |


 <a href="#top">Top</a>
@@ -2249,7 +2249,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `pcb_accessories(type)` | List of accessories to go on the BOM, SD cards, USB cables, etc. |
 | `pcb_colour(type)` | Colour of the subtrate |
 | `pcb_components(type)` | List of components |
-| `pcb_grid(type)` | Grid if a perfboard |
+| `pcb_grid(type)` | Grid origin if a perfboard |
 | `pcb_hole_d(type)` | Mounting hole diameter |
 | `pcb_holes(type)` | List of hole positions |
 | `pcb_land_d(type)` | Pad around mounting hole |
@@ -2386,7 +2386,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `pcb_accessories(type)` | List of accessories to go on the BOM, SD cards, USB cables, etc. |
 | `pcb_colour(type)` | Colour of the subtrate |
 | `pcb_components(type)` | List of components |
-| `pcb_grid(type)` | Grid if a perfboard |
+| `pcb_grid(type)` | Grid origin if a perfboard |
 | `pcb_hole_d(type)` | Mounting hole diameter |
 | `pcb_holes(type)` | List of hole positions |
 | `pcb_land_d(type)` | Pad around mounting hole |
@@ -2461,6 +2461,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(EnviroPlus)` |  Enviro+ |
 |   1 | `pcb(ExtruderPCB)` |  Extruder connection PCB |
 |   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 |
 |   1 | `pcb(MT3608)` |  MT3608 boost converter module |
 |   1 | `pcb(Melzi)` |  Melzi electronics - not shown |
@@ -2470,13 +2471,14 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(3)` |  Molex KK header 3 way |
 |  16 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  30 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  22 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  26 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 |
 |   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
 |   1 | `pcb(PERF60x40)` |  Perfboard 60 x 40mm |
 |   1 | `pcb(PERF70x30)` |  Perfboard 70 x 30mm |
 |   1 | `pcb(PERF70x50)` |  Perfboard 70 x 50mm |
+|   1 | `pcb(PERF70x51)` |  Perfboard 70 x 51mm |
 |   1 | `pcb(PERF74x51)` |  Perfboard 74 x 51mm |
 |   1 | `pcb(PERF80x20)` |  Perfboard 80 x 20mm |
 |   1 | `pin_socket(2p54header, 13, 2, right_angle = true)` |  Pin socket 13 x 2 right_angle |
@@ -2484,16 +2486,18 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(RPI3)` |  Raspberry Pi 3 |
 |   1 | `pcb(RPI4)` |  Raspberry Pi 4 |
 |   1 | `pcb(RPI0)` |  Raspberry Pi Zero |
-|  12 | `screw(M2_cap_screw, 16)` |  Screw M2 cap x 16mm |
-|   4 | `screw(M2_cap_screw, 20)` |  Screw M2 cap x 20mm |
-|   2 | `screw(M2p5_cap_screw, 20)` |  Screw M2.5 cap x 20mm |
+|   8 | `screw(M2_cap_screw, 16)` |  Screw M2 cap x 16mm |
+|   8 | `screw(M2_cap_screw, 20)` |  Screw M2 cap x 20mm |
+|   2 | `screw(M2p5_cap_screw, 16)` |  Screw M2.5 cap x 16mm |
+|   8 | `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 |
-|  12 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
-|   4 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
-|   9 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
-|   9 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
+|   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
+|   8 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
+|   8 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
+|   4 | `screw(M3_cap_screw, 25)` |  Screw M3 cap x 25mm |
+|  14 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
 |   8 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
+|   1 | `pcb(XIAO)` |  Seeeduino XIAO |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm |
 |   2 | `green_terminal(gt_2p54, 4)` |  Terminal block 4 way 0.1" |
@@ -2501,32 +2505,33 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  16 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  30 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  22 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  26 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |

 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   4 | pcb_spacer2060.stl |
+|   4 | pcb_spacer20100.stl |
 |   4 | pcb_spacer2070.stl |
 |   4 | pcb_spacer2080.stl |
 |   4 | pcb_spacer2090.stl |
-|   4 | pcb_spacer25120.stl |
-|   4 | pcb_spacer25130.stl |
-|   4 | pcb_spacer25140.stl |
-|   4 | pcb_spacer25150_2.stl |
-|   4 | pcb_spacer25160_2.stl |
-|   4 | pcb_spacer25180.stl |
-|   4 | pcb_spacer25190.stl |
-|   2 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30170.stl |
-|   5 | pcb_spacer30200.stl |
-|   5 | pcb_spacer30210.stl |
-|   4 | pcb_spacer30220.stl |
+|   4 | pcb_spacer25100.stl |
+|   4 | pcb_spacer25110.stl |
+|   4 | pcb_spacer25120_2.stl |
+|   4 | pcb_spacer25130_2.stl |
+|   4 | pcb_spacer25150.stl |
+|   4 | pcb_spacer25160.stl |
+|   2 | pcb_spacer2550.stl |
+|   4 | pcb_spacer2590.stl |
+|   4 | pcb_spacer30140.stl |
+|   5 | pcb_spacer30170.stl |
+|   5 | pcb_spacer30180.stl |
+|   4 | pcb_spacer30190.stl |
 |   4 | pcb_spacer3050.stl |
-|   4 | pcb_spacer40230.stl |
-|   4 | pcb_spacer40240.stl |
+|   4 | pcb_spacer3060.stl |
+|   4 | pcb_spacer40200.stl |
+|   4 | pcb_spacer40210.stl |


 <a href="#top">Top</a>
@@ -3383,6 +3388,8 @@ Surface mount components for PCBs.
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| `smd_cap_end_cap(type)` | End cap width |
+| `smd_cap_size(type)` | Body length, width |
 | `smd_led_lens(type)` | Lens length width and height |
 | `smd_led_size(type)` | Body length, width and height |
 | `smd_res_end_cap(type)` | End cap width |
@@ -3399,6 +3406,7 @@ Surface mount components for PCBs.
 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `smd_capacitor(type, height)` | Draw an SMD capacitor with specified height |
 | `smd_led(type, colour, cutout)` | Draw an SMD LED with specified `colour` |
 | `smd_resistor(type, value)` | Draw an SMD resistor with specified value |

@@ -3409,6 +3417,9 @@ Surface mount components for PCBs.
 | ---:|:--- |:---|
 |   1 | `smd_led(LED0603, green)` |  SMD LED 0603 green |
 |   1 | `smd_led(LED0805, blue)` |  SMD LED 0805 blue |
+|   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 |
+|   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 |
+|   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 |
 |   1 | `smd_resistor(RES0603, 1R0)` |  SMD resistor 0603 1R0 0.1W |
 |   1 | `smd_resistor(RES0805, 10M)` |  SMD resistor 0805 10M 0.125W |
 |   1 | `smd_resistor(RES1206, 100K)` |  SMD resistor 1206 100K 0.25W |
@@ -4111,7 +4122,7 @@ Just a BOM entry at the moment and cable bundle size functions for holes, plus c
 |   1 |  |  Wire orange 7/0.2mm strands, length 90mm |
 |   1 |  |  Wire red 7/0.2mm strands, length 90mm |
 |   1 |  |  Wire yellow 7/0.2mm strands, length 90mm |
-|   1 | `ziptie(small_ziptie, 2.1)` |  Ziptie 2.5mm x 100mm min length |
+|   1 | `ziptie(small_ziptie)` |  Ziptie 2.5mm x 100mm min length |


 <a href="#top">Top</a>
@@ -4139,16 +4150,16 @@ Cable zipties.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `ziptie(type, r, t = 0)` | Draw specified ziptie wrapped around radius `r` and optionally through panel thickness `t` |
+| `ziptie(type, r = 5, t = 0)` | Draw specified ziptie wrapped around radius `r` and optionally through panel thickness `t` |

 ![zipties](tests/png/zipties.png)

 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `ziptie(small_ziptie, 5)` |  Ziptie 2.5mm x 100mm min length |
-|   1 | `ziptie(ziptie_3p6mm, 5)` |  Ziptie 3.6mm x 100mm min length |
-|   1 | `ziptie(ziptie_3mm, 5)` |  Ziptie 3mm x 100mm min length |
+|   1 | `ziptie(small_ziptie)` |  Ziptie 2.5mm x 100mm min length |
+|   1 | `ziptie(ziptie_3p6mm)` |  Ziptie 3.6mm x 100mm min length |
+|   1 | `ziptie(ziptie_3mm)` |  Ziptie 3mm x 100mm min length |


 <a href="#top">Top</a>
@@ -5358,7 +5369,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 |   6 | `screw(M3_cap_screw, 10)` |  Screw M3 cap x 10mm |
 |   6 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   6 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
-|   3 | `ziptie(small_ziptie, 3)` |  Ziptie 2.5mm x 100mm min length |
+|   3 | `ziptie(small_ziptie)` |  Ziptie 2.5mm x 100mm min length |

 ### Printed
 | Qty | Filename |
@@ -5560,7 +5571,7 @@ The STL and assembly must be given a name and parameterless wrappers for the stl
 |   4 | `screw(M3_cap_screw, 10)` |  Screw M3 cap x 10mm |
 |   4 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   4 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
-|   4 | `ziptie(small_ziptie, 3)` |  Ziptie 2.5mm x 100mm min length |
+|   4 | `ziptie(small_ziptie)` |  Ziptie 2.5mm x 100mm min length |

 ### Printed
 | Qty | Filename |
--- a/scripts/bom.py
+++ b/scripts/bom.py
@@ -31,6 +31,12 @@ from set_config import *
 import json
 import re

+try:
+    import parts
+    got_parts_py = True
+except:
+    got_parts_py = False
+
 def find_scad_file(mname):
    for filename in os.listdir(source_dir):
        if filename[-5:] == ".scad":
@@ -46,6 +52,18 @@ def find_scad_file(mname):
                            return filename
    return None

+def main_assembly(target):
+    file = None
+    if target:
+        assembly = target + "_assembly"
+        file = find_scad_file(assembly)
+    if not file:
+        assembly = "main_assembly"
+        file = find_scad_file(assembly)
+    if not file:
+        raise Exception("can't find source for " + assembly)
+    return assembly, file
+
 class Part:
    def __init__(self, args):
        self.count = 1
@@ -117,6 +135,33 @@ class BOM:
            return ass
        return ass.replace("assembly", "assemblies")

+    def print_CSV(self,  file = None):
+        i = 0
+        for part in sorted(self.vitamins):
+            i += 1
+            if ': ' in part:
+                part_no, description = part.split(': ')
+            else:
+                part_no, description = "", part
+            qty = self.vitamins[part].count
+            if got_parts_py:
+                match = re.match(r'^.*\((.*?)[,\)].*$', part_no)
+                if match and not match.group(1).startswith('"'):
+                    part_no = part_no.replace('(' + match.group(1), '_' + match.group(1) + '(').replace('(, ', '(')
+                func = 'parts.' + part_no.replace('(', '(%d, ' % qty).replace(', )', ')')
+                func = func.replace('true',  'True').replace('false', 'False').replace('undef', 'None')
+                try:
+                    price, url = eval(func)
+                    print("'%s',%3d,%.2f,'=B%d*C%d',%s" % (description, qty, price, i, i, url), file=file)
+                except:
+                    if part_no:
+                        print("%s not found in parts.py" % func)
+                    print("'%s',%3d" % (description, qty), file=file)
+            else:
+                print("'%s',%3d" % (description, qty), file=file)
+        if got_parts_py:
+            print(",'=SUM(B1:B%d)',,'=SUM(D1:D%d)'" %(i, i), file=file)
+
    def print_bom(self, breakdown, file = None):
        if self.vitamins:
            print("Vitamins:", file=file)
@@ -221,28 +266,20 @@ def parse_bom(file = "openscad.log", name = None):
    return main

 def usage():
-    print("\nusage:\n\tbom [target_config] [<accessory_name>_assembly] - Generate BOMs for a project or an accessory to a project.")
+    print("\nusage:\n\tbom [target_config] - Generate BOMs for a project.")
    sys.exit(1)

-def boms(target = None, assembly = None):
+def boms(target = None):
    try:
        bom_dir = set_config(target, usage) + "bom"
-        if assembly:
-            bom_dir += "/accessories"
-            if not os.path.isdir(bom_dir):
-                os.makedirs(bom_dir)
-        else:
-            assembly = "main_assembly"
-            if os.path.isdir(bom_dir):
-                shutil.rmtree(bom_dir)
-                sleep(0.1)
-            os.makedirs(bom_dir)
+        if os.path.isdir(bom_dir):
+            shutil.rmtree(bom_dir)
+            sleep(0.1)
+        os.makedirs(bom_dir)
        #
-        # Find the scad file that makes the module
+        # Find the scad file that makes the main assembly
        #
-        scad_file = find_scad_file(assembly)
-        if not scad_file:
-            raise Exception("can't find source for " + assembly)
+        assembly, scad_file = main_assembly(target)
        #
        # make a file to use the module
        #
@@ -259,8 +296,9 @@ def boms(target = None, assembly = None):

        main = parse_bom("openscad.echo", assembly)

-        if assembly == "main_assembly":
-            main.print_bom(True, open(bom_dir + "/bom.txt","wt"))
+        main.print_bom(True, open(bom_dir + "/bom.txt","wt"))
+
+        main.print_CSV(open(bom_dir + "/bom.csv","wt"))

        for ass in main.assemblies:
            with open(bom_dir + "/" + ass + ".txt", "wt") as f:
@@ -278,20 +316,8 @@ def boms(target = None, assembly = None):
        sys.exit(1)

 if __name__ == '__main__':
-    if len(sys.argv) > 3: usage()
+    if len(sys.argv) > 2: usage()

-    if len(sys.argv) == 3:
-        target, assembly = sys.argv[1], sys.argv[2]
-    else:
-        if len(sys.argv) == 2:
-            if sys.argv[1][-9:] == "_assembly":
-                target, assembly = None, sys.argv[1]
-            else:
-                target, assembly = sys.argv[1], None
-        else:
-            target, assembly = None, None
+    target = sys.argv[1] if len(sys.argv) == 2 else None

-    if assembly:
-        if assembly[-9:] != "_assembly": usage()
-
-    boms(target, assembly)
+    boms(target)
--- a/scripts/views.py
+++ b/scripts/views.py
@@ -77,7 +77,7 @@ def bom_to_assemblies(bom_dir, bounds_map):
    #
    if flat_bom:
        ass = flat_bom[-1]
-        if len(ass["assemblies"]) < 2 and not ass["vitamins"] and not ass["printed"] and not ass["routed"]:
+        if len(ass["assemblies"]) == 1 and not ass["vitamins"] and not ass["printed"] and not ass["routed"]:
            flat_bom = flat_bom[:-1]
    return [assembly["name"] for  assembly in flat_bom]

@@ -161,6 +161,7 @@ def views(target, do_assemblies = None):
    # Find all the scad files
    #
    main_blurb = None
+    main_assembly, main_file = bom.main_assembly(target)
    pngs = []
    for dir in source_dirs(bom_dir):
        if os.path.isdir(dir):
@@ -232,7 +233,7 @@ def views(target, do_assemblies = None):
                                                update_image(tmp_name, tn_name)
                                    done_assemblies.append(real_name)
                                else:
-                                    if module == 'main_assembly':
+                                    if module == main_assembly:
                                        main_blurb = blurb.scrape_module_blurb(lines[:line_no])
                        line_no += 1
    #
@@ -246,9 +247,6 @@ def views(target, do_assemblies = None):
        project = ' '.join(word[0].upper() + word[1:] for word in os.path.basename(os.getcwd()).split('_'))
        print('<a name="TOP"></a>', file = doc_file)
        print('# %s' % project, file = doc_file)
-        main_file = bom.find_scad_file('main_assembly')
-        if not main_file:
-            raise Exception("can't find source for main_assembly")
        text = blurb.scrape_blurb(source_dir + '/' + main_file)
        blurbs = blurb.split_blurb(text)
        if len(text):
--- a/tests/PCBs.scad
+++ b/tests/PCBs.scad
@@ -29,7 +29,12 @@ module pcbs() {
            rotate(90)
                pcb_assembly(pcbs[$i], 5 + $i, 3);

-    translate([0, 110])
+    translate([0, 45])
+        layout([for(p = tiny_pcbs) pcb_length(p)], 3)
+            translate([0, pcb_width(tiny_pcbs[$i]) / 2])
+                 pcb_assembly(tiny_pcbs[$i], 5 + $i, 3);
+
+    translate([0, 120])
        layout([for(p = perfboards) pcb_length(p)], 10)
            translate([0, -pcb_width(perfboards[$i]) / 2])
                pcb_assembly(perfboards[$i], 5 + $i, 3);
--- a/tests/SMDs.scad
+++ b/tests/SMDs.scad
@@ -28,6 +28,11 @@ module smds() {
    translate([0, 3])
        layout([for(l = smd_leds) smd_led_size(l).x], 1)
            smd_led(smd_leds[$i], ["green", "blue", "red"][$i % 3]);
+
+    translate([0, 6])
+        layout([for(c = smd_capacitors) smd_cap_size(c).x], 1)
+            let(c = smd_capacitors[$i])
+                smd_capacitor(c, smd_cap_size(c).y * 0.8);
 }

 if($preview)
--- a/tests/png/axials.png
+++ b/tests/png/axials.png
--- a/tests/png/displays.png
+++ b/tests/png/displays.png
--- a/tests/png/pcb.png
+++ b/tests/png/pcb.png
--- a/tests/png/pcbs.png
+++ b/tests/png/pcbs.png
--- a/tests/png/smds.png
+++ b/tests/png/smds.png
--- a/tests/png/veroboard.png
+++ b/tests/png/veroboard.png
--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -50,7 +50,7 @@ function pcb_parts_on_bom(type) = type[9];  //! True if the parts should be sepa
 function pcb_holes(type)        = type[10]; //! List of hole positions
 function pcb_components(type)   = type[11]; //! List of components
 function pcb_accessories(type)  = type[12]; //! List of accessories to go on the BOM, SD cards, USB cables, etc.
-function pcb_grid(type)         = type[13]; //! Grid if a perfboard
+function pcb_grid(type)         = type[13]; //! Grid origin if a perfboard
 function pcb_polygon(type)      = type[14]; //! Optional outline polygon for odd shaped boards
 function pcb_screw(type, cap = hs_cap) = Len(type[15]) ? type[15] : find_screw(cap, screw_smaller_than(pcb_hole_d(type))); //! Mounting screw type
 function pcb_size(type) = [pcb_length(type), pcb_width(type), pcb_thickness(type)]; //! Length, width and thickness in a vector
@@ -919,6 +919,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
    rotate(comp.z) {
        // Components that have a cutout parameter go in this section
        if(show(comp, "2p54header"))    pin_header(2p54header, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
+        if(show(comp, "2p54joiner"))    pin_header(2p54joiner, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
        if(show(comp, "2p54boxhdr"))    box_header(2p54header, comp[4], comp[5], param(6, false), cutouts);
        if(show(comp, "2p54socket"))    pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
        if(show(comp, "chip"))          chip(comp[4], comp[5], comp[6], param(7, grey(30)), cutouts);
@@ -954,16 +955,18 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
            if(show(comp, "gterm635"))      green_terminal(gt_6p35, comp[4], comp[5], param(6,"lime"));
            if(show(comp, "term35"))        terminal_35(comp[4], param(5,"blue"));
            if(show(comp, "transition"))    idc_transition(2p54header, comp[4], comp[5]);
-            if(show(comp, "led"))           led(comp[4], comp[5], 2.6);
+            if(show(comp, "led"))           translate_z(eps) led(comp[4], comp[5], 2.6);
            if(show(comp, "pdip"))          pdip(comp[4], comp[5], param(6, false), param(7, inch(0.3)));
            if(show(comp, "ax_res"))        ax_res(comp[4], comp[5], param(6, 5), param(7, 0));
            if(show(comp, "link"))          wire_link(l = comp[4], h = param(5, 1), d = param(6, 0.8), tail = param(7, 3));
            if(show(comp, "D_plug"))        translate_z(d_pcb_offset(comp[4])) d_plug(comp[4], pcb = true);
            if(show(comp, "molex_hdr"))     molex_254(comp[4]);
            if(show(comp, "jst_xh"))        jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
+            if(show(comp, "jst_ph"))        jst_xh_header(jst_ph_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
            if(show(comp, "potentiometer")) potentiometer(param(4, 5), param(5, 9));
            if(show(comp, "buzzer"))        buzzer(param(4, 9), param(5, 12), param(6, grey(20)));
            if(show(comp, "smd_res"))       smd_resistor(comp[4], comp[5]);
+            if(show(comp, "smd_cap"))       smd_capacitor(comp[4], comp[5]);
        }
    }
 }
@@ -1018,44 +1021,64 @@ module pcb_grid_positions(type) {
 module pcb(type) { //! Draw specified PCB
    grid = pcb_grid(type);
    t = pcb_thickness(type);
+    w = pcb_width(type);
+    l = pcb_length(type);
+
+    module pcb_shape()
+        if(Len(pcb_polygon(type)))
+            polygon(pcb_polygon(type));
+        else
+            rounded_square([l, w], r = pcb_radius(type));
+
    if(pcb_name(type))
        vitamin(str("pcb(", type[0], "): ", pcb_name(type)));

    for(part = pcb_accessories(type))
        vitamin(part);

-    color(pcb_colour(type)) linear_extrude(t) difference() {
-        if(Len(pcb_polygon(type)))
-            polygon(pcb_polygon(type));
-        else
-            rounded_square([pcb_length(type), pcb_width(type)], r = pcb_radius(type));
+    color(pcb_colour(type))
+        linear_extrude(t)
+            difference() {
+                pcb_shape();

-        pcb_hole_positions(type)
-            circle(d = pcb_hole_d(type) + eps);
+                pcb_hole_positions(type)
+                    offset(eps)
+                        circle4n(d = pcb_hole_d(type));

-        if(Len(grid))
-            pcb_grid_positions(type)
-                circle(d = 1 + eps);
-    }
+                if(Len(grid))
+                    pcb_grid_positions(type)
+                        circle(d = 1 + eps);
+            }

    land = pcb_land_d(type);
+    land_r = Len(land) > 2 ? land[2] : 0;
    hole = pcb_hole_d(type);
-    color("silver")
+    plating = 0.1;
+    color(Len(land) > 3 ? land[3] : silver)
        translate_z(t / 2)
-            pcb_hole_positions(type)
-                if(is_list(land))
-                    linear_extrude(t + 2 * eps, center = true)
-                        difference() {
-                            square(land, center = true);
+            linear_extrude(t + 2 * plating, center = true)
+                difference() {
+                    intersection() {
+                        pcb_hole_positions(type)
+                            if(is_list(land)) {
+                                p = pcb_holes(type)[$i];  // If edge SMT pad then make it rectangular to overlap without gaps
+                                edge = abs(p.x) < eps || abs(p.x - l) < eps || abs(p.y) < eps || abs(p.y - w) < eps;
+                                rounded_square([land.x, land.y], edge ? 0 : land_r);
+                            }
+                            else
+                                circle(d = max(land, 1));

-                            circle(d = hole);
-                        }
-                else
-                    tube(or =  max(land, 1) / 2, ir = hole / 2, h = t + 2 * eps);
+                        offset(eps)
+                            pcb_shape();   // Handle half holes on the edge of PCBs such as ESP8266
+                    }
+
+                    pcb_hole_positions(type)
+                        circle4n(d = hole);
+                }

    fr4 = pcb_colour(type) != "sienna";
-    plating = 0.15;
-    color(pcb_colour(type) == "green" ? "silver" : "gold")
+    pcb_colour = pcb_colour(type);
+    color(pcb_colour == "green" ? silver : pcb_colour == "sienna" ? copper : gold)
        translate_z(-plating)
            linear_extrude(fr4 ? t + 2 * plating : plating)
                if(Len(grid)) {
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -705,6 +705,8 @@ PERF70x30 = ["PERF70x30", "Perfboard 70 x 30mm", 70, 30, 1.6, 0, 2.3, 0, "green"

 PERF60x40 = ["PERF60x40", "Perfboard 60 x 40mm", 60, 40, 1.6, 0, 2.3, 0, "green", true, [[2,2],[-2,2],[2,-2],[-2,-2]], [], [], [5.87, 3.49]];

+PERF70x51 = ["PERF70x51", "Perfboard 70 x 51mm", 70, 51, 1.0, 0, 3.0, 0, "sienna", true, [[3.0, 5.25], [-3.0, 5.25], [3.0, -5.25], [-3.0, -5.25]], [], [], [5.79, 3.91]];
+
 PERF74x51 = ["PERF74x51", "Perfboard 74 x 51mm", 74, 51, 1.0, 0, 3.0, 0, "sienna", true, [[3.0, 3.5], [-3.0, 3.5], [3.0, -3.5], [-3.0, -3.5]], [], [], [9.5, 4.5]];

 PSU12V1A = ["PSU12V1A", "PSU 12V 1A", 67, 31, 1.7, 0, 3.9, 0, "green", true, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]], [], []];
@@ -747,10 +749,59 @@ ESP_01 = [
    [] // accessories
 ];

-pcbs = [MP1584EN, TP4056, ESP_01, RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+XIAO = [
+    "XIAO", "Seeeduino XIAO",
+    21, 18, 1.2, // Size
+    1.5, // corner radius
+    0.8, // mounting hole diameter
+    [2, 2.6, 1- eps, gold], // pad around mounting hole
+    grey(25), // color
+    false, // true if parts should be separate BOM items
+    [for(x = [0:6], y = [-1,1]) [x * 2.54 + 2.71, y * 3 * 2.54 + 9], // Inboard hole positions
+     for(x = [0:6], y = [-1,1]) [x * 2.54 + 2.71, y * 9 + 9]],       // Hole positions on the edge, pad overlaps the inboard holes
+    [ // components
+        [7.6, 9, 0, "block", 12.3, 12, 2.41, silver], // can
+        [21 + 1.76 - 7.35 / 2, 9, 0, "usb_C"],
+    ],
+    [] // accessories
+];
+
+LIPO_fuel_gauge = [
+    "LIPO_fuel_gauge", "LIPO fuel gauge",
+    24, 10, 1.6, // Size
+    0, // corner radius
+    1, // mounting hole diameter
+    1.8, // pad around mounting hole
+    "red", // color
+    false, // true if parts should be separate BOM items
+    [for(x = [0:2], y = [-1,1]) [x * 2.54 + 5.27, y * 1.5 * 2.54 + 5],
+     for(x = 3,     y = [-1,1]) [x * 2.54 + 5.27, y * 0.5 * 2.54 + 5]],
+    [ // components
+        [17, 5, 90, "jst_ph", 2, true],
+        [2.54 + 5.27,  1.5 * 2.54 + 5, 0, "-2p54joiner", 3, 1],
+        [2.54 + 5.27, -1.5 * 2.54 + 5, 0, "-2p54joiner", 3, 1],
+        [3 * 2.54 + 5.27, 5,           0, "-2p54joiner", 1, 2],
+        [6.4 + 1.5, 5, 0, "chip", 3, 2, 0.8],
+        [1.2,  2.5, 90, "smd_res", RES0603, "472"],
+        [2.4,  2.5, 90, "smd_res", RES0603, "472"],
+        [1.2, -2.5, 90, "smd_res", RES0603, "472"],
+        [2.4, -2.5, 90, "smd_res", RES0603, "472"],
+
+        [10.35, -4, -90, "smd_res", RES0603, "181"],
+        [10.35,  4, -90, "smd_res", RES0603, "102"],
+
+        [12.89, 1.5 * 2.54 + 5, 0, "smd_cap", CAP0603, 0.85],
+        [12.89,-1.5 * 2.54 + 5, 0, "smd_cap", CAP0603, 0.85],
+   ],
+    [] // accessories
+];
+
+tiny_pcbs = [XIAO, MP1584EN, TP4056, ESP_01, LIPO_fuel_gauge];
+
+pcbs = [RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];

 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1];

-perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];
+perfboards = [PERF74x51, PERF70x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];

 use <pcb.scad>
--- a/vitamins/pin_headers.scad
+++ b/vitamins/pin_headers.scad
@@ -17,16 +17,18 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //

-//                               p     p     b    p     p       b         s    b                 b    p      r     r
-//                               i     i     e    i     i       a         o    o                 o    i      a     a
-//                               t     n     l    n     n       s         c    x                 x    n
-//                               c           o                  e         k                                  b     h
-//                               h     l     w    w     c                      s                 t    y
-//                                                              c         h    z                             o
+//                               p     p     b    p      p          b     s    b                 b    p      r   r
+//                               i     i     e    i      i          a     o    o                 o    i      a   a
+//                               t     n     l    n      n          s     c    x                 x    n
+//                               c           o                      e     k                                  b   h
+//                               h     l     w    w      c                     s                 t    y
+//                                                                  c     h    z                             o
 //                                                                                                           f
-2p54header    = ["2p54header",   2.54, 11.6, 3.2, 0.66, "gold", grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ];
-jst_xh_header = ["jst_xh_header",2.5,  10,   3.4, 0.64, "gold", grey(90), 0,   [4.9, 5.75, 7],   0.8, 0.525, 0.6,  6.1];
-jst_ph_header = ["jst_ph_header",2.0,   9,   3.4, 0.64, silver, grey(90), 0,   [3.9, 4.5,  6],   0.6, 0.55,  0.25, 4.8];
+2p54header  = ["2p54header",   2.54, 11.6, 3.2, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ];
+2p54joiner =  ["2p54joiner",   2.54, 6.86, 2.5, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ]; // Cropped pins for joining PCBs
+
+jst_xh_header = ["jst_xh_header",2.5,  10, 3.4, 0.64, gold,   grey(90), 0,   [4.9, 5.75, 7],   0.8, 0.525, 0.6,  6.1];
+jst_ph_header = ["jst_ph_header",2.0,   9, 3.4, 0.64, silver, grey(90), 0,   [3.9, 4.5,  6],   0.6, 0.55,  0.25, 4.8];

 pin_headers = [ 2p54header ];

--- a/vitamins/smd.scad
+++ b/vitamins/smd.scad
@@ -109,3 +109,23 @@ module smd_resistor(type, value) { //! Draw an SMD resistor with specified value
                resize([(size.x - 2 * cap) * 0.75, size.y / 2])
                    text(value, halign = "center", valign = "center");
 }
+
+function smd_cap_size(type)    = type[1]; //! Body length, width
+function smd_cap_end_cap(type) = type[2]; //! End cap width
+
+module smd_capacitor(type, height) { //! Draw an SMD capacitor with specified height
+    size = smd_cap_size(type);
+    vitamin(str("smd_capacitor(", type[0], "): SMD capacitor ", smd_size(size)));
+
+    cap = smd_cap_end_cap(type);
+
+    t = 0.02;
+    color("tan")
+        translate_z(height / 2)
+            cube([size.x - 2 * cap, size.y - 2 * t, height - 2 * t], center = true);
+
+    color(silver)
+        for(end = [-1, 1])
+            translate([end * (size.x / 2 - cap / 2), 0, height / 2])
+                cube([cap, size.y - 2 * eps, height], center = true);
+}
--- a/vitamins/smds.scad
+++ b/vitamins/smds.scad
@@ -32,4 +32,10 @@ RES1206 = ["RES1206", [3.1, 1.6, 0.6],  0.5, 1/4];

 smd_resistors = [RES0603, RES0805, RES1206];

+CAP0603 = ["CAP0603", [1.6, 0.8], 0.3];
+CAP0805 = ["CAP0805", [2.0, 1.2], 0.4];
+CAP1206 = ["CAP1206", [3.1, 1.6], 0.5];
+
+smd_capacitors = [CAP0603, CAP0805, CAP1206];
+
 use <smd.scad>
--- a/vitamins/veroboard.scad
+++ b/vitamins/veroboard.scad
@@ -83,7 +83,7 @@ module veroboard(type) { //! Draw specified veroboard with missing tracks and tr
    hole_d = 1;
    tw = vero_track_width(type);
    colour = vero_fr4(type) ? "green" : "goldenrod";
-    tc = vero_fr4(type) ? "silver" : "darkorange";
+    tc = vero_fr4(type) ? "silver" : copper;
    no_track = vero_no_track(type);

    vitamin(str("veroboard(", type[0], "): Veroboard ", holes, " holes x ", strips, "strips"));
--- a/vitamins/ziptie.scad
+++ b/vitamins/ziptie.scad
@@ -30,7 +30,7 @@ function ziptie_latch(type)     = type[3]; //! Latch dimensions
 function ziptie_colour(type)    = type[4]; //! Colour
 function ziptie_tail(type)      = type[5]; //! The length without teeth

-module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius `r` and optionally through panel thickness `t`
+module ziptie(type, r = 5, t = 0) //! Draw specified ziptie wrapped around radius `r` and optionally through panel thickness `t`
 {
    latch = ziptie_latch(type);
    lx = latch.x / 2;
@@ -50,7 +50,7 @@ module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius `r
    len = length <= 100 ? 100 : length;
    width =  ziptie_width(type);

-    vitamin(str("ziptie(", type[0], ", ", r, "): Ziptie ", width, "mm x ", len, "mm min length"));
+    vitamin(str("ziptie(", type[0], "): Ziptie ", width, "mm x ", len, "mm min length"));

    color(ziptie_colour(type)){
        linear_extrude(width, center = true)
Author	SHA1	Message	Date
Chris Palmer	d1a17bd4ac	Added LIPO fuel gauge PCB.	2021-06-08 08:09:08 +01:00
Chris Palmer	b8efa11fd9	Added SMD capacitors.	2021-06-08 08:08:35 +01:00
Chris Palmer	3bc8f35e37	Can now put jst_ph connectors on PCBs	2021-06-07 17:32:23 +01:00
Chris Palmer	39c11ef3b2	Added 2p54joiner to represent cropped headers joining PCBs.	2021-06-07 17:31:44 +01:00
Chris Palmer	5a8a1da880	Added Seeeduino XIAO. Tiny PCBs now shown in a third line.	2021-06-07 12:23:29 +01:00
Chris Palmer	3147862212	PCB lands can be rounded and can specify colour. Holes can be positioned on the edge to make surface mountable connections.	2021-06-07 10:59:47 +01:00
Chris Palmer	4fc8a7f47d	Fixed z-fighting between transparent LEDs and PCB.	2021-06-07 10:56:32 +01:00
Chris Palmer	a9ed9944c3	Added PERF70x51.	2021-06-06 17:18:37 +01:00
Chris Palmer	9cd2dbc316	Added copper colour constant. Copper PCB pads and veroboard tracks now use copper colour.	2021-06-06 17:17:33 +01:00
Chris Palmer	f3bfbbfcf2	Fixed Python error when top level assembly is empty.	2021-06-06 16:53:06 +01:00
Chris Palmer	baaa85ffed	Updated readme.	2021-06-06 16:51:32 +01:00
Chris Palmer	f1a49d4e28	Better description of pcb_grid().	2021-06-06 16:49:33 +01:00
Chris Palmer	0eed0673b0	Updated changelog.	2021-06-04 18:48:38 +01:00
Chris Palmer	9a4cc7ec42	Ziptie BOM entries no longer segregated by radius wrapped around.	2021-06-04 18:46:31 +01:00
Chris Palmer	2fb1185edf	Updated changelog.	2021-06-04 17:49:17 +01:00
Chris Palmer	a782d43e67	bom.py now generates bom.csv to allow costed BOMs to be made using a spreadsheet.	2021-06-04 17:47:29 +01:00
Chris Palmer	ae934d47c7	Updated changelog.	2021-06-03 11:59:54 +01:00
Chris Palmer	823f3b936e	Add the ability to have a target specific top level module in place of main_assembly().	2021-06-03 11:58:10 +01:00
Chris Palmer	3027b942a6	Updated changelog.	2021-06-02 16:07:19 +01:00