KiCad 6 no longer has SetPlotPadsOnSilkLayer

kibot/out_any_layer.py

@@ -11,6 +11,7 @@ from .out_base import (BaseOutput)
 from .error import (PlotError, KiPlotConfigurationError)
 from .layer import Layer
 from .gs import GS
+from .misc import KICAD_VERSION_5_99
 from .out_base import VariantOptions
 from .macros import macros, document  # noqa: F401
 from . import log
@@ -25,7 +26,7 @@ class AnyLayerOptions(VariantOptions):
             self.exclude_edge_layer = True
             """ do not include the PCB edge layer """
             self.exclude_pads_from_silkscreen = False
-            """ do not plot the component pads in the silk screen """
+            """ do not plot the component pads in the silk screen (KiCad 5.x only) """
             self.plot_sheet_reference = False
             """ currently without effect """
             self.plot_footprint_refs = True
@@ -48,7 +49,8 @@ class AnyLayerOptions(VariantOptions):
         po.SetPlotValue(self.plot_footprint_values)
         po.SetPlotInvisibleText(self.force_plot_invisible_refs_vals)
         po.SetExcludeEdgeLayer(self.exclude_edge_layer)
-        po.SetPlotPadsOnSilkLayer(not self.exclude_pads_from_silkscreen)
+        if GS.kicad_version_n < KICAD_VERSION_5_99:
+            po.SetPlotPadsOnSilkLayer(not self.exclude_pads_from_silkscreen)
         po.SetPlotViaOnMaskLayer(not self.tent_vias)
         # Only useful for gerber outputs
         po.SetCreateGerberJobFile(False)
@@ -132,8 +134,9 @@ class AnyLayerOptions(VariantOptions):
         self.force_plot_invisible_refs_vals = po.GetPlotInvisibleText()
         # viasonmask
         self.tent_vias = not po.GetPlotViaOnMaskLayer()
-        # padsonsilk
-        self.exclude_pads_from_silkscreen = not po.GetPlotPadsOnSilkLayer()
+        if GS.kicad_version_n < KICAD_VERSION_5_99:
+            # padsonsilk
+            self.exclude_pads_from_silkscreen = not po.GetPlotPadsOnSilkLayer()
 
 
 class AnyLayer(BaseOutput):

tests/board_samples/kicad_6/.gitignore

@@ -2,3 +2,4 @@ bom/
 print_err.pro
 test_v5/
 zone-refill.pro
+fp-info-cache

tests/board_samples/kicad_6/simple_2layer.kicad_pcb

