Merge pull request #36 from Neotron-Compute/bugfix/update_bom

Bugfix/update bom

Author: thejpster

.github/workflows/kicad-release.yml

@@ -43,13 +43,15 @@ jobs:
           draft: false
           prerelease: false
       - name: Build gerbers zip file
+        env:
+          SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
         run: |
-          zip -r --junk-paths neotron-pico-gerbers.zip docs/gerbers/
+          zip -r --junk-paths neotron-pico-gerbers-${SOURCE_TAG}.zip docs/gerbers/
       - name: Upload files to Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            neotron-pico-gerbers.zip
+            neotron-pico-gerbers-*.zip
             docs/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Kicad/audio.sch

@@ -15,6 +15,13 @@ filters:
       - column: 'LCSC Part#'
         regex: '^C\d+'
 
+  - name: only_fitted_parts
+    comment: 'Only parts that are not DNF'
+    type: generic
+    include_only:
+      - column: 'DNP'
+        regex: '^0'
+
 variants:
   - name: rotated
     comment: 'Just a place holder for the rotation filter'
@@ -31,14 +38,13 @@ preflight:
 
 outputs:
   # For more information: https://github.com/INTI-CMNB/KiBoM
-  - name: 'generic Schematic PDF'
+  - name: 'generic_sch_pdf'
     comment: "Print the schematic as a PDF"
     type: pdf_sch_print
-    dir: pdfs
     options:
       output: '%f-schematic-%r.%x'
 
-  - name: 'generate gerbers'
+  - name: 'make_gerbers'
     comment: "Generate gerber files"
     type: gerber
     layers: 
@@ -74,17 +80,17 @@ outputs:
       use_gerber_x2_attributes: true
       use_gerber_net_attributes: false
 
-  - name: 'generate drills'
+  - name: 'make_drills'
     comment: "Generate drill files"
     type: excellon
     dir: gerbers
 
-  - name: 'ascii position'
+  - name: 'make_ascii_position'
     comment: "Generate XY position files in ASCII"
     type: position
     dir: gerbers
 
-  - name: 'generate PCB DXF'
+  - name: 'make_dxf'
     comment: "Generate 2D PCB CAD in DXF format"
     type: dxf
     layers:
@@ -104,29 +110,28 @@ outputs:
       exclude_edge_layer: false
       metric_units: true
 
-  - name: 'generate SVG'
+  - name: 'make_svg'
     comment: "Generate 2D PCB image in SVG format"
     type: pcbdraw
     options:
       output: '%f-pcb-%r.%x'
 
-  - name: 'generate PNG'
+  - name: 'make_png'
     comment: "Generate 2D PCB image in PNG format"
     type: pcbdraw
     options:
       output: '%f-pcb-%r.%x'
       format: png
 
-  - name: 'generate 3D model'
+  - name: 'make_step'
     comment: "Generate 3D PCB model in STEP format"
     type: step
     options:
       output: '%f-3d-%r.%x'
 
-  - name: 'generate PCB PDF'
+  - name: 'make_pcb_pdf'
     comment: "Generate 2D PCB CAD in PDF format"
     type: pdf_pcb_print
-    dir: pdfs
     layers:
       - F.Cu
       - In1.Cu
@@ -144,22 +149,78 @@ outputs:
       separated: true
       monochrome: true
 
-  - name: 'generate BoM in CSV'
-    comment: "Generate bill-of-material files"
-    type: kibom
-    dir: gerbers
+  - name: 'make_bom_csv'
+    comment: "Generate bill-of-material file as CSV"
+    type: bom
     options:
+      exclude_filter: 'only_fitted_parts'
+      group_fields:
+        - 'Part'
+        - 'Part Lib'
+        - 'Value'
+        - 'Voltage'
+        - 'Tolerance'
+        - 'Footprint'
+        - 'Footprint Lib'
+      columns:
+        - field: Manufacturer
+          name: Part Number
+          join: ['mpn']
+        - Footprint
+        - References
+        - Quantity per PCB
+        - field: Value
+          join: ['voltage', 'current', 'power', 'tolerance']
+        - Footprint
+        - field: 'LCSC Part#'
+          name: LCSC
+        - Digikey
+        - Mouser
+      output: '%f-bom-%r.%x'
+
+  - name: 'make_bom_html'
+    comment: "Generate bill-of-material files as HTML"
+    type: bom
+    options:
+      format: HTML
+      exclude_filter: 'only_fitted_parts'
+      html:
+        datasheet_as_link: "Datasheet"
+        digikey_link: "Digikey"
+        title: "Neotron Pico Bill of Materials"
+      group_fields:
+        - 'Part'
+        - 'Part Lib'
+        - 'Value'
+        - 'Voltage'
+        - 'Tolerance'
+        - 'Footprint'
+        - 'Footprint Lib'
+      columns:
+        - Row
+        - field: Manufacturer
+          name: Part Number
+          join: ['mpn']
+        - References
+        - Quantity per PCB
+        - field: Value
+          join: ['voltage', 'current', 'power', 'tolerance']
+        - field: 'LCSC Part#'
+          name: LCSC
+        - Digikey
+        - Mouser
+        - Footprint
       output: '%f-bom-%r.%x'
 
-  - name: 'generate BoM in HTML'
+  - name: 'make_ibom'
     comment: "Generate assembly HTML page"
     type: ibom
-    dir: ibom
     options:
       output: '%f-ibom-%r.%x'
