X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb-rnd.mk;h=a574b804490a76f9d364db8f325f01ad09168326;hb=a7ae4b40905bec53c79509adce0d15983173a740;hp=468d760518c559010bebffbc50ec574b613cc082;hpb=c9f089d9b96fea235a9031b5d7c0f023114774f0;p=hw%2Faltusmetrum

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index 468d760..a574b80 100644
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -1,7 +1,7 @@
 AM=../altusmetrum
 SCHEME=$(AM)/scheme
 
-.SUFFIXES: .sch .lht .ps .pdf
+.SUFFIXES: .lht .sch .ps .pdf .tdx .scad .stl
 
 # need to have PROJECT defined
 ifndef PROJECT
@@ -13,28 +13,29 @@ ifndef SCHEMATICS
 	SCHEMATICS=$(PROJECT).sch
 endif
 
-CONFIG=gafrc attribs project project.lht
+CONFIG=gafrc attribs project.lht
 
 all:	drc partslist partslist.csv pcb
 
 drc:	$(PROJECT).drc
 
 $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
-	-gnetlist -g drc2 $(SCHEMATICS) -o $@
+	-lepton-netlist -g drc2 $(SCHEMATICS) -o $@
 
-partslists: partslist partslist.csv partslist.dk partslist-check.dk partslist-mouser.csv partslist.other
+partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist-other.csv
 
 partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
-	gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
+	lepton-netlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
 	head -n1 $(PROJECT).unsorted > partslist
 	tail -n+2 $(PROJECT).unsorted | sort | awk -f $(AM)/bin/fillpartslist >> partslist
 	rm -f $(PROJECT).unsorted
 
 partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
-	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 | sort ) > $@ && rm -f $(PROJECT).csvtmp
+	lepton-netlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
+	(head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8 | \
+		awk -f $(AM)/bin/fillpartscsv | sort ) > $@ && rm -f $(PROJECT).csvtmp
 
-partslist.dk: partslist.csv
+partslist-dk.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
 
 partslist-check.dk: partslist.csv
@@ -43,7 +44,7 @@ partslist-check.dk: partslist.csv
 partslist-mouser.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor mouser partslist.csv > $@
 
-partslist.other: partslist.csv
+partslist-other.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --not-vendor digikey,mouser partslist.csv > $@
 
 $(PROJECT)-seeed.csv: partslist.csv
@@ -53,192 +54,79 @@ $(PROJECT)-goldphoenix.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor goldphoenix partslist.csv > $@
 
 pcb:	$(SCHEMATICS) Makefile $(CONFIG)
