diff --git a/atusb/Makefile b/atusb/Makefile index 2301f16..cb176e4 100644 --- a/atusb/Makefile +++ b/atusb/Makefile @@ -1,5 +1,6 @@ PLOT_BRD = pcbnew --plot=ps_a4 --ps-pads-drill-opt=none --fill-all-zones CPTX = ../../eda-tools/mlztx/cptx +GMERGE = ../../eda-tools/gerber/gmerge NAME = atusb VERSION = 110314 @@ -65,6 +66,9 @@ gerber: -l `pcbnew --list-layers $(NAME).brd | tr '\012' ,` \ --fill-all-zones $(NAME).brd \ --exclude-pcb-edge + $(GMERGE) $(NAME)-SilkS_Front.gto $(NAME)-Comments.gbr >_tmp \ + || { rm -rf _tmp; exit 1; } + mv _tmp $(NAME)-SilkS_Front.gto fab: gerber pcbnew --plot=dxf --origin=aux -l PCB_Edges $(NAME).brd @@ -76,8 +80,7 @@ fab: gerber $(PCB_FILES:%=$(DIR)/%) gerbv: - gerbv $(NAME)-Comments.gbr \ - $(NAME)-SilkS_Front.gto \ + gerbv $(NAME)-SilkS_Front.gto \ $(NAME)-SoldP_Front.gtp \ $(NAME)-Front.gtl \ $(NAME)-Mask_Front.gts \ @@ -96,7 +99,7 @@ clean: rm -f $(NAME)-SilkS_Front.gto $(NAME)-SoldP_Front.gtp rm -f $(NAME)-Back.gbl $(NAME)-Mask_Back.gbs rm -f $(NAME)-SilkS_Back.gbo $(NAME)-SoldP_Back.gbp - rm -f $(NAME)-Comments.gbr + rm -f $(NAME)-Comments.gbr $(NAME)-Drawings.gbr spotless: clean rm -f '$$'savepcb.brd diff --git a/atusb/atusb.brd b/atusb/atusb.brd index 6ae5cee..8e02e20 100644 --- a/atusb/atusb.brd +++ b/atusb/atusb.brd @@ -1,11 +1,11 @@ -PCBNEW-BOARD Version 1 date Mon Mar 14 21:37:48 2011 +PCBNEW-BOARD Version 1 date Tue Mar 15 01:26:22 2011 # Created by Pcbnew(2010-12-27 BZR 2685)-unstable $GENERAL LayerCount 2 Ly 1FFF8001 -EnabledLayers 12E88001 +EnabledLayers 13E88001 Links 90 NoConn 1 Di 45786 36114 53375 52076 @@ -1883,7 +1883,7 @@ De 28 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 46150 49950 46150 50300 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 52750 50000 52750 50300 50 @@ -1915,7 +1915,7 @@ De 21 1 0 Normal $EndTEXTPCB $DRAWSEGMENT Po 0 46150 51800 46150 50250 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $TEXTPCB Te "20110314" @@ -1925,36 +1925,36 @@ $EndTEXTPCB $TEXTPCB Te "37.6 mm" Po 45500 44950 600 800 120 900 -De 25 1 0 Normal +De 24 1 0 Normal $EndTEXTPCB $DRAWSEGMENT Po 0 46150 37000 46150 49950 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 46250 36950 46050 36950 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 46250 51800 46050 51800 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $TEXTPCB Te "16.3 mm" Po 49550 52800 600 800 120 0 -De 25 1 0 Normal +De 24 1 0 Normal $EndTEXTPCB $DRAWSEGMENT Po 0 46400 51950 52700 51950 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 52750 51850 52750 52050 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 46350 51850 46350 52050 50 -De 25 0 900 0 0 +De 24 0 900 0 0 $EndDRAWSEGMENT $DRAWSEGMENT Po 0 52750 51750 46350 51750 50 @@ -1972,6 +1972,11 @@ $DRAWSEGMENT Po 0 46350 36950 52750 36950 50 De 28 0 900 0 0 $EndDRAWSEGMENT +$TEXTPCB +Te "20110314" +Po 46811 40591 300 300 70 900 +De 21 1 0 Normal +$EndTEXTPCB $TRACK Po 0 47750 45400 50100 47750 80 -1 De 0 0 1 0 0 @@ -2952,7 +2957,7 @@ ZLayer 0 ZAux 8 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 50200 43350 0 ZCorner 51050 42500 0 ZCorner 52650 42500 0 @@ -3030,7 +3035,7 @@ ZLayer 0 ZAux 5 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 52650 43950 0 ZCorner 52650 42600 0 ZCorner 51100 42600 0 @@ -3066,7 +3071,7 @@ ZLayer 0 ZAux 9 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 52650 46850 0 ZCorner 52650 44050 0 ZCorner 50400 44050 0 @@ -3119,7 +3124,7 @@ ZLayer 0 ZAux 13 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 52650 51700 0 ZCorner 52650 47000 0 ZCorner 51200 47000 0 @@ -3479,7 +3484,7 @@ ZLayer 15 ZAux 9 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 52650 46850 0 ZCorner 52650 44050 0 ZCorner 50800 44050 0 @@ -3566,7 +3571,7 @@ ZLayer 15 ZAux 8 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 50700 42850 0 ZCorner 51050 42500 0 ZCorner 52650 42500 0 @@ -3709,7 +3714,7 @@ ZLayer 15 ZAux 5 E ZClearance 100 T ZMinThickness 100 -ZOptions 1 16 F 200 200 +ZOptions 1 16 S 200 200 ZCorner 52650 43950 0 ZCorner 52650 42600 0 ZCorner 51100 42600 0 @@ -3743,9 +3748,4 @@ $FILLSEGMENTS 52411 43850 52600 43850 $endFILLSEGMENTS $endCZONE_OUTLINE -$TEXTPCB -Te "20110314" -Po 46811 40591 300 300 70 900 -De 21 1 0 Normal -$EndTEXTPCB $EndBOARD