tztz/KicadLib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Resolved merge issue

Browse source
This commit is contained in:
DerekGn 2017-03-17 11:43:44 +00:00
parent 375c7b9801
commit dda9ee3d84
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
library/atmel.lib
View file

@ -10898,16 +10898,16 @@ F1 "AVR-ISP-10" -340 -330 50 H V L BNN
F2 "AVR-ISP-10" -750 50 50 V I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
T 0 -380 -100 45 0 0 0 SCK Normal 1 C C
T 0 230 200 45 0 0 0 VCC Normal 1 C C
T 0 230 -200 45 0 1 0 GND Normal 1 C C
T 0 230 -100 45 0 1 0 GND Normal 1 C C
T 0 230 0 45 0 1 0 GND Normal 1 C C
T 0 230 100 45 0 1 0 GND Normal 1 C C
T 0 -450 100 45 0 1 0 LED/NC Normal 1 C C
T 0 -400 -200 45 0 1 0 MISO Normal 1 C C
T 0 -390 200 45 0 1 0 MOSI Normal 1 C C
T 0 -370 0 45 0 1 0 RST Normal 1 C C
T 0 -380 -100 45 0 0 0 SCK Normal 1 C C
T 0 230 200 45 0 0 0 VCC Normal 1 C C
T 0 230 -200 45 0 1 0 GND Normal 1 C C
T 0 230 -100 45 0 1 0 GND Normal 1 C C
T 0 230 0 45 0 1 0 GND Normal 1 C C
T 0 230 100 45 0 1 0 GND Normal 1 C C
T 0 -450 100 45 0 1 0 LED/NC Normal 1 C C
T 0 -400 -200 45 0 1 0 MISO Normal 1 C C
T 0 -390 200 45 0 1 0 MOSI Normal 1 C C
T 0 -370 0 45 0 1 0 RST Normal 1 C C
S -280 -230 130 -250 0 1 0 F
S -280 -40 -260 -250 0 1 0 F
S -260 290 -280 40 0 1 0 F
@ -10934,12 +10934,12 @@ F1 "AVR-ISP-6" -265 -230 50 H V L BNN
F2 "AVR-ISP-6" -520 40 50 V I C CNN
F3 "" -25 0 50 H I C CNN
DRAW
T 0 -315 5 45 0 0 0 SCK Normal 1 C C
T 0 275 110 45 0 0 0 VCC Normal 1 C C
T 0 285 -105 45 0 1 0 GND Normal 1 C C
T 0 -333 102 45 0 1 0 MISO Normal 1 C C
T 0 307 -2 45 0 1 0 MOSI Normal 1 C C
T 0 -315 -100 45 0 1 0 RST Normal 1 C C
T 0 -315 5 45 0 0 0 SCK Normal 1 C C
T 0 275 110 45 0 0 0 VCC Normal 1 C C
T 0 285 -105 45 0 1 0 GND Normal 1 C C
T 0 -333 102 45 0 1 0 MISO Normal 1 C C
T 0 307 -2 45 0 1 0 MOSI Normal 1 C C
T 0 -315 -100 45 0 1 0 RST Normal 1 C C
S -205 -140 165 -160 0 1 0 F
S -205 200 155 180 0 1 0 F
S -200 -160 -220 -40 0 1 0 F
@ -11001,12 +11001,12 @@ F1 "AVR-PUDI-6" -210 -245 50 H V L BNN
F2 "AVR-PUDI-6" -445 35 50 V I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
T 0 -350 0 45 0 0 0 NC Normal 1 C C
T 0 310 110 45 0 0 0 VCC Normal 1 C C
T 0 310 -105 45 0 1 0 GND Normal 1 C C
T 0 332 -2 45 0 1 0 NC Normal 1 C C
T 0 -300 -100 45 0 1 0 PDI_C Normal 1 C C
T 0 -298 102 45 0 1 0 PDI_D Normal 1 C C
T 0 -350 0 45 0 0 0 NC Normal 1 C C
T 0 310 110 45 0 0 0 VCC Normal 1 C C
T 0 310 -105 45 0 1 0 GND Normal 1 C C
T 0 332 -2 45 0 1 0 NC Normal 1 C C
T 0 -300 -100 45 0 1 0 PDI_C Normal 1 C C
T 0 -298 102 45 0 1 0 PDI_D Normal 1 C C
S -180 -140 190 -160 0 1 0 F
S -180 200 180 180 0 1 0 F
S -175 -160 -195 -40 0 1 0 F
@ -11029,12 +11029,12 @@ F1 "AVR-TPI-6" -210 -245 50 H V L BNN
F2 "AVR-PDI-6" -445 35 50 V I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
T 0 -300 0 45 0 0 0 TPI_C Normal 1 C C
T 0 310 110 45 0 0 0 VTG Normal 1 C C
T 0 310 -105 45 0 1 0 GND Normal 1 C C
T 0 332 -2 45 0 1 0 NC Normal 1 C C
T 0 -320 -100 45 0 1 0 RES Normal 1 C C
T 0 -298 102 45 0 1 0 TPI_D Normal 1 C C
T 0 -300 0 45 0 0 0 TPI_C Normal 1 C C
T 0 310 110 45 0 0 0 VTG Normal 1 C C
T 0 310 -105 45 0 1 0 GND Normal 1 C C
T 0 332 -2 45 0 1 0 NC Normal 1 C C
T 0 -320 -100 45 0 1 0 RES Normal 1 C C
T 0 -298 102 45 0 1 0 TPI_D Normal 1 C C
S -180 -140 190 -160 0 1 0 F
S -180 200 180 180 0 1 0 F
S -175 -160 -195 -40 0 1 0 F