+      extra_fields: "Voltage,Tolerance,Manufacturer,MPN"
 
-  - name: 'jlc position'
-    comment: "Pick and place file, JLC style"
+  - name: 'make_jlc_position'
+    comment: "Generate pick and place file, JLC style"
     type: position
     options:
       variant: rotated
@@ -182,10 +243,18 @@ outputs:
         - id: Side
           name: Layer
 
-  - name: 'jlc bom'
-    comment: "BoM for JLC"
+  - name: 'make_jlc_bom'
+    comment: "Generate BoM, JLC style"
     type: bom
     options:
+      group_fields:
+        - 'Part'
+        - 'Part Lib'
+        - 'Value'
+        - 'Voltage'
+        - 'Tolerance'
+        - 'Footprint'
+        - 'Footprint Lib'
       output: '%f-bom-jlc-%r.%x'
       exclude_filter: 'only_jlc_parts'
       ref_separator: ','

Kicad/bmc.sch

@@ -26,6 +26,9 @@ F 5 "MCP23S17T-E/SOCT-ND" H 4425 3050 50  0001 C CNN "Digikey"
 F 6 "MCP23S17T-E/SO" H 4425 3050 50  0001 C CNN "MPN"
 F 7 "Microchip" H 4425 3050 50  0001 C CNN "Manufacturer"
 F 8 "C145413" H 4425 3050 50  0001 C CNN "LCSC Part#"
+F 9 "~" H 4425 3050 50  0001 C CNN "Mouser"
+F 10 "~" H 4425 3050 50  0001 C CNN "Tolerance"
+F 11 "~" H 4425 3050 50  0001 C CNN "Voltage"
 	1    4425 3050
 	1    0    0    -1  
 $EndComp
@@ -173,6 +176,9 @@ F 5 "296-8278-1-ND" H 6050 3650 50  0001 C CNN "Digikey"
 F 6 "SN74HC245NSR" H 6050 3650 50  0001 C CNN "MPN"
 F 7 "Texas Instruments" H 6050 3650 50  0001 C CNN "Manufacturer"
 F 8 "C5625" H 6050 3650 50  0001 C CNN "LCSC Part#"
+F 9 "595-SN74HC245NSR" H 6050 3650 50  0001 C CNN "Mouser"
+F 10 "~" H 6050 3650 50  0001 C CNN "Tolerance"
+F 11 "~" H 6050 3650 50  0001 C CNN "Voltage"
 	1    6050 3650
 	1    0    0    -1  
 $EndComp
@@ -313,11 +319,13 @@ F 1 "100nF" H 8015 2455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7938 2350 50  0001 C CNN
 F 3 "~" H 7900 2500 50  0001 C CNN
 F 4 "0" H 7900 2500 50  0001 C CNN "DNP"
-F 5 "" H 7900 2500 50  0001 C CNN "Digikey"
+F 5 "~" H 7900 2500 50  0001 C CNN "Digikey"
 F 6 "CPL-CAP-X7R-0805-100NF-50V" H 7900 2500 50  0001 C CNN "MPN"
 F 7 "CPL" H 7900 2500 50  0001 C CNN "Manufacturer"
-F 8 "" H 7900 2500 50  0001 C CNN "Mouser"
+F 8 "~" H 7900 2500 50  0001 C CNN "Mouser"
 F 9 "C49678" H 7900 2500 50  0001 C CNN "LCSC Part#"
+F 10 "X5R" H 7900 2500 50  0001 C CNN "Tolerance"
+F 11 "10V" H 7900 2500 50  0001 C CNN "Voltage"
 	1    7900 2500
 	1    0    0    -1  
 $EndComp
@@ -336,11 +344,13 @@ F 1 "100nF" H 8490 2455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8413 2350 50  0001 C CNN
 F 3 "~" H 8375 2500 50  0001 C CNN
 F 4 "0" H 8375 2500 50  0001 C CNN "DNP"
-F 5 "" H 8375 2500 50  0001 C CNN "Digikey"
+F 5 "~" H 8375 2500 50  0001 C CNN "Digikey"
 F 6 "CPL-CAP-X7R-0805-100NF-50V" H 8375 2500 50  0001 C CNN "MPN"
 F 7 "CPL" H 8375 2500 50  0001 C CNN "Manufacturer"
-F 8 "" H 8375 2500 50  0001 C CNN "Mouser"
+F 8 "~" H 8375 2500 50  0001 C CNN "Mouser"
 F 9 "C49678" H 8375 2500 50  0001 C CNN "LCSC Part#"
+F 10 "X5R" H 8375 2500 50  0001 C CNN "Tolerance"
+F 11 "10V" H 8375 2500 50  0001 C CNN "Voltage"
 	1    8375 2500
 	1    0    0    -1  
 $EndComp

Kicad/dac4.sch

@@ -5,5 +5,10 @@ D 16-bit I/O expander, SPI, interrupts, w pull-ups, SOIC-28
 K SPI parallel port expander
 F http://ww1.microchip.com/downloads/en/DeviceDoc/20001952C.pdf
 $ENDCMP
+$CMP Raspberry_Pi_Pico
+D Processor Board with dual-core 133 MHz Cortex-M0+, 2 MiB Flash and 256 KiB SRAM
+K Processor Board
+F https://datasheets.raspberrypi.org/pico/pico-datasheet.pdf
+$ENDCMP
 #
 #End Doc Library