better routing

1 files changed, 206 insertions, 218 deletions

diff --git a/hardware/kicad/SIMtrace.net b/hardware/kicad/SIMtrace.net
index b4c5221..2633024 100644
--- a/hardware/kicad/SIMtrace.net
+++ b/hardware/kicad/SIMtrace.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Mi 15 Jun 2011 17:09:38 CEST
+# EESchema Netlist Version 1.1 created  Mi 15 Jun 2011 17:14:14 CEST
 (
  ( /4DCBE233 JACK_2.5  J2 JACK_2.5 {Lib=JACK_2.5}
   (    1 GND )
@@ -7,11 +7,11 @@
  )
  ( /4DCB8C13 SOD123  D2 1N5819 {Lib=ZENER}
   (    1 /USBVCC )
-  (    2 N-000064 )
+  (    2 N-000065 )
  )
  ( /4DCB8C0D SOD123  D3 1N5819 {Lib=ZENER}
   (    1 N-000017 )
-  (    2 N-000064 )
+  (    2 N-000065 )
  )
  ( /4DC8FA06 SIM_AMPHENOL  P4 SIM {Lib=ISO7816_NO}
   (   C1 /VCC_SIM )
@@ -38,11 +38,11 @@
   (    2 GND )
  )
  ( /4DC7A441 SM0603  R16 10K {Lib=R}
-  (    1 N-000020 )
-  (    2 N-000019 )
+  (    1 N-000021 )
+  (    2 N-000020 )
  )
  ( /4DC7A43A SOT23_BC847  Q2 BC847 {Lib=BC847}
-  (    1 N-000020 )
+  (    1 N-000021 )
   (    2 GND )
   (    3 /UDP_PUP )
  )
@@ -103,7 +103,7 @@
   (    2 GND )
  )
  ( /4DC6A5DE SM0603  C14 1uF {Lib=C}
-  (    1 N-000064 )
+  (    1 N-000065 )
   (    2 GND )
  )
  ( /4DC6A5D9 SM0603  C22 1uF {Lib=C}
@@ -115,11 +115,11 @@
   (    2 GND )
  )
  ( /4DC6A52E SOT223-6  IC2 TPS73633 {Lib=TPS736XX}
-  (    1 N-000064 )
+  (    1 N-000065 )
   (    2 3V3 )
   (    3 GND )
   (    4 N-000024 )
-  (    5 N-000064 )
+  (    5 N-000065 )
   (    6 GND )
  )
  ( /4DC6A187 SSOP20  IC4 QS3244 {Lib=QS3244}
@@ -137,24 +137,20 @@
   (   20 3V3 )
  )
  ( /4DC68E45 SM0603  C23 100nF {Lib=C}
-  (    1 N-000063 )
+  (    1 N-000058 )
   (    2 GND )
  )
  ( /4DC68E1D SM0805  FB2 FILTER {Lib=FILTER}
-  (    1 N-000063 )
+  (    1 N-000058 )
   (    2 3V3 )
  )
