From 60e2c4e90d59dbf00858bd874cfd1b38aa38550b Mon Sep 17 00:00:00 2001
From: jerryjacobs <>
Date: Fri, 3 Oct 2008 21:25:57 +0000
Subject: [PATCH] Atmel library update, usb connector added, fixed usb 3d paths

---
 library/atmel.dcm                             |   7 +-
 library/atmel.lib                             |  73 +-
 library/conn.dcm                              |  13 +-
 library/conn.lib                              | 765 ++++++++++--------
 modules/connect.mod                           |   4 +-
 .../packages3d/connectors/usb/usb_pinout.png  | Bin 0 -> 12348 bytes
 6 files changed, 456 insertions(+), 406 deletions(-)
 create mode 100644 modules/packages3d/connectors/usb/usb_pinout.png

diff --git a/library/atmel.dcm b/library/atmel.dcm
index 2d66d212..0b6e53b9 100644
--- a/library/atmel.dcm
+++ b/library/atmel.dcm
@@ -1,4 +1,4 @@
-EESchema-DOCLIB  Version 2.0  Date: 28/9/2008-11:25:45
+EESchema-DOCLIB  Version 2.0  Date: 28/9/2008-12:18:59
 #
 $CMP ATMEGA16-A
 D 8 Bit AVR Microcontroller, 16kB Flash, 1024B SRAM, 512B EEPROM
@@ -65,4 +65,9 @@ D Atmel AVR 6 Pin ISP connector
 K ISP isp ISP6 isp6 isp-6 ISP-6 ATMEL-ISP atmel-isp ATMELISP atmelisp 6pin AVR avr
 $ENDCMP
 #
+$CMP AVR-JTAG-10
+D Atmel AVR 10 Pin JTAG connector
+K JTAG jtag JTAG10 jtag10 JTAG-10 jtag-10 ATMEL-JTAG atmel-jtag ATMELJTAG atmeljtag 10pin AVR avr
+$ENDCMP
+#
 #End Doc Library
diff --git a/library/atmel.lib b/library/atmel.lib
index deb42ced..1ac583f8 100644
--- a/library/atmel.lib
+++ b/library/atmel.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 28/9/2008-11:25:45
+EESchema-LIBRARY Version 2.3  Date: 28/9/2008-12:18:59
 #
 # ATMEGA16-A
 #
@@ -724,46 +724,39 @@ ENDDEF
 #
 # AVR-JTAG-10
 #
-DEF AVR-JTAG-10 JP 0 40 Y Y 1 L N
-F0 "JP" -250 350 50 H V L B
-F1 "AVR-JTAG-10" 0 0 50 H V L B
-F2 "atmel-AVR-JTAG-10" 0 150 50 H I C C
+DEF AVR-JTAG-10 CON 0 40 Y Y 1 F N
+F0 "CON" -170 330 50 H V C C
+F1 "AVR-JTAG-10" -340 -330 50 H V L B
+F2 "AVR-JTAG-10" -570 20 50 V I C C
+$FPLIST
+ AVR-JTAG-10
+$ENDFPLIST
 DRAW
-P 2 1 0 0  50 -200  75 -200 N
-P 2 1 0 0  50 -100  75 -100 N
-P 2 1 0 0  50 0  75 0 N
-P 2 1 0 0  50 100  75 100 N
-P 2 1 0 0  50 200  75 200 N
-P 2 1 0 0  -75 -200  -50 -200 N
-P 2 1 0 0  -75 -100  -50 -100 N
-P 2 1 0 0  -75 0  -50 0 N
-P 2 1 0 0  -75 100  -50 100 N
-P 2 1 0 0  -75 200  -50 200 N
-P 2 1 0 0  -250 300  -250 -300 N
-P 2 1 0 0  250 300  -250 300 N
-P 2 1 0 0  250 -300  250 300 N
-P 2 1 0 0  -250 -300  250 -300 N
-T 0 -110 -390 70 0 1 0 JTAG
-T 0 367 147 45 0 1 0 TDI
-T 0 367 47 45 0 1 0 TDO
-T 0 367 -52 45 0 1 0 TMS
-T 0 367 -152 45 0 1 0 TCK
-T 0 367 247 45 0 1 0 VCC
-T 0 -360 247 45 0 1 0 VREF
-T 0 -360 147 45 0 1 0 SRST
-T 0 -360 47 45 0 1 0 TRST
-T 0 -383 -52 45 0 1 0 GND
-T 0 -383 -152 45 0 1 0 GND
-X 1 1 200 -200 100 L 40 40 1 1 P
-X 5 5 200 -100 100 L 40 40 1 1 P
-X 3 3 200 0 100 L 40 40 1 1 P
-X 9 9 200 100 100 L 40 40 1 1 P
-X 7 7 200 200 100 L 40 40 1 1 P
-X 10 10 -200 -200 100 R 40 40 1 1 P
-X 2 2 -200 -100 100 R 40 40 1 1 P
-X 8 8 -200 0 100 R 40 40 1 1 P
-X 6 6 -200 100 100 R 40 40 1 1 P
-X 4 4 -200 200 100 R 40 40 1 1 P
+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
+S 110 290 130 -230 0 1 0 F
+S -260 290 130 270 0 1 0 F
+T 0 -370 -200 45 0 1 0 TDI
+T 0 -360 -100 45 0 0 0 NC
+T 0 -380 0 45 0 1 0 TMS
+T 0 -380 100 45 0 1 0 TDO
+T 0 -380 200 45 0 1 0 TCK
+T 0 230 200 45 0 0 0 GND
+T 0 260 100 45 0 1 0 VREF
+T 0 240 -200 45 0 1 0 GND
+T 0 290 -100 45 0 1 0 nTRST
+T 0 290 0 45 0 1 0 nSRST
+X ~ 10 50 -200 100 L 40 40 1 1 P
+X ~ 8 50 -100 100 L 40 40 1 1 P
+X ~ 6 50 0 100 L 40 40 1 1 P
+X ~ 4 50 100 100 L 40 40 1 1 P
+X ~ 2 50 200 100 L 40 40 1 1 P
+X ~ 9 -200 -200 100 R 40 40 1 1 P
+X ~ 7 -200 -100 100 R 40 40 1 1 P
+X ~ 5 -200 0 100 R 40 40 1 1 P
+X ~ 3 -200 100 100 R 40 40 1 1 P
+X ~ 1 -200 200 100 R 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/library/conn.dcm b/library/conn.dcm
index 0ab585bb..1a5414aa 100644
--- a/library/conn.dcm
+++ b/library/conn.dcm
@@ -1,4 +1,4 @@
-EESchema-DOCLIB  Version 2.0  Date: 30/7/2007-13:26:08
+EESchema-DOCLIB  Version 2.0  Date: 3/10/2008-22:02:44
 #
 $CMP BUSAT
 D Connecteur BUS ISA 16 bits
@@ -260,9 +260,14 @@ D Prise Peritel
 K CONN
 $ENDCMP
 #
-$CMP USB_CONN
-D USB CONNECTOR
-K USB
+$CMP USB_1
+D USB Connector
+K USB usb CONNECTOR connector
+$ENDCMP
+#
+$CMP USB_2
+D USB Connector
+K USB usb CONNECTOR connector
 $ENDCMP
 #
 $CMP XLR3
diff --git a/library/conn.lib b/library/conn.lib
index 8b4ee146..28419768 100644
--- a/library/conn.lib
+++ b/library/conn.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 30/7/2007-13:26:08
+EESchema-LIBRARY Version 2.3  Date: 3/10/2008-22:02:44
 #
 # BUSAT
 #