@@ -0,0 +1,113 @@
+(kicad_pcb (version 20201002) (generator pcbnew)
+
+  (general
+    (thickness 1.6)
+  )
+
+  (paper "A4")
+  (title_block
+    (title "Simple Plotting Test")
+    (date "2018-06-04")
+    (rev "A")
+    (company "KiPlot - KiCad Plotting Driver")
+  )
+
+  (layers
+    (0 "F.Cu" signal)
+    (31 "B.Cu" signal)
+    (32 "B.Adhes" user "B.Adhesive")
+    (33 "F.Adhes" user "F.Adhesive")
+    (34 "B.Paste" user)
+    (35 "F.Paste" user)
+    (36 "B.SilkS" user "B.Silkscreen")
+    (37 "F.SilkS" user "F.Silkscreen")
+    (38 "B.Mask" user)
+    (39 "F.Mask" user)
+    (40 "Dwgs.User" user "User.Drawings")
+    (41 "Cmts.User" user "User.Comments")
+    (42 "Eco1.User" user "User.Eco1")
+    (43 "Eco2.User" user "User.Eco2")
+    (44 "Edge.Cuts" user)
+    (45 "Margin" user)
+    (46 "B.CrtYd" user "B.Courtyard")
+    (47 "F.CrtYd" user "F.Courtyard")
+    (48 "B.Fab" user)
+    (49 "F.Fab" user)
+  )
+
+  (setup
+    (pcbplotparams
+      (layerselection 0x00010fc_ffffffff)
+      (disableapertmacros false)
+      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (svguseinch false)
+      (svgprecision 6)
+      (excludeedgelayer true)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (sketchpadsonfab false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory "")
+    )
+  )
+
+
+  (net 0 "")
+
+  (module "TestPoint:TestPoint_THTPad_2.0x2.0mm_Drill1.0mm" (layer "F.Cu") (tedit 5B1533F4) (tstamp 00000000-0000-0000-0000-00005b15541f)
+    (at 140 100)
+    (descr "THT rectangular pad as test Point, square 2.0mm_Drill1.0mm  side length, hole diameter 1.0mm")
+    (tags "test point THT pad rectangle square")
+    (attr exclude_from_pos_files exclude_from_bom)
+    (fp_text reference "TP1" (at 0 -2) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6de6eb96-2bce-4893-8df8-ee4f11c74ee2)
+    )
+    (fp_text value "TestPoint2mm" (at 0 2.05) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 41a9120a-c6ae-4f4c-89c9-74577a60e61b)
+    )
+    (fp_text user "${REFERENCE}" (at 0 -2) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6d950297-d87f-4013-828d-d61567be0ff9)
+    )
+    (fp_line (start -1.2 -1.2) (end 1.2 -1.2) (layer "F.SilkS") (width 0.12) (tstamp 96569f29-d14d-459b-aa18-c71851f86ebd))
+    (fp_line (start 1.2 -1.2) (end 1.2 1.2) (layer "F.SilkS") (width 0.12) (tstamp e0b3cf66-8357-4d7c-b7f6-f72b3c01d9a3))
+    (fp_line (start 1.2 1.2) (end -1.2 1.2) (layer "F.SilkS") (width 0.12) (tstamp f071f4fd-84af-4ce5-92c3-8cbf0759c557))
+    (fp_line (start -1.2 1.2) (end -1.2 -1.2) (layer "F.SilkS") (width 0.12) (tstamp fce549bf-eb06-4c57-9871-f274395a6db4))
+    (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer "F.CrtYd") (width 0.05) (tstamp 007608dd-c1f2-45c2-badb-3a62f64a38ba))
+    (fp_line (start -1.5 -1.5) (end -1.5 1.5) (layer "F.CrtYd") (width 0.05) (tstamp 6b7b21e3-3ef8-47a3-ac37-f233999767d9))
+    (fp_line (start 1.5 1.5) (end 1.5 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp 89f4a15b-e62b-41db-be77-4222d41d0594))
+    (fp_line (start -1.5 -1.5) (end 1.5 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp d7e8bce2-c343-42c9-b249-7442bfcbfac1))
+    (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 59e3f63a-c9de-4e49-b736-b450c077c5ee))
+  )
+
+  (gr_line (start 145 95) (end 132 95) (layer "Edge.Cuts") (width 0.2) (tstamp 0e145530-18ad-4043-9162-57ab89376be3))
+  (gr_line (start 132 95) (end 132 106) (layer "Edge.Cuts") (width 0.2) (tstamp 0f5b234a-5391-423f-914b-6481e2e4b824))
+  (gr_line (start 148 106) (end 148 98) (layer "Edge.Cuts") (width 0.2) (tstamp 2fdbf9a7-eb5f-4089-b5d6-a2ce1a74d77d))
+  (gr_arc (start 145 98) (end 148 98) (angle -90) (layer "Edge.Cuts") (width 0.2) (tstamp 6fdb63ac-c5a6-4cde-a60f-ceff411b1607))
+  (gr_line (start 132 106) (end 148 106) (layer "Edge.Cuts") (width 0.2) (tstamp bf8b6910-62ee-4e86-8c6e-6aaf131bdde2))
+
+  (segment (start 140 100) (end 143 100) (width 1) (layer "F.Cu") (net 0) (tstamp 2024a043-b527-4a79-8fd0-789dc8affa64))
+  (segment (start 134 99) (end 134 101) (width 1) (layer "F.Cu") (net 0) (tstamp ad45ccad-656d-4667-8c74-5c79ecd6675b))
+  (segment (start 142 102) (end 143 102) (width 1) (layer "B.Cu") (net 0) (tstamp 11d54499-6257-4e14-b0ac-6c8398bbc4be))
+  (segment (start 140 100) (end 142 102) (width 1) (layer "B.Cu") (net 0) (tstamp 38bd6bf7-b2df-46b0-88e4-290d244f92c3))
+
+)

tests/test_plot/test_dxf.py

@@ -20,7 +20,7 @@ PS_DIR = 'DXF'
 
 def test_dxf():
     prj = 'simple_2layer'
-    ctx = context.TestContext('DXF', prj, 'dxf', PS_DIR)
+    ctx = context.TestContext('test_dxf', prj, 'dxf', PS_DIR)
     ctx.run()
 
     f_cu = ctx.get_gerber_filename('F_Cu', '.dxf')