From 5b37d88b28d6a99aaf4bce49cdd1796bbd0bda14 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Wed, 14 Jun 2023 08:39:05 -0300 Subject: [PATCH] [Internal templates] More customizations - Target dir for manf outputs and separated for the archive - Parameters to disable JLCPCB pos and bom --- .../config_templates/Elecrow.kibot.yaml | 8 +++++--- .../config_templates/FusionPCB.kibot.yaml | 8 +++++--- .../config_templates/JLCPCB.kibot.yaml | 19 +++++++++++++------ .../config_templates/P-Ban.kibot.yaml | 8 +++++--- .../config_templates/PCBWay.kibot.yaml | 8 +++++--- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/kibot/resources/config_templates/Elecrow.kibot.yaml b/kibot/resources/config_templates/Elecrow.kibot.yaml index 04a761c0..08dd2cfa 100644 --- a/kibot/resources/config_templates/Elecrow.kibot.yaml +++ b/kibot/resources/config_templates/Elecrow.kibot.yaml @@ -14,7 +14,7 @@ outputs: - name: _Elecrow_gerbers comment: Gerbers compatible with Elecrow type: gerber - dir: Elecrow + dir: @_KIBOT_MANF_DIR@ options: &gerber_options exclude_edge_layer: true exclude_pads_from_silkscreen: true @@ -43,7 +43,7 @@ outputs: - name: _Elecrow_drill comment: Drill files compatible with Elecrow type: excellon - dir: Elecrow + dir: @_KIBOT_MANF_DIR@ options: pth_and_npth_single_file: false pth_id: '' @@ -53,7 +53,7 @@ outputs: - name: _Elecrow_compress comment: ZIP file for Elecrow type: compress - dir: Elecrow + dir: @_KIBOT_MANF_DIR_COMP@ options: files: - from_output: _Elecrow_gerbers @@ -65,6 +65,8 @@ outputs: definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' + _KIBOT_MANF_DIR: Elecrow + _KIBOT_MANF_DIR_COMP: Elecrow _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 ef5d5fba..72cde313 100644 --- a/kibot/resources/config_templates/FusionPCB.kibot.yaml +++ b/kibot/resources/config_templates/FusionPCB.kibot.yaml @@ -14,7 +14,7 @@ outputs: - name: _FusionPCB_gerbers comment: Gerbers compatible with FusionPCB type: gerber - dir: FusionPCB + dir: @_KIBOT_MANF_DIR@ options: &gerber_options exclude_edge_layer: true exclude_pads_from_silkscreen: true @@ -44,7 +44,7 @@ outputs: - name: _FusionPCB_drill comment: Drill files compatible with FusionPCB type: excellon - dir: FusionPCB + dir: @_KIBOT_MANF_DIR@ options: pth_and_npth_single_file: true use_aux_axis_as_origin: true @@ -53,7 +53,7 @@ outputs: - name: _FusionPCB_compress comment: ZIP file for FusionPCB type: compress - dir: FusionPCB + dir: @_KIBOT_MANF_DIR_COMP@ options: files: - from_output: _FusionPCB_gerbers @@ -65,6 +65,8 @@ outputs: definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' + _KIBOT_MANF_DIR: FusionPCB + _KIBOT_MANF_DIR_COMP: FusionPCB _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 615f818e..2f5862b9 100644 --- a/kibot/resources/config_templates/JLCPCB.kibot.yaml +++ b/kibot/resources/config_templates/JLCPCB.kibot.yaml @@ -30,7 +30,7 @@ outputs: - name: _JLCPCB_gerbers comment: Gerbers compatible with JLCPCB type: gerber - dir: JLCPCB + dir: @_KIBOT_MANF_DIR@ options: &gerber_options exclude_edge_layer: true exclude_pads_from_silkscreen: true @@ -56,7 +56,7 @@ outputs: - name: _JLCPCB_drill comment: Drill files compatible with JLCPCB type: excellon - dir: JLCPCB + dir: @_KIBOT_MANF_DIR@ options: pth_and_npth_single_file: false pth_id: '-PTH' @@ -69,9 +69,10 @@ outputs: - name: _JLCPCB_position comment: "Pick and place file, JLCPCB style" type: position - dir: JLCPCB + dir: @_KIBOT_MANF_DIR@ + run_by_default: @_KIBOT_POS_ENABLED@ options: - pre_transform: _rot_footprint + pre_transform: @_KIBOT_POS_PRE_TRANSFORM@ output: '%f_cpl_jlc.%x' format: CSV units: millimeters @@ -94,7 +95,8 @@ outputs: - name: _JLCPCB_bom comment: "BoM for JLCPCB" type: bom - dir: JLCPCB + dir: @_KIBOT_MANF_DIR@ + run_by_default: @_KIBOT_BOM_ENABLED@ options: output: '%f_%i_jlc.%x' exclude_filter: '_only_jlc_parts' @@ -115,7 +117,7 @@ outputs: - name: _JLCPCB_compress comment: ZIP file for JLCPCB type: compress - dir: JLCPCB + dir: @_KIBOT_MANF_DIR_COMP@ options: files: - from_output: _JLCPCB_gerbers @@ -132,6 +134,11 @@ definitions: _KIBOT_POS_ONLY_SMD: true _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' + _KIBOT_MANF_DIR: JLCPCB + _KIBOT_MANF_DIR_COMP: JLCPCB + _KIBOT_POS_PRE_TRANSFORM: _rot_footprint + _KIBOT_POS_ENABLED: true + _KIBOT_BOM_ENABLED: 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 ca14a653..4ccd22b6 100644 --- a/kibot/resources/config_templates/P-Ban.kibot.yaml +++ b/kibot/resources/config_templates/P-Ban.kibot.yaml @@ -14,7 +14,7 @@ outputs: - name: _P-Ban_gerbers comment: Gerbers compatible with P-Ban type: gerber - dir: P-Ban + dir: @_KIBOT_MANF_DIR@ options: &gerber_options exclude_edge_layer: true exclude_pads_from_silkscreen: true @@ -44,7 +44,7 @@ outputs: - name: _P-Ban_drill comment: Drill files compatible with P-Ban type: excellon - dir: P-Ban + dir: @_KIBOT_MANF_DIR@ options: pth_and_npth_single_file: true map: @@ -59,7 +59,7 @@ outputs: - name: _P-Ban_compress comment: ZIP file for P-Ban type: compress - dir: P-Ban + dir: @_KIBOT_MANF_DIR_COMP@ options: files: - from_output: _P-Ban_gerbers @@ -71,6 +71,8 @@ outputs: definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' + _KIBOT_MANF_DIR: P-Ban + _KIBOT_MANF_DIR_COMP: P-Ban _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 c75c28fa..c29914ef 100644 --- a/kibot/resources/config_templates/PCBWay.kibot.yaml +++ b/kibot/resources/config_templates/PCBWay.kibot.yaml @@ -14,7 +14,7 @@ outputs: - name: _PCBWay_gerbers comment: Gerbers compatible with PCBWay type: gerber - dir: PCBWay + dir: @_KIBOT_MANF_DIR@ options: &gerber_options exclude_edge_layer: true exclude_pads_from_silkscreen: true @@ -41,7 +41,7 @@ outputs: - name: _PCBWay_drill comment: Drill files compatible with PCBWay type: excellon - dir: PCBWay + dir: @_KIBOT_MANF_DIR@ options: metric_units: false minimal_header: true @@ -60,7 +60,7 @@ outputs: - name: _PCBWay_compress comment: ZIP file for PCBWay type: compress - dir: PCBWay + dir: @_KIBOT_MANF_DIR_COMP@ options: format: ZIP files: @@ -73,6 +73,8 @@ outputs: definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' + _KIBOT_MANF_DIR: PCBWay + _KIBOT_MANF_DIR_COMP: PCBWay _KIBOT_GERBER_LAYERS: | - copper - F.SilkS