@@ -440,15 +440,15 @@ DEF CNT-RJ45 P 0 40 Y N 1 F N
 F0 "P" -30 0 60 V V C C
 F1 "CNT-RJ45" 80 0 60 V V C C
 DRAW
-P 5 0 1 0  -80 -540  0 -540  -40 -600  -80 -540  -80 -540 N
-S -100 700 150 -700 0 1 0 N
-P 3 0 1 0  -80 -600  0 -600  0 -600 N
-P 5 0 1 0  -80 -240  0 -240  -40 -300  -80 -240  -80 -240 N
-P 4 0 1 0  -100 -350  -40 -350  -40 -300  -40 -300 N
-P 3 0 1 0  -80 -300  0 -300  0 -300 N
-P 4 0 1 0  -100 -200  -40 -200  -40 -240  -40 -240 N
-P 4 0 1 0  -100 -650  -40 -650  -40 -600  -40 -600 N
 P 4 0 1 0  -100 -500  -40 -500  -40 -540  -40 -540 N
+P 4 0 1 0  -100 -650  -40 -650  -40 -600  -40 -600 N
+P 4 0 1 0  -100 -200  -40 -200  -40 -240  -40 -240 N
+P 3 0 1 0  -80 -300  0 -300  0 -300 N
+P 4 0 1 0  -100 -350  -40 -350  -40 -300  -40 -300 N
+P 5 0 1 0  -80 -240  0 -240  -40 -300  -80 -240  -80 -240 N
+P 3 0 1 0  -80 -600  0 -600  0 -600 N
+S -100 700 150 -700 0 1 0 N
+P 5 0 1 0  -80 -540  0 -540  -40 -600  -80 -540  -80 -540 N
 X P9 9 0 950 250 D 50 50 1 1 P I
 X P14 14 -350 -650 250 R 50 50 1 1 P I
 X P13 13 -350 -500 250 R 50 50 1 1 P I
@@ -472,8 +472,8 @@ DEF ~CONN_1 P 0 30 N N 1 F N
 F0 "P" 80 0 40 H V L C
 F1 "CONN_1" 0 55 30 H I C C
 DRAW
-C 0 0 31 0 1 0 N
 P 2 0 1 0  -30 0  -50 0 N
+C 0 0 31 0 1 0 N
 X 1 1 -150 0 100 R 60 60 1 1 P
 ENDDRAW
 ENDDEF
@@ -1490,44 +1490,44 @@ $FPLIST
  DB15*
 $ENDFPLIST
 DRAW
-P 2 0 1 0  -150 -600  20 -600 N
-P 2 0 1 0  -150 400  20 400 N
-P 2 0 1 0  -150 200  20 200 N
-C -70 -500 30 0 1 0 N
-P 2 0 1 0  -150 0  20 0 N
-A 120 662 29 702 -37 0 1 0 N 130 689 149 660
-P 2 0 1 0  -150 300  -100 300 N
-C -70 700 30 0 1 0 N
-P 2 0 1 0  -150 -700  -100 -700 N
-C 50 600 30 0 1 0 N
-P 2 0 1 0  -150 500  -100 500 N
-P 2 0 1 0  -150 -500  -100 -500 N
-P 2 0 1 0  -150 100  -100 100 N
-A -110 760 41 1799 774 0 1 0 N -151 760 -101 800
-P 2 0 1 0  -150 -400  20 -400 N
-C 50 -200 30 0 1 0 N
-P 2 0 1 0  -150 -200  20 -200 N
-C -70 300 30 0 1 0 N
-P 2 0 1 0  -150 600  20 600 N
-C 50 -600 30 0 1 0 N
-P 2 0 1 0  -150 700  -100 700 N
-P 2 0 1 0  -150 -300  -100 -300 N
-P 2 0 1 0  130 690  -100 800 N
-C -70 -300 30 0 1 0 N
-C 50 -400 30 0 1 0 N
-C 50 200 30 0 1 0 N
-P 2 0 1 0  130 -690  -100 -800 N
-A 117 -660 32 -666 1 0 1 0 N 130 -689 149 -660
-P 2 0 1 0  -150 -760  -150 760 N
-C -70 -100 30 0 1 0 N
-C 50 400 30 0 1 0 N
-C -70 500 30 0 1 0 N
-C -70 -700 30 0 1 0 N
-C -70 100 30 0 1 0 N
-C 50 0 30 0 1 0 N
-P 2 0 1 0  -150 -100  -100 -100 N
-P 2 0 1 0  150 -660  150 660 N
 A -108 -759 42 -1787 -788 0 1 0 N -150 -760 -100 -800
+P 2 0 1 0  150 -660  150 660 N
+P 2 0 1 0  -150 -100  -100 -100 N
+C 50 0 30 0 1 0 N
+C -70 100 30 0 1 0 N
+C -70 -700 30 0 1 0 N
+C -70 500 30 0 1 0 N
+C 50 400 30 0 1 0 N
+C -70 -100 30 0 1 0 N
+P 2 0 1 0  -150 -760  -150 760 N
+A 117 -660 32 -666 1 0 1 0 N 130 -689 149 -660
+P 2 0 1 0  130 -690  -100 -800 N
+C 50 200 30 0 1 0 N
+C 50 -400 30 0 1 0 N
+C -70 -300 30 0 1 0 N
+P 2 0 1 0  130 690  -100 800 N
+P 2 0 1 0  -150 -300  -100 -300 N
+P 2 0 1 0  -150 700  -100 700 N
+C 50 -600 30 0 1 0 N
+P 2 0 1 0  -150 600  20 600 N
+C -70 300 30 0 1 0 N
+P 2 0 1 0  -150 -200  20 -200 N
+C 50 -200 30 0 1 0 N
+P 2 0 1 0  -150 -400  20 -400 N
+A -110 760 41 1799 774 0 1 0 N -151 760 -101 800
+P 2 0 1 0  -150 100  -100 100 N
+P 2 0 1 0  -150 -500  -100 -500 N
+P 2 0 1 0  -150 500  -100 500 N
+C 50 600 30 0 1 0 N
+P 2 0 1 0  -150 -700  -100 -700 N
+C -70 700 30 0 1 0 N
+P 2 0 1 0  -150 300  -100 300 N
+A 120 662 29 702 -37 0 1 0 N 130 689 149 660
+P 2 0 1 0  -150 0  20 0 N
+C -70 -500 30 0 1 0 N
+P 2 0 1 0  -150 200  20 200 N
+P 2 0 1 0  -150 400  20 400 N
+P 2 0 1 0  -150 -600  20 -600 N
 X 1 1 -450 -700 300 R 60 60 1 1 P
 X P9 9 -450 -600 300 R 60 60 1 1 P
 X 2 2 -450 -500 300 R 60 60 1 1 P
@@ -1555,64 +1555,64 @@ $FPLIST
  DB25*
 $ENDFPLIST
 DRAW
-C -70 -800 30 0 1 0 N
-C -70 600 30 0 1 0 N
-A -108 -1259 42 -1787 -788 0 1 8 N -150 -1260 -100 -1300
-A 116 -1169 34 -657 -15 0 1 8 N 130 -1200 150 -1170
-C -70 -200 30 0 1 0 N
-C 50 -500 30 0 1 0 N
-C 50 -700 30 0 1 0 N
-C 50 900 30 0 1 0 N
-C -70 1000 30 0 1 0 N
-C -70 0 30 0 1 0 N
-C 50 700 30 0 1 0 N
-C 50 -300 30 0 1 0 N
-C -70 200 30 0 1 0 N
-C -70 400 30 0 1 0 N
-C -70 -1000 30 0 1 0 N
-C 50 1100 30 0 1 0 N
-A 117 1170 32 664 1 0 1 8 N 130 1199 149 1170
-A -109 1270 41 1799 774 0 1 8 N -150 1270 -100 1310
-C -70 -600 30 0 1 0 N
-C 50 -100 30 0 1 0 N
-C 50 100 30 0 1 0 N
-C 50 300 30 0 1 0 N
-C 50 -900 30 0 1 0 N
-C -70 -400 30 0 1 0 N
-C -70 -1200 30 0 1 0 N
-C 50 500 30 0 1 0 N
-C -70 1200 30 0 1 0 N
-C -70 800 30 0 1 0 N
-C 50 -1100 30 0 1 0 N
-P 2 0 1 0  -150 500  20 500 N
-P 2 0 1 8  -150 -1260  -150 1270 N
-P 2 0 1 0  -150 -300  20 -300 N
-P 2 0 1 0  -150 -200  -100 -200 N
-P 2 0 1 0  -150 -500  20 -500 N
-P 2 0 1 8  130 1200  -100 1310 N
-P 2 0 1 0  -150 1100  20 1100 N
-P 2 0 1 0  -150 -400  -100 -400 N
-P 2 0 1 0  -150 0  -100 0 N
-P 2 0 1 0  -150 -900  20 -900 N
-P 2 0 1 0  -150 100  20 100 N
-P 2 0 1 0  -150 700  20 700 N
-P 2 0 1 0  -150 300  20 300 N
-P 2 0 1 0  -150 -1100  20 -1100 N
-P 2 0 1 0  -150 400  -100 400 N
-P 2 0 1 0  -150 800  -100 800 N
-P 2 0 1 8  -100 -1300  130 -1200 N
-P 2 0 1 8  150 -1170  150 1170 N
-P 2 0 1 0  -150 600  -100 600 N
-P 2 0 1 0  -150 -800  -100 -800 N
-P 2 0 1 0  -150 -600  -100 -600 N
-P 2 0 1 0  -150 1000  -100 1000 N
-P 2 0 1 0  -150 1200  -100 1200 N
-P 2 0 1 0  -150 -1000  -100 -1000 N
-P 2 0 1 0  -150 -100  20 -100 N
-P 2 0 1 0  -150 -1200  -100 -1200 N
-P 2 0 1 0  -150 -700  20 -700 N
-P 2 0 1 0  -150 900  20 900 N
 P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 900  20 900 N
+P 2 0 1 0  -150 -700  20 -700 N
+P 2 0 1 0  -150 -1200  -100 -1200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 -1000  -100 -1000 N
+P 2 0 1 0  -150 1200  -100 1200 N
+P 2 0 1 0  -150 1000  -100 1000 N
+P 2 0 1 0  -150 -600  -100 -600 N
+P 2 0 1 0  -150 -800  -100 -800 N
+P 2 0 1 0  -150 600  -100 600 N
+P 2 0 1 8  150 -1170  150 1170 N
+P 2 0 1 8  -100 -1300  130 -1200 N
+P 2 0 1 0  -150 800  -100 800 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 0  -150 -1100  20 -1100 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 700  20 700 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 -900  20 -900 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 1100  20 1100 N
+P 2 0 1 8  130 1200  -100 1310 N
+P 2 0 1 0  -150 -500  20 -500 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 8  -150 -1260  -150 1270 N
+P 2 0 1 0  -150 500  20 500 N
+C 50 -1100 30 0 1 0 N
+C -70 800 30 0 1 0 N
+C -70 1200 30 0 1 0 N
+C 50 500 30 0 1 0 N
+C -70 -1200 30 0 1 0 N
+C -70 -400 30 0 1 0 N
+C 50 -900 30 0 1 0 N
+C 50 300 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C -70 -600 30 0 1 0 N
+A -109 1270 41 1799 774 0 1 8 N -150 1270 -100 1310
+A 117 1170 32 664 1 0 1 8 N 130 1199 149 1170
+C 50 1100 30 0 1 0 N
+C -70 -1000 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 700 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 1000 30 0 1 0 N
+C 50 900 30 0 1 0 N
+C 50 -700 30 0 1 0 N
+C 50 -500 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+A 116 -1169 34 -657 -15 0 1 8 N 130 -1200 150 -1170
+A -108 -1259 42 -1787 -788 0 1 8 N -150 -1260 -100 -1300
+C -70 600 30 0 1 0 N
+C -70 -800 30 0 1 0 N
 X 1 1 -450 -1200 300 R 60 60 1 1 P
 X P14 14 -450 -1100 300 R 60 60 1 1 P
 X 2 2 -450 -1000 300 R 60 60 1 1 P
@@ -1650,88 +1650,88 @@ $FPLIST
  DB37*
 $ENDFPLIST
 DRAW
-C -70 1600 30 0 1 0 N
-C 50 100 30 0 1 0 N
-C 50 1500 30 0 1 0 N
-C -70 1000 30 0 1 0 N
-P 2 0 1 0  -150 1000  -100 1000 N
-C 50 -500 30 0 1 0 N
-P 2 0 1 0  -150 -500  20 -500 N
-C 50 -1500 30 0 1 0 N
-P 2 0 1 0  -150 -1000  -100 -1000 N
-P 2 0 1 0  -150 1500  20 1500 N
-P 2 0 1 0  -150 200  -100 200 N
-P 2 0 1 0  -150 -900  20 -900 N
-P 2 0 1 0  -150 1870  -150 -1859 N
-C -70 1400 30 0 1 0 N
-P 2 0 1 0  -150 400  -100 400 N
-P 2 0 1 0  -150 1600  -100 1600 N
-C -70 -600 30 0 1 0 N
-P 2 0 1 0  -150 300  20 300 N
-P 2 0 1 0  -150 1300  20 1300 N
-A -106 -1855 44 -1736 -823 0 1 0 N -150 -1860 -100 -1899
-C -70 800 30 0 1 0 N
-P 2 0 1 0  -150 500  20 500 N
-C -70 -200 30 0 1 0 N
-C -70 -800 30 0 1 0 N
-P 2 0 1 0  -150 800  -100 800 N
-C 50 -100 30 0 1 0 N
-P 2 0 1 0  -150 -100  20 -100 N
-P 2 0 1 0  -150 1400  -100 1400 N
-P 2 0 1 0  -150 -1500  20 -1500 N
-C -70 -1200 30 0 1 0 N
-C 50 300 30 0 1 0 N
-P 2 0 1 0  -150 1200  -100 1200 N
-C -70 -1600 30 0 1 0 N
-P 2 0 1 0  -150 -1700  20 -1700 N
-P 2 0 1 0  -150 -300  20 -300 N
-C -70 200 30 0 1 0 N
-C 50 1700 30 0 1 0 N
-C -70 0 30 0 1 0 N
-P 2 0 1 0  -150 -200  -100 -200 N
-C 50 -1300 30 0 1 0 N
-P 2 0 1 0  -150 1800  -100 1800 N
-C -70 1200 30 0 1 0 N
-P 2 0 1 0  -150 1700  20 1700 N
-P 2 0 1 0  -100 1910  130 1800 N
-P 2 0 1 0  -150 -400  -100 -400 N
-P 2 0 1 0  -100 -1900  130 -1800 N
-P 2 0 1 0  -150 -1600  -100 -1600 N
-C 50 -1100 30 0 1 0 N
-P 2 0 1 0  -150 -1400  -100 -1400 N
-C 50 500 30 0 1 0 N
-A -106 1866 44 1747 823 0 1 0 N -150 1870 -100 1910
-C 50 -700 30 0 1 0 N
-A 117 1770 32 664 1 0 1 0 N 130 1799 149 1770
-P 2 0 1 0  -150 -1100  20 -1100 N
-P 2 0 1 0  -150 -800  -100 -800 N
-A 115 -1768 35 -649 -31 0 1 0 N 130 -1800 150 -1770
-C -70 600 30 0 1 0 N
-P 2 0 1 0  -150 -700  20 -700 N
-C 50 1100 30 0 1 0 N
-P 2 0 1 0  -150 700  20 700 N
-P 2 0 1 0  -150 1100  20 1100 N
-C -70 -400 30 0 1 0 N
-P 2 0 1 0  -150 -1800  -100 -1800 N
-P 2 0 1 0  -150 900  20 900 N
-C -70 -1400 30 0 1 0 N
-C 50 1300 30 0 1 0 N
-C -70 -1000 30 0 1 0 N
-C -70 400 30 0 1 0 N
-C -70 1800 30 0 1 0 N
-C 50 700 30 0 1 0 N
-P 2 0 1 0  -150 0  -100 0 N
-C 50 -300 30 0 1 0 N
-P 2 0 1 0  -150 600  -100 600 N
-P 2 0 1 0  -150 100  20 100 N
-C -70 -1800 30 0 1 0 N
-C 50 -900 30 0 1 0 N
-C 50 900 30 0 1 0 N
-P 2 0 1 0  -150 -1200  -100 -1200 N
-C 50 -1700 30 0 1 0 N
-P 2 0 1 0  -150 -1300  20 -1300 N
-P 2 0 1 0  150 -1770  150 1770 N
 P 2 0 1 0  -150 -600  -100 -600 N
