diff --git a/kibot/resources/config_templates/Elecrow.kibot.yaml b/kibot/resources/config_templates/Elecrow.kibot.yaml index 08dd2cfa..fb24666f 100644 --- a/kibot/resources/config_templates/Elecrow.kibot.yaml +++ b/kibot/resources/config_templates/Elecrow.kibot.yaml @@ -5,13 +5,13 @@ kibot: version: 1 groups: - - name: _Elecrow + - name: _Elecrow@_KIBOT_IMPORT_ID@ outputs: - - _Elecrow_gerbers - - _Elecrow_drill + - _Elecrow_gerbers@_KIBOT_IMPORT_ID@ + - _Elecrow_drill@_KIBOT_IMPORT_ID@ outputs: - - name: _Elecrow_gerbers + - name: _Elecrow_gerbers@_KIBOT_IMPORT_ID@ comment: Gerbers compatible with Elecrow type: gerber dir: @_KIBOT_MANF_DIR@ @@ -40,7 +40,7 @@ outputs: @_KIBOT_F_PASTE@ @_KIBOT_B_PASTE@ - - name: _Elecrow_drill + - name: _Elecrow_drill@_KIBOT_IMPORT_ID@ comment: Drill files compatible with Elecrow type: excellon dir: @_KIBOT_MANF_DIR@ @@ -50,23 +50,25 @@ outputs: npth_id: '-NPTH' output: "%f%i.TXT" - - name: _Elecrow_compress + - name: _Elecrow_compress@_KIBOT_IMPORT_ID@ comment: ZIP file for Elecrow type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: files: - - from_output: _Elecrow_gerbers + - from_output: _Elecrow_gerbers@_KIBOT_IMPORT_ID@ dest: / - - from_output: _Elecrow_drill + - from_output: _Elecrow_drill@_KIBOT_IMPORT_ID@ dest: / ... definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' - _KIBOT_MANF_DIR: Elecrow - _KIBOT_MANF_DIR_COMP: Elecrow + _KIBOT_IMPORT_ID: '' + _KIBOT_IMPORT_DIR: 'Elecrow' + _KIBOT_MANF_DIR: @_KIBOT_IMPORT_DIR@ + _KIBOT_MANF_DIR_COMP: @_KIBOT_IMPORT_DIR@ _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 72cde313..c22a5e8a 100644 --- a/kibot/resources/config_templates/FusionPCB.kibot.yaml +++ b/kibot/resources/config_templates/FusionPCB.kibot.yaml @@ -5,13 +5,13 @@ kibot: version: 1 groups: - - name: _FusionPCB + - name: _FusionPCB@_KIBOT_IMPORT_ID@ outputs: - - _FusionPCB_gerbers - - _FusionPCB_drill + - _FusionPCB_gerbers@_KIBOT_IMPORT_ID@ + - _FusionPCB_drill@_KIBOT_IMPORT_ID@ outputs: - - name: _FusionPCB_gerbers + - name: _FusionPCB_gerbers@_KIBOT_IMPORT_ID@ comment: Gerbers compatible with FusionPCB type: gerber dir: @_KIBOT_MANF_DIR@ @@ -41,7 +41,7 @@ outputs: @_KIBOT_F_PASTE@ @_KIBOT_B_PASTE@ - - name: _FusionPCB_drill + - name: _FusionPCB_drill@_KIBOT_IMPORT_ID@ comment: Drill files compatible with FusionPCB type: excellon dir: @_KIBOT_MANF_DIR@ @@ -50,23 +50,25 @@ outputs: use_aux_axis_as_origin: true output: "%f.TXT" - - name: _FusionPCB_compress + - name: _FusionPCB_compress@_KIBOT_IMPORT_ID@ comment: ZIP file for FusionPCB type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: files: - - from_output: _FusionPCB_gerbers + - from_output: _FusionPCB_gerbers@_KIBOT_IMPORT_ID@ dest: / - - from_output: _FusionPCB_drill + - from_output: _FusionPCB_drill@_KIBOT_IMPORT_ID@ dest: / ... definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' - _KIBOT_MANF_DIR: FusionPCB - _KIBOT_MANF_DIR_COMP: FusionPCB + _KIBOT_IMPORT_ID: '' + _KIBOT_IMPORT_DIR: 'FusionPCB' + _KIBOT_MANF_DIR: @_KIBOT_IMPORT_DIR@ + _KIBOT_MANF_DIR_COMP: @_KIBOT_IMPORT_DIR@ _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 d0a57fa4..bb268fc0 100644 --- a/kibot/resources/config_templates/JLCPCB.kibot.yaml +++ b/kibot/resources/config_templates/JLCPCB.kibot.yaml @@ -13,21 +13,21 @@ filters: regex: '^C\d+' groups: - - name: _JLCPCB_fab + - name: _JLCPCB_fab@_KIBOT_IMPORT_ID@ outputs: - - _JLCPCB_gerbers - - _JLCPCB_drill - - name: _JLCPCB_assembly + - _JLCPCB_gerbers@_KIBOT_IMPORT_ID@ + - _JLCPCB_drill@_KIBOT_IMPORT_ID@ + - name: _JLCPCB_assembly@_KIBOT_IMPORT_ID@ outputs: - - _JLCPCB_position - - _JLCPCB_bom - - name: _JLCPCB + - _JLCPCB_position@_KIBOT_IMPORT_ID@ + - _JLCPCB_bom@_KIBOT_IMPORT_ID@ + - name: _JLCPCB@_KIBOT_IMPORT_ID@ outputs: - - _JLCPCB_fab - - _JLCPCB_assembly + - _JLCPCB_fab@_KIBOT_IMPORT_ID@ + - _JLCPCB_assembly@_KIBOT_IMPORT_ID@ outputs: - - name: _JLCPCB_gerbers + - name: _JLCPCB_gerbers@_KIBOT_IMPORT_ID@ comment: Gerbers compatible with JLCPCB type: gerber dir: @_KIBOT_MANF_DIR@ @@ -53,7 +53,7 @@ outputs: @_KIBOT_F_PASTE@ @_KIBOT_B_PASTE@ - - name: _JLCPCB_drill + - name: _JLCPCB_drill@_KIBOT_IMPORT_ID@ comment: Drill files compatible with JLCPCB type: excellon dir: @_KIBOT_MANF_DIR@ @@ -66,7 +66,7 @@ outputs: route_mode_for_oval_holes: false output: "%f%i.%x" - - name: _JLCPCB_position + - name: _JLCPCB_position@_KIBOT_IMPORT_ID@ comment: "Pick and place file, JLCPCB style" type: position dir: @_KIBOT_MANF_DIR@ @@ -92,7 +92,7 @@ outputs: - id: Side name: Layer - - name: _JLCPCB_bom + - name: _JLCPCB_bom@_KIBOT_IMPORT_ID@ comment: "BoM for JLCPCB" type: bom dir: @_KIBOT_MANF_DIR@ @@ -114,7 +114,7 @@ outputs: hide_stats_info: true quote_all: true - - name: _JLCPCB_compress + - name: _JLCPCB_compress@_KIBOT_IMPORT_ID@ comment: ZIP file for JLCPCB type: compress dir: @_KIBOT_MANF_DIR_COMP@ @@ -122,13 +122,13 @@ outputs: # Position and BoM can be disabled skip_not_run: true files: - - from_output: _JLCPCB_gerbers + - from_output: _JLCPCB_gerbers@_KIBOT_IMPORT_ID@ dest: / - - from_output: _JLCPCB_drill + - from_output: _JLCPCB_drill@_KIBOT_IMPORT_ID@ dest: / - - from_output: _JLCPCB_position + - from_output: _JLCPCB_position@_KIBOT_IMPORT_ID@ dest: / - - from_output: _JLCPCB_bom + - from_output: _JLCPCB_bom@_KIBOT_IMPORT_ID@ dest: / ... diff --git a/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml b/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml index 3b78c5dc..5826cde3 100644 --- a/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml +++ b/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml @@ -4,9 +4,10 @@ kibot: version: 1 outputs: - - name: _macrofab_xyrs + - name: _macrofab_xyrs@_KIBOT_IMPORT_ID@ comment: "Pick and place file, XYRS style" type: bom + dir: @_KIBOT_IMPORT_DIR@ options: pre_transform: ['_kicost_rename', '_rot_footprint'] dnf_filter: _only_smd @@ -49,3 +50,5 @@ outputs: ... definitions: _KIBOT_MPN_FIELD: '- field: MPN' + _KIBOT_IMPORT_ID: '' + _KIBOT_IMPORT_DIR: '.' diff --git a/kibot/resources/config_templates/P-Ban.kibot.yaml b/kibot/resources/config_templates/P-Ban.kibot.yaml index 4ccd22b6..50aa1250 100644 --- a/kibot/resources/config_templates/P-Ban.kibot.yaml +++ b/kibot/resources/config_templates/P-Ban.kibot.yaml @@ -5,13 +5,13 @@ kibot: version: 1 groups: - - name: _P-Ban + - name: _P-Ban@_KIBOT_IMPORT_ID@ outputs: - - _P-Ban_gerbers - - _P-Ban_drill + - _P-Ban_gerbers@_KIBOT_IMPORT_ID@ + - _P-Ban_drill@_KIBOT_IMPORT_ID@ outputs: - - name: _P-Ban_gerbers + - name: _P-Ban_gerbers@_KIBOT_IMPORT_ID@ comment: Gerbers compatible with P-Ban type: gerber dir: @_KIBOT_MANF_DIR@ @@ -41,7 +41,7 @@ outputs: @_KIBOT_F_PASTE@ @_KIBOT_B_PASTE@ - - name: _P-Ban_drill + - name: _P-Ban_drill@_KIBOT_IMPORT_ID@ comment: Drill files compatible with P-Ban type: excellon dir: @_KIBOT_MANF_DIR@ @@ -56,23 +56,25 @@ outputs: right_digits: 3 output: "%f.drl" - - name: _P-Ban_compress + - name: _P-Ban_compress@_KIBOT_IMPORT_ID@ comment: ZIP file for P-Ban type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: files: - - from_output: _P-Ban_gerbers + - from_output: _P-Ban_gerbers@_KIBOT_IMPORT_ID@ dest: / - - from_output: _P-Ban_drill + - from_output: _P-Ban_drill@_KIBOT_IMPORT_ID@ dest: / ... definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' - _KIBOT_MANF_DIR: P-Ban - _KIBOT_MANF_DIR_COMP: P-Ban + _KIBOT_IMPORT_ID: '' + _KIBOT_IMPORT_DIR: 'P-Ban' + _KIBOT_MANF_DIR: @_KIBOT_IMPORT_DIR@ + _KIBOT_MANF_DIR_COMP: @_KIBOT_IMPORT_DIR@ _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 c29914ef..81530856 100644 --- a/kibot/resources/config_templates/PCBWay.kibot.yaml +++ b/kibot/resources/config_templates/PCBWay.kibot.yaml @@ -5,13 +5,13 @@ kibot: version: 1 groups: - - name: _PCBWay + - name: _PCBWay@_KIBOT_IMPORT_ID@ outputs: - - _PCBWay_gerbers - - _PCBWay_drill + - _PCBWay_gerbers@_KIBOT_IMPORT_ID@ + - _PCBWay_drill@_KIBOT_IMPORT_ID@ outputs: - - name: _PCBWay_gerbers + - name: _PCBWay_gerbers@_KIBOT_IMPORT_ID@ comment: Gerbers compatible with PCBWay type: gerber dir: @_KIBOT_MANF_DIR@ @@ -38,7 +38,7 @@ outputs: @_KIBOT_F_PASTE@ @_KIBOT_B_PASTE@ - - name: _PCBWay_drill + - name: _PCBWay_drill@_KIBOT_IMPORT_ID@ comment: Drill files compatible with PCBWay type: excellon dir: @_KIBOT_MANF_DIR@ @@ -57,24 +57,26 @@ outputs: npth_id: '-NPTH' output: "%f%i.drl" - - name: _PCBWay_compress + - name: _PCBWay_compress@_KIBOT_IMPORT_ID@ comment: ZIP file for PCBWay type: compress dir: @_KIBOT_MANF_DIR_COMP@ options: format: ZIP files: - - from_output: _PCBWay_gerbers + - from_output: _PCBWay_gerbers@_KIBOT_IMPORT_ID@ dest: / - - from_output: _PCBWay_drill + - from_output: _PCBWay_drill@_KIBOT_IMPORT_ID@ dest: / ... definitions: _KIBOT_F_PASTE: '' _KIBOT_B_PASTE: '' - _KIBOT_MANF_DIR: PCBWay - _KIBOT_MANF_DIR_COMP: PCBWay + _KIBOT_IMPORT_ID: '' + _KIBOT_IMPORT_DIR: 'PCBWay' + _KIBOT_MANF_DIR: @_KIBOT_IMPORT_DIR@ + _KIBOT_MANF_DIR_COMP: @_KIBOT_IMPORT_DIR@ _KIBOT_GERBER_LAYERS: | - copper - F.SilkS