Add the ability to have a target specific top level module in place of main_assembly().

CHANGELOG.md

@@ -3,6 +3,25 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+#### [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.
+
+### [v15.14.0](https://github.com/nophead/NopSCADlib/releases/tag/v15.14.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v15.13.4...v15.14.0 "diff with v15.13.4")
+*   2021-05-31 [`2581098`](https://github.com/nophead/NopSCADlib/commit/258109811b7b7f71895340dc4b86b96d7dbc2037 "show commit") [C.P.](# "Chris Palmer") Added uppercase version of `BLCD_motors.scad`.
+
+*   2021-05-31 [`b39fd53`](https://github.com/nophead/NopSCADlib/commit/b39fd536c2841a95ab50b8a196e21ee8fc5976d1 "show commit") [C.P.](# "Chris Palmer") Removed lower case version of `bldc_motors.scad`.
+
+*   2021-05-31 [`a5a87d2`](https://github.com/nophead/NopSCADlib/commit/a5a87d260dd4bbe40a8727a4099207271918d02b "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2021-05-30 [`00ca412`](https://github.com/nophead/NopSCADlib/commit/00ca412441c85ea1fd7082453c823445fbbdce4e "show commit") [M.B.](# "Martin Budden") Added BLDC3548 motor.
+
+*   2021-05-30 [`1e6d7f5`](https://github.com/nophead/NopSCADlib/commit/1e6d7f5dd68e64181aef019bb8bca186abb2ac68 "show commit") [M.B.](# "Martin Budden") Brushless DC motors.
+
 #### [v15.13.4](https://github.com/nophead/NopSCADlib/releases/tag/v15.13.4 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.13.3...v15.13.4 "diff with v15.13.3")
 *   2021-05-30 [`ec07d95`](https://github.com/nophead/NopSCADlib/commit/ec07d95657d52aab375b3b2acb95c87b369d2194 "show commit") [M.B.](# "Martin Budden") Added assertion to check colour format in module thread.
 

docs/usage.md

@@ -270,6 +270,13 @@ 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.
+
 ### 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

readme.md

@@ -1396,7 +1396,7 @@ IEC mains inlets and outlet.
 |   1 | `iec(IEC_inlet)` |  IEC inlet |
 |   1 | `iec(IEC_inlet_atx)` |  IEC inlet for ATX |
 |   1 | `iec(IEC_outlet)` |  IEC outlet RS 811-7193 |
-|   1 | `iec(IEC_switched_fused_inlet)` |  IEC320 C14 switched fused inlet module |
+|   1 | `iec(IEC_320_C14_switched_fused_inlet)` |  IEC320 C14 switched fused inlet module |
 |  12 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   4 | `screw(M3_cs_cap_screw, 10)` |  Screw M3 cs cap x 10mm |
 |   8 | `screw(M3_cs_cap_screw, 12)` |  Screw M3 cs cap x 12mm |

scripts/bom.py

@@ -46,6 +46,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
@@ -221,28 +233,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 +263,7 @@ 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"))
 
         for ass in main.assemblies:
             with open(bom_dir + "/" + ass + ".txt", "wt") as f:
@@ -278,20 +281,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)

scripts/views.py

@@ -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):

utils/rounded_polygon.scad

@@ -75,28 +75,28 @@ function rounded_polygon_length(points, tangents) = //! Calculate the length giv
 module rounded_polygon(points, _tangents = undef) { //! Draw the rounded polygon from the point list, can pass the tangent list to save it being calculated
     len = len(points);
     indices = [0 : len - 1];
-    tangents = [ for (t = _tangents ? _tangents : rounded_polygon_tangents(points)) each [t.x, t.y] ];
+    tangents = _tangents ? _tangents : rounded_polygon_tangents(points);
 
     difference() {
         union() {
-            for(i = indices)
+            for(i = indices, last = (i - 1 + len) % len)
                 if(points[i][2] > 0)
                     hull() {
-                        translate([points[i].x, points[i].y])
+                        translate(vec2(points[i]))
                             circle(points[i][2]);
 
-                        polygon([tangents[(2 * i - 1 + 2 * len) % (2 * len)], tangents[2 * i], [points[i].x, points[i].y]]);
+                        polygon([vec2(tangents[last][1]), vec2(tangents[i][0]), vec2(points[i])]);
                     }
 
-            polygon(tangents, convexity = points);
+            polygon([for(t = tangents) each(vec2(t))], convexity = points);
         }
-        for(i = indices)
+        for(i = indices, last = (i - 1 + len) % len)
             if(points[i][2] < 0)
                 hull() {
-                    translate([points[i].x, points[i].y])
+                    translate(vec2(points[i]))
                         circle(-points[i][2]);
 
-                    polygon([tangents[(2 * i - 1 + 2 * len) % (2 * len)], tangents[2 * i], [points[i].x, points[i].y]]);
+                    polygon([vec2(tangents[last][1]), vec2(tangents[i][0]), vec2(points[i])]);
                 }
      }
 }

utils/thread.scad

@@ -156,7 +156,7 @@ module thread(dia, pitch, length, profile, center = true, top = -1, bot = -1, st
                                         translate([0, offset])
                                             square([r, len]);
 
-                                        translate([0, bot_chamfer_h])
+                                        translate([0, offset + bot_chamfer_h])
                                             square([r + h + overlap, len - top_chamfer_h - bot_chamfer_h]);
                                     }
                                     if(!solid)

vitamins/iecs.scad

@@ -55,7 +55,7 @@ outlet_spades = [[spade4p8ll, 8, -7,  -2, 90],
 //                                                                                                                            w     h  r    t
 IEC_fused_inlet = ["IEC_fused_inlet", "IEC fused inlet JR-101-1F",   M3_cs_cap_screw, 36, 27, 16, 31, 3, 28,   31,   2, 2.0, 30,   33, 4, 3.0, 44, 15, fused_spades,  false ];
 IEC_fused_inlet2= ["IEC_fused_inlet2","IEC fused inlet old",         M3_cs_cap_screw, 36, 27, 14, 31, 3, 28,   31,   2, 2.5, 30,   33, 4, 2.5, 44, 18, fused_spades2, false ];
-IEC_320_C14_switched_fused_inlet = ["IEC_switched_fused_inlet", "IEC320 C14 switched fused inlet module",
+IEC_320_C14_switched_fused_inlet = ["IEC_320_C14_switched_fused_inlet", "IEC320 C14 switched fused inlet module",
                                                                      M3_cs_cap_screw, 40,  27, 16,46.8,3,28,   48, 2.4, 1.0, 33,   57, 4, 3.0, 48,16.5, iec320c14FusedSwitchedSpades,  false ];
 IEC_inlet       = ["IEC_inlet",       "IEC inlet",                   M3_cs_cap_screw, 40, 28, 18, 20, 3, 28,   20.5, 4, 2.5, 37,   23, 1, 2.5, 48, 14, inlet_spades,  false ];
 IEC_inlet_atx   = ["IEC_inlet_atx",   "IEC inlet for ATX",           M3_cs_cap_screw, 40, 27, 18, 19, 3, 30.5, 22,   2, 2.0, 30.5, 22, 2, 4.0, 50, 15, atx_spades,    false ];