+P 2 0 1 0  150 -1770  150 1770 N
+P 2 0 1 0  -150 -1300  20 -1300 N
+C 50 -1700 30 0 1 0 N
+P 2 0 1 0  -150 -1200  -100 -1200 N
+C 50 900 30 0 1 0 N
+C 50 -900 30 0 1 0 N
+C -70 -1800 30 0 1 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 600  -100 600 N
+C 50 -300 30 0 1 0 N
+P 2 0 1 0  -150 0  -100 0 N
+C 50 700 30 0 1 0 N
+C -70 1800 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C -70 -1000 30 0 1 0 N
+C 50 1300 30 0 1 0 N
+C -70 -1400 30 0 1 0 N
+P 2 0 1 0  -150 900  20 900 N
+P 2 0 1 0  -150 -1800  -100 -1800 N
+C -70 -400 30 0 1 0 N
+P 2 0 1 0  -150 1100  20 1100 N
+P 2 0 1 0  -150 700  20 700 N
+C 50 1100 30 0 1 0 N
+P 2 0 1 0  -150 -700  20 -700 N
+C -70 600 30 0 1 0 N
+A 115 -1768 35 -649 -31 0 1 0 N 130 -1800 150 -1770
+P 2 0 1 0  -150 -800  -100 -800 N
+P 2 0 1 0  -150 -1100  20 -1100 N
+A 117 1770 32 664 1 0 1 0 N 130 1799 149 1770
+C 50 -700 30 0 1 0 N
+A -106 1866 44 1747 823 0 1 0 N -150 1870 -100 1910
+C 50 500 30 0 1 0 N
+P 2 0 1 0  -150 -1400  -100 -1400 N
+C 50 -1100 30 0 1 0 N
+P 2 0 1 0  -150 -1600  -100 -1600 N
+P 2 0 1 0  -100 -1900  130 -1800 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -100 1910  130 1800 N
+P 2 0 1 0  -150 1700  20 1700 N
+C -70 1200 30 0 1 0 N
+P 2 0 1 0  -150 1800  -100 1800 N
+C 50 -1300 30 0 1 0 N
+P 2 0 1 0  -150 -200  -100 -200 N
+C -70 0 30 0 1 0 N
+C 50 1700 30 0 1 0 N
+C -70 200 30 0 1 0 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -1700  20 -1700 N
+C -70 -1600 30 0 1 0 N
+P 2 0 1 0  -150 1200  -100 1200 N
+C 50 300 30 0 1 0 N
+C -70 -1200 30 0 1 0 N
+P 2 0 1 0  -150 -1500  20 -1500 N
+P 2 0 1 0  -150 1400  -100 1400 N
+P 2 0 1 0  -150 -100  20 -100 N
+C 50 -100 30 0 1 0 N
+P 2 0 1 0  -150 800  -100 800 N
+C -70 -800 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+P 2 0 1 0  -150 500  20 500 N
+C -70 800 30 0 1 0 N
+A -106 -1855 44 -1736 -823 0 1 0 N -150 -1860 -100 -1899
+P 2 0 1 0  -150 1300  20 1300 N
+P 2 0 1 0  -150 300  20 300 N
+C -70 -600 30 0 1 0 N
+P 2 0 1 0  -150 1600  -100 1600 N
+P 2 0 1 0  -150 400  -100 400 N
+C -70 1400 30 0 1 0 N
+P 2 0 1 0  -150 1870  -150 -1859 N
+P 2 0 1 0  -150 -900  20 -900 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 1500  20 1500 N
+P 2 0 1 0  -150 -1000  -100 -1000 N
+C 50 -1500 30 0 1 0 N
+P 2 0 1 0  -150 -500  20 -500 N
+C 50 -500 30 0 1 0 N
+P 2 0 1 0  -150 1000  -100 1000 N
+C -70 1000 30 0 1 0 N
+C 50 1500 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C -70 1600 30 0 1 0 N
 X 1 1 -450 -1800 300 R 60 60 1 1 P
 X 20 20 -450 -1700 300 R 60 60 1 1 P
 X 2 2 -450 -1600 300 R 60 60 1 1 P
@@ -1781,36 +1781,36 @@ $FPLIST
  DB9*
 $ENDFPLIST
 DRAW
-P 2 0 1 0  -150 400  -100 400 N
-P 2 0 1 8  -140 470  -150 460 N
-C -70 0 30 0 1 0 N
-C -70 -400 30 0 1 0 N
-P 2 0 1 0  -150 300  20 300 N
-C 50 -300 30 0 1 0 N
-C -70 400 30 0 1 0 N
-P 2 0 1 0  -150 -100  20 -100 N
-P 2 0 1 8  -140 -470  -110 -490 N
-P 2 0 1 8  -140 470  -100 490 N
-P 2 0 1 8  -100 490  -70 490 N
-P 2 0 1 0  -150 -300  20 -300 N
-P 2 0 1 8  150 370  150 -390 N
-P 2 0 1 0  -150 -400  -100 -400 N
-P 2 0 1 0  -150 100  20 100 N
-P 2 0 1 0  -150 0  -100 0 N
-P 2 0 1 8  -150 -460  -150 460 N
-P 2 0 1 0  -150 200  -100 200 N
-C -70 -200 30 0 1 0 N
-C 50 -100 30 0 1 0 N
-P 2 0 1 0  -150 -200  -100 -200 N
-P 2 0 1 8  140 -409  -50 -490 N
-C 50 100 30 0 1 0 N
-C 50 300 30 0 1 0 N
-P 2 0 1 8  129 390  -70 490 N
-P 2 0 1 8  -150 -459  -140 -470 N
-P 2 0 1 8  150 -390  140 -409 N
-P 2 0 1 8  -110 -490  -50 -490 N
-P 2 0 1 8  129 390  150 370 N
 C -70 200 30 0 1 0 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 8  129 390  -70 490 N
+C 50 300 30 0 1 0 N
+C 50 100 30 0 1 0 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 0  -150 -200  -100 -200 N
+C 50 -100 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 8  150 370  150 -390 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 0  -150 -100  20 -100 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+P 2 0 1 0  -150 300  20 300 N
+C -70 -400 30 0 1 0 N
+C -70 0 30 0 1 0 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 0  -150 400  -100 400 N
 X 1 1 -450 -400 300 R 60 60 1 1 P
 X P6 6 -450 -300 300 R 60 60 1 1 P
 X 2 2 -450 -200 300 R 60 60 1 1 P
@@ -1957,10 +1957,10 @@ DEF DIL24 P 0 40 Y N 1 F N
 F0 "P" 0 100 70 H V C C
 F1 "DIL24" 0 -100 70 H V C C
 DRAW
-P 2 0 1 0  50 -650  50 650 N
-P 2 0 1 0  -50 -650  50 -650 N
-P 2 0 1 0  -50 650  -50 -650 N
 P 2 0 1 0  50 650  -50 650 N
+P 2 0 1 0  -50 650  -50 -650 N
+P 2 0 1 0  -50 -650  50 -650 N
+P 2 0 1 0  50 -650  50 650 N
 X P13 13 350 -550 300 L 60 60 1 1 P I
 X P14 14 350 -450 300 L 60 60 1 1 P I
 X P15 15 350 -350 300 L 60 60 1 1 P I
@@ -2205,21 +2205,21 @@ DEF DIN_5 P 0 40 Y N 1 F N
 F0 "P" 0 0 70 H V C C
 F1 "DIN_5" 0 -150 70 H V C C
 DRAW
-P 2 0 1 0  219 200  190 180 N
-A 0 -300 30 899 1 0 1 0 N 0 -270 30 -300
-P 2 0 1 0  300 200  219 200 N
-C 0 200 50 0 1 0 N
-P 2 0 1 0  250 0  300 0 N
-C 159 140 50 0 1 0 N
-P 2 0 1 0  0 250  0 300 N
-C -161 140 50 0 1 0 N
-P 2 0 1 0  -250 0  -300 0 N
-P 2 0 1 0  -300 200  -220 200 N
-A 0 -300 30 899 -1799 0 1 0 N 0 -270 -30 -300
-C -200 0 50 0 1 0 N
-C 200 0 50 0 1 0 N
-C 0 0 300 0 1 0 N
 P 2 0 1 0  -220 200  -190 180 N
+C 0 0 300 0 1 0 N
+C 200 0 50 0 1 0 N
+C -200 0 50 0 1 0 N
+A 0 -300 30 899 -1799 0 1 0 N 0 -270 -30 -300
+P 2 0 1 0  -300 200  -220 200 N
+P 2 0 1 0  -250 0  -300 0 N
+C -161 140 50 0 1 0 N
+P 2 0 1 0  0 250  0 300 N
+C 159 140 50 0 1 0 N
+P 2 0 1 0  250 0  300 0 N
+C 0 200 50 0 1 0 N
+P 2 0 1 0  300 200  219 200 N
+A 0 -300 30 899 1 0 1 0 N 0 -270 30 -300
+P 2 0 1 0  219 200  190 180 N
 X 3 3 0 600 300 D 60 60 1 1 P
 X 5 5 600 0 300 L 60 60 1 1 P
 X 4 4 600 200 300 L 60 60 1 1 P
@@ -2262,9 +2262,9 @@ DEF HE10-10 P 0 40 Y Y 1 F N
 F0 "P" 0 550 70 H V C C
 F1 "HE10-10" 0 -600 70 H V C C
 DRAW
-S -150 250 -150 250 0 1 0 N
-S -150 250 -150 250 0 1 0 N
 S -250 500 250 -500 0 1 0 N
+S -150 250 -150 250 0 1 0 N
+S -150 250 -150 250 0 1 0 N
 X 10 10 550 -400 300 L 60 60 1 1 P I
 X 8 8 550 -200 300 L 60 60 1 1 P I
 X 6 6 550 0 300 L 60 60 1 1 P I
@@ -2565,14 +2565,14 @@ DEF LEMO2 K 0 40 Y N 1 F N
 F0 "K" 0 200 70 H V C C
 F1 "LEMO2" 0 -200 70 H V C C
 DRAW
-P 2 0 1 0  -120 0  120 0 N
-A 0 0 120 -1 -899 0 1 0 N 120 0 0 -120
-P 2 0 1 0  -50 50  -30 70 N
-C 0 -59 30 0 1 0 N
-C 0 0 150 0 1 0 N
-P 2 0 1 0  -30 -59  -50 -50 N
-A 0 0 120 1799 -899 0 1 0 N -120 0 0 -120
 C 0 70 30 0 1 0 N
+A 0 0 120 1799 -899 0 1 0 N -120 0 0 -120
+P 2 0 1 0  -30 -59  -50 -50 N
+C 0 0 150 0 1 0 N
+C 0 -59 30 0 1 0 N
+P 2 0 1 0  -50 50  -30 70 N
+A 0 0 120 -1 -899 0 1 0 N 120 0 0 -120
+P 2 0 1 0  -120 0  120 0 N
 X ~ 2 -350 -50 300 R 60 60 1 1 B
 X ~ 2 -350 -50 300 R 60 60 1 2 B
 X ~ 1 -350 50 300 R 60 60 1 1 B
@@ -2586,18 +2586,18 @@ DEF LEMO4 K 0 40 Y N 1 F N
 F0 "K" 0 100 70 H V C C
 F1 "LEMO4" 0 -100 70 H V C C
 DRAW
-P 2 0 1 0  -220 -9  219 -9 N
-A 0 -9 220 1799 -899 0 1 0 N -220 -9 0 -229
-P 2 0 1 0  -150 150  -130 130 N
-C 0 0 250 0 1 0 N
-P 2 0 1 0  150 150  130 130 N
-C -100 100 40 0 1 0 N
-C -100 -100 40 0 1 0 N
-C 100 100 40 0 1 0 N
-P 2 0 1 0  150 -150  130 -130 N
-P 2 0 1 0  -150 -150  -130 -130 N
-A 0 -9 220 -901 1 0 1 0 N 0 -229 220 -9
 C 100 -100 40 0 1 0 N
+A 0 -9 220 -901 1 0 1 0 N 0 -229 220 -9
+P 2 0 1 0  -150 -150  -130 -130 N
+P 2 0 1 0  150 -150  130 -130 N
+C 100 100 40 0 1 0 N
+C -100 -100 40 0 1 0 N
+C -100 100 40 0 1 0 N
+P 2 0 1 0  150 150  130 130 N
+C 0 0 250 0 1 0 N
+P 2 0 1 0  -150 150  -130 130 N
+A 0 -9 220 1799 -899 0 1 0 N -220 -9 0 -229
+P 2 0 1 0  -220 -9  219 -9 N
 T 0 50 150 70 0 0 1 1
 X ~ 3 450 -150 300 L 60 60 1 2 B
 X ~ 4 450 -150 300 L 60 60 1 1 B
@@ -2616,19 +2616,19 @@ DEF LEMO5 K 0 40 Y N 1 F N
 F0 "K" 200 300 70 H V C C
 F1 "LEMO5" 300 -300 70 H V C C
 DRAW
-P 2 0 1 0  200 150  140 130 N
-C 0 -129 40 0 1 0 N
-C 0 0 250 0 1 0 N
-P 2 0 1 0  -61 -240  -61 -209 N
-P 2 0 1 0  -200 -150  -160 -70 N
-P 2 0 1 0  -61 -209  50 -209 N
-C 100 121 40 0 1 0 N
-C -150 -29 40 0 1 0 N
-P 2 0 1 0  -200 150  -140 130 N
-C 150 -29 40 0 1 0 N
-P 2 0 1 0  200 -150  160 -70 N
-P 2 0 1 0  50 -209  50 -240 N
 C -100 121 40 0 1 0 N
+P 2 0 1 0  50 -209  50 -240 N
+P 2 0 1 0  200 -150  160 -70 N
+C 150 -29 40 0 1 0 N
+P 2 0 1 0  -200 150  -140 130 N
+C -150 -29 40 0 1 0 N
+C 100 121 40 0 1 0 N
+P 2 0 1 0  -61 -209  50 -209 N
+P 2 0 1 0  -200 -150  -160 -70 N
+P 2 0 1 0  -61 -240  -61 -209 N
+C 0 0 250 0 1 0 N
+C 0 -129 40 0 1 0 N
+P 2 0 1 0  200 150  140 130 N
 T 0 -80 -150 70 0 0 1 1
 X ~ 5 450 -150 250 L 60 60 1 1 B
 X ~ 3 450 -150 300 L 60 60 1 2 B
@@ -2649,22 +2649,22 @@ DEF LEMO6 J 0 40 Y N 1 F N
 F0 "J" 450 400 70 H V C C
 F1 "LEMO6" 400 -450 70 H V C C
 DRAW
-P 2 0 1 0  350 200  230 110 N
-A 0 0 300 -1 -899 0 1 0 N 300 -1 1 -300
-C 200 -100 30 0 1 0 N
-C -200 -100 30 0 1 0 N
-C 0 200 30 0 1 0 N
-C 0 -200 30 0 1 0 N
-P 2 0 1 0  -350 200  -230 110 N
-C 0 0 400 0 1 0 N
-C -200 100 30 0 1 0 N
-P 2 0 1 0  350 -200  230 -110 N
-P 2 0 1 0  0 350  0 230 N
-P 2 0 1 0  -300 0  300 0 N
-P 2 0 1 0  0 -350  0 -230 N
-P 2 0 1 0  -350 -200  -230 -110 N
-A 0 0 300 -901 -1799 0 1 0 N -1 -300 -300 -1
 C 200 100 30 0 1 0 N
+A 0 0 300 -901 -1799 0 1 0 N -1 -300 -300 -1
+P 2 0 1 0  -350 -200  -230 -110 N
+P 2 0 1 0  0 -350  0 -230 N
+P 2 0 1 0  -300 0  300 0 N
+P 2 0 1 0  0 350  0 230 N
+P 2 0 1 0  350 -200  230 -110 N
+C -200 100 30 0 1 0 N
+C 0 0 400 0 1 0 N
+P 2 0 1 0  -350 200  -230 110 N
+C 0 -200 30 0 1 0 N
+C 0 200 30 0 1 0 N
+C -200 -100 30 0 1 0 N
+C 200 -100 30 0 1 0 N
+A 0 0 300 -1 -899 0 1 0 N 300 -1 1 -300
+P 2 0 1 0  350 200  230 110 N
 X ~ 5 0 600 250 D 60 60 1 1 P
 X ~ 5 0 600 300 D 60 60 1 2 P
 X ~ 3 600 -200 300 L 60 60 1 2 P
@@ -3025,14 +3025,14 @@ DEF RJ12 J 0 40 Y Y 1 F N
 F0 "J" 200 500 60 H V C C
 F1 "RJ12" -150 500 60 H V C C
 DRAW
-P 3 0 1 0  50 250  50 200  50 200 N
-S 350 -300 -300 450 0 1 0 N
-P 3 0 1 0  -100 250  -100 200  -100 200 N
-P 14 0 1 0  -200 250  250 250  250 -150  150 -150  150 -200  100 -200  100 -250  -50 -250  -50 -200  -100 -200  -100 -150  -200 -150  -200 250  -200 250 N
-P 3 0 1 0  150 200  150 250  150 250 N
-P 3 0 1 0  0 250  0 200  0 200 N
-P 3 0 1 0  -50 250  -50 200  -50 200 N
 P 3 0 1 0  100 250  100 200  100 200 N
+P 3 0 1 0  -50 250  -50 200  -50 200 N
+P 3 0 1 0  0 250  0 200  0 200 N
+P 3 0 1 0  150 200  150 250  150 250 N
+P 14 0 1 0  -200 250  250 250  250 -150  150 -150  150 -200  100 -200  100 -250  -50 -250  -50 -200  -100 -200  -100 -150  -200 -150  -200 250  -200 250 N
+P 3 0 1 0  -100 250  -100 200  -100 200 N
+S 350 -300 -300 450 0 1 0 N
+P 3 0 1 0  50 250  50 200  50 200 N
 X SHIELD_2 8 500 300 150 L 50 30 1 1 P
 X SHIELD_1 7 500 400 150 L 50 30 1 1 P
 X ~ 1 -200 -450 150 U 50 50 1 1 P
@@ -3050,16 +3050,16 @@ DEF RJ45 J 0 40 Y Y 1 F N
 F0 "J" 200 500 60 H V C C
 F1 "RJ45" -150 500 60 H V C C
 DRAW
-P 3 0 1 0  25 250  25 200  25 200 N
-P 3 0 1 0  -175 200  -175 250  -175 250 N
-P 3 0 1 0  75 250  75 200  75 200 N
-S -400 -300 400 450 0 1 0 N
-P 3 0 1 0  -25 250  -25 200  -25 200 N
-P 3 0 1 0  -75 250  -75 200  -75 200 N
-P 3 0 1 0  -125 250  -125 200  -125 200 N
-P 14 0 1 0  -225 250  225 250  225 -150  125 -150  125 -200  75 -200  75 -250  -75 -250  -75 -200  -125 -200  -125 -150  -225 -150  -225 250  -225 250 N
-P 3 0 1 0  125 200  125 250  125 250 N
 P 3 0 1 0  175 200  175 250  175 250 N
+P 3 0 1 0  125 200  125 250  125 250 N
+P 14 0 1 0  -225 250  225 250  225 -150  125 -150  125 -200  75 -200  75 -250  -75 -250  -75 -200  -125 -200  -125 -150  -225 -150  -225 250  -225 250 N
+P 3 0 1 0  -125 250  -125 200  -125 200 N
+P 3 0 1 0  -75 250  -75 200  -75 200 N
+P 3 0 1 0  -25 250  -25 200  -25 200 N
+S -400 -300 400 450 0 1 0 N
+P 3 0 1 0  75 250  75 200  75 200 N
+P 3 0 1 0  -175 200  -175 250  -175 250 N
+P 3 0 1 0  25 250  25 200  25 200 N
 X SHIELD 9 550 350 150 L 50 30 1 1 P
 X ~ 1 -350 -450 150 U 50 50 1 1 P
 X ~ 2 -250 -450 150 U 50 50 1 1 P
@@ -3078,43 +3078,43 @@ DEF SCART-F P 0 30 Y N 1 F N
 F0 "P" 0 1200 60 H V C C
 F1 "SCART-F" 40 -1200 60 H V C C
 DRAW
-A -260 971 40 899 -1799 0 1 0 N -260 1011 -300 971
-S -200 170 -100 130 0 1 0 N
-S 100 -330 200 -370 0 1 0 N
-P 2 0 1 0  -260 1011  20 1011 N
-S -200 -430 -100 -470 0 1 0 N
-S 100 670 200 630 0 1 0 N
-S 100 -530 200 -570 0 1 0 N
-P 2 0 1 0  -300 921  -300 900 N
-P 2 0 1 0  190 1150  200 1150 N
-S 100 870 200 830 0 1 0 N
-P 2 0 1 0  -300 850  -300 -1100 N
-S -200 -830 -100 -870 0 1 0 N
-P 2 0 1 0  -300 921  -300 971 N
-S -200 -230 -100 -270 0 1 0 N
-S -200 -1030 -100 -1070 0 1 0 N
-S 100 -930 200 -970 0 1 0 N
-S -200 570 -100 530 0 1 0 N
-S 100 70 200 30 0 1 0 N
-S 100 -130 200 -170 0 1 0 N
-P 2 0 1 0  -300 850  -300 900 N
-S -200 970 -100 930 0 1 0 N
-S 100 470 200 430 0 1 0 N
-S -200 -630 -100 -670 0 1 0 N
-P 2 0 1 0  130 1120  50 1030 N
-S -200 770 -100 730 0 1 0 N
-A 250 -1100 50 -901 1 0 1 0 N 250 -1150 300 -1100
-A -250 -1100 50 1799 -899 0 1 0 N -300 -1100 -250 -1150
-S -200 -30 -100 -70 0 1 0 N
-P 2 0 1 0  -250 -1150  250 -1150 N
-A 200 1050 100 -1 901 0 1 0 N 300 1050 200 1150
-A 190 1081 69 899 1464 0 1 0 N 190 1150 133 1119
-A 20 1040 30 -901 -183 0 1 0 N 20 1010 48 1031
-C -200 1090 50 0 1 0 N
-S 100 270 200 230 0 1 0 N
-S 100 -730 200 -770 0 1 0 N
-S -200 370 -100 330 0 1 0 N
 P 2 0 1 0  300 -1100  300 1061 N
+S -200 370 -100 330 0 1 0 N
+S 100 -730 200 -770 0 1 0 N
+S 100 270 200 230 0 1 0 N
+C -200 1090 50 0 1 0 N
+A 20 1040 30 -901 -183 0 1 0 N 20 1010 48 1031
+A 190 1081 69 899 1464 0 1 0 N 190 1150 133 1119
+A 200 1050 100 -1 901 0 1 0 N 300 1050 200 1150
+P 2 0 1 0  -250 -1150  250 -1150 N
+S -200 -30 -100 -70 0 1 0 N
+A -250 -1100 50 1799 -899 0 1 0 N -300 -1100 -250 -1150
+A 250 -1100 50 -901 1 0 1 0 N 250 -1150 300 -1100
+S -200 770 -100 730 0 1 0 N
+P 2 0 1 0  130 1120  50 1030 N
+S -200 -630 -100 -670 0 1 0 N
+S 100 470 200 430 0 1 0 N
+S -200 970 -100 930 0 1 0 N
+P 2 0 1 0  -300 850  -300 900 N
+S 100 -130 200 -170 0 1 0 N
+S 100 70 200 30 0 1 0 N
+S -200 570 -100 530 0 1 0 N
+S 100 -930 200 -970 0 1 0 N
+S -200 -1030 -100 -1070 0 1 0 N
+S -200 -230 -100 -270 0 1 0 N
+P 2 0 1 0  -300 921  -300 971 N
+S -200 -830 -100 -870 0 1 0 N
+P 2 0 1 0  -300 850  -300 -1100 N
+S 100 870 200 830 0 1 0 N
+P 2 0 1 0  190 1150  200 1150 N
+P 2 0 1 0  -300 921  -300 900 N
+S 100 -530 200 -570 0 1 0 N
+S 100 670 200 630 0 1 0 N
+S -200 -430 -100 -470 0 1 0 N
+P 2 0 1 0  -260 1011  20 1011 N
+S 100 -330 200 -370 0 1 0 N
+S -200 170 -100 130 0 1 0 N
+A -260 971 40 899 -1799 0 1 0 N -260 1011 -300 971
 T 0 -70 1100 150 0 0 1 +
 X P2 2 600 -950 300 L 60 60 1 1 P
 X P4 4 600 -750 300 L 60 60 1 1 P
@@ -3212,10 +3212,10 @@ DEF SIL26 U 0 40 Y N 1 F N
 F0 "U" 0 100 70 H V C C
 F1 "SIL26" 0 -100 70 H V C C
 DRAW
-P 2 0 1 0  50 -1350  50 1350 N
-P 2 0 1 0  -50 -1350  50 -1350 N
-P 2 0 1 0  -50 1350  -50 -1350 N
 P 2 0 1 0  50 1350  -50 1350 N
+P 2 0 1 0  -50 1350  -50 -1350 N
+P 2 0 1 0  -50 -1350  50 -1350 N
+P 2 0 1 0  50 -1350  50 1350 N
 X 26 26 -350 -1250 300 R 60 60 1 1 P I
 X 25 25 -350 -1150 300 R 60 60 1 1 P I
 X 24 24 -350 -1050 300 R 60 60 1 1 P I
@@ -3445,33 +3445,32 @@ DEF TEST W 0 30 N N 1 F N
 F0 "W" 0 60 40 H V C C
 F1 "TEST" 0 -70 40 H V C C
 DRAW
-C 70 0 30 0 1 0 N
 C -70 0 30 0 1 0 N
+C 70 0 30 0 1 0 N
 X 2 2 200 0 100 L 60 60 0 1 P
 X 1 1 -200 0 100 R 60 60 0 1 P
 ENDDRAW
 ENDDEF
 #
-# USB_CONN
+# USB
 #
-DEF USB_CONN J 0 0 Y Y 1 F N
+DEF USB J 0 0 Y Y 1 F N
 F0 "J" -50 400 60 H V C C
-F1 "USB_CONN" -250 150 60 V V C C
-ALIAS USB
+F1 "USB" -250 150 60 V V C C
 DRAW
-S -100 200 50 200 0 1 0 N
-P 4 0 1 0  0 -50  0 -400  50 -450  50 -450 N
-S 50 100 -100 100 0 1 0 N
-P 4 0 1 0  -100 -450  -50 -400  -50 -50  -50 -50 N
-S -100 200 -100 200 0 1 0 N
-S 50 100 50 200 0 1 0 N
-S -100 200 -100 100 0 1 0 N
-P 3 0 1 0  100 -50  200 -200  200 -200 N
-P 9 0 1 0  -150 0  100 0  100 250  50 300  -100 300  -150 250  -150 0  -150 0  -150 0 N
-P 4 0 1 0  -100 -50  -100 -250  -250 -350  -250 -350 N
-P 6 0 1 0  -200 -50  150 -50  150 350  -200 350  -200 -50  -200 -50 N
-P 3 0 1 0  -150 -50  -250 -200  -250 -200 N
 P 4 0 1 0  50 -50  50 -250  200 -350  200 -350 N
