Merge branch 'main' into development

ClemensElflein · Aug 8, 2022 · 35c4bae · 35c4bae
2 parents eb8b4dc + c7388a3
commit 35c4bae
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/Hardware/OpenMowerMainboard/OpenMowerMainboard.kibot.yaml b/Hardware/OpenMowerMainboard/OpenMowerMainboard.kibot.yaml
@@ -6,12 +6,26 @@ preflight:
   run_drc: true
   set_text_variables:
     - name: 'git_version'
-      command: 'git describe --tags'
+      # Replace n.m.i with n.m."x"
+      command: >
+        git describe --tags | sed -E 's/^(v[0-9]+\.[0-9]+)\.([0-9]+)/\1.x/'
+  update_xml: true
+
+filters:
+  - name: anything_in_Config
+    type: 'generic'
+    comment: 'Remove components with something in config'
+    keys: ["do not place", "DNP", 'bench_test']
+    exclude_config: true
+    exclude_value: true
 
 outputs:
   - name: 'bom'
-    type: 'bom'
+    comment: 'Used to generate the BoM in CSV, HTML, TSV, TXT, XML or XLSX format using the internal BoM.'
+    type: 'kibom'   # reads bom.ini in contrast with 'bom'
     dir: 'release'
+    options:
+      format: CSV
 
   - name: 'write_gerber_drill'
     comment: 'This is the information for the drilling machine in gerber format.'
@@ -38,25 +52,40 @@ outputs:
     comment: 'Generates the file with position information for the PCB components, used by the pick and place machine.'
     type: 'position'
     dir: 'release'
+    options:
+      dnf_filter: anything_in_Config
 
   - name: 'ibom'
     comment: 'Generates an interactive web page useful to identify the position of the components in the PCB.'
     type: 'ibom'
     dir: 'release'
+    options:
+      dnf_filter: anything_in_Config
+      extra_fields: Stock_PN
+      highlight_pin1: true
+
+  - name: 'pdf_sch_print'
+    comment: 'Exports the PCB to the most common exchange format. Suitable for printing.'
+    type: 'pdf_sch_print'
+    dir: 'release'
+    options:
+      dnf_filter: anything_in_Config
 
   - name: 'pcbdraw_svg'
     comment: 'Exports the PCB as a 2D model (SVG, PNG or JPG).'
     type: 'pcbdraw'
     dir: 'release'
     options:
       format: 'svg'
+      dnf_filter: anything_in_Config
 
   - name: 'pcbdraw_png'
     comment: 'Exports the PCB as a 2D model (SVG, PNG or JPG).'
     type: 'pcbdraw'
     dir: 'release'
     options:
       format: 'png'
+      dnf_filter: anything_in_Config
 
   - name: 'pcbdraw_svg_bottom'
     comment: 'Exports the PCB as a 2D model (SVG, PNG or JPG).'
@@ -65,6 +94,7 @@ outputs:
     options:
       bottom: true
       format: 'svg'
+      dnf_filter: anything_in_Config
 
   - name: 'pcbdraw_png_bottom'
     comment: 'Exports the PCB as a 2D model (SVG, PNG or JPG).'
@@ -73,6 +103,7 @@ outputs:
     options:
       bottom: true
       format: 'png'
+      dnf_filter: anything_in_Config
 
   - name: 'navigate_results'
     comment: 'Generates a web page to navigate the generated outputs'

diff --git a/Hardware/OpenMowerMainboard/bom.ini b/Hardware/OpenMowerMainboard/bom.ini
@@ -33,7 +33,7 @@ board_variant = ['default']
 ; Whether to hide headers from output file
 hide_headers = False
 ; Whether to hide PCB info from output file
-hide_pcb_info = False
+hide_pcb_info = True
 ; Interpret as a Digikey P/N and link the following field
 digikey_link = False