Merge tag 'v1.7.2'

Release v1.7.2

Author: set-soft

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -9,7 +9,7 @@ body:
       required: true
     - label: I have searched existing issues (including closed ones)
       required: true
-    - label: I use KiKit at least version 1.7.1 (older version are not supported)
+    - label: I use KiKit at least version 1.7.2 (older version are not supported)
       required: true
 - type: input
   attributes:

kikit/defs.py

@@ -69,6 +69,10 @@ class LayerV1(IntEnum):
     def allCu():
         return list(range(LayerV1.F_Cu, LayerV1.B_Cu + 1))
 
+    @staticmethod
+    def innerCu(layerCount):
+        return list(range(LayerV1.In1_Cu, LayerV1.In1_Cu + layerCount - 2))
+
     @staticmethod
     def all():
         return list(range(LayerV1.F_Cu, LayerV1.User_4 + 1))
@@ -150,9 +154,19 @@ class LayerV2(IntEnum):
     def allCu():
         return list(range(LayerV2.F_Cu, LayerV2.In30_Cu + 2, 2))
 
+    @staticmethod
+    def innerCu(layerCount):
+        return list(range(LayerV2.In1_Cu, LayerV2.In1_Cu + (layerCount - 2) * 2, 2))
+
     @staticmethod
     def all():
-        return list(range(64))
+        return (
+            list(range(LayerV2.F_Cu, LayerV2.In30_Cu + 2, 2))
+            + list(range(LayerV2.F_Mask, LayerV2.B_Paste + 2, 2))
+            + list(range(LayerV2.Dwgs_User, LayerV2.Margin + 2, 2))
+            + list(range(LayerV2.B_CrtYd, LayerV2.F_Fab + 2, 2))
+            + list(range(LayerV2.User_1, LayerV2.User_9 + 2, 2))
+        )
 
     @staticmethod
     def allTech():

kikit/drc.py

@@ -20,7 +20,7 @@ def roundCoord(x: int) -> int:
     # emulate that
     return round(x - 50, -4)
 
-def getItemDescription(item: pcbnew.BOARD_ITEM, units: pcbnew.EDA_UNITS = pcbnew.EDA_UNITS_MILLIMETRES):
+def getItemDescription(item: pcbnew.BOARD_ITEM, units: pcbnew.EDA_UNITS = pcbnew.EDA_UNITS_MM):
     if isV9():
         uProvider = pcbnew.UNITS_PROVIDER(pcbnew.pcbIUScale, units)
         return item.GetItemDescription(uProvider, True)
@@ -89,9 +89,9 @@ def format(self, units: Any) -> str:
     def _formatObject(self, obj: pcbnew.BOARD_ITEM, units: Any) -> str:
         p = obj.GetPosition()
         pos = "unknown"
-        if units == pcbnew.EDA_UNITS_MILLIMETRES:
+        if units == pcbnew.EDA_UNITS_MM:
             pos = f"{toMm(p[0]):.4f} mm, {toMm(p[1]):.4f} mm"
-        if units == pcbnew.EDA_UNITS_INCHES:
+        if units == pcbnew.EDA_UNITS_INCH:
             pos = f"{pcbnew.ToMils(p[0]):.1f} mil, {pcbnew.ToMils(p[1]):.1f} mil"
         return f"@({pos}): {getItemDescription(obj, units)}"
 
@@ -200,7 +200,7 @@ def runBoardDrc(board: pcbnew.BOARD, strict: bool) -> DrcReport:
         try:
             tmpFile.close()
             result = pcbnew.WriteDRCReport(board, tmpFile.name,
-                                           pcbnew.EDA_UNITS_MILLIMETRES, strict)
+                                           pcbnew.EDA_UNITS_MM, strict)
             if not result:
                 raise RuntimeError("Cannot run DRC: Unspecified KiCAD error")
             with open(tmpFile.name, encoding="utf-8") as f:
@@ -248,7 +248,7 @@ def runImpl(board, useMm, ignoreExcluded, strict, level, yieldViolation):
     import sys
     faulthandler.enable(sys.stderr)
 
-    units = pcbnew.EDA_UNITS_MILLIMETRES if useMm else EDA_UNITS_INCHES
+    units = pcbnew.EDA_UNITS_MM if useMm else pcbnew.EDA_UNITS_INCH
     report = runBoardDrc(board, strict)
     if ignoreExcluded:
         report.pruneExclusions(readBoardDrcExclusions(board))

kikit/export.py

@@ -8,16 +8,16 @@
 
 fullGerberPlotPlan = [
     # name, id, comment
-    ("CuTop", F_Cu, "Top layer"),
-    ("CuBottom", B_Cu, "Bottom layer"),
-    ("PasteBottom", B_Paste, "Paste Bottom"),
-    ("PasteTop", F_Paste, "Paste top"),
-    ("SilkTop", F_SilkS, "Silk top"),
-    ("SilkBottom", B_SilkS, "Silk top"),
-    ("MaskBottom", B_Mask, "Mask bottom"),
-    ("MaskTop", F_Mask, "Mask top"),
-    ("EdgeCuts", Edge_Cuts, "Edges"),
-    ("CmtUser", Cmts_User, "V-CUT")
+    ("CuTop", Layer.F_Cu, "Top layer"),
+    ("CuBottom", Layer.B_Cu, "Bottom layer"),
+    ("PasteBottom", Layer.B_Paste, "Paste Bottom"),
+    ("PasteTop", Layer.F_Paste, "Paste top"),
+    ("SilkTop", Layer.F_SilkS, "Silk top"),
+    ("SilkBottom", Layer.B_SilkS, "Silk top"),
+    ("MaskBottom", Layer.B_Mask, "Mask bottom"),
+    ("MaskTop", Layer.F_Mask, "Mask top"),
+    ("EdgeCuts", Layer.Edge_Cuts, "Edges"),
+    ("CmtUser", Layer.Cmts_User, "V-CUT")
 ]
 
 exportSettingsJlcpcb = {
@@ -57,7 +57,7 @@
 
 def hasCopper(plotPlan):
     for _, layer, _ in plotPlan:
-        if layer in [F_Cu, B_Cu]:
+        if layer in [Layer.F_Cu, Layer.B_Cu]:
             return True
     return False
 
@@ -123,19 +123,18 @@ def gerberImpl(boardfile, outputdir, plot_plan=fullGerberPlotPlan, drilling=True
         pctl.OpenPlotfile(suffix, PLOT_FORMAT_GERBER, comment)
         jobfile_writer.AddGbrFile(id, os.path.basename(pctl.GetPlotFileName()))
         if pctl.PlotLayer() == False:
-            print("plot error")
+            raise RuntimeError("KiCAD plot error")
 
     if hasCopper(plot_plan):
         #generate internal copper layers, if any
-        lyrcnt = board.GetCopperLayerCount()
-        for innerlyr in range (1, lyrcnt - 1):
+        for i, layer in enumerate(Layer.innerCu(board.GetCopperLayerCount())):
             popt.SetSkipPlotNPTH_Pads(True)
-            pctl.SetLayer(innerlyr)
-            lyrname = "" if settings["NoSuffix"] else 'inner{}'.format(innerlyr)
-            pctl.OpenPlotfile(lyrname, PLOT_FORMAT_GERBER, "inner")
-            jobfile_writer.AddGbrFile(innerlyr, os.path.basename(pctl.GetPlotFileName()))
+            pctl.SetLayer(layer)
+            layerName = "" if settings["NoSuffix"] else f"inner{i + 1}"
+            pctl.OpenPlotfile(layerName, PLOT_FORMAT_GERBER, "inner")
+            jobfile_writer.AddGbrFile(layer, os.path.basename(pctl.GetPlotFileName()))
             if pctl.PlotLayer() == False:
-                print("plot error")
+                raise RuntimeError("KiCAD plot error")
 
     # At the end you have to close the last plot, otherwise you don't know when
     # the object will be recycled!
@@ -186,7 +185,7 @@ def pasteDxfExport(board, plotDir):
     popt.SetMirror(False)
     setExcludeEdgeLayer(popt, True)
     popt.SetScale(1)
-    popt.SetDXFPlotUnits(DXF_UNITS_MILLIMETERS)
+    popt.SetDXFPlotUnits(DXF_UNITS_MM)
     popt.SetDXFPlotPolygonMode(False)
     popt.SetDrillMarksType(DRILL_MARKS_NO_DRILL_SHAPE)
 

kikit/panelize.py

@@ -490,6 +490,9 @@ def __init__(self, panelFilename):
         """
         self.errors: List[Tuple[KiPoint, str]] = []
 
+        if not panelFilename.endswith(".kicad_pcb"):
+            raise PanelError("Panel filename has to have .kicad_pcb suffix")
+
         self.filename = panelFilename
         self.board = pcbnew.NewBoard(panelFilename)
         self.sourcePaths = set() # A set of all board files that were appended to the panel
@@ -1645,6 +1648,8 @@ def addNPTHole(self, position: VECTOR2I, diameter: KiLength,
             footprint.SetReference(ref)
         if hasattr(footprint, "SetExcludedFromPosFiles"): # KiCAD 6 doesn't support this attribute
             footprint.SetExcludedFromPosFiles(excludedFromPos)
+        if hasattr(footprint, "SetExcludedFromBOM"):
+            footprint.SetExcludedFromBOM(True)
         if hasattr(footprint, "SetBoardOnly"):
             footprint.SetBoardOnly(True)
         self.board.Add(footprint)
@@ -1666,6 +1671,10 @@ def addFiducial(self, position: VECTOR2I, copperDiameter: KiLength,
         self.board.Add(footprint)
         if ref is not None:
             footprint.SetReference(ref)
+        if hasattr(footprint, "SetExcludedFromBOM"):
+            footprint.SetExcludedFromBOM(True)
+        if hasattr(footprint, "SetBoardOnly"):
+            footprint.SetBoardOnly(True)
         for pad in footprint.Pads():
             pad.SetSize(toKiCADPoint((copperDiameter, copperDiameter)))
             pad.SetLocalSolderMaskMargin(int((openingDiameter - copperDiameter) / 2))
@@ -2345,7 +2354,7 @@ def addPanelDimensions(self, layer: Layer, offset: KiLength) -> None:
         hDim.SetStart(toKiCADPoint((minx, miny)))
         hDim.SetEnd(toKiCADPoint((maxx, miny)))
         hDim.SetLayer(layer)
-        hDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MILLIMETRES)
+        hDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MM)
         hDim.SetSuppressZeroes(True)
         if self.chamferHeight is not None:
             hDim.SetExtensionOffset(-self.chamferHeight)
@@ -2359,7 +2368,7 @@ def addPanelDimensions(self, layer: Layer, offset: KiLength) -> None:
         vDim.SetStart(toKiCADPoint((minx, miny)))
         vDim.SetEnd(toKiCADPoint((minx, maxy)))
         vDim.SetLayer(layer)
-        vDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MILLIMETRES)
+        vDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MM)
         vDim.SetSuppressZeroes(True)
         if self.chamferWidth is not None:
             vDim.SetExtensionOffset(-self.chamferWidth)

pcm/kikit-lib/metadata.json

@@ -27,7 +27,7 @@
     },
     "versions": [
         {
-            "version": "1.7.1",
+            "version": "1.7.2",
             "status": "stable",
             "kicad_version": "8.0"
         }

pcm/kikit/metadata.json

@@ -27,7 +27,7 @@
     },
     "versions": [
         {
-            "version": "1.7.1",
+            "version": "1.7.2",
             "status": "stable",
             "kicad_version": "8.0"
         }

setup.py

@@ -58,7 +58,7 @@
     ],
     install_requires=[
         "numpy",
-        "pcbnewTransition >= 0.5.0, <=0.6",
+        "pcbnewTransition >= 0.5.2, <=0.6",
         "shapely>=2.0.3",
         "click>=7.1",
         "markdown2>=2.3",