-	gsch2pcb-rnd project
-
-$(PROJECT).xy:	$(PROJECT).lht $(CONFIG)
-	pcb-rnd -x bom $(PROJECT).lht
-
-$(PROJECT).bottom.gbr:	$(PROJECT).lht $(CONFIG)
-	pcb-rnd -x gerber $(PROJECT).lht
-	@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
-
-$(PROJECT).all-drill.cnc: $(PROJECT).bottom.gbr
-	gerbv -x drill -o $(PROJECT).all-drill.cnc $(PROJECT).plated-drill.cnc $(PROJECT).unplated-drill.cnc
-
-zip: $(PROJECT).zip
-
-$(PROJECT).zip: $(PROJECT).bottom.gbr $(PROJECT).xy Makefile
-	rm -f $@ && zip $@ $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
-
-ac: $(PROJECT)-ac.zip $(PROJECT)-bom.csv
-
-$(PROJECT)-bom.csv: partslist.csv
-	cp partslist.csv $@
-
-$(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr $(PROJECT).xy
-	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).bottompaste.gbr ]; then \
-		cp $(PROJECT).bottompaste.gbr $(PROJECT).gbp; \
-	fi
-	if [ -f $(PROJECT).topsilk.gbr ]; then \
-		cp $(PROJECT).topsilk.gbr $(PROJECT).gto; \
-	fi
-	if [ -f $(PROJECT).toppaste.gbr ]; then \
-		cp $(PROJECT).toppaste.gbr $(PROJECT).gtp; \
-	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).ncd
-	if [ -f $(PROJECT).unplated-drill.cnc ]; then \
-		cp $(PROJECT).unplated-drill.cnc $(PROJECT).drd; \
-	fi
-	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
-	rm -f $@ && zip $@ \
-		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
-		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
-		$(PROJECT).gml $(PROJECT).ncd $(PROJECT).gml $(PROJECT).drd \
-		$(PROJECT).gl2 $(PROJECT).gl3 \
-		$(PROJECT).xy
+	lepton-netlist -g tEDAx -o $(PROJECT).tdx $(SCHEMATICS)
+	echo 'LoadTedaxFrom(netlist, $(PROJECT).tdx); SaveTo(Layout)' | \
+		pcb-rnd --gui batch $(PROJECT).lht
+#	echo "Run pcb-rnd and import $(PROJECT).tdx"
+
+define emit_xyrs
+	pcb-rnd -x XY $(PROJECT).lht
+endef
+
+ac: $(PROJECT)-ac-pcb.zip $(PROJECT)-ac-asy.zip
+
+$(PROJECT)-ac-pcb.zip:  $(PROJECT).lht $(CONFIG)
+	pcb-rnd -x cam gerber:universal --outfile out/$(PROJECT) $(PROJECT).lht
+	rm -f $@ && zip -j $@ out/*
+
+$(PROJECT)-ac-asy.zip:  $(PROJECT)-ac-pcb.zip partslist.csv
+	cp partslist.csv $(PROJECT)-bom.csv
+	$(call emit_xyrs)
+	rm -f $@ && zip -j $@ $(PROJECT).xy $(PROJECT)-bom.csv out/$(PROJECT).fab
 
 oshpark: $(PROJECT)-oshpark.zip
 
-$(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc 
-	cp $(PROJECT).bottom.gbr bottom\ layer.ger
-	cp $(PROJECT).bottommask.gbr bottom\ solder\ mask.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).all-drill.cnc drills.xln
-	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
-	rm -f $@ && zip $@ *.ger *.xln
+$(PROJECT)-oshpark.zip:	$(PROJECT).lht $(CONFIG)
+	pcb-rnd -x cam gerber:OSH_Park --outfile out/$(PROJECT) $(PROJECT).lht
+	$(call emit_xyrs)
+	rm -f $@ && zip -j $@ out/* $(PROJECT).xy
 
 seeed: $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 
-$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(PROJECT).xy $(SEEED_EXTRA)
-	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).bottompaste.gbr ]; then \
-		cp $(PROJECT).bottompaste.gbr $(PROJECT).gbp; \
-	fi
-	if [ -f $(PROJECT).topsilk.gbr ]; then \
-		cp $(PROJECT).topsilk.gbr $(PROJECT).gto; \
-	fi
-	if [ -f $(PROJECT).toppaste.gbr ]; then \
-		cp $(PROJECT).toppaste.gbr $(PROJECT).gtp; \
-	fi
-	cp $(PROJECT).outline.gbr $(PROJECT).gml
-	cp $(PROJECT).top.gbr $(PROJECT).gtl
-	cp $(PROJECT).topmask.gbr $(PROJECT).gts
-	cp $(PROJECT).all-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
-	rm -f $@ && zip $@ \
-		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
-		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
-		$(PROJECT).gml $(PROJECT).txt \
-		$(PROJECT).gl2 $(PROJECT).gl3 \
-		$(PROJECT).xy $(PROJECT)-sch.pdf \
-		$(SEEED_EXTRA)
-
-goldphoenix: $(PROJECT)-goldphoenix.zip
-
-$(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(PROJECT).xy $(PROJECT)-goldphoenix.csv
-	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).bottompaste.gbr ]; then \
-		cp $(PROJECT).bottompaste.gbr $(PROJECT).gbp; \
-	fi
-	if [ -f $(PROJECT).topsilk.gbr ]; then \
-		cp $(PROJECT).topsilk.gbr $(PROJECT).gto; \
-	fi
-	if [ -f $(PROJECT).toppaste.gbr ]; then \
-		cp $(PROJECT).toppaste.gbr $(PROJECT).gtp; \
-	fi
-	cp $(PROJECT).outline.gbr $(PROJECT).gml
-	cp $(PROJECT).top.gbr $(PROJECT).gtl
-	cp $(PROJECT).topmask.gbr $(PROJECT).gts
-	cp $(PROJECT).all-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
-	rm -f $@ && zip $@ \
-		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
-		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
-		$(PROJECT).gml $(PROJECT).txt \
-		$(PROJECT).gl2 $(PROJECT).gl3 \
-		$(PROJECT).xy $(PROJECT)-sch.pdf \
-		$(PROJECT)-goldphoenix.csv
-
-stencilsunlimited:	$(PROJECT).bottom.gbr $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
-	rm -f $(PROJECT)-stencil.zip && zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
+$(PROJECT)-seeed.zip:	$(PROJECT).lht $(CONFIG) $(PROJECT)-sch.pdf $(SEEED_EXTRA)
+	pcb-rnd -x cam gerber:Seeed --outfile out/$(PROJECT) $(PROJECT).lht
+	$(call emit_xyrs)
+	rm -f $@ && zip -j $@ out/* $(PROJECT).xy $(PROJECT)-sch.pdf $(SEEED_EXTRA)
+
+jlcpcb: $(PROJECT)-jlcpcb.zip 
+
+$(PROJECT)-jlcpcb.zip:	$(PROJECT).lht $(CONFIG)
+	pcb-rnd -x cam gerber:JLC_PCB --outfile out/$(PROJECT) $(PROJECT).lht
+	$(call emit_xyrs)
+	rm -f $@ && zip -j $@ out/* $(PROJECT).xy
+
+stencilsunlimited:	$(BOTTOMCOPPER) $(PROJECT).toppaste.gbr $(OUTLINE)
+	rm -f $(PROJECT)-stencil.zip && zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(OUTLINE)
 
 stencil:	$(PROJECT).lht
-	pcb-rnd -x gerber -c design/paste_adjust=-3mil $(PROJECT).lht
-	mv $(PROJECT).toppaste.gbr stencil.gbr
+	pcb-rnd -x cam gerber:stencils --outfile out/$(PROJECT) $(PROJECT).lht
+
+$(PROJECT).scad:	$(PROJECT).lht
+	pcb-rnd -x openscad $(PROJECT).lht
+
+$(PROJECT).stl:	$(PROJECT).scad
+	openscad --o $(PROJECT).stl $(PROJECT).scad
 
 clean:
-	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr *.cnc *bak* *- *.zip 
-	rm -f *.net *.xy *.cmd *.png partslist partslist.csv *.ger *.xln
-	rm -f *.partslist *.unsorted $(PROJECT).xls muffin-5267.pdf muffin-keithp.pdf
-	rm -f partslist-check.dk partslist.dk partslist-mouser.csv partslist.other
+	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr *.cnc *bak* *- *.zip *.tdx *.backup
+	rm -f *.net *.xy *.cmd *.png partslist partslist.csv *.ger *.xln PCB*save
+	rm -f *.partslist *.unsorted $(PROJECT).xls muffin-*.pdf attribs
+	rm -f partslist-check.dk partslist-dk.csv partslist-mouser.csv partslist-other.csv
 	rm -f $(PROJECT)-sch.ps $(PROJECT)-sch.pdf $(PROJECT)-pcb.ps $(PROJECT)-pcb.pdf
 	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp $(PROJECT).ncd
 	rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts
 	rm -f $(PROJECT).txt $(PROJECT).gl2 $(PROJECT).gl3
+	rm -f $(PROJECT).drd $(PROJECT).g2l $(PROJECT).g3l $(PROJECT).gko 
 	rm -f $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 	rm -f $(PROJECT)-goldphoenix.zip $(PROJECT)-goldphoenix.csv
-	rm -f $(PROJECT)*.ps $(PROJECT)*.pdf
+	rm -f $(PROJECT)*.ps $(PROJECT)*.pdf $(PROJECT)-bom.csv
+	rm -f *.scad
+	rm -fr out
+
+muffins: muffin-6570.pdf muffin-5267.pdf muffin-keithp.pdf
 
-muffins: muffin-5267.pdf muffin-keithp.pdf
+muffin-6570.pdf: partslist.csv $(AM)/glabels/muffin-6570.glabels
+	glabels-3-batch $(AM)/glabels/muffin-6570.glabels -i partslist.csv -o $@ > /dev/null
 
 muffin-5267.pdf: partslist.csv $(AM)/glabels/muffin-short-5267.glabels
 	glabels-3-batch $(AM)/glabels/muffin-short-5267.glabels -i partslist.csv -o $@ > /dev/null
@@ -246,17 +134,13 @@ muffin-5267.pdf: partslist.csv $(AM)/glabels/muffin-short-5267.glabels
 muffin-keithp.pdf: partslist.csv $(AM)/glabels/muffin-5267.glabels
 	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i partslist.csv -o $@ > /dev/null
 
-.sch.ps:
-	gschem -p -o $@ -s /usr/share/gEDA/scheme/print.scm $*.sch
+.sch.pdf:
+	lepton-cli export -o $@ $*.sch
 
-.ps.pdf:
-	ps2pdf $*.ps
-
-SCHEMATICS_PS=$(SCHEMATICS:.sch=.ps)
 SCHEMATICS_PDF=$(SCHEMATICS:.sch=.pdf)
 
 $(PROJECT)-sch.pdf:	$(SCHEMATICS_PDF)
-	pdfjoin -o $@ $(SCHEMATICS_PDF)
+	pdfunite $(SCHEMATICS_PDF) $@
 
 $(PROJECT)-pcb.ps:	$(PROJECT).lht $(CONFIG)
 	pcb-rnd -x ps --psfile $@ --media Letter --ps-color $(PROJECT).lht
@@ -264,19 +148,14 @@ $(PROJECT)-pcb.ps:	$(PROJECT).lht $(CONFIG)
 $(PROJECT)-pcb.pdf:	$(PROJECT)-pcb.ps
 	ps2pdf $(PROJECT)-pcb.ps
 
-$(PROJECT)-big.ps:	$(PROJECT).lht $(CONFIG)
+$(PROJECT)-big.ps:     $(PROJECT).lht $(CONFIG)
 	pcb-rnd -x ps --psfile $@ --media Letter --ps-color --fill-page --no-align-marks $(PROJECT).lht
 
-$(PROJECT)-big.pdf:	$(PROJECT)-big.ps
+$(PROJECT)-big.pdf:    $(PROJECT)-big.ps
 	ps2pdf $(PROJECT)-big.ps
 
 pdf:	$(PROJECT)-sch.pdf $(PROJECT)-pcb.pdf $(PROJECT)-big.pdf
 
-project:
-	(echo 'schematics $(SCHEMATICS)'; \
-	 echo 'output-name $(PROJECT)'; \
-	 echo 'skip-m4') > $@
-
 attribs: $(AM)/attribs
 	cp $(AM)/attribs $@
 
@@ -285,5 +164,8 @@ gafrc:
 	 echo '(reset-component-library)'; \
 	 echo '(load "../altusmetrum/gafrc")') > $@
 
+project.lht: $(AM)/lihata/project.lht
+	cp $(AM)/lihata/project.lht .
+
 .gitignore: $(AM)/gitignore.in
 	sed 's/@@PROJECT@@/$(PROJECT)/g' $(AM)/gitignore.in > .gitignore