From 80765e324ff50cb01bfb3cf57795e36d3814a976 Mon Sep 17 00:00:00 2001
From: ac <andyc1367@gmail.com>
Date: Mon, 9 Sep 2024 09:31:49 +1000
Subject: [PATCH] Added user layers to jlc gerbers

---
 default.kibot.yaml | 72 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 10 deletions(-)

diff --git a/default.kibot.yaml b/default.kibot.yaml
index 14622cf..4b05c5f 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -2,9 +2,6 @@
 kibot:
   version: 1
 
-import:
-  - file: JLCPCB
-
 preflight:
   run_erc: true
   update_xml: true
@@ -146,14 +143,69 @@ outputs:
       only_different: true
       pcb: false
       old: KIBOT_TAG-0
-  
-  - name: 'JLCPCB_compress'
-    type: compress
-    extends: _JLCPCB_compress
-    options:
-      output: '%f_JLC.%x'
-    
 
+  - name: JLCPCB_gerbers
+    comment: Gerbers compatible with JLCPCB
+    type: gerber
+    dir: JLCPCB
+    options: &gerber_options
+      exclude_edge_layer: true
+      exclude_pads_from_silkscreen: true
+      plot_sheet_reference: false
+      plot_footprint_refs: true
+      plot_footprint_values: false
+      force_plot_invisible_refs_vals: false
+      tent_vias: true
+      use_protel_extensions: true
+      create_gerber_job_file: false
+      disable_aperture_macros: true
+      gerber_precision: 4.6
+      use_gerber_x2_attributes: false
+      use_gerber_net_attributes: false
+      line_width: 0.1
+      subtract_mask_from_silk: true
+      inner_extension_pattern: '.g%n'
+    layers:
+      # Note: a more generic approach is to use 'copper' but then the filenames
+      # are slightly different.
+      - F.Cu
+      - B.Cu
+      - In1.Cu
+      - In2.Cu
+      - In3.Cu
+      - In4.Cu
+      - In5.Cu
+      - In6.Cu
+      - F.SilkS
+      - B.SilkS
+      - F.Mask
+      - B.Mask
+      - Edge.Cuts
+      - user
+
+  - name: JLCPCB_drill
+    comment: Drill files compatible with JLCPCB
+    type: excellon
+    dir: JLCPCB
+    options:
+      pth_and_npth_single_file: false
+      pth_id: '-PTH'
+      npth_id: '-NPTH'
+      metric_units: true
+      map: gerber
+      route_mode_for_oval_holes: false
+      output: "%f%i.%x"
+
+  - name: 'JLCPCB_compress'
+    comment: ZIP file for JLCPCB
+    type: compress
+    options:
+      files:
+        - from_output: JLCPCB_gerbers
+          dest: /
+        - from_output: JLCPCB_drill
+          dest: /
+      output: '%f_JLC.%x'
 groups:
   - name: pcb
     outputs: