Skip to content

Commit

Permalink
[Fabrication Templates] Move files to the archive
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
set-soft committed Dec 18, 2023
1 parent d341db0 commit b432a64
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 5 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions docs/source/configuration/imports.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions kibot/resources/config_templates/Elecrow.kibot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions kibot/resources/config_templates/FusionPCB.kibot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions kibot/resources/config_templates/JLCPCB.kibot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions kibot/resources/config_templates/P-Ban.kibot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions kibot/resources/config_templates/PCBWay.kibot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
Expand All @@ -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
Expand Down

0 comments on commit b432a64

Please sign in to comment.