- ( /4DC68538 SM0603  R15 10K {Lib=R}
-  (    1 GND )
-  (    2 /BOOTLOADER )
- )
  ( /4DC6852C PUSH_BUTTON  SW2 BOOTLOADER {Lib=SW_PUSH}
-  (    1 3V3 )
+  (    1 GND )
   (    2 /BOOTLOADER )
  )
  ( /4DC683ED PIN_ARRAY_2X1  JP2 ERASE {Lib=JUMPER}
   (    1 3V3 )
-  (    2 N-000032 )
+  (    2 N-000030 )
  )
  ( /4DC68259 PIN_ARRAY_2X1  JP1 TEST {Lib=JUMPER}
   (    1 /TEST )
@@ -173,7 +169,7 @@
   (    2 GND )
  )
  ( /4DC5A30D SM0603  R18 10k {Lib=R}
-  (    1 N-000010 )
+  (    1 N-000009 )
   (    2 3V3 )
  )
  ( /4DC5A250 SOIC8  U1 FLASH_SPI {Lib=FLASH_SPI}
@@ -183,16 +179,16 @@
   (    4 GND )
   (    5 /MOSI )
   (    6 /SCK )
-  (    7 N-000010 )
+  (    7 N-000009 )
   (    8 3V3 )
  )
  ( /4DC555D0 SM0603  R14 150R {Lib=R}
   (    1 3V3 )
-  (    2 N-000053 )
+  (    2 N-000054 )
  )
  ( /4CF7BAEE SM0603  R13 150R {Lib=R}
   (    1 3V3 )
-  (    2 N-000055 )
+  (    2 N-000056 )
  )
  ( /4DC51F05 FFC_REBELSIM  P3 REBELSIM {Lib=REBELSIM}
   (    1 /VCC_PHONE )
@@ -216,7 +212,7 @@
  )
  ( /4D020DD3 SM0603  C6 10nF {Lib=C}
   (    1 GND )
-  (    2 N-000043 )
+  (    2 N-000042 )
  )
  ( /4D020DCD SM0603  C10 1nF {Lib=C}
   (    1 GND )
@@ -224,7 +220,7 @@
  )
  ( /4D020DC6 SM0603  R11 1k5 {Lib=R}
   (    1 N-000067 )
-  (    2 N-000043 )
+  (    2 N-000042 )
  )
  ( /4D020BEB SM0603  C9 100nF {Lib=C}
   (    1 3V3 )
@@ -245,7 +241,7 @@
  ( /4CFCD6C9 pin_array_10x2  P1 JTAG {Lib=JTAG}
   (    1 3V3 )
   (    2 3V3 )
-  (    3 N-000044 )
+  (    3 N-000043 )
   (    4 GND )
   (    5 /TDI )
   (    6 GND )
@@ -265,15 +261,15 @@
   (   20 GND )
  )
  ( /4CF5471F LED-0603  D5 GREEN {Lib=LED}
-  (    1 N-000053 )
+  (    1 N-000054 )
   (    2 /LED_G )
  )
  ( /4CF54717 LED-0603  D4 RED {Lib=LED}
-  (    1 N-000055 )
+  (    1 N-000056 )
   (    2 /LED_R )
  )
  ( /4CE84486 TQFP_64  IC3 AT91SAM7S512/256/128/64/321-AU {Lib=AT91SAM7S512/256/128/64/321-AU}
-  (    1 N-000063 )
+  (    1 N-000058 )
   (    2 GND )
   (    3 GND )
   (    4 GND )
@@ -291,7 +287,7 @@
   (   16 /SC_SW )
   (   17 GND )
   (   18 3V3 )
-  (   19 N-000019 )
+  (   19 N-000020 )
   (   20 /WP )
   (   21 /SCK )
   (   22 /MOSI )
@@ -327,24 +323,24 @@
   (   52 /BOOTLOADER )
   (   53 /TCK )
   (   54 +1.8V )
-  (   55 N-000032 )
+  (   55 N-000030 )
   (   56 /DDM )
   (   57 /DDP )
   (   58 3V3 )
   (   59 3V3 )
   (   60 GND )
-  (   61 N-000034 )
-  (   62 N-000050 )
+  (   61 N-000033 )
+  (   62 N-000049 )
   (   63 N-000067 )
   (   64 +1.8V )
  )
  ( /4CE9ADCF PIN_ARRAY-6X1  P2 DEBUG {Lib=DEBUG}
   (    1 GND )
-  (    2 N-000058 )
+  (    2 N-000059 )
   (    3 3V3 )
   (    4 /DRXD )
   (    5 /DTXD )
-  (    6 N-000058 )
+  (    6 N-000059 )
  )
  ( /4CE9A6AE SM0603  R8 100K {Lib=R}
   (    1 /TDO )
@@ -363,20 +359,20 @@
   (    2 3V3 )
  )
  ( /4CE9A68C SM0603  R4 100K {Lib=R}
-  (    1 N-000044 )
+  (    1 N-000043 )
   (    2 3V3 )
  )
  ( /4CE91633 SM0603  C18 10pF {Lib=C}
-  (    1 N-000050 )
+  (    1 N-000049 )
   (    2 GND )
  )
  ( /4CE9162F SM0603  C17 10pF {Lib=C}
-  (    1 N-000034 )
+  (    1 N-000033 )
   (    2 GND )
  )
  ( /4CE915DE Q_49U3HMS  X1 18.432MHz {Lib=CRYSTAL}
-  (    1 N-000034 )
-  (    2 N-000050 )
+  (    1 N-000033 )
+  (    2 N-000049 )
  )
 )
 *
