UDP_PUP now connected to PA16 (pin 19) on schema

4 files changed, 1165 insertions, 871 deletions

diff --git a/hardware/kicad/SIMtrace.brd b/hardware/kicad/SIMtrace.brd
index 910b3ef..b713179 100644
--- a/hardware/kicad/SIMtrace.brd
+++ b/hardware/kicad/SIMtrace.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Mi 15 Jun 2011 13:50:48 CEST
+PCBNEW-BOARD Version 1 date Mi 15 Jun 2011 13:55:50 CEST
 
 # Created by Pcbnew(2010-00-09 BZR 23xx)-stable
 
diff --git a/hardware/kicad/SIMtrace.net b/hardware/kicad/SIMtrace.net
index 8b61bfa..c9dc5b8 100644
--- a/hardware/kicad/SIMtrace.net
+++ b/hardware/kicad/SIMtrace.net
@@ -1,421 +1,422 @@
-# EESchema Netlist Version 1.1 created  Mi 15 Jun 2011 12:18:12 CEST
+# EESchema Netlist Version 1.1 created  Mi 15 Jun 2011 13:57:54 CEST
 (
- ( /4DC804A6 PIN_ARRAY_2X1 BT1 BATTERY
-  ( 1 N-000062 )
-  ( 2 GND )
- )
- ( /4DC8F975 SM0603 C1 2.2uF
-  ( 1 3V3 )
-  ( 2 GND )
- )
- ( /4D037E30 SM0603 C3 100nF
-  ( 1 3V3 )
-  ( 2 GND )
- )
- ( /4DC66392 SM0603 C4 100nF
-  ( 1 3V3 )
-  ( 2 GND )
- )
- ( /4DC79EDF SM0603 C5 33pF
-  ( 1 N-000063 )
-  ( 2 N-000011 )
- )
- ( /4D020DD3 SM0603 C6 10nF
-  ( 1 GND )
-  ( 2 N-000046 )
- )
- ( /4D020BDE SM0603 C7 100nF
-  ( 1 3V3 )
-  ( 2 GND )
- )
- ( /4D020BEB SM0603 C9 100nF
-  ( 1 3V3 )
-  ( 2 GND )
- )
- ( /4D020DCD SM0603 C10 1nF
-  ( 1 GND )
-  ( 2 N-000032 )
- )
- ( /4DC79ED8 SM0603 C11 15pF
-  ( 1 /DDM )
-  ( 2 GND )
- )
- ( /4DC8F97A SM0603 C12 2.2uF
-  ( 1 +1.8V )
-  ( 2 GND )
- )
- ( /4DC79EDC SM0603 C13 15pF
-  ( 1 /DDP )
-  ( 2 GND )
- )
- ( /4DC6A5DE SM0603 C14 1uF
-  ( 1 N-000022 )
-  ( 2 GND )
- )
- ( /4D020ED8 SM0603 C15 100nF
-  ( 1 +1.8V )
-  ( 2 GND )
- )
- ( /4DC664DD SM0603 C16 100nF
-  ( 1 +1.8V )
-  ( 2 GND )
- )
- ( /4CE9162F SM0603 C17 10pF
-  ( 1 N-000050 )
-  ( 2 GND )
- )
- ( /4CE91633 SM0603 C18 10pF
-  ( 1 N-000038 )
-  ( 2 GND )
- )
- ( /4DC664E0 SM0603 C19 100nF
-  ( 1 +1.8V )
-  ( 2 GND )
- )
- ( /4D020EDF SM0603 C20 100nF
-  ( 1 +1.8V )
-  ( 2 GND )
- )
- ( /4DC6A5CB SM0603 C21 10nF
-  ( 1 N-000021 )
-  ( 2 GND )
- )
- ( /4DC6A5D9 SM0603 C22 1uF
-  ( 1 3V3 )
-  ( 2 GND )
- )
- ( /4DC68E45 SM0603 C23 100nF
-  ( 1 N-000064 )
-  ( 2 GND )
- )
- ( /4DC7A27C SOD123 D1 Schottky
-  ( 1 /UDP_PUP )
-  ( 2 //RESET )
- )
- ( /4DCB8C13 SOD123 D2 1N5819
-  ( 1 /USBVCC )
-  ( 2 N-000022 )
- )
- ( /4DCB8C0D SOD123 D3 1N5819
-  ( 1 N-000062 )
-  ( 2 N-000022 )
- )
- ( /4CF54717 LED-0603 D4 RED
-  ( 1 N-000057 )
-  ( 2 /LED_R )
- )
- ( /4CF5471F LED-0603 D5 GREEN
-  ( 1 N-000055 )
-  ( 2 /LED_G )
- )
- ( /4DC79E48 SM0805 FB1 FILTER
-  ( 1 N-000060 )
-  ( 2 /USBVCC )
- )
- ( /4DC68E1D SM0805 FB2 FILTER
-  ( 1 N-000064 )
-  ( 2 3V3 )
- )
- ( /4DC6A52E SOT223-6 IC2 TPS73633
-  ( 1 3V3 )
-  ( 3 N-000021 )
-  ( 4 GND )
-  ( 5 N-000022 )
-  ( 8 N-000022 )
- )
- ( /4CE84486 TQFP_64 IC3 AT91SAM7S512/256/128/64/321-AU
-  ( 1 N-000064 )
-  ( 2 GND )
-  ( 3 GND )
-  ( 4 GND )
-  ( 5 GND )
-  ( 6 /VCC_PHONE )
-  ( 7 3V3 )
-  ( 8 +1.8V )
-  ( 9 /LED_R )
-  ( 10 /LED_G )
-  ( 11 /I/O_PHONE )
-  ( 12 +1.8V )
-  ( 13 /I/O_SW )
-  ( 14 /I/O_PHONE )
-  ( 15 /CLK_PHONE )
-  ( 16 /SC_SW )
-  ( 17 GND )
-  ( 18 3V3 )
-  ( 19 ? )
-  ( 20 /WP )
-  ( 21 /SCK )
-  ( 22 /MOSI )
-  ( 23 /RST_PHONE )
-  ( 24 +1.8V )
-  ( 25 ? )
-  ( 26 ? )
-  ( 27 /MISO )
-  ( 28 /CS )
-  ( 29 /DTXD )
-  ( 30 /DRXD )
-  ( 31 /SW_SIM )
-  ( 32 /RST_SIM )
-  ( 33 /TDI )
-  ( 34 /I/O_SIM )
-  ( 35 /VCC_SIM )
-  ( 36 /CLK_SIM )
-  ( 37 ? )
-  ( 38 /CLK_PHONE )
-  ( 39 //RESET )
-  ( 40 /TEST )
-  ( 41 /A-B-DETECT )
-  ( 42 N-000017 )
-  ( 43 ? )
-  ( 44 /CLK_SIM )
-  ( 45 3V3 )
-  ( 46 GND )
-  ( 47 /I/O_SIM )
-  ( 48 ? )
-  ( 49 /TDO )
-  ( 50 ? )
-  ( 51 /TMS )
-  ( 52 /BOOTLOADER )
-  ( 53 /TCK )
-  ( 54 +1.8V )
-  ( 55 N-000034 )
-  ( 56 /DDM )
-  ( 57 /DDP )
-  ( 58 3V3 )
-  ( 59 3V3 )
-  ( 60 GND )
-  ( 61 N-000050 )
-  ( 62 N-000038 )
-  ( 63 N-000032 )
-  ( 64 +1.8V )
- )
- ( /4DC6A187 SSOP20 IC4 QS3244
-  ( 1 /SC_SW )
-  ( 2 /VCC_PHONE )
-  ( 4 /RST_PHONE )
-  ( 6 /CLK_PHONE )
-  ( 9 /I/O_SIM )
-  ( 10 GND )
-  ( 11 /I/O_PHONE )
-  ( 14 /CLK_SIM )
-  ( 16 /RST_SIM )
-  ( 18 /VCC_SIM )
-  ( 19 /I/O_SW )
-  ( 20 3V3 )
- )
- ( /4CFAC6EA USB_MINI-B J1 USB-B_MINI
-  ( 1 N-000060 )
-  ( 2 N-000063 )
-  ( 3 N-000011 )
-  ( 4 /A-B-DETECT )
-  ( 5 GND )
- )
- ( /4DCBE233 JACK_2.5 J2 JACK_2.5
-  ( 1 GND )
-  ( 2 /DRXD )
-  ( 3 /DTXD )
- )
- ( /4DC68259 PIN_ARRAY_2X1 JP1 TEST
-  ( 1 /TEST )
-  ( 2 3V3 )
- )
- ( /4DC683ED PIN_ARRAY_2X1 JP2 ERASE
-  ( 1 3V3 )
-  ( 2 N-000034 )
- )
- ( /4CFCD6C9 pin_array_10x2 P1 JTAG
-  ( 1 3V3 )
-  ( 2 3V3 )
-  ( 3 N-000047 )
-  ( 4 GND )
-  ( 5 /TDI )
-  ( 6 GND )
-  ( 7 /TMS )
-  ( 8 GND )
-  ( 9 /TCK )
-  ( 10 GND )
-  ( 11 /TCK )
-  ( 12 GND )
-  ( 13 /TDO )
-  ( 14 GND )
-  ( 15 //RESET )
-  ( 16 GND )
-  ( 17 ? )
-  ( 18 GND )
-  ( 19 ? )
-  ( 20 GND )
- )
- ( /4CE9ADCF PIN_ARRAY-6X1 P2 DEBUG
-  ( 1 GND )
-  ( 2 N-000029 )
-  ( 3 3V3 )
-  ( 4 /DRXD )
-  ( 5 /DTXD )
-  ( 6 N-000029 )
- )
- ( /4DC51F05 FFC_REBELSIM P3 REBELSIM
-  ( 1 /VCC_PHONE )
-  ( 2 /RST_PHONE )
-  ( 3 /CLK_PHONE )
-  ( 4 /I/O_PHONE )
-  ( 5 ? )
-  ( 6 GND )
- )
- ( /4DC8FA06 SIM_AMPHENOL P4 SIM
-  ( C1 /VCC_SIM )
-  ( C2 /RST_SIM )
-  ( C3 /CLK_SIM )
-  ( C4 ? )
-  ( C5 GND )
-  ( C6 ? )
-  ( C7 /I/O_SIM )
-  ( C8 ? )
-  ( SW1 /SW_SIM )
-  ( SW2 3V3 )
- )
- ( /4DC7A1CA SOT23_BC847 Q1 BC847
-  ( 1 /UDP_PUP )
-  ( 2 N-000013 )
-  ( 3 3V3 )
- )
- ( /4DC7A43A SOT23_BC847 Q2 BC847
-  ( 1 N-000018 )
-  ( 2 GND )
-  ( 3 /UDP_PUP )
- )
- ( /4DC79ED1 SM0603 R1 100K
-  ( 1 3V3 )
-  ( 2 /UDP_PUP )
- )
- ( /4DC79E9A SM0603 R2 10K
-  ( 1 /A-B-DETECT )
-  ( 2 3V3 )
- )
- ( /4DC79ECE SM0603 R3 1K5
-  ( 1 N-000011 )
-  ( 2 N-000013 )
- )
- ( /4CE9A68C SM0603 R4 100K
-  ( 1 N-000047 )
-  ( 2 3V3 )
- )
- ( /4CE9A69A SM0603 R5 100K
-  ( 1 /TDI )
-  ( 2 3V3 )
- )
- ( /4CE9A6A5 SM0603 R6 100K
-  ( 1 /TMS )
-  ( 2 3V3 )
- )
- ( /4CE9A6A9 SM0603 R7 100K
-  ( 1 /TCK )
-  ( 2 3V3 )
- )
- ( /4CE9A6AE SM0603 R8 100K
-  ( 1 /TDO )
-  ( 2 3V3 )
- )
- ( /4DC79EAD SM0603 R9 27R
-  ( 1 /DDM )
-  ( 2 N-000063 )
- )
- ( /4DC79EA7 SM0603 R10 27R
-  ( 1 /DDP )
-  ( 2 N-000011 )
- )
- ( /4D020DC6 SM0603 R11 1k5
-  ( 1 N-000032 )
-  ( 2 N-000046 )
- )
- ( /4D0206C7 SM0603 R12 100k
-  ( 1 3V3 )
-  ( 2 //RESET )
- )
- ( /4CF7BAEE SM0603 R13 150R
-  ( 1 3V3 )
-  ( 2 N-000057 )
- )
- ( /4DC555D0 SM0603 R14 150R
-  ( 1 3V3 )
-  ( 2 N-000055 )
- )
- ( /4DC68538 SM0603 R15 10K
-  ( 1 GND )
-  ( 2 /BOOTLOADER )
- )
- ( /4DC7A441 SM0603 R16 10K
-  ( 1 N-000017 )
-  ( 2 N-000018 )
- )
- ( /4DC799F2 SM0603 R17 10k
-  ( 1 /WP )
-  ( 2 GND )
- )
- ( /4DC5A30D SM0603 R18 10k
-  ( 1 N-000009 )
-  ( 2 3V3 )
- )
- ( /4D020733 PUSH_BUTTON SW1 RESET
-  ( 1 //RESET )
-  ( 2 GND )
- )
- ( /4DC6852C PUSH_BUTTON SW2 BOOTLOADER
-  ( 1 3V3 )
-  ( 2 /BOOTLOADER )
- )
- ( /4DC5A250 SOIC8 U1 FLASH_SPI
-  ( 1 /CS )
-  ( 2 /MISO )
-  ( 3 /WP )
-  ( 4 GND )
-  ( 5 /MOSI )
-  ( 6 /SCK )
-  ( 7 N-000009 )
-  ( 8 3V3 )
- )
- ( /4CE915DE Q_49U3HMS X1 18.432MHz
-  ( 1 N-000050 )
-  ( 2 N-000038 )
+ ( /4DCBE233 JACK_2.5  J2 JACK_2.5 {Lib=JACK_2.5}
+  (    1 GND )
+  (    2 /DRXD )
+  (    3 /DTXD )
+ )
+ ( /4DCB8C13 SOD123  D2 1N5819 {Lib=ZENER}
+  (    1 /USBVCC )
+  (    2 N-000065 )
+ )
+ ( /4DCB8C0D SOD123  D3 1N5819 {Lib=ZENER}
+  (    1 N-000048 )
+  (    2 N-000065 )
+ )
+ ( /4DC8FA06 SIM_AMPHENOL  P4 SIM {Lib=ISO7816_NO}
+  (   C1 /VCC_SIM )
+  (   C2 /RST_SIM )
+  (   C3 /CLK_SIM )
+  (   C4 ? )
+  (   C5 GND )
+  (   C6 ? )
+  (   C7 /I/O_SIM )
+  (   C8 ? )
+  (  SW1 /SW_SIM )
+  (  SW2 3V3 )
+ )
+ ( /4DC8F97A SM0603  C12 2.2uF {Lib=C}
+  (    1 +1.8V )
+  (    2 GND )
+ )
+ ( /4DC8F975 SM0603  C1 2.2uF {Lib=C}
+  (    1 3V3 )
+  (    2 GND )
+ )
+ ( /4DC804A6 PIN_ARRAY_2X1  BT1 BATTERY {Lib=BATTERY}
+  (    1 N-000048 )
+  (    2 GND )
+ )
+ ( /4DC7A441 SM0603  R16 10K {Lib=R}
+  (    1 N-000018 )
+  (    2 N-000027 )
+ )
+ ( /4DC7A43A SOT23_BC847  Q2 BC847 {Lib=BC847}
+  (    1 N-000018 )
+  (    2 GND )
+  (    3 /UDP_PUP )
+ )
+ ( /4DC7A27C SOD123  D1 Schottky {Lib=ZENER}
+  (    1 /UDP_PUP )
+  (    2 //RESET )
+ )
+ ( /4DC7A1CA SOT23_BC847  Q1 BC847 {Lib=BC847}
+  (    1 /UDP_PUP )
+  (    2 N-000021 )
+  (    3 3V3 )
+ )
+ ( /4DC79EDF SM0603  C5 33pF {Lib=C}
+  (    1 N-000012 )
+  (    2 N-000013 )
+ )
+ ( /4DC79EDC SM0603  C13 15pF {Lib=C}
+  (    1 /DDP )
+  (    2 GND )
+ )
+ ( /4DC79ED8 SM0603  C11 15pF {Lib=C}
+  (    1 /DDM )
+  (    2 GND )
+ )
+ ( /4DC79ED1 SM0603  R1 100K {Lib=R}
+  (    1 3V3 )
+  (    2 /UDP_PUP )
+ )
+ ( /4DC79ECE SM0603  R3 1K5 {Lib=R}
+  (    1 N-000013 )
+  (    2 N-000021 )
+ )
+ ( /4DC79EAD SM0603  R9 27R {Lib=R}
+  (    1 /DDM )
+  (    2 N-000012 )
+ )
+ ( /4DC79EA7 SM0603  R10 27R {Lib=R}
+  (    1 /DDP )
+  (    2 N-000013 )
+ )
+ ( /4DC79E9A SM0603  R2 10K {Lib=R}
+  (    1 /A-B-DETECT )
+  (    2 3V3 )
+ )
+ ( /4CFAC6EA USB_MINI-B  J1 USB-B_MINI {Lib=USB-B_MINI}
+  (    1 N-000016 )
+  (    2 N-000012 )
+  (    3 N-000013 )
+  (    4 /A-B-DETECT )
+  (    5 GND )
+ )
+ ( /4DC79E48 SM0805  FB1 FILTER {Lib=FILTER}
+  (    1 N-000016 )
+  (    2 /USBVCC )
+ )
+ ( /4DC799F2 SM0603  R17 10k {Lib=R}
+  (    1 /WP )
+  (    2 GND )
+ )
+ ( /4DC6A5DE SM0603  C14 1uF {Lib=C}
+  (    1 N-000065 )
+  (    2 GND )
+ )
+ ( /4DC6A5D9 SM0603  C22 1uF {Lib=C}
+  (    1 3V3 )
+  (    2 GND )
+ )
+ ( /4DC6A5CB SM0603  C21 10nF {Lib=C}
+  (    1 N-000022 )
+  (    2 GND )
+ )
+ ( /4DC6A52E SOT223-6  IC2 TPS73633 {Lib=TPS736XX}
+  (    1 N-000065 )
+  (    2 3V3 )
+  (    3 GND )
+  (    4 N-000022 )
+  (    5 N-000065 )
+ )
+ ( /4DC6A187 SSOP20  IC4 QS3244 {Lib=QS3244}
+  (    1 /SC_SW )
+  (    2 /VCC_PHONE )
+  (    4 /RST_PHONE )
+  (    6 /CLK_PHONE )
+  (    9 /I/O_SIM )
+  (   10 GND )
+  (   11 /I/O_PHONE )
+  (   14 /CLK_SIM )
+  (   16 /RST_SIM )
+  (   18 /VCC_SIM )
+  (   19 /I/O_SW )
+  (   20 3V3 )
+ )
+ ( /4DC68E45 SM0603  C23 100nF {Lib=C}
+  (    1 N-000055 )
+  (    2 GND )
+ )
+ ( /4DC68E1D SM0805  FB2 FILTER {Lib=FILTER}
+  (    1 N-000055 )
+  (    2 3V3 )
+ )
+ ( /4DC68538 SM0603  R15 10K {Lib=R}
+  (    1 GND )
+  (    2 /BOOTLOADER )
+ )
+ ( /4DC6852C PUSH_BUTTON  SW2 BOOTLOADER {Lib=SW_PUSH}
+  (    1 3V3 )
+  (    2 /BOOTLOADER )
+ )
+ ( /4DC683ED PIN_ARRAY_2X1  JP2 ERASE {Lib=JUMPER}
+  (    1 3V3 )
+  (    2 N-000031 )
+ )
+ ( /4DC68259 PIN_ARRAY_2X1  JP1 TEST {Lib=JUMPER}
+  (    1 /TEST )
+  (    2 3V3 )
+ )
+ ( /4DC664E0 SM0603  C19 100nF {Lib=C}
+  (    1 +1.8V )
+  (    2 GND )
+ )
+ ( /4DC664DD SM0603  C16 100nF {Lib=C}
+  (    1 +1.8V )
+  (    2 GND )
+ )
+ ( /4DC66392 SM0603  C4 100nF {Lib=C}
+  (    1 3V3 )
+  (    2 GND )
+ )
+ ( /4DC5A30D SM0603  R18 10k {Lib=R}
+  (    1 N-000010 )
+  (    2 3V3 )
+ )
+ ( /4DC5A250 SOIC8  U1 FLASH_SPI {Lib=FLASH_SPI}
+  (    1 /CS )
+  (    2 /MISO )
+  (    3 /WP )
+  (    4 GND )
+  (    5 /MOSI )
+  (    6 /SCK )
+  (    7 N-000010 )
+  (    8 3V3 )
+ )
+ ( /4DC555D0 SM0603  R14 150R {Lib=R}
+  (    1 3V3 )
+  (    2 N-000051 )
+ )
+ ( /4CF7BAEE SM0603  R13 150R {Lib=R}
+  (    1 3V3 )
+  (    2 N-000053 )
+ )
+ ( /4DC51F05 FFC_REBELSIM  P3 REBELSIM {Lib=REBELSIM}
+  (    1 /VCC_PHONE )
+  (    2 /RST_PHONE )
+  (    3 /CLK_PHONE )
+  (    4 /I/O_PHONE )
+  (    5 ? )
+  (    6 GND )
+ )
+ ( /4D037E30 SM0603  C3 100nF {Lib=C}
+  (    1 3V3 )
+  (    2 GND )
+ )
+ ( /4D020EDF SM0603  C20 100nF {Lib=C}
+  (    1 +1.8V )
+  (    2 GND )
+ )
+ ( /4D020ED8 SM0603  C15 100nF {Lib=C}
+  (    1 +1.8V )
+  (    2 GND )
+ )
+ ( /4D020DD3 SM0603  C6 10nF {Lib=C}
+  (    1 GND )
+  (    2 N-000041 )
+ )
+ ( /4D020DCD SM0603  C10 1nF {Lib=C}
+  (    1 GND )
+  (    2 N-000067 )
+ )
+ ( /4D020DC6 SM0603  R11 1k5 {Lib=R}
+  (    1 N-000067 )
+  (    2 N-000041 )
+ )
+ ( /4D020BEB SM0603  C9 100nF {Lib=C}
+  (    1 3V3 )
+  (    2 GND )
+ )
+ ( /4D020BDE SM0603  C7 100nF {Lib=C}
+  (    1 3V3 )
+  (    2 GND )
+ )
+ ( /4D020733 PUSH_BUTTON  SW1 RESET {Lib=SW_PUSH}
+  (    1 //RESET )
+  (    2 GND )
+ )
+ ( /4D0206C7 SM0603  R12 100k {Lib=R}
+  (    1 3V3 )
+  (    2 //RESET )
+ )
+ ( /4CFCD6C9 pin_array_10x2  P1 JTAG {Lib=JTAG}
+  (    1 3V3 )
+  (    2 3V3 )
+  (    3 N-000042 )
+  (    4 GND )
+  (    5 /TDI )
+  (    6 GND )
+  (    7 /TMS )
+  (    8 GND )
+  (    9 /TCK )
+  (   10 GND )
+  (   11 /TCK )
+  (   12 GND )
+  (   13 /TDO )
+  (   14 GND )
+  (   15 //RESET )
+  (   16 GND )
+  (   17 ? )
+  (   18 GND )
+  (   19 ? )
+  (   20 GND )
+ )
+ ( /4CF5471F LED-0603  D5 GREEN {Lib=LED}
+  (    1 N-000051 )
+  (    2 /LED_G )
+ )
+ ( /4CF54717 LED-0603  D4 RED {Lib=LED}
+  (    1 N-000053 )
+  (    2 /LED_R )
+ )
+ ( /4CE84486 TQFP_64  IC3 AT91SAM7S512/256/128/64/321-AU {Lib=AT91SAM7S512/256/128/64/321-AU}
+  (    1 N-000055 )
+  (    2 GND )
+  (    3 GND )
+  (    4 GND )
+  (    5 GND )
+  (    6 /VCC_PHONE )
+  (    7 3V3 )
+  (    8 +1.8V )
+  (    9 /LED_R )
+  (   10 /LED_G )
+  (   11 /I/O_PHONE )
+  (   12 +1.8V )
+  (   13 /I/O_SW )
+  (   14 /I/O_PHONE )
+  (   15 /CLK_PHONE )
+  (   16 /SC_SW )
+  (   17 GND )
+  (   18 3V3 )
+  (   19 N-000027 )
+  (   20 /WP )
+  (   21 /SCK )
+  (   22 /MOSI )
+  (   23 /RST_PHONE )
+  (   24 +1.8V )
+  (   25 ? )
+  (   26 ? )
+  (   27 /MISO )
+  (   28 /CS )
+  (   29 /DTXD )
+  (   30 /DRXD )
+  (   31 /SW_SIM )
+  (   32 /RST_SIM )
+  (   33 /TDI )
+  (   34 /I/O_SIM )
+  (   35 /VCC_SIM )
+  (   36 /CLK_SIM )
+  (   37 ? )
+  (   38 /CLK_PHONE )
+  (   39 //RESET )
+  (   40 /TEST )
+  (   41 /A-B-DETECT )
+  (   42 ? )
+  (   43 ? )
+  (   44 /CLK_SIM )
+  (   45 3V3 )
+  (   46 GND )
+  (   47 /I/O_SIM )
+  (   48 ? )
+  (   49 /TDO )
+  (   50 ? )
+  (   51 /TMS )
+  (   52 /BOOTLOADER )
+  (   53 /TCK )
+  (   54 +1.8V )
+  (   55 N-000031 )
+  (   56 /DDM )
+  (   57 /DDP )
+  (   58 3V3 )
+  (   59 3V3 )
+  (   60 GND )
+  (   61 N-000034 )
+  (   62 N-000046 )
+  (   63 N-000067 )
+  (   64 +1.8V )
+ )
+ ( /4CE9ADCF PIN_ARRAY-6X1  P2 DEBUG {Lib=DEBUG}
+  (    1 GND )
+  (    2 N-000057 )
+  (    3 3V3 )
+  (    4 /DRXD )
+  (    5 /DTXD )
+  (    6 N-000057 )
+ )
+ ( /4CE9A6AE SM0603  R8 100K {Lib=R}
+  (    1 /TDO )
+  (    2 3V3 )
+ )
+ ( /4CE9A6A9 SM0603  R7 100K {Lib=R}
+  (    1 /TCK )
+  (    2 3V3 )
+ )
+ ( /4CE9A6A5 SM0603  R6 100K {Lib=R}
+  (    1 /TMS )
+  (    2 3V3 )
+ )
+ ( /4CE9A69A SM0603  R5 100K {Lib=R}
+  (    1 /TDI )
+  (    2 3V3 )
+ )
+ ( /4CE9A68C SM0603  R4 100K {Lib=R}
+  (    1 N-000042 )
+  (    2 3V3 )
+ )
+ ( /4CE91633 SM0603  C18 10pF {Lib=C}
+  (    1 N-000046 )
+  (    2 GND )
+ )
+ ( /4CE9162F SM0603  C17 10pF {Lib=C}
+  (    1 N-000034 )
+  (    2 GND )
+ )
+ ( /4CE915DE Q_49U3HMS  X1 18.432MHz {Lib=CRYSTAL}
+  (    1 N-000034 )
+  (    2 N-000046 )
  )
 )
 *
 { Allowed footprints by component:
-$component C1
+$component D2
+ D?
+ SO*
  SM*
- C?
- C1-1
 $endlist
-$component C3
+$component D3
+ D?
+ SO*
  SM*
- C?
- C1-1
 $endlist
-$component C4
+$component C12
  SM*
  C?
  C1-1
 $endlist
-$component C5
+$component C1
  SM*
  C?
  C1-1
 $endlist
-$component C6
- SM*
- C?
- C1-1
+$component R16
+ R?
+ SM0603
+ SM0805
+ R?-*
 $endlist
-$component C7
+$component D1
+ D?
+ SO*
  SM*
- C?
- C1-1
 $endlist
-$component C9
+$component C5
  SM*
  C?
  C1-1
 $endlist
-$component C10
+$component C13
  SM*
  C?
  C1-1
@@ -425,42 +426,102 @@ $component C11
  C?
  C1-1
 $endlist
-$component C12
+$component R1
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R3
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R9
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R10
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R2
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R17
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C14
  SM*
  C?
  C1-1
 $endlist
-$component C13
+$component C22
  SM*
  C?
  C1-1
 $endlist
-$component C14
+$component C21
  SM*
  C?
  C1-1
 $endlist
-$component C15
+$component C23
  SM*
  C?
  C1-1
 $endlist
-$component C16
+$component R15
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C19
  SM*
  C?
  C1-1
 $endlist
-$component C17
+$component C16
  SM*
  C?
  C1-1
 $endlist
-$component C18
+$component C4
  SM*
  C?
  C1-1
 $endlist
-$component C19
+$component R18
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R14
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R13
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C3
  SM*
  C?
  C1-1
@@ -470,37 +531,44 @@ $component C20
  C?
  C1-1
 $endlist
-$component C21
+$component C15
  SM*
  C?
  C1-1
 $endlist
-$component C22
+$component C6
  SM*
  C?
  C1-1
 $endlist
-$component C23
+$component C10
  SM*
  C?
  C1-1
 $endlist
-$component D1
- D?
- SO*
- SM*
+$component R11
+ R?
+ SM0603
+ SM0805
+ R?-*
 $endlist
-$component D2
- D?
- SO*
+$component C9
  SM*
+ C?
+ C1-1
 $endlist
-$component D3
- D?
- SO*
+$component C7
  SM*
+ C?
+ C1-1
 $endlist
-$component D4
+$component R12
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component D5
  LED-3MM
  LED-5MM
  LED-10MM
@@ -509,7 +577,7 @@ $component D4
  LED-1206
  LEDV
 $endlist
-$component D5
+$component D4
  LED-3MM
  LED-5MM
  LED-10MM
@@ -518,113 +586,341 @@ $component D5
  LED-1206
  LEDV
 $endlist
-$component R1
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R2
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R3
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R4
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R5
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R6
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R7
- R?
- SM0603
- SM0805
- R?-*
-$endlist
 $component R8
  R?
  SM0603
  SM0805
  R?-*
 $endlist
-$component R9
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R10
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R11
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R12
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R13
+$component R7
  R?
  SM0603
  SM0805
  R?-*
 $endlist
-$component R14
+$component R6
  R?
  SM0603
  SM0805
  R?-*
 $endlist
-$component R15
+$component R5
  R?
  SM0603
  SM0805
  R?-*
 $endlist
-$component R16
+$component R4
  R?
  SM0603
  SM0805
  R?-*
 $endlist
-$component R17
- R?
- SM0603
- SM0805
- R?-*
+$component C18
+ SM*
+ C?
+ C1-1
 $endlist
-$component R18
- R?
- SM0603
- SM0805
- R?-*
+$component C17
+ SM*
+ C?
+ C1-1
 $endlist
 $endfootprintlist
 }
+{ Pin List by Nets
+Net 1 "GND" "GND"
+ R17 2
+ C14 2
+ C21 2
+ Q2 2
+ J1 5
+ P2 1
+ IC2 3
+ IC4 10
+ C22 2
+ C10 1
+ IC3 5
+ IC3 60
+ P1 4
+ C18 2
+ C17 2
+ SW1 2
+ C7 2
+ C9 2
+ C6 1
+ P1 18
+ P1 6
+ P1 16
+ P1 14
+ P1 12
+ P1 20
+ P1 10
+ P1 8
+ IC3 46
+ IC3 17
+ IC3 4
+ IC3 3
+ IC3 2
+ P3 6
+ BT1 2
+ C20 2
+ C15 2
+ J2 1
+ C19 2
+ C16 2
+ C4 2
+ C3 2
+ C23 2
+ R15 1
+ C12 2
+ C13 2
+ C11 2
+ C1 2
+ P4 C5
+ U1 4
+Net 4 "/BOOTLOADER" "BOOTLOADER"
+ R15 2
+ IC3 52
+ SW2 2
+Net 5 "3V3" "3V3"
+ P4 SW2
+ R12 1
+ C9 1
+ C7 1
+ IC3 7
+ P1 1
+ P1 2
+ C1 1
+ R1 1
+ R18 2
+ C3 1
+ R13 1
+ R14 1
+ R7 2
+ SW2 1
+ FB2 2
+ IC3 18
+ IC4 20
+ Q1 3
+ R2 2
+ U1 8
+ C22 1
+ P2 3
+ IC3 45
+ R6 2
+ JP1 2
+ IC3 59
+ R5 2
+ JP2 1
+ C4 1
+ R4 2
+ R8 2
+ IC3 58
+ IC2 2
+Net 6 "/CS" "CS"
+ IC3 28
+ U1 1
+Net 7 "/MISO" "MISO"
+ IC3 27
+ U1 2
+Net 8 "/MOSI" "MOSI"
+ IC3 22
+ U1 5
+Net 9 "/SCK" "SCK"
+ U1 6
+ IC3 21
+Net 10 "" ""
+ U1 7
+ R18 1
+Net 11 "/VCC_SIM" "VCC_SIM"
+ IC3 35
+ P4 C1
+ IC4 18
+Net 12 "" ""
+ C5 1
+ R9 2
+ J1 2
+Net 13 "" ""
+ R3 1
+ J1 3
+ R10 2
+ C5 2
+Net 14 "/DDM" "DDM"
+ C11 1
+ IC3 56
+ R9 1
+Net 15 "/A-B-DETECT" "A-B-DETECT"
+ IC3 41
+ R2 1
+ J1 4
+Net 16 "" ""
+ FB1 1
+ J1 1
+Net 18 "" ""
+ R16 1
+ Q2 1
+Net 19 "/UDP_PUP" "UDP_PUP"
+ Q1 1
+ D1 1
+ Q2 3
+ R1 2
+Net 20 "//RESET" "/RESET"
+ D1 2
+ P1 15
+ R12 2
+ SW1 1
+ IC3 39
+Net 21 "" ""
+ R3 2
+ Q1 2
+Net 22 "" ""
+ IC2 4
+ C21 1
+Net 23 "/I/O_SIM" "I/O_SIM"
+ IC3 47
+ IC4 9
+ P4 C7
+ IC3 34
+Net 24 "/CLK_SIM" "CLK_SIM"
+ IC4 14
+ P4 C3
+ IC3 36
+ IC3 44
+Net 25 "/SC_SW" "SC_SW"
+ IC3 16
+ IC4 1
+ IC4 1
+ IC4 1
+Net 26 "/RST_SIM" "RST_SIM"
+ P4 C2
+ IC3 32
+ IC4 16
+Net 27 "" ""
+ IC3 19
+ R16 2
+Net 28 "/DTXD" "DTXD"
+ IC3 29
+ P2 5
+ J2 3
+Net 31 "" ""
+ IC3 55
+ JP2 2
+Net 34 "" ""
+ IC3 61
+ X1 1
+ C17 1
+Net 38 "/I/O_PHONE" "I/O_PHONE"
+ IC3 14
+ IC3 11
+ IC4 11
+ P3 4
+Net 39 "/RST_PHONE" "RST_PHONE"
+ IC3 23
+ P3 2
+ IC4 4
+Net 40 "/CLK_PHONE" "CLK_PHONE"
+ P3 3
+ IC3 38
+ IC3 15
+ IC4 6
+Net 41 "" ""
+ C6 2
+ R11 2
+Net 42 "" ""
+ P1 3
+ R4 1
+Net 43 "/VCC_PHONE" "VCC_PHONE"
+ IC4 2
+ IC3 6
+ P3 1
+Net 44 "/TEST" "TEST"
+ JP1 1
+ IC3 40
+Net 46 "" ""
+ C18 1
+ IC3 62
+ X1 2
+Net 47 "/I/O_SW" "I/O_SW"
+ IC3 13
+ IC4 19
+Net 48 "" ""
+ BT1 1
+ D3 1
+Net 51 "" ""
+ D5 1
+ R14 2
+Net 52 "/LED_G" "LED_G"
+ D5 2
+ IC3 10
+Net 53 "" ""
+ D4 1
+ R13 2
+Net 54 "/LED_R" "LED_R"
+ D4 2
+ IC3 9
+Net 55 "" ""
+ C23 1
+ FB2 1
+ IC3 1
+Net 56 "/TDO" "TDO"
+ P1 13
+ IC3 49
+ R8 1
+Net 57 "" ""
+ P2 2
+ P2 6
+Net 58 "/TDI" "TDI"
+ R5 1
+ IC3 33
+ P1 5
+Net 59 "/TCK" "TCK"
+ R7 1
+ P1 9
+ IC3 53
+ P1 11
+Net 60 "/TMS" "TMS"
+ IC3 51
+ R6 1
+ P1 7
+Net 61 "/DDP" "DDP"
+ IC3 57
+ C13 1
+ R10 1
+Net 62 "/WP" "WP"
+ R17 1
+ U1 3
+ IC3 20
+Net 63 "/DRXD" "DRXD"
+ J2 2
+ P2 4
+ IC3 30
+Net 64 "/SW_SIM" "SW_SIM"
+ P4 SW1
+ IC3 31
+Net 65 "" ""
+ IC2 5
+ IC2 1
+ C14 1
+ D2 2
+ D3 2
+Net 66 "/USBVCC" "USBVCC"
+ FB1 2
+ D2 1
+Net 67 "" ""
+ IC3 63
+ C10 2
+ R11 1
+Net 68 "+1.8V" "+1.8V"
+ C19 1
+ C16 1
+ IC3 64
+ IC3 24
+ IC3 54
+ C12 1
+ IC3 12
+ C15 1
+ C20 1
+ IC3 8
+}
+#End
diff --git a/hardware/kicad/SIMtrace.pro b/hardware/kicad/SIMtrace.pro
index 9923688..00e4ab8 100644
--- a/hardware/kicad/SIMtrace.pro
+++ b/hardware/kicad/SIMtrace.pro
@@ -1,4 +1,4 @@
-update=Mi 15 Jun 2011 12:54:48 CEST
+update=Mi 15 Jun 2011 13:55:50 CEST
 last_client=pcbnew
 [general]
 version=1
@@ -79,8 +79,8 @@ EquName1=devcms
 [pcbnew]
 version=1
 PadDrlX=0
-PadDimH=315
-PadDimV=354
+PadDimH=1260
+PadDimV=394
 BoardThickness=630
 SgPcb45=1
 TxtPcbV=800
diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index 8c63867..a41b285 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mi 15 Jun 2011 12:18:42 CEST
+EESchema Schematic File Version 2  date Mi 15 Jun 2011 13:57:47 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -38,8 +38,8 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "12 may 2011"
-Rev "0.9+"
+Date "15 jun 2011"
+Rev "0.9.1"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
@@ -47,627 +47,626 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	5050 1000 5050 950 
-Wire Wire Line
-	9100 4000 9100 3150
+	8550 2200 8550 3200
 Wire Wire Line
-	9800 3900 9200 3900
+	8550 3200 7450 3200
 Wire Wire Line
-	9200 3800 7450 3800
+	5050 1700 5050 1600
 Wire Wire Line
-	1850 6500 1850 6800
+	9600 3150 9100 3150
 Wire Wire Line
-	1050 6800 900  6800
+	9600 3250 9200 3250
 Wire Wire Line
-	900  6800 900  6900
+	9200 3250 9200 3900
 Wire Wire Line
-	500  2200 800  2200
+	9100 3900 7450 3900
+Connection ~ 9100 3900
 Wire Wire Line
-	10300 4550 10750 4550
-Connection ~ 1150 3550
+	9800 4000 9100 4000
+Connection ~ 1600 6650
 Wire Wire Line
-	1150 3550 900  3550
+	1600 6800 1600 6500
 Wire Wire Line
-	900  3550 900  3700
+	1600 6800 1450 6800
 Wire Wire Line
-	8550 1100 8900 1100
+	1600 6650 2100 6650
 Wire Wire Line
-	7850 1700 7750 1700
+	1600 6500 1450 6500
 Wire Wire Line
-	7750 1700 7750 1800
+	1050 6500 650  6500
 Wire Wire Line
-	7750 1800 7450 1800
+	9250 4850 8800 4850
 Wire Wire Line
-	7450 1700 7650 1700
+	1500 2200 1700 2200
 Wire Wire Line
-	1300 1100 1300 1400
+	1150 3000 1150 3650
 Wire Wire Line
-	800  1250 800  1600
+	8100 1100 8350 1100
 Wire Wire Line
-	2100 1950 1850 1950
+	8550 1700 8550 1400
 Wire Wire Line
-	2100 1950 2100 2150
-Connection ~ 2100 2700
+	7450 1900 8300 1900
 Wire Wire Line
-	2100 2550 2100 2700
+	1150 650  1600 650 
+Connection ~ 650  900 
 Wire Wire Line
-	1150 2800 2450 2800
+	750  650  650  650 
 Wire Wire Line
-	2950 2700 4800 2700
+	650  650  650  1600
+Connection ~ 800  1600
 Wire Wire Line
-	1700 2600 1700 2200
+	1400 900  650  900 
 Wire Wire Line
-	1700 2600 1150 2600
+	650  1600 1000 1600
+Connection ~ 1300 1250
 Wire Wire Line
-	1550 3600 1550 2900
+	1300 1800 1300 1950
 Wire Wire Line
-	2450 2800 2450 2900
-Connection ~ 3050 2700
+	1300 1950 1350 1950
+Connection ~ 1850 2800
 Wire Wire Line
-	3050 3050 3050 2700
+	1850 2800 1850 1950
 Wire Wire Line
-	4800 2700 4800 2900
+	1150 2700 2450 2700
 Wire Wire Line
-	8950 2550 8950 2650
-Connection ~ 7650 1250
+	2950 2900 4700 2900
 Wire Wire Line
-	7650 1700 7650 1000
+	1350 3550 1350 3400
+Connection ~ 1350 2900
 Wire Wire Line
-	7650 1000 7500 1000
-Connection ~ 7550 5200
+	1150 2900 1550 2900
+Connection ~ 3050 3450
 Wire Wire Line
-	7450 5200 7650 5200
+	2850 3450 3300 3450
+Connection ~ 3300 2900
 Wire Wire Line
-	7550 5200 7550 5400
+	3300 3050 3300 2900
+Connection ~ 8950 1950
 Wire Wire Line
-	7550 5400 7450 5400
-Connection ~ 1850 6650
-Connection ~ 3400 6650
+	8950 2050 8950 1950
 Wire Wire Line
-	3400 6800 3400 6650
+	6850 1000 7000 1000
+Connection ~ 7550 5300
 Wire Wire Line
-	3100 6800 2900 6800
+	7450 5300 7550 5300
+Connection ~ 9200 3800
 Wire Wire Line
-	2500 7250 2500 7050
-Connection ~ 1950 6650
+	9800 3800 9650 3800
 Wire Wire Line
-	2100 6800 1950 6800
+	4700 2900 4700 3000
 Wire Wire Line
-	1950 6800 1950 6650
+	1850 7200 1850 7250
 Wire Wire Line
-	8450 6050 8450 5600
+	3400 7250 3400 7200
 Wire Wire Line
-	9650 5600 9650 5750
+	2900 6650 3550 6650
 Wire Wire Line
-	8850 5950 8850 5600
-Connection ~ 7700 5600
+	3100 7250 3100 7200
 Wire Wire Line
-	7700 5450 7700 5800
+	10200 5600 8850 5600
 Wire Wire Line
-	7450 5600 7700 5600
+	9250 5850 9250 5600
 Wire Wire Line
-	8250 5450 8100 5450
+	7700 6650 7700 6500
+Connection ~ 9650 5600
 Wire Wire Line
-	7450 5100 7900 5100
+	10550 6550 8700 6550
 Wire Wire Line
-	10550 6450 9100 6450
+	10550 6350 9500 6350
 Wire Wire Line
-	9900 6250 10550 6250
+	7450 2900 8350 2900
 Wire Wire Line
-	7450 3300 7900 3300
-Connection ~ 10700 1350
+	8750 1950 9350 1950
 Wire Wire Line
-	10950 1350 10700 1350
+	7000 1250 7650 1250
 Wire Wire Line
-	6200 1250 6400 1250
+	4750 1000 4750 700 
+Connection ~ 3500 5750
 Wire Wire Line
-	3200 5400 3200 5500
-Connection ~ 3500 5900
+	3500 5750 3350 5750
+Connection ~ 3500 6000
 Wire Wire Line
-	3500 5900 3850 5900
+	3500 6000 4100 6000
 Wire Wire Line
-	3850 5900 3850 5800
+	4100 6000 4100 5900
 Wire Wire Line
-	3500 5600 3500 6100
+	4500 5600 4500 5500
 Wire Wire Line
-	3500 6100 4500 6100
+	4500 5500 5050 5500
 Wire Wire Line
-	4500 6100 4500 6000
+	3850 5400 3850 5300
 Wire Wire Line
-	4100 5500 4100 5400
+	3850 5300 5050 5300
 Wire Wire Line
-	4100 5400 5050 5400
+	4900 5500 4900 5000
+Connection ~ 3200 4900
 Wire Wire Line
-	3500 5200 3500 5100
+	3200 5000 3200 4850
 Wire Wire Line
-	3500 5100 5050 5100
+	5050 4900 3200 4900
+Connection ~ 2000 5100
 Wire Wire Line
-	3500 5000 4900 5000
-Connection ~ 2000 5200
+	1900 5100 2000 5100
 Wire Wire Line
-	2000 5200 2400 5200
+	2000 5000 2000 5300
 Wire Wire Line
-	2400 5200 2400 5100
-Connection ~ 4900 4700
+	2000 5300 2800 5300
 Wire Wire Line
-	2800 4800 2800 4700
+	2800 5300 2800 5200
 Wire Wire Line
-	2800 4700 5050 4700
+	2400 4700 2400 4600
 Wire Wire Line
-	2000 4600 2000 4500
+	2400 4600 5050 4600
 Wire Wire Line
-	2000 4500 5050 4500
+	1550 4800 1550 4900
 Wire Wire Line
-	4900 4700 4900 4400
+	1300 4300 5050 4300
+Connection ~ 950  4100
 Wire Wire Line
-	4900 4400 2050 4400
-Connection ~ 1550 4300
+	950  4200 950  4100
 Wire Wire Line
-	1550 4400 1550 4300
+	10550 1950 10950 1950
 Wire Wire Line
-	950  4600 950  4700
+	9350 1850 8750 1850
 Wire Wire Line
-	750  4100 5050 4100
+	7450 3600 7900 3600
 Wire Wire Line
-	10550 2050 10950 2050
+	7450 3400 7900 3400
 Wire Wire Line
-	9350 1750 8750 1750
+	10950 1850 10550 1850
 Wire Wire Line
-	7450 3700 7900 3700
+	10550 1750 10700 1750
 Wire Wire Line
-	7450 3500 7900 3500
+	10700 1750 10700 1200
 Wire Wire Line
-	9250 2150 9250 2050
+	8600 6450 8600 5750
 Wire Wire Line
-	9250 2050 9350 2050
+	8950 6750 8800 6750
+Connection ~ 7150 6600
 Wire Wire Line
-	8200 6550 8200 5750
+	7000 6700 7150 6700
 Wire Wire Line
-	9000 6350 9000 5750
-Connection ~ 9250 5600
+	7150 6700 7150 6500
 Wire Wire Line
-	9400 6250 9400 5750
+	7300 6600 7150 6600
 Wire Wire Line
-	9600 6750 9450 6750
+	6300 6500 6500 6500
 Wire Wire Line
-	7000 6500 7150 6500
+	10100 6750 10550 6750
 Wire Wire Line
-	6300 6700 6500 6700
-Connection ~ 4900 4600
-Connection ~ 4900 5300
+	10800 5050 10350 5050
 Wire Wire Line
-	5050 1900 4150 1900
+	8800 5050 9250 5050
 Wire Wire Line
-	1850 3950 2050 3950
-Connection ~ 3300 3950
+	8800 4950 9250 4950
+Connection ~ 4900 4500
+Connection ~ 4900 4300
+Connection ~ 4900 5400
+Connection ~ 4900 5100
+Connection ~ 4900 5500
 Wire Wire Line
-	3050 3700 3300 3700
+	5050 1800 4750 1800
+Connection ~ 1950 3950
 Wire Wire Line
-	3300 3700 3300 3950
+	1950 3950 1950 3700
 Wire Wire Line
-	2600 3950 2450 3950
-Connection ~ 4450 700 
+	1950 3700 2650 3700
 Wire Wire Line
-	4150 700  4750 700 
+	3100 3950 4800 3950
 Wire Wire Line
-	4450 1000 4450 850 
+	4800 3950 4800 3800
 Wire Wire Line
-	4750 1600 4750 1800
+	4800 3800 5050 3800
 Wire Wire Line
-	4200 3700 4700 3700
+	4150 1050 4150 700 
 Wire Wire Line
-	3700 3100 3700 3700
+	4450 650  4450 700 
 Wire Wire Line
-	5300 6700 5900 6700
+	4150 1550 4150 1900
 Wire Wire Line
-	2900 1600 2250 1600
+	4450 1600 4450 2100
 Wire Wire Line
-	9300 4550 8800 4550
+	4200 3100 4700 3100
+Connection ~ 3700 3400
 Wire Wire Line
-	7450 4300 8350 4300
-Connection ~ 8250 4400
+	3600 3400 3700 3400
 Wire Wire Line
-	8250 4400 8250 4600
+	5300 6500 5900 6500
 Wire Wire Line
-	8250 4600 7450 4600
+	2400 1600 2400 2500
 Wire Wire Line
-	7450 4100 8350 4100
+	2900 1700 2800 1700
 Wire Wire Line
-	7450 2800 8350 2800
+	9450 2950 9450 3350
 Wire Wire Line
-	7450 2600 8350 2600
+	7450 4700 8200 4700
+Connection ~ 8200 4200
 Wire Wire Line
-	7450 2400 8350 2400
+	8200 4700 8200 4200
 Wire Wire Line
-	8350 4000 7450 4000
-Connection ~ 8200 2600
+	7450 3000 7900 3000
 Wire Wire Line
-	7450 2700 8200 2700
+	7900 3100 7450 3100
 Wire Wire Line
-	8200 2700 8200 2600
+	7450 2500 8350 2500
 Wire Wire Line
-	8200 2500 8200 2000
-Connection ~ 8200 2500
+	10350 4850 10800 4850
 Wire Wire Line
-	8200 2000 7450 2000
+	9450 2950 9600 2950
 Wire Wire Line
-	9300 2800 9300 3050
+	9450 2700 9450 2850
+Connection ~ 3900 1900
 Wire Wire Line
-	9300 3050 9600 3050
+	3800 1900 3900 1900
+Connection ~ 3900 1700
 Wire Wire Line
-	9600 3350 9450 3350
+	3900 1700 3800 1700
+Connection ~ 3900 1500
 Wire Wire Line
-	9600 2850 9450 2850
+	3900 1500 3800 1500
+Connection ~ 3900 1300
 Wire Wire Line
-	7450 4400 8350 4400
-Connection ~ 3900 1800
+	3900 1300 3800 1300
 Wire Wire Line
-	3900 1800 3800 1800
-Connection ~ 3900 1600
+	3900 2000 3900 1100
 Wire Wire Line
-	3900 1600 3800 1600
-Connection ~ 3900 1400
+	3900 1100 3800 1100
+Connection ~ 1600 1400
 Wire Wire Line
-	3900 1400 3800 1400
-Connection ~ 3900 1200
+	1600 950  1600 1600
 Wire Wire Line
-	3800 1200 3900 1200
-Connection ~ 2800 1000
+	1600 1600 1750 1600
+Connection ~ 1600 1200
 Wire Wire Line
-	2800 1000 2800 850 
+	1600 1300 1750 1300
+Connection ~ 1600 1000
 Wire Wire Line
-	2800 850  3900 850 
+	1600 1000 2900 1000
 Wire Wire Line
-	3900 850  3900 1000
+	1600 1100 1750 1100
+Connection ~ 2500 1400
 Wire Wire Line
-	3900 1000 3800 1000
-Connection ~ 1600 1300
+	2250 1400 2900 1400
+Connection ~ 2700 1200
 Wire Wire Line
-	1750 1400 1600 1400
-Connection ~ 1600 1100
+	2250 1200 2900 1200
+Connection ~ 4450 1900
 Wire Wire Line
-	1600 1200 1750 1200
-Connection ~ 2400 1600
-Connection ~ 2600 1300
+	2800 1700 2800 2100
 Wire Wire Line
-	2250 1300 2900 1300
+	2800 2100 4450 2100
+Connection ~ 2500 1500
 Wire Wire Line
-	2900 1100 2250 1100
+	2900 1500 2500 1500
 Wire Wire Line
-	5050 2500 2400 2500
+	2600 1300 2600 2300
 Wire Wire Line
-	2500 1400 2500 2400
+	2600 2300 5050 2300
 Wire Wire Line
-	2500 2400 5050 2400
+	5050 2200 2700 2200
 Wire Wire Line
-	2700 1200 2700 2200
+	5050 2900 4800 2900
 Wire Wire Line
-	5050 3000 4700 3000
+	3800 3700 3700 3700
+Connection ~ 4450 3700
 Wire Wire Line
-	8350 4200 7450 4200
+	5050 3300 4700 3300
+Connection ~ 4450 3100
+Connection ~ 4750 5900
 Wire Wire Line
-	3700 3100 3800 3100
+	4750 5900 5050 5900
 Wire Wire Line
-	4700 3700 4700 3500
+	4750 6150 4750 5700
 Wire Wire Line
-	4700 3500 5050 3500
+	4750 5700 5050 5700
 Wire Wire Line
-	4700 3300 4700 3100
-Connection ~ 4750 6000
+	5050 5800 4750 5800
+Connection ~ 4750 5800
 Wire Wire Line
 	4750 6000 5050 6000
-Connection ~ 4750 5800
+Connection ~ 4750 6000
 Wire Wire Line
-	5050 5800 4750 5800
+	4700 3300 4700 3100
 Wire Wire Line
-	5050 5700 4750 5700
+	5050 3500 4700 3500
 Wire Wire Line
-	4750 5700 4750 6150
+	4700 3500 4700 3700
 Wire Wire Line
-	4750 5900 5050 5900
-Connection ~ 4750 5900
-Connection ~ 4450 3100
+	3800 3100 3700 3100
 Wire Wire Line
-	4700 3300 5050 3300
-Connection ~ 4450 3700
+	8350 4200 7450 4200
 Wire Wire Line
-	3700 3700 3800 3700
+	4700 3000 5050 3000
 Wire Wire Line
-	4800 2900 5050 2900
+	2700 2200 2700 1200
 Wire Wire Line
-	2700 2200 5050 2200
+	5050 2400 2500 2400
 Wire Wire Line
-	5050 2300 2600 2300
+	2500 2400 2500 1400
 Wire Wire Line
-	2600 2300 2600 1300
+	2400 2500 5050 2500
 Wire Wire Line
-	2900 1500 2500 1500
-Connection ~ 2500 1500
+	2900 1100 2250 1100
 Wire Wire Line
-	2800 2100 4450 2100
+	2250 1300 2900 1300
+Connection ~ 2600 1300
+Connection ~ 2400 1600
 Wire Wire Line
-	2800 2100 2800 1700
-Connection ~ 4450 1900
+	1600 1200 1750 1200
+Connection ~ 1600 1100
 Wire Wire Line
-	2250 1200 2900 1200
-Connection ~ 2700 1200
+	1750 1400 1600 1400
+Connection ~ 1600 1300
 Wire Wire Line
-	2250 1400 2900 1400
-Connection ~ 2500 1400
+	3800 1000 3900 1000
 Wire Wire Line
-	1600 1100 1750 1100
+	3900 1000 3900 850 
 Wire Wire Line
-	1600 1000 2900 1000
-Connection ~ 1600 1000
+	3900 850  2800 850 
 Wire Wire Line
-	1600 1300 1750 1300
-Connection ~ 1600 1200
+	2800 850  2800 1000
+Connection ~ 2800 1000
 Wire Wire Line
-	1750 1600 1600 1600
+	3800 1200 3900 1200
+Connection ~ 3900 1200
 Wire Wire Line
-	1600 1600 1600 950 
-Connection ~ 1600 1400
+	3900 1400 3800 1400
+Connection ~ 3900 1400
 Wire Wire Line
-	3800 1100 3900 1100
+	3900 1600 3800 1600
+Connection ~ 3900 1600
 Wire Wire Line
-	3900 1100 3900 2000
+	3900 1800 3800 1800
+Connection ~ 3900 1800
 Wire Wire Line
-	3900 1300 3800 1300
-Connection ~ 3900 1300
+	7450 4400 8350 4400
 Wire Wire Line
-	3900 1500 3800 1500
-Connection ~ 3900 1500
+	9450 2850 9600 2850
 Wire Wire Line
-	3900 1700 3800 1700
-Connection ~ 3900 1700
+	9450 3350 9600 3350
 Wire Wire Line
-	3800 1900 3900 1900
-Connection ~ 3900 1900
+	9600 3050 9300 3050
 Wire Wire Line
-	9450 2850 9450 2700
+	9300 3050 9300 2800
 Wire Wire Line
-	9600 2950 9450 2950
+	7450 2000 8200 2000
+Connection ~ 8200 2500
 Wire Wire Line
-	10350 4850 10800 4850
+	8200 2000 8200 2500
 Wire Wire Line
-	7450 2500 8350 2500
+	8200 2600 8200 2700
 Wire Wire Line
-	7900 3100 7450 3100
+	8200 2700 7450 2700
+Connection ~ 8200 2600
 Wire Wire Line
-	7450 3000 7900 3000
+	8350 4000 7450 4000
 Wire Wire Line
-	8200 4200 8200 4700
-Connection ~ 8200 4200
+	7450 2400 8350 2400
 Wire Wire Line
-	8200 4700 7450 4700
+	7450 2600 8350 2600
 Wire Wire Line
-	9450 2950 9450 3350
+	7450 2800 8350 2800
 Wire Wire Line
-	2800 1700 2900 1700
+	7450 4100 8350 4100
 Wire Wire Line
-	2400 2500 2400 1600
+	7450 4600 8250 4600
 Wire Wire Line
-	5300 6500 5900 6500
+	8250 4600 8250 4400
+Connection ~ 8250 4400
 Wire Wire Line
-	3600 3400 3700 3400
-Connection ~ 3700 3400
+	7450 4300 8350 4300
 Wire Wire Line
-	4700 3100 4200 3100
+	9300 4550 8800 4550
 Wire Wire Line
-	4450 2100 4450 1600
+	2900 1600 2250 1600
 Wire Wire Line
-	4150 1900 4150 1550
+	5300 6700 5900 6700
 Wire Wire Line
-	4450 650  4450 700 
+	3700 3100 3700 3700
 Wire Wire Line
-	4150 700  4150 1050
+	4700 3700 4200 3700
 Wire Wire Line
-	5050 3800 4800 3800
+	4750 1800 4750 1600
 Wire Wire Line
-	4800 3800 4800 3950
+	4450 1000 4450 850 
 Wire Wire Line
-	4800 3950 3100 3950
+	4150 700  4750 700 
+Connection ~ 4450 700 
 Wire Wire Line
-	2650 3700 1950 3700
+	2600 3950 2450 3950
 Wire Wire Line
-	1950 3700 1950 3950
-Connection ~ 1950 3950
+	3300 3950 3300 3700
 Wire Wire Line
-	4750 1800 5050 1800
-Connection ~ 4900 5500
-Connection ~ 4900 5100
-Connection ~ 4900 5400
-Connection ~ 4900 4300
-Connection ~ 4900 4500
+	3300 3700 3050 3700
+Connection ~ 3300 3950
 Wire Wire Line
-	8800 4950 9250 4950
+	1850 3950 2050 3950
 Wire Wire Line
-	8800 5050 9250 5050
+	4150 1900 5050 1900
+Connection ~ 4900 5300
+Connection ~ 4900 4600
 Wire Wire Line
-	10800 5050 10350 5050
+	6300 6700 6500 6700
 Wire Wire Line
-	10100 6750 10550 6750
+	7150 6500 7000 6500
 Wire Wire Line
-	6300 6500 6500 6500
+	9600 6750 9450 6750
 Wire Wire Line
-	7300 6600 7150 6600
+	9400 6250 9400 5750
+Connection ~ 9250 5600
 Wire Wire Line
-	7150 6500 7150 6700
+	9000 6350 9000 5750
 Wire Wire Line
-	7150 6700 7000 6700
-Connection ~ 7150 6600
+	8200 6550 8200 5750
 Wire Wire Line
-	8950 6750 8800 6750
+	9350 2050 9250 2050
 Wire Wire Line
-	8600 6450 8600 5750
+	9250 2050 9250 2150
 Wire Wire Line
-	10700 1200 10700 1750
+	7450 3500 7900 3500
 Wire Wire Line
-	10700 1750 10550 1750
+	7450 3700 7900 3700
 Wire Wire Line
-	10950 1850 10550 1850
+	9350 1750 8750 1750
 Wire Wire Line
-	7450 3400 7900 3400
+	10550 2050 10950 2050
 Wire Wire Line
-	7450 3600 7900 3600
+	750  4100 5050 4100
 Wire Wire Line
-	9350 1850 8750 1850
+	950  4600 950  4700
 Wire Wire Line
-	10550 1950 10950 1950
+	1550 4400 1550 4300
+Connection ~ 1550 4300
 Wire Wire Line
-	950  4200 950  4100
-Connection ~ 950  4100
+	2050 4400 4900 4400
 Wire Wire Line
-	1300 4300 5050 4300
+	4900 4400 4900 4700
 Wire Wire Line
-	1550 4800 1550 4900
+	5050 4500 2000 4500
 Wire Wire Line
-	5050 4600 2400 4600
+	2000 4500 2000 4600
 Wire Wire Line
-	2400 4600 2400 4700
+	5050 4700 2800 4700
 Wire Wire Line
-	2800 5200 2800 5300
+	2800 4700 2800 4800
+Connection ~ 4900 4700
 Wire Wire Line
-	2800 5300 2000 5300
+	2400 5100 2400 5200
 Wire Wire Line
-	2000 5300 2000 5000
+	2400 5200 2000 5200
+Connection ~ 2000 5200
 Wire Wire Line
-	1900 5100 2000 5100
-Connection ~ 2000 5100
+	4900 5000 3500 5000
 Wire Wire Line
-	5050 4900 3200 4900
+	5050 5100 3500 5100
 Wire Wire Line
-	3200 5000 3200 4850
-Connection ~ 3200 4900
+	3500 5100 3500 5200
 Wire Wire Line
-	4900 5000 4900 5500
+	5050 5400 4100 5400
 Wire Wire Line
-	5050 5300 3850 5300
+	4100 5400 4100 5500
 Wire Wire Line
-	3850 5300 3850 5400
+	4500 6000 4500 6100
 Wire Wire Line
-	5050 5500 4500 5500
+	4500 6100 3500 6100
 Wire Wire Line
-	4500 5500 4500 5600
+	3500 6100 3500 5600
 Wire Wire Line
-	4100 5900 4100 6000
+	3850 5800 3850 5900
 Wire Wire Line
-	4100 6000 3500 6000
-Connection ~ 3500 6000
+	3850 5900 3500 5900
+Connection ~ 3500 5900
 Wire Wire Line
-	3500 5750 3350 5750
-Connection ~ 3500 5750
+	3200 5400 3200 5500
 Wire Wire Line
-	4750 700  4750 1000
+	6200 1250 6400 1250
 Wire Wire Line
-	7000 1250 7650 1250
+	10950 1350 10700 1350
+Connection ~ 10700 1350
 Wire Wire Line
-	8750 1950 9350 1950
+	7450 3300 7900 3300
 Wire Wire Line
-	7450 2900 8350 2900
+	9900 6250 10550 6250
 Wire Wire Line
-	10550 6350 9500 6350
+	10550 6450 9100 6450
 Wire Wire Line
-	10550 6550 8700 6550
-Connection ~ 9650 5600
+	7450 5100 7900 5100
 Wire Wire Line
-	7700 6650 7700 6500
+	8250 5450 8100 5450
 Wire Wire Line
-	9250 5850 9250 5600
+	7450 5600 7700 5600
 Wire Wire Line
-	8850 5600 10200 5600
+	7700 5450 7700 5800
+Connection ~ 7700 5600
 Wire Wire Line
-	3100 7250 3100 7200
+	8850 5600 8850 5950
 Wire Wire Line
-	2900 6650 3550 6650
+	9650 5600 9650 5750
 Wire Wire Line
-	3400 7250 3400 7200
+	8450 6050 8450 5600
 Wire Wire Line
-	1850 7200 1850 7250
+	1950 6650 1950 6800
 Wire Wire Line
-	4700 3000 4700 2900
+	1950 6800 2100 6800
+Connection ~ 1950 6650
 Wire Wire Line
-	9800 3800 9650 3800
-Connection ~ 9200 3800
+	2500 7250 2500 7050
 Wire Wire Line
-	7450 5300 7550 5300
-Connection ~ 7550 5300
+	3100 6800 2900 6800
 Wire Wire Line
-	6850 1000 7000 1000
+	3400 6800 3400 6650
+Connection ~ 3400 6650
+Connection ~ 1850 6650
 Wire Wire Line
-	8950 2050 8950 1950
-Connection ~ 8950 1950
+	7450 5400 7550 5400
 Wire Wire Line
-	3300 3050 3300 2900
-Connection ~ 3300 2900
+	7550 5400 7550 5200
 Wire Wire Line
-	2850 3450 3300 3450
-Connection ~ 3050 3450
+	7450 5200 7650 5200
+Connection ~ 7550 5200
 Wire Wire Line
-	1550 2900 1150 2900
-Connection ~ 1350 2900
+	7500 1000 7650 1000
 Wire Wire Line
-	1350 3550 1350 3400
+	7650 1000 7650 1700
+Connection ~ 7650 1250
 Wire Wire Line
-	4700 2900 2950 2900
+	8950 2550 8950 2650
 Wire Wire Line
-	1150 2700 2450 2700
+	4800 2900 4800 2700
 Wire Wire Line
-	1850 1950 1850 2800
-Connection ~ 1850 2800
+	3050 3050 3050 2700
+Connection ~ 3050 2700
 Wire Wire Line
-	1350 1950 1300 1950
+	2450 2900 2450 2800
 Wire Wire Line
-	1300 1950 1300 1800
-Connection ~ 1300 1250
+	1550 2900 1550 3600
 Wire Wire Line
-	1000 1600 650  1600
+	1150 2600 1700 2600
 Wire Wire Line
-	1400 900  650  900 
-Connection ~ 800  1600
+	1700 2600 1700 2200
 Wire Wire Line
-	650  1600 650  650 
+	4800 2700 2950 2700
 Wire Wire Line
-	650  650  750  650 
-Connection ~ 650  900 
+	2450 2800 1150 2800
 Wire Wire Line
-	1150 650  1600 650 
+	2100 2550 2100 2700
+Connection ~ 2100 2700
 Wire Wire Line
-	7450 1900 8300 1900
+	2100 2150 2100 1950
 Wire Wire Line
-	8350 1700 8350 1400
+	2100 1950 1850 1950
 Wire Wire Line
-	7900 1100 8150 1100
+	800  1250 800  1600
 Wire Wire Line
-	1150 3000 1150 3650
+	1300 1100 1300 1400
 Wire Wire Line
-	1700 2200 1500 2200
+	7650 1700 7450 1700
 Wire Wire Line
-	9250 4850 8800 4850
+	8750 1100 9100 1100
 Wire Wire Line
-	1050 6500 650  6500
+	900  3700 900  3550
 Wire Wire Line
-	1450 6500 1600 6500
+	900  3550 1150 3550
+Connection ~ 1150 3550
 Wire Wire Line
-	1600 6650 2100 6650
+	10300 4550 10750 4550
 Wire Wire Line
-	1450 6800 1600 6800
+	500  2200 800  2200
 Wire Wire Line
-	1600 6800 1600 6500
-Connection ~ 1600 6650
+	900  6900 900  6800
 Wire Wire Line
-	9100 4000 9800 4000
-Connection ~ 9100 3900
+	900  6800 1050 6800
 Wire Wire Line
-	9100 3900 7450 3900
+	1850 6500 1850 6800
 Wire Wire Line
-	9200 3900 9200 3250
+	9200 3800 7450 3800
 Wire Wire Line
-	9200 3250 9600 3250
+	9200 3900 9800 3900
 Wire Wire Line
-	9100 3150 9600 3150
+	9100 4000 9100 3150
 Wire Wire Line
-	5050 1700 5050 1600
+	5050 1000 5050 950 
+NoConn ~ 7450 1800
 $Comp
 L JACK_2.5 J2
 U 1 1 4DCBE233
@@ -825,39 +824,38 @@ F 1 "3V3" H 3550 6775 40  0000 C CNN
 	1    3550 6650
 	0    1    1    0   
 $EndComp
-NoConn ~ 7450 3200
 NoConn ~ 7450 4800
-Text Label 8600 1100 0    60   ~ 0
+Text Label 8800 1100 0    60   ~ 0
 UDP_PUP
 $Comp
 L R R16
 U 1 1 4DC7A441
-P 8100 1700
-F 0 "R16" V 8180 1700 50  0000 C CNN
-F 1 "10K" V 8100 1700 50  0000 C CNN
-F 2 "SM0603" H 8100 1700 60  0001 C CNN
-	1    8100 1700
-	0    -1   -1   0   
+P 8550 1950
+F 0 "R16" V 8630 1950 50  0000 C CNN
+F 1 "10K" V 8550 1950 50  0000 C CNN
+F 2 "SM0603" H 8550 1950 60  0001 C CNN
+	1    8550 1950
+	1    0    0    -1  
 $EndComp
 $Comp
 L BC847 Q2
 U 1 1 4DC7A43A
-P 8350 1200
-F 0 "Q2" H 8350 1050 50  0000 R CNN
-F 1 "BC847" V 8750 1200 50  0000 R CNN
-F 2 "SOT23_BC847" H 8350 1200 60  0001 C CNN
-F 4 "45V" V 8600 1100 50  0000 C CNN "Field1"
-F 5 "100mA" V 8600 1350 50  0000 C CNN "Field2"
-	1    8350 1200
+P 8550 1200
+F 0 "Q2" H 8550 1050 50  0000 R CNN
+F 1 "BC847" V 8950 1200 50  0000 R CNN
+F 2 "SOT23_BC847" H 8550 1200 60  0001 C CNN
+F 4 "45V" V 8800 1100 50  0000 C CNN "Field1"
+F 5 "100mA" V 8800 1350 50  0000 C CNN "Field2"
+	1    8550 1200
 	0    1    -1   0   
 $EndComp
 $Comp
 L GND #PWR09
 U 1 1 4DC7A434
-P 7900 1100
-F 0 "#PWR09" H 7900 1100 30  0001 C CNN
-F 1 "GND" H 7900 1030 30  0001 C CNN
-	1    7900 1100
+P 8100 1100
+F 0 "#PWR09" H 8100 1100 30  0001 C CNN
+F 1 "GND" H 8100 1030 30  0001 C CNN
+	1    8100 1100
 	0    1    1    0   
 $EndComp
 Text Label 7600 1900 0    60   ~ 0