From b432a64709f4728ebb8091332f358748766d55d3 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Mon, 18 Dec 2023 20:54:26 -0300 Subject: [PATCH] [Fabrication Templates] Move files to the archive - Is the most common case, so now we move (instead of copy) - Can be configured using _KIBOT_COMPRESS_MOVE - Left the JLCPCB BoM and Position outside, they must be uploaded separately Closes #537 --- CHANGELOG.md | 8 +++++++- docs/source/configuration/imports.rst | 1 + kibot/resources/config_templates/Elecrow.kibot.yaml | 2 ++ kibot/resources/config_templates/FusionPCB.kibot.yaml | 2 ++ kibot/resources/config_templates/JLCPCB.kibot.yaml | 6 ++---- kibot/resources/config_templates/P-Ban.kibot.yaml | 2 ++ kibot/resources/config_templates/PCBWay.kibot.yaml | 2 ++ 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dee86f39..2fc88908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,8 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 3DRender_bottom_straight: to generate simple and quick 3D renders. - _KIBOT_POS_DNF_FILTER option to JLCPCB. It now excludes components added by KiKit to create panels and can be customized. - - _KIBOT_PLOT_FOOTPRINT_REFS and _KIBOT_PLOT_FOOTPRINT_VALUES to + - _KIBOT_PLOT_FOOTPRINT_REFS and _KIBOT_PLOT_FOOTPRINT_VALUES to manufacturer templates. (#523) + - _KIBOT_COMPRESS_MOVE to move gerber and drill files to the compressed + output, enabled by default. (#537) - Filters: - New `_rot_footprint_jlcpcb` internal filter to fix the JLCPCB bottom rotations. @@ -87,6 +89,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Footprints: now they are flagged with exclude from BoM and Pos, also with no court yard requirements for KiCad 7 - Symbol: Excluded from simulation for KiCad 7 +- Elecrow, FusionPCB, JLCPCB, PCBWay and P-Ban templates now moves the files + to the compressed output by default. + - Note that JLCPCB BoM and Position files aren't included anymore, they are + uploaded separately. ### Fixed - Schematics: problems with deep nested and recycled sheets (#520) diff --git a/docs/source/configuration/imports.rst b/docs/source/configuration/imports.rst index 9d68bcc4..94eac38e 100644 --- a/docs/source/configuration/imports.rst +++ b/docs/source/configuration/imports.rst @@ -323,6 +323,7 @@ The manufacturer templates (Elecrow, FusionPCB, JLCPCB, P-Ban and PCBWay) suppor - **_KIBOT_GERBER_LAYERS**: List of layers to use for the gerbers (default: a specially crafted list of layers) - **_KIBOT_PLOT_FOOTPRINT_REFS**: Include the footprint references in the gerbers (default: true) - **_KIBOT_PLOT_FOOTPRINT_VALUES**: Include the footprint values in the gerbers (default: true, except for JLCPCB) +- **_KIBOT_COMPRESS_MOVE**: Move the generated files to the compressed archive (default: true) The JLCPCB case is a little bit more complex and also supports: diff --git a/kibot/resources/config_templates/Elecrow.kibot.yaml b/kibot/resources/config_templates/Elecrow.kibot.yaml index 0b695991..07934e99 100644 --- a/kibot/resources/config_templates/Elecrow.kibot.yaml +++ b/kibot/resources/config_templates/Elecrow.kibot.yaml @@ -55,6 +55,7 @@ outputs: type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: + move_files: @_KIBOT_COMPRESS_MOVE@ files: - from_output: _Elecrow_gerbers@_KIBOT_IMPORT_ID@ dest: / @@ -71,6 +72,7 @@ definitions: _KIBOT_MANF_DIR_COMP: '@_KIBOT_IMPORT_DIR@' _KIBOT_PLOT_FOOTPRINT_REFS: true _KIBOT_PLOT_FOOTPRINT_VALUES: true + _KIBOT_COMPRESS_MOVE: true _KIBOT_GERBER_LAYERS: | - copper - F.SilkS diff --git a/kibot/resources/config_templates/FusionPCB.kibot.yaml b/kibot/resources/config_templates/FusionPCB.kibot.yaml index d27ef390..a961edf9 100644 --- a/kibot/resources/config_templates/FusionPCB.kibot.yaml +++ b/kibot/resources/config_templates/FusionPCB.kibot.yaml @@ -55,6 +55,7 @@ outputs: type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: + move_files: @_KIBOT_COMPRESS_MOVE@ files: - from_output: _FusionPCB_gerbers@_KIBOT_IMPORT_ID@ dest: / @@ -71,6 +72,7 @@ definitions: _KIBOT_MANF_DIR_COMP: '@_KIBOT_IMPORT_DIR@' _KIBOT_PLOT_FOOTPRINT_REFS: true _KIBOT_PLOT_FOOTPRINT_VALUES: true + _KIBOT_COMPRESS_MOVE: true _KIBOT_GERBER_LAYERS: | - copper - F.SilkS diff --git a/kibot/resources/config_templates/JLCPCB.kibot.yaml b/kibot/resources/config_templates/JLCPCB.kibot.yaml index 40db9769..2949054b 100644 --- a/kibot/resources/config_templates/JLCPCB.kibot.yaml +++ b/kibot/resources/config_templates/JLCPCB.kibot.yaml @@ -131,15 +131,12 @@ outputs: options: # Position and BoM can be disabled skip_not_run: true + move_files: @_KIBOT_COMPRESS_MOVE@ files: - from_output: _JLCPCB_gerbers@_KIBOT_IMPORT_ID@ dest: / - from_output: _JLCPCB_drill@_KIBOT_IMPORT_ID@ dest: / - - from_output: _JLCPCB_position@_KIBOT_IMPORT_ID@ - dest: / - - from_output: _JLCPCB_bom@_KIBOT_IMPORT_ID@ - dest: / ... definitions: @@ -156,6 +153,7 @@ definitions: _KIBOT_BOM_ENABLED: true _KIBOT_PLOT_FOOTPRINT_REFS: true _KIBOT_PLOT_FOOTPRINT_VALUES: false + _KIBOT_COMPRESS_MOVE: true _KIBOT_GERBER_LAYERS: | - copper - F.SilkS diff --git a/kibot/resources/config_templates/P-Ban.kibot.yaml b/kibot/resources/config_templates/P-Ban.kibot.yaml index 9d1a6402..113fd963 100644 --- a/kibot/resources/config_templates/P-Ban.kibot.yaml +++ b/kibot/resources/config_templates/P-Ban.kibot.yaml @@ -61,6 +61,7 @@ outputs: type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: + move_files: @_KIBOT_COMPRESS_MOVE@ files: - from_output: _P-Ban_gerbers@_KIBOT_IMPORT_ID@ dest: / @@ -77,6 +78,7 @@ definitions: _KIBOT_MANF_DIR_COMP: '@_KIBOT_IMPORT_DIR@' _KIBOT_PLOT_FOOTPRINT_REFS: true _KIBOT_PLOT_FOOTPRINT_VALUES: true + _KIBOT_COMPRESS_MOVE: true _KIBOT_GERBER_LAYERS: | - F.Cu - B.Cu diff --git a/kibot/resources/config_templates/PCBWay.kibot.yaml b/kibot/resources/config_templates/PCBWay.kibot.yaml index 7e33e434..cdc62d5f 100644 --- a/kibot/resources/config_templates/PCBWay.kibot.yaml +++ b/kibot/resources/config_templates/PCBWay.kibot.yaml @@ -63,6 +63,7 @@ outputs: dir: @_KIBOT_MANF_DIR_COMP@ options: format: ZIP + move_files: @_KIBOT_COMPRESS_MOVE@ files: - from_output: _PCBWay_gerbers@_KIBOT_IMPORT_ID@ dest: / @@ -79,6 +80,7 @@ definitions: _KIBOT_MANF_DIR_COMP: '@_KIBOT_IMPORT_DIR@' _KIBOT_PLOT_FOOTPRINT_REFS: true _KIBOT_PLOT_FOOTPRINT_VALUES: true + _KIBOT_COMPRESS_MOVE: true _KIBOT_GERBER_LAYERS: | - copper - F.SilkS