diff --git a/README.md b/README.md index 3da673cf..f507c388 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Notes: [**Requests**](https://pypi.org/project/Requests/) (python module) (PyPi dependency) [Debian](https://packages.debian.org/bullseye/python3-requests) - Mandatory -[**KiCad Automation tools**](https://github.com/INTI-CMNB/KiAuto) v1.6.11 (tool) (PyPi dependency) +[**KiCad Automation tools**](https://github.com/INTI-CMNB/KiAuto) v1.6.13 (tool) (PyPi dependency) - Mandatory for: `gencad`, `netlist`, `pdf_pcb_print`, `pdf_sch_print`, `render_3d`, `run_drc`, `run_erc`, `step`, `svg_pcb_print`, `svg_sch_print`, `update_xml` [**KiCost**](https://github.com/INTI-CMNB/KiCost) v1.1.8 (tool) @@ -1146,6 +1146,8 @@ Next time you need this list just use an alias, like this: This format allows simple pads and connections navigation, mainly for circuit debug. The output can be loaded using Open Board View (https://openboardview.org/) * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1170,6 +1172,8 @@ Next time you need this list just use an alias, like this: - The `Component` column is named `Row` and works just like any other column. This output is what you get from the 'Tools/Generate Bill of Materials' menu in eeschema. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1352,6 +1356,8 @@ Next time you need this list just use an alias, like this: * Description: Generates a compressed file containing output files. This is used to generate groups of files in compressed file format. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1383,6 +1389,8 @@ Next time you need this list just use an alias, like this: * Type: `download_datasheets` * Description: Downloads the datasheets for the project * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1410,6 +1418,8 @@ Next time you need this list just use an alias, like this: * Description: Exports the PCB to 2D mechanical EDA tools (like AutoCAD). This output is what you get from the File/Plot menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1461,6 +1471,8 @@ Next time you need this list just use an alias, like this: You can create a map file for documentation purposes. This output is what you get from the 'File/Fabrication output/Drill Files' menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1500,6 +1512,8 @@ Next time you need this list just use an alias, like this: This format is interpreted by some CADCAM software and helps certain manufacturers * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1524,6 +1538,8 @@ Next time you need this list just use an alias, like this: You can create a map file for documentation purposes. This output is what you get from the 'File/Fabrication output/Drill Files' menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1554,6 +1570,8 @@ Next time you need this list just use an alias, like this: * Description: This is the main fabrication format for the PCB. This output is what you get from the File/Plot menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1610,6 +1628,8 @@ Next time you need this list just use an alias, like this: * Description: Exports the PCB for plotters and laser printers. This output is what you get from the File/Plot menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1663,6 +1683,8 @@ Next time you need this list just use an alias, like this: For more information: https://github.com/INTI-CMNB/InteractiveHtmlBom This output is what you get from the InteractiveHtmlBom plug-in (pcbnew). * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1738,6 +1760,8 @@ Next time you need this list just use an alias, like this: We recommend using the `bom` output instead. This output is what you get from the 'Tools/Generate Bill of Materials' menu in eeschema. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1835,6 +1859,8 @@ Next time you need this list just use an alias, like this: For more information: https://github.com/INTI-CMNB/KiCost This output is what you get from the KiCost plug-in (eeschema). * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1881,6 +1907,8 @@ Next time you need this list just use an alias, like this: * Type: `navigate_results` * Description: Generates a web page to navigate the generated outputs * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1901,6 +1929,8 @@ Next time you need this list just use an alias, like this: The netlist can be generated in the classic format and in IPC-D-356 format, useful for board testing * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -1924,6 +1954,8 @@ Next time you need this list just use an alias, like this: KiCad 5: including the frame is slow. KiCad 6: for custom frames use the `enable_ki6_frame_fix`, is slow. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2009,6 +2041,8 @@ Next time you need this list just use an alias, like this: Uses configurable colors. Can also render the components if the 2D models are available * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2057,6 +2091,8 @@ Next time you need this list just use an alias, like this: This output is what you get from the File/Plot menu in pcbnew. The `pcb_print` is usually a better alternative. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `custom_reports`: [list(dict)] A list of customized reports for the manufacturer. * Valid keys: @@ -2131,6 +2167,8 @@ Next time you need this list just use an alias, like this: This output is what you get from the 'File/Print' menu in pcbnew. The `pcb_print` is usually a better alternative. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2175,6 +2213,8 @@ Next time you need this list just use an alias, like this: This is the main format to document your schematic. This output is what you get from the 'File/Print' menu in eeschema. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2199,6 +2239,8 @@ Next time you need this list just use an alias, like this: * Description: Generates a new PDF from other outputs. This is just a PDF joiner, using `pdfunite` from Poppler Utils. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2227,6 +2269,8 @@ Next time you need this list just use an alias, like this: * Description: Generates the file with position information for the PCB components, used by the pick and place machine. This output is what you get from the 'File/Fabrication output/Footprint position (.pos) file' menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2260,6 +2304,8 @@ Next time you need this list just use an alias, like this: This output is what you get from the File/Plot menu in pcbnew. The `pcb_print` is usually a better alternative. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2321,6 +2367,8 @@ Next time you need this list just use an alias, like this: - Use them in your schematic and PCB. - To keep them updated add the `update_qr` preflight * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2351,6 +2399,8 @@ Next time you need this list just use an alias, like this: * Type: `render_3d` * Description: Exports the image generated by KiCad's 3D viewer. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2390,10 +2440,11 @@ Next time you need this list just use an alias, like this: - `solder_paste`: [string='#808080'] Color for the solder paste. - `variant`: [string=''] Board variant to apply. - `view`: [string='top'] [top,bottom,front,rear,right,left,z,Z,y,Y,x,X] Point of view. - - `wait_ray_tracing`: [number=-600] How many seconds we must wait before capturing the ray tracing render. - Lamentably KiCad can save an unfinished image. Enlarge it if your image looks partially rendered. - Use negative values to enable the auto-detect using CPU load. - In this case the value is interpreted as a time-out.. + - *wait_ray_tracing*: Alias for wait_render. + - `wait_render`: [number=-600] How many seconds we must wait before capturing the render (ray tracing or normal). + Lamentably KiCad can save an unfinished image. Enlarge it if your image looks partially rendered. + Use negative values to enable the auto-detect using CPU load. + In this case the value is interpreted as a time-out.. - `width`: [number=1280] Image width (aprox.). - `zoom`: [number=0] Zoom steps. Use positive to enlarge, get closer, and negative to reduce. Same result as using the mouse wheel in the 3D viewer. @@ -2405,6 +2456,8 @@ Next time you need this list just use an alias, like this: * Description: Generates a report about the design. Mainly oriented to be sent to the manufacturer or check PCB details. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2437,6 +2490,8 @@ Next time you need this list just use an alias, like this: This copy isn't intended for development. Is just a tweaked version of the original where you can look at the results. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2458,6 +2513,8 @@ Next time you need this list just use an alias, like this: This is the most common 3D format for exchange purposes. This output is what you get from the 'File/Export/STEP' menu in pcbnew. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2490,6 +2547,8 @@ Next time you need this list just use an alias, like this: This output is what you get from the File/Plot menu in pcbnew. The `pcb_print` is usually a better alternative. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2540,6 +2599,8 @@ Next time you need this list just use an alias, like this: This output is what you get from the 'File/Print' menu in pcbnew. The `pcb_print` is usually a better alternative. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. @@ -2585,6 +2646,8 @@ Next time you need this list just use an alias, like this: * Description: Exports the PCB. Suitable for printing. This is a format to document your schematic. * Valid keys: + - `category`: [string|list(string)=''] The category for this output. If not specified an internally defined category is used. + Categories looks like file system paths, i.e. PCB/fabrication/gerber. - `comment`: [string=''] A comment for documentation purposes. - `dir`: [string='./'] Output directory for the generated files. If it starts with `+` the rest is concatenated to the default dir. - `disable_run_by_default`: [string|boolean] Use it to disable the `run_by_default` status of other output. diff --git a/docs/samples/generic_plot.kibot.yaml b/docs/samples/generic_plot.kibot.yaml index d190247a..b31e7996 100644 --- a/docs/samples/generic_plot.kibot.yaml +++ b/docs/samples/generic_plot.kibot.yaml @@ -1509,11 +1509,12 @@ outputs: variant: '' # [string='top'] [top,bottom,front,rear,right,left,z,Z,y,Y,x,X] Point of view view: 'top' - # [number=-600] How many seconds we must wait before capturing the ray tracing render. + # `wait_ray_tracing` is an alias for `wait_render` + # [number=-600] How many seconds we must wait before capturing the render (ray tracing or normal). # Lamentably KiCad can save an unfinished image. Enlarge it if your image looks partially rendered. # Use negative values to enable the auto-detect using CPU load. # In this case the value is interpreted as a time-out. - wait_ray_tracing: -600 + wait_render: -600 # [number=1280] Image width (aprox.) width: 1280 # [number=0] Zoom steps. Use positive to enlarge, get closer, and negative to reduce. diff --git a/kibot/out_render_3d.py b/kibot/out_render_3d.py index a3c49edd..298054b1 100644 --- a/kibot/out_render_3d.py +++ b/kibot/out_render_3d.py @@ -16,7 +16,7 @@ from .macros import macros, document, output_class # noqa: F401 from . import log logger = log.get_logger() -RegDependency.register(kiauto_dependency('render_3d', (1, 6, 8))) +RegDependency.register(kiauto_dependency('render_3d', (1, 6, 13))) class Render3DOptions(Base3DOptions): @@ -69,11 +69,13 @@ class Render3DOptions(Base3DOptions): Each step is currently 10 degrees. Only for KiCad 6 """ self.ray_tracing = False """ Enable the ray tracing. Much better result, but slow, and you'll need to adjust `wait_rt` """ - self.wait_ray_tracing = -600 - """ How many seconds we must wait before capturing the ray tracing render. + self.wait_render = -600 + """ How many seconds we must wait before capturing the render (ray tracing or normal). Lamentably KiCad can save an unfinished image. Enlarge it if your image looks partially rendered. Use negative values to enable the auto-detect using CPU load. In this case the value is interpreted as a time-out. """ + self.wait_ray_tracing = None + """ {wait_render} """ self.view = 'top' """ [top,bottom,front,rear,right,left,z,Z,y,Y,x,X] Point of view """ self.zoom = 0 @@ -141,7 +143,7 @@ class Render3DOptions(Base3DOptions): logger.error("3D Viewer not supported for KiCad 6.0.0/1\n" "Please upgrade KiCad to 6.0.2 or newer") exit(MISSING_TOOL) - check_script(CMD_PCBNEW_3D, URL_PCBNEW_3D, '1.6.8') + check_script(CMD_PCBNEW_3D, URL_PCBNEW_3D, '1.6.13') # Base command with overwrite cmd = [CMD_PCBNEW_3D, '--rec_w', str(self.width+2), '--rec_h', str(self.height+85), '3d_view', '--output_name', output] @@ -161,11 +163,11 @@ class Render3DOptions(Base3DOptions): self.add_step(cmd, self.rotate_z, '--rotate_z') if self.zoom: cmd.extend(['--zoom', str(self.zoom)]) - if self.wait_ray_tracing != 5: - if self.wait_ray_tracing < 0: - self.wait_ray_tracing = -self.wait_ray_tracing + if self.wait_render != 5: + if self.wait_render < 0: + self.wait_render = -self.wait_render cmd.append('--detect_rt') - cmd.extend(['--wait_rt', str(self.wait_ray_tracing)]) + cmd.extend(['--wait_rt', str(self.wait_render), '--use_rt_wait']) if self.ray_tracing: cmd.append('--ray_tracing') if self.orthographic: diff --git a/src/kibot-check b/src/kibot-check index afa5e6d2..3df98735 100755 --- a/src/kibot-check +++ b/src/kibot-check @@ -287,7 +287,7 @@ deps = '{\ "version": [\ 1,\ 6,\ - 8\ + 13\ ]\ },\ {\