From cb9b35322097905345653d818eb5f94b20581eac Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Thu, 5 Jan 2023 14:13:03 -0300
Subject: [PATCH] [Templates] Added MacroFab XYRS

---
 README.md                                     |  3 ++
 docs/README.in                                |  3 ++
 .../config_templates/MacroFab_XYRS.kibot.yaml | 54 +++++++++++++++++++
 .../bom/MacroFab_XYRS.kibot.yaml              | 39 ++------------
 4 files changed, 65 insertions(+), 34 deletions(-)
 create mode 100644 kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml

diff --git a/README.md b/README.md
index d341cafc..e542c22e 100644
--- a/README.md
+++ b/README.md
@@ -4719,6 +4719,9 @@ They include support for:
   - _JLCPCB_fab: _JLCPCB_gerbers+_JLCPCB_gerbers_stencil+_JLCPCB_drill
   - _JLCPCB_assembly: _JLCPCB_position+_JLCPCB_bom
   - _JLCPCB: _JLCPCB_fab+_JLCPCB_assembly
+- [MacroFab_XYRS](https://help.macrofab.com/knowledge/macrofab-required-design-files): XYRS position file in MacroFab format
+  - _only_smd: Filter to get only the SMD parts
+  - _macrofab_xyrs: Position file in XYRS format compatible with MacroFab.
 - [P-Ban](https://www.p-ban.com/): contain fabrication outputs compatible with P-Ban
   - _P-Ban_gerbers: Gerbers. You need to define the layers for more than 8.
   - _P-Ban_drill: Drill files
diff --git a/docs/README.in b/docs/README.in
index fad06186..82d98f27 100644
--- a/docs/README.in
+++ b/docs/README.in
@@ -1302,6 +1302,9 @@ They include support for:
   - _JLCPCB_fab: _JLCPCB_gerbers+_JLCPCB_gerbers_stencil+_JLCPCB_drill
   - _JLCPCB_assembly: _JLCPCB_position+_JLCPCB_bom
   - _JLCPCB: _JLCPCB_fab+_JLCPCB_assembly
+- [MacroFab_XYRS](https://help.macrofab.com/knowledge/macrofab-required-design-files): XYRS position file in MacroFab format
+  - _only_smd: Filter to get only the SMD parts
+  - _macrofab_xyrs: Position file in XYRS format compatible with MacroFab.
 - [P-Ban](https://www.p-ban.com/): contain fabrication outputs compatible with P-Ban
   - _P-Ban_gerbers: Gerbers. You need to define the layers for more than 8.
   - _P-Ban_drill: Drill files
diff --git a/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml b/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml
new file mode 100644
index 00000000..e4ae1c63
--- /dev/null
+++ b/kibot/resources/config_templates/MacroFab_XYRS.kibot.yaml
@@ -0,0 +1,54 @@
+# MacroFab compatible XYRS
+# https://help.macrofab.com/knowledge/macrofab-required-design-files
+kibot:
+  version: 1
+
+filters:
+  - name: _only_smd
+    comment: 'Only SMD parts'
+    type: generic
+    exclude_virtual: true
+    exclude_tht: true
+
+outputs:
+  - name: _macrofab_xyrs
+    comment: "Pick and place file, XYRS style"
+    type: bom
+    options:
+      pre_transform: ['_kicost_rename', '_rot_footprint']
+      dnf_filter: _only_smd
+      output: '%f-%i%I%v_MacroFab.XYRS'
+      units: mils
+      group_fields: []
+      sort_style: ref
+      use_aux_axis_as_origin: true
+      ignore_dnf: false
+      footprint_populate_values: '0,1'
+      footprint_type_values: '1,2,0'
+      csv:
+        separator: '	'
+        hide_pcb_info: true
+        hide_stats_info: true
+        hide_header: true
+      columns:
+        - field: References
+          name: Designator
+        - field: Footprint X
+          name: X-Loc
+        - field: Footprint Y
+          name: Y-Loc
+        - field: Footprint Rot
+          name: Rotation
+        - field: Footprint Side
+          name: Side
+        - field: Footprint Type
+          name: Type
+        - field: Footprint X-Size
+          name: X-Size
+        - field: Footprint Y-Size
+          name: Y-Size
+        - field: Value
+        - field: Footprint
+        - field: Footprint Populate
+          name: Populate
+        - field: MPN
diff --git a/kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml b/kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml
index aa92f41d..b34af2d9 100644
--- a/kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml
+++ b/kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml
@@ -1,46 +1,17 @@
 # MacroFab compatible XYRS
-# https://help.macrofab.com/knowledge/macrofab-required-design-files
+# This is just a template for the quick-start
 kibot:
   version: 1
 
-filters:
-  - name: fix_rotation
-    comment: 'Adjust rotation for JLC'
-    type: rot_footprint
-
-  - name: only_smd
-    comment: 'Only SMD parts'
-    type: generic
-    exclude_virtual: true
-    exclude_tht: true
-
-variants:
-  - name: rotated
-    comment: 'Just a place holder for the rotation filter'
-    type: kibom
-    variant: rotated
-    pre_transform: fix_rotation
-    dnf_filter: only_smd
+import:
+  - file: MacroFab_XYRS
 
 outputs:
-  - name: 'macrofab_xyrs'
+  - name: macrofab_xyrs
     comment: "Pick and place file, XYRS style"
+    extends: _macrofab_xyrs
     type: bom
     options:
-      variant: rotated
-      output: '%f_MacroFab.XYRS'
-      units: mils
-      group_fields: []
-      sort_style: ref
-      use_aux_axis_as_origin: true
-      ignore_dnf: false
-      footprint_populate_values: '0,1'
-      footprint_type_values: '1,2,0'
-      csv:
-        separator: '	'
-        hide_pcb_info: true
-        hide_stats_info: true
-        hide_header: true
       columns:
         - field: References
           name: Designator