Adjust oshpark targets. Add seeed targets

Try to pull correct filenames for the oshpark target.
Add seeed target for both PCB and BOM.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/bin/partslist-vendor b/bin/partslist-vendor
index 9e2545345d5cfc8dd6e46256b8b00cf4972d61e7..5c451de182544bff78353877ed3cc6d9c8a7196e 100755 (executable)
--- a/bin/partslist-vendor
+++ b/bin/partslist-vendor
@@ -38,6 +38,7 @@ string[*] required_elements = {
        "mfg_part_number",
        "device",
        "value",
+       "refdes",
 };
 
 bool has_header_member(string member) {
@@ -86,6 +87,31 @@ string part_number(string[string] entry)
                return entry["vendor_part_number"];
 }
 
+void process_seeed(string[string] entry)
+{
+
+       if (entry["loadstatus"] != "smt")
+               return;
+
+       static bool start = true;
+       if (start) {
+               printf("Part/Designator,Manufacturer Part Number/Seeed SKU, Quantity");
+               start = false;
+       }
+
+       string[*] refdes = String::wordsplit(entry["refdes"], " \t");
+       if (dim(refdes) > 1)
+               printf ("\"");
+       for (int i = 0; i < dim(refdes); i++) {
+               printf("%s", refdes[i]);
+               if (i < dim(refdes) - 1)
+                       printf (",");
+       }
+       if (dim(refdes) > 1)
+               printf ("\"");
+       printf(",%s,%s\n", entry["mfg_part_number"], entry["quantity"]);
+}
+
 void process_digikey(string[string] entry)
 {
        printf("%s,%s,%s %s\n",
@@ -109,8 +135,10 @@ void process_file(file f) {
        while (!File::end(f)) {
                string[string] entry = read_entry(f);
                string vendor = entry["vendor"];
-               if ((!is_uninit(&vendors) && has_vendor(vendors, vendor)) ||
-                   (!is_uninit(&not_vendors) && !has_vendor(not_vendors, vendor))) {
+               if (!is_uninit(&vendors) && has_vendor(vendors, "seeed")) {
+                       process_seeed(entry);
+               } else if ((!is_uninit(&vendors) && has_vendor(vendors, vendor)) ||
+                          (!is_uninit(&not_vendors) && !has_vendor(not_vendors, vendor))) {
                        switch (entry["vendor"]) {
                        case "digikey":
                                process_digikey(entry);

diff --git a/pcb.mk b/pcb.mk
index 78264ec638500be25ba8301c0f42c773055ff868..7a19fcd14bece9f0a12b4d33deeed8755f8c5772 100644 (file)
--- a/pcb.mk
+++ b/pcb.mk
@@ -28,18 +28,21 @@ partslist.csv:      $(SCHEMATICS) Makefile $(AM)/preferred-parts
        gnetlist -L $(SCHEME) -g partslistgag -o $(PROJECT).csvtmp $(SCHEMATICS)
        (head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8 | awk -f $(AM)/bin/fillpartscsv ) > $@ && rm -f $(PROJECT).csvtmp
 
-partslist.dk: $(SCHEMATICS) Makefile $(AM)/preferred-parts partslist.csv
+partslist.dk: partslist.csv
        $(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
 
-partslist-check.dk: $(SCHEMATICS) Makefile $(AM)/preferred-parts partslist.csv
+partslist-check.dk: partslist.csv
        $(AM)/bin/partslist-vendor --vendor digikey --mfg partslist.csv > $@
 
-partslist.mouser: $(SCHEMATICS) Makefile $(SCHEME)/gnet-partslist-bom.scm
+partslist.mouser: partslist.csv
        $(AM)/bin/partslist-vendor --vendor mouser partslist.csv > $@
 
-partslist.other: $(SCHEMATICS) Makefile $(SCHEME)/gnet-partslist-bom.scm
+partslist.other: partslist.csv
        $(AM)/bin/partslist-vendor --not-vendor digikey,mouser partslist.csv > $@
 
+$(PROJECT)-seeed.csv: partslist.csv
+       $(AM)/bin/partslist-vendor --vendor seeed partslist.csv > $@
+
 pcb:   $(SCHEMATICS) project Makefile
        gsch2pcb project
 
@@ -48,23 +51,74 @@ $(PROJECT).xy:      $(PROJECT).pcb
 
 $(PROJECT).bottom.gbr: $(PROJECT).pcb
        pcb -x gerber $(PROJECT).pcb
-
-zip:   $(PROJECT).bottom.gbr $(PROJECT).bottommask.gbr $(PROJECT).fab.gbr $(PROJECT).top.gbr $(PROJECT).topmask.gbr $(PROJECT).toppaste.gbr $(PROJECT).group2.gbr $(PROJECT).group3.gbr $(PROJECT).plated-drill.cnc $(PROJECT).xy  Makefile # $(PROJECT).xls
-       rm -f $(PROJECT).topsilk.gbr
+       @case "$(SILK)" in \
+       none)   rm -f $(PROJECT).topsilk.gbr $(PROJECT).bottom.gbr; \
+               ;; \
+       top)    rm -f $(PROJECT).bottomsilk.gbr; \
+               ;; \
+       bottom) rm -f $(PROJECT).topsilk.gbr; \
+               ;; \
+       both) \
+               ;; \
+       *)      echo "Invalid silk $(SILK)"; exit 1; \
+               ;; \
+       esac
+
+zip: $(PROJECT).zip
+
+$(PROJECT).zip: $(PROJECT).bottom.gbr Makefile
        zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
 
-oshpark: $(PROJECT).bottom.gbr $(PROJECT).bottommask.gbr $(PROJECT).top.gbr $(PROJECT).topmask.gbr $(PROJECT).plated-drill.cnc
+oshpark: $(PROJECT)-oshpark.zip
+
+$(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr
        cp $(PROJECT).bottom.gbr bottom\ layer.ger
        cp $(PROJECT).bottommask.gbr bottom\ solder\ mask.ger
-       cp $(PROJECT).bottomsilk.gbr bottom\ silk\ screen.ger
+       if [ -f $(PROJECT).bottomsilk.gbr ]; then \
+               cp $(PROJECT).bottomsilk.gbr bottom\ silk\ screen.ger; \
+       fi
+       if [ -f $(PROJECT).topsilk.gbr ]; then \
+               cp $(PROJECT).topsilk.gbr top\ silk\ screen.ger; \
+       fi
        cp $(PROJECT).outline.gbr board\ outline.ger
        cp $(PROJECT).top.gbr top\ layer.ger
        cp $(PROJECT).topmask.gbr top\ solder\ mask.ger
        cp $(PROJECT).plated-drill.cnc drills.xln
-       cp $(PROJECT).group2.gbr internal\ plane\ 1.ger
-       cp $(PROJECT).group3.gbr internal\ plane\ 2.ger
+       if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \
+               cp $(PROJECT).group1.gbr internal\ plane\ 1.ger; \
+               cp $(PROJECT).group2.gbr internal\ plane\ 2.ger; \
+       elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \
+               cp $(PROJECT).group2.gbr internal\ plane\ 1.ger; \
+               cp $(PROJECT).group3.gbr internal\ plane\ 2.ger; \
+       fi
        zip $(PROJECT)-oshpark.zip *.ger *.xln
 
+seeed: $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
+
+$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr
+       cp $(PROJECT).bottom.gbr $(PROJECT).gbl
+       cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
+       if [ -f $(PROJECT).bottomsilk.gbr ]; then \
+               cp $(PROJECT).bottomsilk.gbr $(PROJECT).gbo; \
+       fi
+       if [ -f $(PROJECT).topsilk.gbr ]; then \
+               cp $(PROJECT).topsilk.gbr $(PROJECT).gto; \
+       fi
+       cp $(PROJECT).outline.gbr $(PROJECT).gml
+       cp $(PROJECT).top.gbr $(PROJECT).gtl
+       cp $(PROJECT).topmask.gbr $(PROJECT).gts
+       cp $(PROJECT).plated-drill.cnc $(PROJECT).txt
+       if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \
+               cp $(PROJECT).group1.gbr $(PROJECT).gl2; \
+               cp $(PROJECT).group2.gbr $(PROJECT).gl3; \
+       elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \
+               cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
+               cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
+       fi
+       zip $(PROJECT)-seeed.zip $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo \
+               $(PROJECT).gto $(PROJECT).gml $(PROJECT).gtl $(PROJECT).txt \
+               $(PROJECT).gl2 $(PROJECT).gl3
+
 stencil:       $(PROJECT).bottom.gbr $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
        zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr