diff --git a/Makefile b/Makefile index 1a1e1d1..f89dfb7 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,9 @@ fabrication: $(BOARD).kicad_pcb $(BOARD).kicad_sch $(GERBER_ZIPS) kicad-cli sch export python-bom $(word 2,$^) -o $(TEMPLATE_FAB_DIR)/$(BOARD)_bom.xml xsltproc -o $(TEMPLATE_FAB_DIR)/$(BOARD)_bom.csv present/bom2grouped_csv_jlcpcb.xsl $(TEMPLATE_FAB_DIR)/$(BOARD)_bom.xml # - kicad-cli pcb export pos $< --side front --format csv --units mm -o $(TEMPLATE_FAB_DIR)/$(BOARD)_top_pos.csv - sed -e '1 s/Ref/Designator/' -e '1 s/PosX/Mid X/' -e '1 s/PosY/Mid Y/' -e '1 s/Rot/Rotation/' -e '1 s/Side/Layer/' $(TEMPLATE_FAB_DIR)/$(BOARD)_top_pos.csv > $(TEMPLATE_FAB_DIR)/$(BOARD)_pos_jlcpcb.csv + kicad-cli pcb export pos $< --side both --format csv --units mm -o $(TEMPLATE_FAB_DIR)/$(BOARD)_pos.csv + kicad-cli pcb export pos $< --side both --format ascii --units mm -o $(TEMPLATE_FAB_DIR)/$(BOARD)_pos.txt + sed -e '1 s/Ref/Designator/' -e '1 s/PosX/Mid X/' -e '1 s/PosY/Mid Y/' -e '1 s/Rot/Rotation/' -e '1 s/Side/Layer/' $(TEMPLATE_FAB_DIR)/$(BOARD)_pos.csv > $(TEMPLATE_FAB_DIR)/$(BOARD)_pos_jlcpcb.csv kicad-cli pcb export step --subst-models $< -o $(TEMPLATE_FAB_DIR)/$(BOARD)_model.step ; \ rc=$$?; if [ $$rc -ne 0 ] && [ $$rc -ne 2 ]; then exit $$rc; fi kicad-cli pcb export vrml $< -o $(TEMPLATE_FAB_DIR)/$(BOARD)_model.vrml diff --git a/present/template/index.json b/present/template/index.json index 0012bfc..c264a3f 100644 --- a/present/template/index.json +++ b/present/template/index.json @@ -5,10 +5,11 @@ "files": [ {"file": "gerbers_jlcpcb.zip", "description": "Gerber Files for JLCPCB (ZIP)"}, {"file": "gerbers_pcbway.zip", "description": "Gerber Files for PCBWay (ZIP)"}, - {"file": "linht-hw_top_pos.csv", "description": "Position File (CSV)"}, + {"file": "linht-hw_pos.csv", "description": "Position File (CSV)"}, + {"file": "linht-hw_pos.txt", "description": "Position File (ASCII)"}, {"file": "linht-hw_pos_jlcpcb.csv", "description": "Position File for JLCPCB (CSV)"}, + {"file": "linht-hw_bom.txt", "description": "Bill of Materials (ASCII)"}, {"file": "linht-hw_bom.csv", "description": "Bill of Materials for JLCPCB (CSV)"}, - {"file": "linht-hw_bom.xml", "description": "Bill of Materials (XML)"}, {"file": "linht-hw_schematic.pdf", "description": "Schematic (PDF)"}, {"file": "linht-hw_schematic_bw.pdf", "description": "Schematic without Colors (PDF)"}, {"file": "linht-hw_model.step.xz", "description": "3D Model (STEP.XZ)"},