+P 3 0 1 0  -150 -50  -250 -200  -250 -200 N
+P 6 0 1 0  -200 -50  150 -50  150 350  -200 350  -200 -50  -200 -50 N
+P 4 0 1 0  -100 -50  -100 -250  -250 -350  -250 -350 N
+P 9 0 1 0  -150 0  100 0  100 250  50 300  -100 300  -150 250  -150 0  -150 0  -150 0 N
+P 3 0 1 0  100 -50  200 -200  200 -200 N
+S -100 200 -100 100 0 1 0 N
+S 50 100 50 200 0 1 0 N
+S -100 200 -100 200 0 1 0 N
+P 4 0 1 0  -100 -450  -50 -400  -50 -50  -50 -50 N
+S 50 100 -100 100 0 1 0 N
+P 4 0 1 0  0 -50  0 -400  50 -450  50 -450 N
+S -100 200 50 200 0 1 0 N
 X Shield_1 5 350 -450 300 L 40 30 1 1 P
 X D- 2 350 -350 150 L 40 30 1 1 B
 X D+ 3 350 -200 150 L 40 30 1 1 B
@@ -3481,6 +3480,54 @@ X Vbus 1 -400 -200 150 R 40 30 1 1 w
 ENDDRAW
 ENDDEF
 #
+# USB_1
+#
+DEF ~USB_1 J 0 0 Y Y 1 F N
+F0 "J" -150 400 60 H V C C
+F1 "USB_1" -25 -600 60 H I C C
+DRAW
+P 4 0 1 0  50 -50  50 -250  200 -350  200 -350 N
+P 3 0 1 0  -150 -50  -250 -200  -250 -200 N
+P 6 0 1 0  -200 -50  150 -50  150 350  -200 350  -200 -50  -200 -50 N
+P 4 0 1 0  -100 -50  -100 -250  -250 -350  -250 -350 N
+P 9 0 1 0  -150 0  100 0  100 250  50 300  -100 300  -150 250  -150 0  -150 0  -150 0 N
+P 3 0 1 0  100 -50  200 -200  200 -200 N
+S -100 200 -100 100 0 1 0 N
+S 50 100 50 200 0 1 0 N
+S -100 200 -100 200 0 1 0 N
+P 4 0 1 0  -100 -450  -50 -400  -50 -50  -50 -50 N
+S 50 100 -100 100 0 1 0 N
+P 4 0 1 0  0 -50  0 -400  50 -450  50 -450 N
+S -100 200 50 200 0 1 0 N
+T 900 -250 150 60 0 0 0 USB
+X Shield_1 5 350 -450 300 L 40 30 1 1 P
+X D- 2 350 -350 150 L 40 30 1 1 B
+X D+ 3 350 -200 150 L 40 30 1 1 B
+X Shield_2 6 -400 -450 300 R 40 30 1 1 P
+X GND 4 -400 -350 150 R 40 30 1 1 w
+X Vbus 1 -400 -200 150 R 40 30 1 1 w
+ENDDRAW
+ENDDEF
+#
+# USB_2
+#
+DEF ~USB_2 J 0 40 Y Y 1 F N
+F0 "J" -75 250 60 H V C C
+F1 "USB_2" 50 -300 60 H I C C
+F4 "VCC" 325 150 50 H I C C "VCC"
+F6 "D+" 300 50 50 H I C C "Data+"
+F8 "D-" 300 -50 50 H I C C "Data-"
+F10 "GND" 325 -150 50 H I C C "Ground"
+DRAW
+P 5 0 0 0  -150 200  0 200  0 -200  -150 -200  -150 -200 N
+T 900 -100 0 60 0 0 0 USB
+X ~ 4 200 -150 200 L 50 50 1 1 I
+X ~ 3 200 -50 200 L 50 50 1 1 I
+X ~ 2 200 50 200 L 50 50 1 1 I
+X ~ 1 200 150 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # XLR3
 #
 DEF XLR3 K 0 30 Y N 1 F N
@@ -3488,9 +3535,9 @@ F0 "K" 150 250 60 H V C C
 F1 "XLR3" 200 -250 60 H V C C
 DRAW
 C 0 0 200 0 1 0 f
-C 129 0 40 0 1 0 N
-C -130 0 40 0 1 0 N
 C 0 -130 40 0 1 0 N
+C -130 0 40 0 1 0 N
+C 129 0 40 0 1 0 N
 T 0 -100 90 40 0 0 1 1
 T 0 10 -40 40 0 0 1 3
 T 0 100 90 40 0 0 1 2
@@ -3507,10 +3554,10 @@ F0 "K" 100 250 60 H V C C
 F1 "XLR4" 100 -250 60 H V C C
 DRAW
 C 0 0 200 0 1 0 f
-C -100 100 40 0 1 0 N
-C 100 -100 40 0 1 0 N
-C -100 -100 40 0 1 0 N
 C 100 100 40 0 1 0 N
+C -100 -100 40 0 1 0 N
+C 100 -100 40 0 1 0 N
+C -100 100 40 0 1 0 N
 T 0 -40 60 60 0 0 1 1
 X ~ 3 350 -100 210 L 60 60 1 1 P
 X ~ 4 350 100 210 L 60 60 1 1 P
@@ -3526,11 +3573,11 @@ F0 "K" 100 250 60 H V C C
 F1 "XLR5" 200 -240 60 H V C C
 DRAW
 C 0 0 200 0 1 0 f
-C 100 100 40 0 1 0 N
-C -100 100 40 0 1 0 N
-C 0 -140 40 0 1 0 N
-C 130 -50 40 0 1 0 N
 C -130 -50 40 0 1 0 N
+C 130 -50 40 0 1 0 N
+C 0 -140 40 0 1 0 N
+C -100 100 40 0 1 0 N
+C 100 100 40 0 1 0 N
 T 0 -40 60 60 0 0 1 1
 X P3 4 350 -50 180 L 60 60 1 1 P
 X P5 5 350 100 210 L 60 60 1 1 P
diff --git a/modules/connect.mod b/modules/connect.mod
index 01212d0e..7092a003 100644
--- a/modules/connect.mod
+++ b/modules/connect.mod
@@ -18843,7 +18843,7 @@ Ne 0 ""
 Po -2362 0
 $EndPAD
 $SHAPE3D
-Na "connectors/USB_type_B.wrl"
+Na "connectors/usb/normal/usb_b/usb_b_through_hole.wrl"
 Sc 0.393700 0.393700 0.393700
 Of 0.000000 0.000000 0.001000
 Ro 0.000000 0.000000 0.000000
@@ -18904,7 +18904,7 @@ Ne 0 ""
 Po 1050 2800
 $EndPAD
 $SHAPE3D
-Na "connectors/usb_a_through_hole.wrl"
+Na "connectors/usb/normal/usb_a/usb_a_through_hole.wrl"
 Sc 1.000000 1.000000 1.000000
 Of 0.000000 0.000000 0.000000
 Ro 0.000000 0.000000 0.000000
diff --git a/modules/packages3d/connectors/usb/usb_pinout.png b/modules/packages3d/connectors/usb/usb_pinout.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f5425a774adcee465af12e7af7b15c2c90ba6a
GIT binary patch
literal 12348
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

literal 0
HcmV?d00001