patch up CI

scripts/dependencies.sh

@@ -4,7 +4,7 @@ set -v
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-sudo add-apt-repository --yes ppa:kicad/kicad-8.0-releases
+sudo add-apt-repository --yes ppa:kicad/kicad-9.0-releases
 sudo apt-get update -qq
 sudo DEBIAN_FRONTEND=noninteractive apt install --install-recommends kicad kicad-packages3d- kicad-demos-
 sudo DEBIAN_FRONTEND=noninteractive apt install python3 pip

scripts/jlc_bom_formatter.py

@@ -10,11 +10,14 @@ def footprintFix(fpName):
             return propertiesList[1][-1] + propertiesList[2]
 
     # Strip out library name from FP.
-    return fpName.split(":")[-1]
+    if isinstance(fpName, float):
+        print("Malformed BOM, check you are not missing footprint assignments.")
+    else:
+        return fpName.split(":")[-1]
 
 bom_file = pd.read_csv(sys.argv[1])
 
 bom_file.columns = ['Designator', 'Value', 'Footprint', 'JLCPCB Part #']
 bom_file['Footprint'] = bom_file['Footprint'].apply(lambda x: footprintFix(x))
 
-bom_file.to_csv(sys.argv[2], index=False)
+bom_file.to_csv(sys.argv[2], index=False)

scripts/jlc_cpl_formatter.py

@@ -1,11 +1,26 @@
 import pandas as pd
 import os, sys, csv
 
-cpl_file = pd.read_csv(sys.argv[1])
+def reduce_layer(layername):
+    if 'top' in layername:
+        return 'T'
+    elif 'bottom' in layername:
+        return 'B'
+    else:
+        return ''
 
-cpl_file.columns = ['Designator', 'Val', 'Package', 'Mid X', 'Mid Y', 'Rotation', 'Layer']
-cpl_file = cpl_file.reindex(columns=['Designator', 'Mid X', 'Mid Y', 'Layer', 'Rotation'])
-cpl_file.drop([0,1,2,3,4,5])
-cpl_file['Layer'] = "T"
+if __name__ == "__main__":
+    cpl_file = pd.read_csv(sys.argv[1])
 
-cpl_file.to_csv(sys.argv[2], index=False)
+    # Remove header rows from table
+    cpl_file.drop([0,1,2,3,4,5])
+
+    # Assign names and sort rows to match JLC format
+    cpl_file.columns = ['Designator', 'Val', 'Package', 'Mid X', 'Mid Y', 'Rotation', 'Layer']
+    cpl_file = cpl_file.reindex(columns=['Designator', 'Mid X', 'Mid Y', 'Layer', 'Rotation'])
+
+    # Change top/bottom to T/B
+    cpl_file['Layer'] = cpl_file['Layer'].apply(reduce_layer)
+
+    # Write file to disk
+    cpl_file.to_csv(sys.argv[2], index=False)