@@ -483,12 +479,6 @@ $component C23
  C?
  C1-1
 $endlist
-$component R15
- R?
- SM0603
- SM0805
- R?-*
-$endlist
 $component C19
  SM*
  C?
@@ -630,299 +620,297 @@ $endlist
 $endfootprintlist
 }
 { Pin List by Nets
-Net 1 "3V3" "3V3"
- R2 2
- R5 2
- R6 2
- U1 8
- R8 2
- R7 2
+Net 3 "3V3" "3V3"
  R1 1
+ U1 8
+ C7 1
+ C1 1
+ P4 SW2
  IC3 45
- IC3 18
- IC3 58
- P2 3
+ R18 2
+ C9 1
+ IC4 20
+ C22 1
  IC3 59
- P1 2
+ IC3 58
+ R12 1
  P1 1
+ P1 2
  Q1 3
- C1 1
  IC2 2
- P4 SW2
- C22 1
- IC4 20
- R12 1
- SW2 1
+ IC3 7
+ R2 2
+ P2 3
+ IC3 18
+ R4 2
  FB2 2
- R14 1
- R13 1
- JP2 1
- JP1 2
- C7 1
- C9 1
- R18 2
+ R5 2
+ R6 2
+ R8 2
  C4 1
- IC3 7
+ R7 2
  C3 1
- R4 2
-Net 2 "GND" "GND"
- IC3 46
+ JP1 2
+ R14 1
+ JP2 1
+ R13 1
+Net 4 "GND" "GND"
+ P1 10
+ C9 2
  C10 1
- C6 1
- SW1 2
- P2 1
+ P1 16
+ P1 14
+ P1 12
+ P1 20
  C7 2
- C9 2
- P1 18
  P1 8
- P1 6
- C18 2
- P1 10
+ P1 18
  C17 2
- P1 20
- P1 14
- P1 12
- IC3 17
- P1 16
+ C18 2
  IC3 5
- P3 6
- C3 2
- C20 2
- C15 2
- U1 4
- C19 2
  IC3 4
- IC3 60
- C16 2
- C4 2
- C23 2
- IC3 2
  IC3 3
- R15 1
- J1 5
- R17 2
- C14 2
+ IC3 2
+ IC3 60
+ P1 6
  P1 4
+ SW1 2
  J2 1
- BT1 2
- Q2 2
- C22 2
- C21 2
- IC2 3
+ C1 2
  C12 2
+ P4 C5
+ C16 2
+ U1 4
  IC2 6
- IC4 10
+ C22 2
+ P2 1
+ C21 2
+ C15 2
+ C20 2
+ C3 2
+ IC3 46
+ Q2 2
  C11 2
- P4 C5
- C1 2
  C13 2
-Net 5 "/BOOTLOADER" "BOOTLOADER"
- IC3 52
- SW2 2
- R15 2
+ C6 1
+ BT1 2
+ R17 2
+ C4 2
+ C19 2
+ IC4 10
+ C14 2
+ SW2 1
+ IC3 17
+ IC2 3
+ P3 6
+ J1 5
+ C23 2
+Net 5 "/CS" "CS"
+ IC3 28
+ U1 1
 Net 6 "/MISO" "MISO"
  IC3 27
  U1 2
-Net 7 "/CS" "CS"
- U1 1
- IC3 28
-Net 8 "/MOSI" "MOSI"
+Net 7 "/MOSI" "MOSI"
  IC3 22
  U1 5
-Net 9 "/SCK" "SCK"
- U1 6
+Net 8 "/SCK" "SCK"
  IC3 21
-Net 10 "" ""
+ U1 6
+Net 9 "" ""
  R18 1
  U1 7
+Net 10 "/RST_SIM" "RST_SIM"
+ IC3 32
+ P4 C2
+ IC4 16
 Net 11 "/VCC_SIM" "VCC_SIM"
+ IC4 18
  IC3 35
  P4 C1
- IC4 18
 Net 12 "" ""
- R9 2
  J1 2
+ R9 2
  C5 1
 Net 13 "" ""
- R10 2
+ C5 2
  R3 1
+ R10 2
  J1 3
- C5 2
 Net 14 "/DDM" "DDM"
- C11 1
  IC3 56
  R9 1
+ C11 1
 Net 15 "/A-B-DETECT" "A-B-DETECT"
- IC3 41
  J1 4
+ IC3 41
  R2 1
 Net 16 "" ""
  FB1 1
  J1 1
 Net 17 "" ""
- BT1 1
  D3 1
-Net 19 "" ""
- IC3 19
- R16 2
+ BT1 1
+Net 19 "/UDP_PUP" "UDP_PUP"
+ R1 2
+ Q1 1
+ Q2 3
+ D1 1
 Net 20 "" ""
+ R16 2
+ IC3 19
+Net 21 "" ""
  Q2 1
  R16 1
-Net 21 "/UDP_PUP" "UDP_PUP"
- Q1 1
- R1 2
- D1 1
- Q2 3
 Net 22 "//RESET" "/RESET"
- IC3 39
  R12 2
  SW1 1
- D1 2
  P1 15
+ IC3 39
+ D1 2
 Net 23 "" ""
- Q1 2
  R3 2
+ Q1 2
 Net 24 "" ""
- C21 1
  IC2 4
+ C21 1
 Net 25 "/I/O_SIM" "I/O_SIM"
- IC3 34
- IC3 47
  P4 C7
+ IC3 34
  IC4 9
+ IC3 47
 Net 26 "/CLK_SIM" "CLK_SIM"
- IC3 36
  IC3 44
  P4 C3
  IC4 14
+ IC3 36
 Net 27 "/SC_SW" "SC_SW"
  IC3 16
  IC4 1
  IC4 1
  IC4 1
-Net 28 "/RST_SIM" "RST_SIM"
- P4 C2
- IC3 32
- IC4 16
-Net 32 "" ""
- IC3 55
+Net 30 "" ""
  JP2 2
-Net 34 "" ""
- IC3 61
- C17 1
+ IC3 55
+Net 33 "" ""
  X1 1
+ C17 1
+ IC3 61
+Net 34 "/TCK" "TCK"
+ R7 1
+ P1 9
+ P1 11
+ IC3 53
 Net 35 "/TDI" "TDI"
  IC3 33
- R5 1
  P1 5
-Net 37 "/I/O_SW" "I/O_SW"
- IC3 13
- IC4 19
-Net 40 "/I/O_PHONE" "I/O_PHONE"
- IC4 11
+ R5 1
+Net 39 "/I/O_PHONE" "I/O_PHONE"
  P3 4
  IC3 14
+ IC4 11
  IC3 11
-Net 41 "/RST_PHONE" "RST_PHONE"
- IC3 23
+Net 40 "/RST_PHONE" "RST_PHONE"
  P3 2
+ IC3 23
  IC4 4
-Net 42 "/CLK_PHONE" "CLK_PHONE"
- IC3 15
- P3 3
+Net 41 "/CLK_PHONE" "CLK_PHONE"
  IC3 38
  IC4 6
-Net 43 "" ""
- R11 2
+ IC3 15
+ P3 3
+Net 42 "" ""
  C6 2
-Net 44 "" ""
- R4 1
+ R11 2
+Net 43 "" ""
  P1 3
-Net 45 "/VCC_PHONE" "VCC_PHONE"
- IC4 2
- IC3 6
+ R4 1
+Net 44 "/VCC_PHONE" "VCC_PHONE"
  P3 1
-Net 46 "/WP" "WP"
- R17 1
- U1 3
+ IC3 6
+ IC4 2
+Net 45 "/WP" "WP"
  IC3 20
-Net 47 "/TEST" "TEST"
+ U1 3
+ R17 1
+Net 46 "/TEST" "TEST"
  IC3 40
  JP1 1
-Net 48 "/TMS" "TMS"
- P1 7
- IC3 51
- R6 1
-Net 50 "" ""
- X1 2
- C18 1
+Net 48 "/BOOTLOADER" "BOOTLOADER"
+ IC3 52
+ SW2 2
+Net 49 "" ""
  IC3 62
-Net 53 "" ""
- D5 1
+ C18 1
+ X1 2
+Net 50 "/I/O_SW" "I/O_SW"
+ IC3 13
+ IC4 19
+Net 51 "/SW_SIM" "SW_SIM"
+ IC3 31
+ P4 SW1
+Net 54 "" ""
  R14 2
-Net 54 "/LED_G" "LED_G"
- IC3 10
+ D5 1
+Net 55 "/LED_G" "LED_G"
  D5 2
-Net 55 "" ""
+ IC3 10
+Net 56 "" ""
  R13 2
  D4 1
-Net 56 "/LED_R" "LED_R"
- IC3 9
+Net 57 "/LED_R" "LED_R"
  D4 2
-Net 57 "/TDO" "TDO"
- IC3 49
- P1 13
- R8 1
+ IC3 9
 Net 58 "" ""
+ IC3 1
+ C23 1
+ FB2 1
+Net 59 "" ""
  P2 2
  P2 6
-Net 59 "/TCK" "TCK"
- P1 9
- P1 11
- IC3 53
- R7 1
-Net 60 "/DDP" "DDP"
- IC3 57
+Net 60 "/TDO" "TDO"
+ IC3 49
+ P1 13
+ R8 1
+Net 61 "/TMS" "TMS"
+ R6 1
+ P1 7
+ IC3 51
+Net 62 "/DDP" "DDP"
  C13 1
  R10 1
-Net 61 "/DRXD" "DRXD"
+ IC3 57
+Net 63 "/DRXD" "DRXD"
  IC3 30
- P2 4
  J2 2
-Net 62 "/DTXD" "DTXD"
+ P2 4
+Net 64 "/DTXD" "DTXD"
  IC3 29
  P2 5
  J2 3
-Net 63 "" ""
- FB2 1
- IC3 1
- C23 1
-Net 64 "" ""
- D3 2
+Net 65 "" ""
  C14 1
  IC2 5
- D2 2
  IC2 1
-Net 65 "/SW_SIM" "SW_SIM"
- IC3 31
- P4 SW1
+ D3 2
+ D2 2
 Net 66 "/USBVCC" "USBVCC"
- D2 1
  FB1 2
+ D2 1
 Net 67 "" ""
- IC3 63
  C10 2
  R11 1
+ IC3 63
 Net 68 "+1.8V" "+1.8V"
+ IC3 24
+ IC3 8
  IC3 12
- IC3 64
  IC3 54
- C16 1
- C19 1
- IC3 8
- C20 1
- IC3 24
+ IC3 64
  C12 1
  C15 1
+ C20 1
+ C16 1
+ C19 1
 }
 #End