From b67a10fc97d33c82831e8ce4ba8f1c1662a69389 Mon Sep 17 00:00:00 2001
From: Kevin Redon <kevredon@mail.tsaitgaist.info>
Date: Fri, 13 May 2011 11:56:37 +0200
Subject: [PATCH] update simtrace schematics to 0.4

---
 hardware/kicad/SIMtrac.net                  |  580 ++++--
 hardware/kicad/SIMtrac.pro                  |   28 +-
 hardware/kicad/SIMtrac.sch                  | 1873 +++++++++++--------
 hardware/kicad/lib/SIMtrace.bak             |   53 +
 hardware/kicad/lib/SIMtrace.bck             |    7 +
 hardware/kicad/lib/SIMtrace.dcm             |    7 +
 hardware/kicad/lib/SIMtrace.lib             |   53 +
 hardware/kicad/lib/imported/smart_cards.mod |  323 ++++
 hardware/kicad/lib/imported/smartcard.lib   |   33 +
 hardware/kicad/lib/imported/smartcard.mod   |  112 ++
 hardware/kicad/lib/imported/smartwed.lib    |   87 +
 hardware/kicad/lib/imported/smartwed.mod    |  215 +++
 hardware/kicad/lib/smartcard.bak            |  100 +-
 hardware/kicad/lib/smartcard.bck            |   17 +-
 hardware/kicad/lib/smartcard.dcm            |   17 +-
 hardware/kicad/lib/smartcard.lib            |   98 +-
 16 files changed, 2642 insertions(+), 961 deletions(-)
 create mode 100644 hardware/kicad/lib/SIMtrace.bak
 create mode 100644 hardware/kicad/lib/SIMtrace.bck
 create mode 100644 hardware/kicad/lib/SIMtrace.dcm
 create mode 100644 hardware/kicad/lib/SIMtrace.lib
 create mode 100644 hardware/kicad/lib/imported/smart_cards.mod
 create mode 100644 hardware/kicad/lib/imported/smartcard.lib
 create mode 100644 hardware/kicad/lib/imported/smartcard.mod
 create mode 100644 hardware/kicad/lib/imported/smartwed.lib
 create mode 100644 hardware/kicad/lib/imported/smartwed.mod

diff --git a/hardware/kicad/SIMtrac.net b/hardware/kicad/SIMtrac.net
index c5d98a3..def9229 100644
--- a/hardware/kicad/SIMtrac.net
+++ b/hardware/kicad/SIMtrac.net
@@ -1,27 +1,165 @@
-# EESchema Netlist Version 1.1 created  So 21 Nov 2010 18:44:49 CET
+# EESchema Netlist Version 1.1 created  Do 25 Nov 2010 16:43:12 CET
 (
+ ( /4CECC87B $noname  SW1 SWITCH_INV {Lib=SWITCH_INV}
+  (    1 3V3 )
+  (    2 N-000029 )
+  (    3 +1.8V )
+ )
+ ( /4CECC425 TO92-EBC  Q2-1 BC237 {Lib=BC237}
+  (    B N-000060 )
+  (    C N-000025 )
+  (    E N-000049 )
+ )
+ ( /4CECC3E1 TO92-EBC  Q2-2 BC237 {Lib=BC237}
+  (    B N-000060 )
+  (    C /RST )
+  (    E N-000010 )
+ )
+ ( /4CECC3CE TO92-EBC  Q2-3 BC237 {Lib=BC237}
+  (    B N-000060 )
+  (    C /CLK )
+  (    E N-000061 )
+ )
+ ( /4CECC3A8 TO92-EBC  Q2-5 BC237 {Lib=BC237}
+  (    B N-000060 )
+  (    C N-000057 )
+  (    E N-000059 )
+ )
+ ( /4CECC337 TO92-EBC  Q1 BC237 {Lib=BC237}
+  (    B N-000039 )
+  (    C N-000062 )
+  (    E /I/O )
+ )
+ ( /4CE84486 at91sam7sxxx-au-LQFP64  IC1 AT91SAM7S512/256/128/64/321-AU {Lib=AT91SAM7S512/256/128/64/321-AU}
+  (    1 ? )
+  (    2 GND )
+  (    3 ? )
+  (    4 ? )
+  (    5 ? )
+  (    6 ? )
+  (    7 3V3 )
+  (    8 +1.8V )
+  (    9 ? )
+  (   10 ? )
+  (   11 N-000062 )
+  (   12 +1.8V )
+  (   13 N-000039 )
+  (   14 N-000062 )
+  (   15 N-000061 )
+  (   16 N-000060 )
+  (   17 GND )
+  (   18 N-000029 )
+  (   19 ? )
+  (   20 ? )
+  (   21 ? )
+  (   22 ? )
+  (   23 /RST )
+  (   24 +1.8V )
+  (   25 ? )
+  (   26 ? )
+  (   27 ? )
+  (   28 ? )
+  (   29 /DTXD )
+  (   30 /DRXD )
+  (   31 ? )
+  (   32 /RST )
+  (   33 /TDI )
+  (   34 /I/O )
+  (   35 ? )
+  (   36 /CLK )
+  (   37 ? )
+  (   38 N-000061 )
+  (   39 //RESET )
+  (   40 /TEST )
+  (   41 ? )
+  (   42 ? )
+  (   43 ? )
+  (   44 /CLK )
+  (   45 N-000029 )
+  (   46 GND )
+  (   47 /I/O )
+  (   48 ? )
+  (   49 /TDO )
+  (   50 ? )
+  (   51 /TMS )
+  (   52 ? )
+  (   53 /TCK )
+  (   54 +1.8V )
+  (   55 ? )
+  (   56 /DDM )
+  (   57 /DDP )
+  (   58 N-000029 )
+  (   59 3V3 )
+  (   60 GND )
+  (   61 N-000045 )
+  (   62 N-000038 )
+  (   63 ? )
+  (   64 +1.8V )
+ )
+ ( /4CEA6040 $noname  P4 SC {Lib=SC}
+  (    1 N-000025 )
+  (    2 N-000010 )
+  (    3 N-000061 )
+  (    4 GND )
+  (    5 N-000057 )
+  (    6 N-000062 )
+ )
+ ( /4CE9ADCF $noname  P2 DEBUG {Lib=DEBUG}
+  (    1 GND )
+  (    2 N-000001 )
+  (    3 3V3 )
+  (    4 /DTXD )
+  (    5 /DRXD )
+  (    6 N-000001 )
+ )
+ ( /4CE9A6AE $noname  R5 4K7 {Lib=R}
+  (    1 /TDO )
+  (    2 3V3 )
+ )
+ ( /4CE9A6A9 $noname  R4 4K7 {Lib=R}
+  (    1 /TCK )
+  (    2 3V3 )
+ )
+ ( /4CE9A6A5 $noname  R3 4K7 {Lib=R}
+  (    1 /TMS )
+  (    2 3V3 )
+ )
+ ( /4CE9A69A $noname  R2 4K7 {Lib=R}
+  (    1 /TDI )
+  (    2 3V3 )
+ )
+ ( /4CE9A68C $noname  R1 4K7 {Lib=R}
+  (    1 N-000013 )
+  (    2 3V3 )
+ )
+ ( /4CE9A47C $noname  P3 JTAG {Lib=CONN_10X2}
+  (    1 3V3 )
+  (    2 3V3 )
+  (    3 N-000013 )
+  (    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 )
+ )
  ( /4CE945D9 VCC  J1 USB {Lib=USB_2}
   (    1 +5V )
   (    2 /DDP )
   (    3 /DDM )
   (    4 GND )
  )
- ( /4CE9355B $noname  P3 SC_OUT {Lib=CONN_3X2}
-  (    1 N-000045 )
-  (    2 /RST )
-  (    3 /CLK )
-  (    4 GND )
-  (    5 N-000052 )
-  (    6 /I/O )
- )
- ( /4CE93557 $noname  P2 SC_IN {Lib=CONN_3X2}
-  (    1 N-000045 )
-  (    2 /RST )
-  (    3 /CLK )
-  (    4 GND )
-  (    5 N-000052 )
-  (    6 /I/O )
- )
  ( /4CE91AE6 $noname  P1 SAM-BA {Lib=CONN_4}
   (    1 3V3 )
   (    2 /TEST )
@@ -29,16 +167,16 @@
   (    4 GND )
  )
  ( /4CE91633 $noname  C15 10pF {Lib=C}
-  (    1 N-000001 )
+  (    1 N-000038 )
   (    2 GND )
  )
  ( /4CE9162F $noname  C14 10pF {Lib=C}
-  (    1 N-000002 )
+  (    1 N-000045 )
   (    2 GND )
  )
  ( /4CE915DE $noname  X1 18.432MHz {Lib=CRYSTAL}
-  (    1 N-000002 )
-  (    2 N-000001 )
+  (    1 N-000045 )
+  (    2 N-000038 )
  )
  ( /4CE914B7 $noname  C13 10uF {Lib=C}
   (    1 +1.8V )
@@ -102,94 +240,73 @@
   (    2 GND )
  )
  ( /4CE8469D $noname  SC2 SC_ID-000 {Lib=ISO7816}
-  (   C1 N-000045 )
+  (   C1 N-000049 )
   (   C2 /RST )
   (   C3 /CLK )
   (   C4 ? )
   (   C5 GND )
-  (   C6 N-000052 )
+  (   C6 N-000059 )
   (   C7 /I/O )
   (   C8 ? )
  )
  ( /4CE84691 $noname  SC1 SC_ID-1 {Lib=ISO7816}
-  (   C1 N-000045 )
+  (   C1 N-000049 )
   (   C2 /RST )
   (   C3 /CLK )
   (   C4 ? )
   (   C5 GND )
-  (   C6 N-000052 )
+  (   C6 N-000059 )
   (   C7 /I/O )
   (   C8 ? )
  )
- ( /4CE84486 at91sam7sxxx-au-LQFP64  IC1 AT91SAM7S512/256/128/64/321-AU {Lib=AT91SAM7S512/256/128/64/321-AU}
-  (    1 ? )
-  (    2 GND )
-  (    3 ? )
-  (    4 ? )
-  (    5 ? )
-  (    6 ? )
-  (    7 3V3 )
-  (    8 +1.8V )
-  (    9 ? )
-  (   10 ? )
-  (   11 ? )
-  (   12 +1.8V )
-  (   13 ? )
-  (   14 ? )
-  (   15 ? )
-  (   16 ? )
-  (   17 GND )
-  (   18 3V3 )
-  (   19 ? )
-  (   20 ? )
-  (   21 ? )
-  (   22 ? )
-  (   23 ? )
-  (   24 +1.8V )
-  (   25 ? )
-  (   26 ? )
-  (   27 ? )
-  (   28 ? )
-  (   29 ? )
-  (   30 ? )
-  (   31 ? )
-  (   32 /RST )
-  (   33 ? )
-  (   34 /I/O )
-  (   35 ? )
-  (   36 /CLK )
-  (   37 ? )
-  (   38 ? )
-  (   39 //RESET )
-  (   40 /TEST )
-  (   41 ? )
-  (   42 ? )
-  (   43 ? )
-  (   44 /CLK )
-  (   45 3V3 )
-  (   46 GND )
-  (   47 /I/O )
-  (   48 ? )
-  (   49 ? )
-  (   50 ? )
-  (   51 ? )
-  (   52 ? )
-  (   53 ? )
-  (   54 +1.8V )
-  (   55 ? )
-  (   56 /DDM )
-  (   57 /DDP )
-  (   58 3V3 )
-  (   59 3V3 )
-  (   60 GND )
-  (   61 N-000002 )
-  (   62 N-000001 )
-  (   63 ? )
-  (   64 +1.8V )
- )
 )
 *
 { Allowed footprints by component:
+$component Q2-1
+ TO92-EBC
+$endlist
+$component Q2-2
+ TO92-EBC
+$endlist
+$component Q2-3
+ TO92-EBC
+$endlist
+$component Q2-5
+ TO92-EBC
+$endlist
+$component Q1
+ TO92-EBC
+$endlist
+$component R5
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R4
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R3
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R2
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R1
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
 $component C15
  SM*
  C?
@@ -271,113 +388,188 @@ $endfootprintlist
 }
 { Pin List by Nets
 Net 1 "" ""
- X1 2
- C15 1
- IC1 62
-Net 2 "" ""
- IC1 61
- C14 1
- X1 1
-Net 27 "/CLK" "CLK"
- IC1 36
- P2 3
- P3 3
- SC2 C3
- SC1 C3
- IC1 44
-Net 28 "/RST" "RST"
- IC1 32
- SC2 C2
  P2 2
- P3 2
- SC1 C2
-Net 42 "//RESET" "/RESET"
- P1 3
- IC1 39
-Net 45 "" ""
- SC1 C1
- P3 1
- P2 1
- SC2 C1
-Net 46 "/DDM" "DDM"
- C1 1
- IC1 56
- J1 3
-Net 47 "/TEST" "TEST"
- IC1 40
- P1 2
-Net 52 "" ""
- P3 5
- SC1 C6
- P2 5
- SC2 C6
-Net 53 "GND" "GND"
- P3 4
- J1 4
- C5 2
- C6 2
- C7 2
- C8 2
- C9 2
- C3 2
- D1 1
- C10 2
- IC2 1
- C11 2
- C12 2
- P2 4
- C2 2
- C1 2
- IC1 46
- IC1 17
- IC1 60
- C13 2
- C14 2
- C15 2
- SC1 C5
- SC2 C5
- IC1 2
- P1 4
- C4 2
-Net 54 "+5V" "+5V"
- D1 2
- J1 1
- IC2 3
- C3 1
-Net 55 "/I/O" "I/O"
- IC1 34
- P3 6
  P2 6
- SC1 C7
- SC2 C7
- IC1 47
-Net 56 "/DDP" "DDP"
- J1 2
- C2 1
- IC1 57
-Net 57 "+1.8V" "+1.8V"
- IC1 64
- IC1 8
- C13 1
- IC1 24
- IC1 12
- C12 1
- C11 1
- IC1 54
- C10 1
-Net 58 "3V3" "3V3"
- C4 1
- P1 1
- IC1 59
- IC1 58
- IC1 18
- IC1 45
- IC2 2
+Net 2 "3V3" "3V3"
+ SW1 1
  C9 1
  C8 1
- C7 1
- C6 1
- C5 1
+ IC2 2
  IC1 7
+ P3 1
+ R1 2
+ R2 2
+ R3 2
+ R4 2
+ R5 2
+ C4 1
+ C5 1
+ C6 1
+ C7 1
+ IC1 59
+ P1 1
+ P3 2
+ P2 3
+Net 3 "GND" "GND"
+ C4 2
+ C11 2
+ P1 4
+ C14 2
+ C15 2
+ C13 2
+ C12 2
+ IC2 1
+ J1 4
+ C2 2
+ C1 2
+ P3 18
+ C10 2
+ C9 2
+ SC2 C5
+ SC1 C5
+ C3 2
+ D1 1
+ P3 12
+ P3 14
+ P3 16
+ IC1 2
+ IC1 60
+ P2 1
+ P4 4
+ P3 4
+ P3 6
+ P3 8
+ P3 10
+ P3 20
+ IC1 46
+ IC1 17
+ C8 2
+ C7 2
+ C6 2
+ C5 2
+Net 8 "/DTXD" "DTXD"
+ IC1 29
+ P2 4
+Net 9 "/TDO" "TDO"
+ IC1 49
+ P3 13
+ R5 1
+Net 10 "" ""
+ P4 2
+ Q2-2 E
+Net 11 "//RESET" "/RESET"
+ IC1 39
+ P1 3
+ P3 15
+Net 13 "" ""
+ R1 1
+ P3 3
+Net 22 "/DRXD" "DRXD"
+ P2 5
+ IC1 30
+Net 25 "" ""
+ Q2-1 C
+ P4 1
+Net 29 "" ""
+ SW1 2
+ IC1 45
+ IC1 58
+ IC1 18
+Net 38 "" ""
+ IC1 62
+ C15 1
+ X1 2
+Net 39 "" ""
+ Q1 B
+ IC1 13
+Net 40 "/RST" "RST"
+ IC1 32
+ IC1 23
+ SC2 C2
+ Q2-2 C
+ SC1 C2
+Net 41 "/TDI" "TDI"
+ P3 5
+ IC1 33
+ R2 1
+Net 43 "/TCK" "TCK"
+ P3 9
+ P3 11
+ R4 1
+ IC1 53
+Net 45 "" ""
+ C14 1
+ X1 1
+ IC1 61
+Net 46 "+1.8V" "+1.8V"
+ IC1 24
+ IC1 8
+ C13 1
+ C12 1
+ C11 1
+ C10 1
+ IC1 12
+ IC1 64
+ IC1 54
+ SW1 3
+Net 49 "" ""
+ SC1 C1
+ SC2 C1
+ Q2-1 E
+Net 52 "/DDP" "DDP"
+ IC1 57
+ J1 2
+ C2 1
+Net 53 "/DDM" "DDM"
+ J1 3
+ IC1 56
+ C1 1
+Net 54 "+5V" "+5V"
+ C3 1
+ D1 2
+ IC2 3
+ J1 1
+Net 55 "/I/O" "I/O"
+ Q1 E
+ IC1 34
+ IC1 47
+ SC2 C7
+ SC1 C7
+Net 56 "/TEST" "TEST"
+ IC1 40
+ P1 2
+Net 57 "" ""
+ Q2-5 C
+ P4 5
+Net 58 "/TMS" "TMS"
+ IC1 51
+ R3 1
+ P3 7
+Net 59 "" ""
+ SC2 C6
+ SC1 C6
+ Q2-5 E
+Net 60 "" ""
+ IC1 16
+ Q2-5 B
+ Q2-3 B
+ Q2-2 B
+ Q2-1 B
+Net 61 "" ""
+ P4 3
+ IC1 38
+ IC1 15
+ Q2-3 E
+Net 62 "" ""
+ Q1 C
+ P4 6
+ IC1 14
+ IC1 11
+Net 63 "/CLK" "CLK"
+ Q2-3 C
+ IC1 44
+ IC1 36
+ SC2 C3
+ SC1 C3
 }
 #End
diff --git a/hardware/kicad/SIMtrac.pro b/hardware/kicad/SIMtrac.pro
index e654f28..1ba20ee 100644
--- a/hardware/kicad/SIMtrac.pro
+++ b/hardware/kicad/SIMtrac.pro
@@ -1,5 +1,23 @@
-update=Mi 24 Nov 2010 08:47:36 CET
+update=Do 02 Dez 2010 14:59:43 CET
 last_client=eeschema
+[pcbnew]
+[pcbnew/libraries]
+LibName1=sockets
+LibName2=connect
+LibName3=discret
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
+LibName8=valves
+LibName9=led
+LibName10=dip_sockets
+LibDir=
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
 [eeschema]
 version=1
 LibDir=
@@ -67,7 +85,7 @@ LibName28=atmel
 LibName29=contrib
 LibName30=valves
 LibName31=lib/at91sam7sxxx-au
-LibName32=lib/smartcard
-LibName33=lib/v-reg-2
-LibName34=lib/con-usb
-LibName35=lib/debug
+LibName32=lib/v-reg-2
+LibName33=lib/con-usb
+LibName34=lib/smartcard
+LibName35=lib/SIMtrace
diff --git a/hardware/kicad/SIMtrac.sch b/hardware/kicad/SIMtrac.sch
index 45a2d90..f359d65 100644
--- a/hardware/kicad/SIMtrac.sch
+++ b/hardware/kicad/SIMtrac.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mi 24 Nov 2010 09:11:26 CET
+EESchema Schematic File Version 2  date Do 02 Dez 2010 18:09:10 CET
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -30,18 +30,18 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:at91sam7sxxx-au
-LIBS:smartcard
 LIBS:v-reg-2
 LIBS:con-usb
-LIBS:debug
+LIBS:smartcard
+LIBS:SIMtrace
 LIBS:SIMtrac-cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrac hw"
-Date "24 nov 2010"
-Rev "0.3"
+Date "2 dec 2010"
+Rev "0.4"
 Comp "osmocom"
 Comment1 "inspired by openPCD"
 Comment2 "CC-BY-SA"
@@ -49,624 +49,1114 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	4250 4400 4250 4200
+	2600 4000 2200 4000
 Wire Wire Line
-	3250 4500 3250 4400
-Connection ~ 4250 3800
+	950  6450 1850 6450
 Wire Wire Line
-	4000 3800 4550 3800
+	9750 3800 9750 4200
 Wire Wire Line
-	8700 1450 8700 1400
+	9750 4200 10050 4200
+Connection ~ 10500 3900
+Connection ~ 10850 3600
 Wire Wire Line
-	10350 3650 10350 4950
+	10850 3900 10850 3450
 Wire Wire Line
-	8800 3100 8800 4950
+	10850 3900 10250 3900
 Wire Wire Line
-	10100 1750 10200 1750
-Connection ~ 8200 2500
-Connection ~ 9700 2500
+	10850 3450 10450 3450
 Wire Wire Line
-	6950 2500 9900 2500
+	10250 3900 10250 4000
+Connection ~ 10350 4500
 Wire Wire Line
-	9900 2500 9900 2050
+	10500 4400 10500 4500
 Wire Wire Line
-	10050 3450 9400 3450
-Connection ~ 10350 2300
+	10500 4500 10250 4500
 Wire Wire Line
-	6950 2300 10350 2300
-Connection ~ 8800 2200
+	10450 3250 10850 3250
 Wire Wire Line
-	8800 2200 6950 2200
+	8950 3350 9350 3350
 Wire Wire Line
-	8900 1800 10400 1800
+	9750 2300 9250 2300
 Wire Wire Line
-	8900 1800 8900 1600
+	9750 2900 9250 2900
+Connection ~ 8350 2400
 Wire Wire Line
-	10050 1600 10350 1600
+	9050 2700 8350 2700
 Wire Wire Line
-	10050 1400 10200 1400
+	8350 2700 8350 1650
+Connection ~ 8350 1800
 Wire Wire Line
-	10200 1400 10200 1750
+	8350 2100 9050 2100
 Wire Wire Line
-	8750 4850 8750 1750
+	8450 2900 8850 2900
 Wire Wire Line
-	10750 4050 10150 4050
-Connection ~ 8700 4050
+	8850 2600 8450 2600
 Wire Wire Line
-	6950 3500 8050 3500
+	8450 2300 8850 2300
 Wire Wire Line
-	8750 3800 6950 3800
+	8000 5100 8000 6200
 Wire Wire Line
-	8150 4300 8150 4100
-Connection ~ 8150 4250
+	8100 3600 8100 4000
 Wire Wire Line
-	8050 3300 7900 3300
+	8250 5800 8400 5800
 Wire Wire Line
-	7900 3300 7900 3700
+	8400 5800 8400 5900
 Wire Wire Line
-	7900 3050 7900 3200
+	8400 5900 8500 5900
 Wire Wire Line
-	8150 4300 6950 4300
+	9650 4700 9650 4800
 Wire Wire Line
-	8150 4250 9050 4250
+	6950 4700 7700 4700
+Connection ~ 7700 4200
 Wire Wire Line
-	10350 4550 7950 4550
-Connection ~ 3300 1600
+	7700 4700 7700 4200
 Wire Wire Line
-	3200 1600 3300 1600
-Connection ~ 3300 1400
+	7250 1250 8900 1250
 Wire Wire Line
-	3300 1400 3200 1400
-Connection ~ 3300 1200
+	7250 1050 8000 1050
 Wire Wire Line
-	3300 1200 3200 1200
-Connection ~ 3300 1000
+	7400 3400 6950 3400
 Wire Wire Line
-	3300 1000 3200 1000
+	6950 3200 7400 3200
 Wire Wire Line
-	3300 1700 3300 800 
+	7400 3100 6950 3100
 Wire Wire Line
-	3300 800  3200 800 
-Connection ~ 1100 1100
+	9650 4800 9500 4800
 Wire Wire Line
-	1100 650  1100 1300
+	9800 6400 9800 5300
+Wire Wire Line
+	6950 2900 7850 2900
+Wire Wire Line
+	6950 2500 7850 2500
+Wire Wire Line
+	10100 1200 10150 1200
+Wire Wire Line
+	10100 900  10150 900 
+Wire Wire Line
+	9350 1200 9600 1200
+Wire Wire Line
+	9600 900  9400 900 
+Wire Wire Line
+	7550 850  7550 950 
+Wire Wire Line
+	8900 1250 8900 1150
+Wire Wire Line
+	8450 1050 8450 1150
+Connection ~ 7600 1300
+Wire Wire Line
+	7600 1300 8950 1300
+Wire Wire Line
+	8950 1300 8950 1200
+Wire Wire Line
+	9300 850  9300 1050
+Wire Wire Line
+	9300 850  8900 850 
+Wire Wire Line
+	8900 850  8900 1100
+Wire Wire Line
+	9500 650  9500 750 
+Wire Wire Line
+	9500 650  8000 650 
+Wire Wire Line
+	8000 650  8000 900 
+Wire Wire Line
+	9150 1000 8950 1000
+Wire Wire Line
+	8950 1000 8950 1150
+Wire Wire Line
+	8950 1150 8900 1150
+Wire Wire Line
+	8250 800  8050 800 
+Wire Wire Line
+	8050 800  8050 950 
+Wire Wire Line
+	7600 1350 7600 900 
+Wire Wire Line
+	1200 2800 1500 2800
+Wire Wire Line
+	1200 2900 1800 2900
+Wire Wire Line
+	6950 4800 7850 4800
+Wire Wire Line
+	8450 6300 8100 6300
+Wire Wire Line
+	9800 6400 9550 6400
+Wire Wire Line
+	9550 6200 10000 6200
+Wire Wire Line
+	5000 1250 5150 1250
+Wire Wire Line
+	6950 1700 6950 1150
+Wire Wire Line
+	6950 1150 6150 1150
+Connection ~ 10750 900 
+Wire Wire Line
+	10750 900  10550 900 
+Wire Wire Line
+	10550 1200 10750 1200
+Wire Wire Line
+	10750 1200 10750 750 
+Wire Wire Line
+	4250 4700 4250 4500
+Connection ~ 4250 4100
+Wire Wire Line
+	4000 4100 4550 4100
+Wire Wire Line
+	9550 5100 10000 5100
+Wire Wire Line
+	8100 3600 8250 3600
+Wire Wire Line
+	8100 3350 8100 3500
+Wire Wire Line
+	8450 5300 8200 5300
+Connection ~ 3300 1900
+Wire Wire Line
+	3200 1900 3300 1900
+Connection ~ 3300 1700
+Wire Wire Line
+	3300 1700 3200 1700
+Connection ~ 3300 1500
+Wire Wire Line
+	3300 1500 3200 1500
+Connection ~ 3300 1300
+Wire Wire Line
+	3300 1300 3200 1300
+Wire Wire Line
+	3300 2000 3300 1100
+Wire Wire Line
+	3300 1100 3200 1100
+Connection ~ 1100 1400
+Wire Wire Line
+	1100 950  1100 1600
+Wire Wire Line
+	1100 1600 1250 1600
+Connection ~ 1100 1200
 Wire Wire Line
 	1100 1300 1250 1300
-Connection ~ 1100 900 
+Connection ~ 1100 1000
 Wire Wire Line
-	1100 1000 1250 1000
-Connection ~ 1100 700 
+	1100 1000 2400 1000
 Wire Wire Line
-	2400 700  1100 700 
+	1100 1100 1250 1100
+Connection ~ 2100 1400
 Wire Wire Line
-	1100 800  1250 800 
-Connection ~ 2100 1100
+	1750 1400 2400 1400
+Connection ~ 2300 1200
 Wire Wire Line
-	1750 1100 2400 1100
-Connection ~ 2300 900 
+	1750 1200 2400 1200
+Connection ~ 3750 1900
 Wire Wire Line
-	1750 900  2400 900 
-Connection ~ 3750 1600
+	2400 1700 1900 1700
 Wire Wire Line
-	2400 1400 1900 1400
+	1900 1700 1900 2100
 Wire Wire Line
-	1900 1400 1900 1800
+	1900 2100 3750 2100
 Wire Wire Line
-	1900 1800 3750 1800
+	3750 2100 3750 1350
+Connection ~ 2100 1500
 Wire Wire Line
-	3750 1800 3750 1050
-Connection ~ 2100 1200
+	2400 1500 2100 1500
 Wire Wire Line
-	2400 1200 2100 1200
+	2200 1300 2200 2300
 Wire Wire Line
-	2200 1000 2200 2000
+	2200 2300 4550 2300
 Wire Wire Line
-	2200 2000 4550 2000
+	3650 2900 3650 2800
 Wire Wire Line
-	2700 2500 2700 2600
-Wire Wire Line
-	4550 1900 2300 1900
-Wire Wire Line
-	1200 2300 1550 2300
-Wire Wire Line
-	4550 1500 3850 1500
-Wire Wire Line
-	3650 1050 3650 1150
-Wire Wire Line
-	3650 1150 3500 1150
-Wire Wire Line
-	4100 1150 3950 1150
-Wire Wire Line
-	3950 1150 3950 1050
-Wire Wire Line
-	4550 2700 2800 2700
-Connection ~ 4250 4800
-Wire Wire Line
-	1900 4400 1900 4000
-Wire Wire Line
-	3950 5950 3950 5850
-Wire Wire Line
-	750  6150 1850 6150
-Wire Wire Line
-	7950 4400 6950 4400
-Connection ~ 8750 4150
-Wire Wire Line
-	10350 4250 10150 4250
-Wire Wire Line
-	8700 4050 9050 4050
-Wire Wire Line
-	10350 4950 10150 4950
-Wire Wire Line
-	10150 4750 10450 4750
-Wire Wire Line
-	8800 4950 9050 4950
-Connection ~ 4250 5000
-Wire Wire Line
-	4250 5000 4550 5000
-Wire Wire Line
-	4550 5200 4250 5200
-Wire Wire Line
-	4250 5200 4250 4600
-Connection ~ 4250 4200
-Wire Wire Line
-	4250 4200 4550 4200
-Connection ~ 4250 4400
-Wire Wire Line
-	1550 2300 1550 2050
-Wire Wire Line
-	2800 3100 3000 3100
-Wire Wire Line
-	3200 3400 3000 3400
-Connection ~ 3950 3400
-Wire Wire Line
-	3600 3400 4200 3400
-Wire Wire Line
-	4550 3000 4200 3000
-Connection ~ 3950 2800
-Wire Wire Line
-	3600 2800 4200 2800
-Wire Wire Line
-	1200 2400 2800 2400
-Wire Wire Line
-	950  6650 950  6900
-Connection ~ 1250 6750
-Wire Wire Line
-	1550 6750 1550 6650
-Connection ~ 1550 6150
-Wire Wire Line
-	1850 6150 1850 6250
-Connection ~ 950  6150
-Wire Wire Line
-	1250 6150 1250 6250
-Wire Wire Line
-	950  6250 950  6050
-Connection ~ 1850 4950
-Wire Wire Line
-	2150 5050 2150 4950
-Wire Wire Line
-	2150 4950 950  4950
-Connection ~ 1550 5550
-Wire Wire Line
-	1850 5550 1850 5450
-Connection ~ 950  5550
-Wire Wire Line
-	1250 5450 1250 5550
-Connection ~ 1550 4950
-Wire Wire Line
-	1850 4950 1850 5050
-Connection ~ 950  4950
-Wire Wire Line
-	1250 5050 1250 4950
-Wire Wire Line
-	950  4300 950  4600
-Connection ~ 2600 3700
-Wire Wire Line
-	2600 3500 2600 3900
-Connection ~ 1350 3700
-Connection ~ 950  3700
-Wire Wire Line
-	1600 3700 950  3700
-Connection ~ 1900 4400
-Connection ~ 950  4400
-Wire Wire Line
-	1350 4300 1350 4400
-Wire Wire Line
-	950  3500 950  3900
-Connection ~ 4250 5600
-Wire Wire Line
-	4250 5600 4550 5600
-Wire Wire Line
-	4250 6050 4250 5400
-Wire Wire Line
-	4250 5400 4550 5400
-Connection ~ 1850 3200
-Wire Wire Line
-	1850 3050 1850 3200
-Wire Wire Line
-	1850 2650 1850 2500
-Wire Wire Line
-	2200 2650 2200 2400
-Connection ~ 2200 2400
-Wire Wire Line
-	2200 3050 2200 3200
-Wire Wire Line
-	2200 3200 1550 3200
+	4550 2200 2300 2200
 Wire Wire Line
 	1200 2600 1550 2600
 Wire Wire Line
-	1550 2600 1550 3350
-Connection ~ 1550 3200
-Connection ~ 1850 2500
+	4550 1800 3850 1800
 Wire Wire Line
-	4550 5500 4250 5500
-Connection ~ 4250 5500
+	3650 1350 3650 1450
 Wire Wire Line
-	4250 5700 4550 5700
-Connection ~ 4250 5700
+	3650 1450 3500 1450
 Wire Wire Line
-	950  4400 2600 4400
+	4100 1450 3950 1450
 Wire Wire Line
-	2600 4400 2600 4300
-Connection ~ 1350 4400
+	3950 1450 3950 1350
 Wire Wire Line
-	1350 3900 1350 3700
-Wire Wire Line
-	950  5050 950  4900
-Wire Wire Line
-	1550 4950 1550 5050
-Connection ~ 1250 4950
-Wire Wire Line
-	1550 5550 1550 5450
-Connection ~ 1250 5550
-Wire Wire Line
-	950  5450 950  5700
-Wire Wire Line
-	950  5550 2150 5550
-Wire Wire Line
-	2150 5550 2150 5450
-Connection ~ 1850 5550
-Wire Wire Line
-	1550 6250 1550 6150
-Connection ~ 1250 6150
-Wire Wire Line
-	1250 6650 1250 6750
-Connection ~ 950  6750
-Wire Wire Line
-	950  6750 1850 6750
-Wire Wire Line
-	1850 6750 1850 6650
-Connection ~ 1550 6750
-Wire Wire Line
-	4200 2800 4200 3000
-Wire Wire Line
-	4550 3200 4200 3200
-Wire Wire Line
-	4200 3200 4200 3400
-Connection ~ 3000 3100
-Wire Wire Line
-	3000 3400 3000 2800
-Wire Wire Line
-	3000 2800 3200 2800
-Wire Wire Line
-	4550 4300 4250 4300
-Connection ~ 4250 4300
-Wire Wire Line
-	4550 4000 4250 4000
-Wire Wire Line
-	4250 5100 4550 5100
+	4550 3000 3750 3000
 Connection ~ 4250 5100
 Wire Wire Line
-	9050 4750 8700 4750
+	1900 4700 1900 4300
 Wire Wire Line
-	10150 4850 10400 4850
+	9800 5300 9550 5300
 Wire Wire Line
-	10400 4150 10150 4150
-Connection ~ 10350 4550
+	8000 5100 8450 5100
+Connection ~ 4250 5300
 Wire Wire Line
-	6950 3900 7950 3900
-Connection ~ 10450 4050
-Connection ~ 8800 4250
+	4250 5300 4550 5300
 Wire Wire Line
-	2850 3700 2200 3700
+	4550 5500 4250 5500
 Wire Wire Line
-	3950 5850 4250 5850
-Connection ~ 4250 5850
+	4250 5500 4250 4900
+Connection ~ 4250 4500
 Wire Wire Line
-	4000 4600 4550 4600
+	4250 4500 4550 4500
+Connection ~ 4250 4700
+Wire Wire Line
+	1550 2600 1550 2350
+Wire Wire Line
+	2800 3400 3000 3400
+Wire Wire Line
+	3200 3700 3000 3700
+Connection ~ 3950 3700
+Wire Wire Line
+	3600 3700 4200 3700
+Wire Wire Line
+	4550 3300 4200 3300
+Connection ~ 3950 3100
+Wire Wire Line
+	3600 3100 4200 3100
+Wire Wire Line
+	950  6950 950  7200
+Connection ~ 1250 7050
+Wire Wire Line
+	1550 7050 1550 6950
+Connection ~ 1550 6450
+Wire Wire Line
+	1850 6450 1850 6550
+Connection ~ 950  6450
+Wire Wire Line
+	1250 6450 1250 6550
+Wire Wire Line
+	950  6550 950  6350
+Connection ~ 1850 5250
+Wire Wire Line
+	2150 5350 2150 5250
+Wire Wire Line
+	2150 5250 950  5250
+Connection ~ 1550 5850
+Wire Wire Line
+	1850 5850 1850 5750
+Connection ~ 950  5850
+Wire Wire Line
+	1250 5750 1250 5850
+Connection ~ 1550 5250
+Wire Wire Line
+	1850 5250 1850 5350
+Connection ~ 950  5250
+Wire Wire Line
+	1250 5350 1250 5250
+Wire Wire Line
+	950  4600 950  4900
+Connection ~ 2600 4000
+Wire Wire Line
+	2600 3800 2600 4200
+Connection ~ 1350 4000
+Connection ~ 950  4000
+Wire Wire Line
+	950  4000 1600 4000
+Connection ~ 1900 4700
+Connection ~ 950  4700
+Wire Wire Line
+	1350 4600 1350 4700
+Wire Wire Line
+	950  3800 950  4200
+Connection ~ 4250 5900
+Wire Wire Line
+	4250 5900 4550 5900
+Wire Wire Line
+	4250 6350 4250 5700
+Wire Wire Line
+	4250 5700 4550 5700
+Connection ~ 2100 3500
+Wire Wire Line
+	2100 3350 2100 3500
+Wire Wire Line
+	2100 2950 2100 2800
+Wire Wire Line
+	2450 2950 2450 2700
+Connection ~ 2450 2700
+Wire Wire Line
+	2450 3350 2450 3500
+Wire Wire Line
+	2450 3500 1800 3500
+Wire Wire Line
+	1800 2900 1800 3650
+Connection ~ 1800 3500
+Connection ~ 2100 2800
+Wire Wire Line
+	4550 5800 4250 5800
+Connection ~ 4250 5800
+Wire Wire Line
+	4250 6000 4550 6000
+Connection ~ 4250 6000
+Wire Wire Line
+	950  4700 2600 4700
+Wire Wire Line
+	2600 4700 2600 4600
+Connection ~ 1350 4700
+Wire Wire Line
+	1350 4200 1350 4000
+Wire Wire Line
+	950  5350 950  5200
+Wire Wire Line
+	1550 5250 1550 5350
+Connection ~ 1250 5250
+Wire Wire Line
+	1550 5850 1550 5750
+Connection ~ 1250 5850
+Wire Wire Line
+	950  5750 950  6000
+Wire Wire Line
+	950  5850 2150 5850
+Wire Wire Line
+	2150 5850 2150 5750
+Connection ~ 1850 5850
+Wire Wire Line
+	1550 6550 1550 6450
+Connection ~ 1250 6450
+Wire Wire Line
+	1250 6950 1250 7050
+Connection ~ 950  7050
+Wire Wire Line
+	950  7050 1850 7050
+Wire Wire Line
+	1850 7050 1850 6950
+Connection ~ 1550 7050
+Wire Wire Line
+	4200 3100 4200 3300
+Wire Wire Line
+	4550 3500 4200 3500
+Wire Wire Line
+	4200 3500 4200 3700
+Connection ~ 3000 3400
+Wire Wire Line
+	3000 3700 3000 3100
+Wire Wire Line
+	3000 3100 3200 3100
+Wire Wire Line
+	4550 4600 4250 4600
 Connection ~ 4250 4600
 Wire Wire Line
-	4550 4800 4000 4800
+	4550 4300 4250 4300
 Wire Wire Line
-	2700 2500 1200 2500
+	4250 5400 4550 5400
+Connection ~ 4250 5400
 Wire Wire Line
-	2700 2600 4550 2600
+	7850 4200 6950 4200
 Wire Wire Line
-	3850 1500 3850 1050
+	4000 4900 4550 4900
+Connection ~ 4250 4900
 Wire Wire Line
-	4550 1600 3750 1600
+	3650 2900 4550 2900
 Wire Wire Line
-	1350 2150 1550 2150
-Connection ~ 1550 2150
+	3850 1800 3850 1350
 Wire Wire Line
-	2800 2400 2800 2700
+	4550 1900 3750 1900
 Wire Wire Line
-	2300 1900 2300 900 
+	3750 3000 3750 2700
 Wire Wire Line
-	4550 2100 2100 2100
+	2300 2200 2300 1200
 Wire Wire Line
-	2100 2100 2100 1100
+	4550 2400 2100 2400
 Wire Wire Line
-	4550 2200 2000 2200
+	2100 2400 2100 1400
 Wire Wire Line
-	2000 2200 2000 1300
+	4550 2500 2000 2500
 Wire Wire Line
-	2400 800  1750 800 
+	2000 2500 2000 1600
 Wire Wire Line
-	1750 1000 2400 1000
-Connection ~ 2200 1000
+	2400 1100 1750 1100
 Wire Wire Line
 	1750 1300 2400 1300
-Connection ~ 2000 1300
+Connection ~ 2200 1300
 Wire Wire Line
-	1100 900  1250 900 
-Connection ~ 1100 800 
+	1750 1600 2400 1600
+Connection ~ 2000 1600
 Wire Wire Line
-	1250 1100 1100 1100
-Connection ~ 1100 1000
+	1100 1200 1250 1200
+Connection ~ 1100 1100
 Wire Wire Line
-	3200 700  3300 700 
+	1250 1400 1100 1400
+Connection ~ 1100 1300
 Wire Wire Line
-	3300 700  3300 550 
+	3200 1000 3300 1000
 Wire Wire Line
-	3300 550  2300 550 
+	3300 1000 3300 850 
 Wire Wire Line
-	2300 550  2300 700 
-Connection ~ 2300 700 
+	3300 850  2300 850 
 Wire Wire Line
-	3200 900  3300 900 
-Connection ~ 3300 900 
+	2300 850  2300 1000
+Connection ~ 2300 1000
 Wire Wire Line
-	3300 1100 3200 1100
-Connection ~ 3300 1100
+	3200 1200 3300 1200
+Connection ~ 3300 1200
 Wire Wire Line
-	3300 1300 3200 1300
-Connection ~ 3300 1300
+	3300 1400 3200 1400
+Connection ~ 3300 1400
 Wire Wire Line
-	3300 1500 3200 1500
-Connection ~ 3300 1500
+	3300 1600 3200 1600
+Connection ~ 3300 1600
 Wire Wire Line
-	8750 4150 9050 4150
+	3300 1800 3200 1800
+Connection ~ 3300 1800
 Wire Wire Line
-	8150 4100 6950 4100
+	8450 5200 8100 5200
 Wire Wire Line
-	7900 3200 8050 3200
+	6950 4400 7850 4400
 Wire Wire Line
-	7900 3700 8050 3700
+	8100 3500 8250 3500
 Wire Wire Line
-	8050 3400 7750 3400
+	8100 4000 8250 4000
 Wire Wire Line
-	7750 3400 7750 3150
+	8250 3700 7950 3700
 Wire Wire Line
-	7950 3900 7950 4550
-Connection ~ 7950 4400
+	7950 3700 7950 3450
 Wire Wire Line
-	8750 4850 9050 4850
+	6950 2000 7700 2000
+Connection ~ 7700 2500
 Wire Wire Line
-	8050 3600 6950 3600
-Connection ~ 8750 3800
-Connection ~ 10350 4250
-Connection ~ 10400 4150
+	7700 2000 7700 2500
 Wire Wire Line
-	6950 1700 7450 1700
-Connection ~ 7450 2200
+	7700 2600 7700 2700
 Wire Wire Line
-	8750 2100 6950 2100
-Connection ~ 8750 2100
+	7700 2700 6950 2700
+Connection ~ 7700 2600
 Wire Wire Line
-	10450 4750 10450 1500
+	4250 4300 4250 4100
 Wire Wire Line
-	10450 1500 10050 1500
+	3250 4700 4550 4700
 Wire Wire Line
-	8700 1400 8950 1400
+	10750 1050 10550 1050
+Connection ~ 10750 1050
 Wire Wire Line
-	8900 1600 8950 1600
+	10550 750  10900 750 
+Connection ~ 10750 750 
 Wire Wire Line
-	8950 1500 8800 1500
+	4950 1050 5150 1050
 Wire Wire Line
-	7450 1700 7450 2200
+	3250 4600 3250 4800
+Connection ~ 3250 4700
 Wire Wire Line
-	7450 2300 7450 2400
+	8000 6200 8450 6200
 Wire Wire Line
-	7450 2400 6950 2400
-Connection ~ 7450 2300
+	8450 6400 8200 6400
 Wire Wire Line
-	10350 1600 10350 3250
+	8250 3800 6950 3800
 Wire Wire Line
-	10400 1800 10400 2600
+	7850 4000 6950 4000
 Wire Wire Line
-	6950 2600 9400 2600
+	1200 2700 1500 2700
 Wire Wire Line
-	9400 2600 9400 3450
+	3750 2700 2000 2700
 Wire Wire Line
-	9700 2800 10100 2800
+	3650 2800 2000 2800
 Wire Wire Line
-	9100 2900 9700 2900
+	8450 1050 8500 1050
 Wire Wire Line
-	9700 2900 9700 2500
-Connection ~ 9700 2800
+	8500 1050 8500 900 
 Wire Wire Line
-	8750 1750 9700 1750
+	8500 900  8700 900 
 Wire Wire Line
-	8800 1500 8800 2700
+	8050 1000 8050 1100
 Wire Wire Line
-	10400 4850 10400 3000
+	8050 1100 7600 1100
+Connection ~ 7600 1100
 Wire Wire Line
-	8200 2500 8200 1650
+	7600 700  7600 850 
 Wire Wire Line
-	8200 1650 8400 1650
+	7600 700  7800 700 
 Wire Wire Line
-	8700 4750 8700 1850
+	8450 1000 8450 750 
 Wire Wire Line
-	4250 4000 4250 3800
+	8450 750  9400 750 
 Wire Wire Line
-	3250 4400 4550 4400
+	9400 750  9400 900 
+Wire Wire Line
+	8500 1100 8500 1200
+Connection ~ 7600 1200
+Wire Wire Line
+	8050 950  8000 950 
+Wire Wire Line
+	8000 950  8000 1050
+Wire Wire Line
+	7600 850  7550 850 
+Wire Wire Line
+	8500 1200 7600 1200
+Wire Wire Line
+	9500 750  9600 750 
+Wire Wire Line
+	9300 1050 9600 1050
+Wire Wire Line
+	10100 750  10150 750 
+Wire Wire Line
+	10100 1050 10150 1050
+Wire Wire Line
+	6950 2400 7850 2400
+Wire Wire Line
+	6950 2600 7850 2600
+Wire Wire Line
+	8200 6400 8200 5300
+Wire Wire Line
+	9500 5900 9650 5900
+Wire Wire Line
+	6950 2800 7850 2800
+Wire Wire Line
+	7400 3300 6950 3300
+Wire Wire Line
+	7550 950  7250 950 
+Wire Wire Line
+	8450 1150 7250 1150
+Wire Wire Line
+	6950 4100 7850 4100
+Wire Wire Line
+	6950 4600 7750 4600
+Wire Wire Line
+	7750 4600 7750 4400
+Connection ~ 7750 4400
+Wire Wire Line
+	8500 4800 8400 4800
+Wire Wire Line
+	8400 4800 8400 4700
+Wire Wire Line
+	8400 4700 8250 4700
+Wire Wire Line
+	6950 4300 7850 4300
+Wire Wire Line
+	9650 5900 9650 5800
+Wire Wire Line
+	6950 3900 8250 3900
+Wire Wire Line
+	8100 5200 8100 6300
+Wire Wire Line
+	9550 5200 9900 5200
+Wire Wire Line
+	9900 5200 9900 6300
+Wire Wire Line
+	9900 6300 9550 6300
+Wire Wire Line
+	8850 2000 8450 2000
+Wire Wire Line
+	8350 1800 9050 1800
+Wire Wire Line
+	8350 2400 9050 2400
+Connection ~ 8350 2100
+Wire Wire Line
+	9750 2000 9250 2000
+Wire Wire Line
+	9250 2600 9750 2600
+Wire Wire Line
+	9350 3250 8950 3250
+Wire Wire Line
+	9350 3450 8950 3450
+Wire Wire Line
+	10250 4500 10250 4400
+Wire Wire Line
+	10350 4900 10350 4500
+Wire Wire Line
+	10500 3900 10500 4000
+Wire Wire Line
+	10950 3350 10450 3350
+Wire Wire Line
+	9400 3800 10700 3800
+Wire Wire Line
+	10700 3800 10700 4200
+Connection ~ 9750 3800
+Wire Wire Line
+	4550 5100 4250 5100
+Text Label 9500 3800 0    60   ~ 0
+I/O_SW
+Text Label 10500 3450 0    60   ~ 0
+I/O_OUT
+Text Label 10350 4850 1    60   ~ 0
+I/O_IN
+Text Label 10500 3250 0    60   ~ 0
+RST_OUT
 $Comp
-L SWITCH_INV SW?
-U 1 1 4CECC87B
-P 3250 5000
-F 0 "SW?" H 3050 5150 50  0000 C CNN
-F 1 "SWITCH_INV" H 3100 4850 50  0000 C CNN
-	1    3250 5000
+L GND #PWR?
+U 1 1 4CF7CFEB
+P 10950 3350
+F 0 "#PWR?" H 10950 3350 30  0001 C CNN
+F 1 "GND" H 10950 3280 30  0001 C CNN
+	1    10950 3350
+	0    -1   -1   0   
+$EndComp
+Text Label 8950 3450 0    60   ~ 0
+VPP_OUT
+Text Label 8950 3350 0    60   ~ 0
+CLK_OUT
+Text Label 8950 3250 0    60   ~ 0
+VCC_OUT
+Text Label 9300 2900 0    60   ~ 0
+VPP_OUT
+Text Label 9300 2600 0    60   ~ 0
+CLK_OUT
+Text Label 9300 2300 0    60   ~ 0
+VCC_OUT
+Text Label 9300 2000 0    60   ~ 0
+RST_OUT
+Text Label 8350 2300 1    60   ~ 0
+SC_SW
+Text Label 8500 2900 0    60   ~ 0
+VPP_IN
+Text Label 8500 2600 0    60   ~ 0
+CLK_IN
+Text Label 8500 2300 0    60   ~ 0
+VCC_IN
+Text Label 8500 2000 0    60   ~ 0
+RST_IN
+Text Label 9900 5800 1    60   ~ 0
+VPP_IN
+Text Label 9800 5800 1    60   ~ 0
+I/O_IN
+Text Label 8200 5800 1    60   ~ 0
+CLK_IN
+Text Label 8100 5800 1    60   ~ 0
+RST_IN
+Text Label 8000 5800 1    60   ~ 0
+VCC_IN
+$Comp
+L GND #PWR?
+U 1 1 4CF7C43B
+P 10000 6200
+F 0 "#PWR?" H 10000 6200 30  0001 C CNN
+F 1 "GND" H 10000 6130 30  0001 C CNN
+	1    10000 6200
+	0    -1   -1   0   
+$EndComp
+Text Label 8300 5800 0    60   ~ 0
+SC2_SW
+Text Label 8300 4700 0    60   ~ 0
+SC1_SW
+Text Label 7300 1250 0    60   ~ 0
+LED4
+Text Label 7300 1150 0    60   ~ 0
+LED3
+Text Label 7300 1050 0    60   ~ 0
+LED2
+Text Label 7300 950  0    60   ~ 0
+LED1
+Text Label 7100 3400 0    60   ~ 0
+LED4
+Text Label 7100 3300 0    60   ~ 0
+LED3
+Text Label 7100 3200 0    60   ~ 0
+LED2
+Text Label 7100 3100 0    60   ~ 0
+LED1
+$Comp
+L LM3046M Q3
+U 3 1 4CF7BEF4
+P 10550 4200
+F 0 "Q3" V 10650 4500 50  0000 C CNN
+F 1 "LM3046M" V 10450 4600 50  0000 C CNN
+	3    10550 4200
+	0    1    -1   0   
+$EndComp
+$Comp
+L LM3046M Q3
+U 1 1 4CF7BEF2
+P 10200 4200
+F 0 "Q3" V 10100 4450 50  0000 C CNN
+F 1 "LM3046M" V 10300 4550 50  0000 C CNN
+	1    10200 4200
+	0    -1   1    0   
+$EndComp
+$Comp
+L VDD #PWR?
+U 1 1 4CF7BDB8
+P 9650 5800
+F 0 "#PWR?" H 9650 5900 30  0001 C CNN
+F 1 "VDD" H 9650 5910 30  0000 C CNN
+	1    9650 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q2
+U 5 1 4CF7BCA5
+P 9050 2850
+F 0 "Q2" H 9200 2950 50  0000 C CNN
+F 1 "LM3046M" H 8850 2950 50  0000 C CNN
+	5    9050 2850
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q2
+U 4 1 4CF7BC9D
+P 9050 2550
+F 0 "Q2" H 9200 2650 50  0000 C CNN
+F 1 "LM3046M" H 8850 2650 50  0000 C CNN
+	4    9050 2550
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q2
+U 3 1 4CF7BC96
+P 9050 2250
+F 0 "Q2" H 9200 2350 50  0000 C CNN
+F 1 "LM3046M" H 8850 2350 50  0000 C CNN
+	3    9050 2250
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q2
+U 1 1 4CF7BC61
+P 9050 1950
+F 0 "Q2" H 9200 2050 50  0000 C CNN
+F 1 "LM3046M" H 8800 2050 50  0000 C CNN
+	1    9050 1950
+	-1   0    0    -1  
+$EndComp
+$Comp
+L R R11
+U 1 1 4CF7BAF2
+P 9850 1200
+F 0 "R11" V 9930 1200 50  0000 C CNN
+F 1 "150R" V 9850 1200 50  0000 C CNN
+	1    9850 1200
 	0    1    1    0   
 $EndComp
 $Comp
-L 1V8 #PWR?
-U 1 1 4CECC83D
-P 3150 5500
-F 0 "#PWR?" H 3150 5640 20  0001 C CNN
-F 1 "1V8" H 3150 5610 30  0000 C CNN
-	1    3150 5500
-	-1   0    0    1   
+L R R10
+U 1 1 4CF7BAEE
+P 9850 1050
+F 0 "R10" V 9930 1050 50  0000 C CNN
+F 1 "150R" V 9850 1050 50  0000 C CNN
+	1    9850 1050
+	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR?
-U 1 1 4CECC831
-P 3350 5500
-F 0 "#PWR?" H 3350 5600 40  0001 C CNN
-F 1 "3V3" H 3350 5625 40  0000 C CNN
-	1    3350 5500
-	-1   0    0    1   
+L R R9
+U 1 1 4CF7BAE8
+P 9850 900
+F 0 "R9" V 9930 900 50  0000 C CNN
+F 1 "150R" V 9850 900 50  0000 C CNN
+	1    9850 900 
+	0    1    1    0   
 $EndComp
 $Comp
-L BC237 Q?
-U 1 1 4CECC425
-P 8600 1650
-F 0 "Q?" H 8350 1550 50  0000 C CNN
-F 1 "BC237" H 8400 1800 50  0000 C CNN
-F 2 "TO92-EBC" H 8790 1650 30  0001 C CNN
-	1    8600 1650
+L R R8
+U 1 1 4CF7BAC4
+P 9850 750
+F 0 "R8" V 9930 750 50  0000 C CNN
+F 1 "150R" V 9850 750 50  0000 C CNN
+	1    9850 750 
+	0    1    1    0   
+$EndComp
+$Comp
+L LM3046M Q1
+U 5 1 4CF7B7C7
+P 9150 1150
+F 0 "Q1" H 9150 1375 50  0000 C CNN
+F 1 "LM3046M" H 9150 975 50  0000 C CNN
+	5    9150 1150
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q1
+U 4 1 4CF7B7BF
+P 8700 1050
+F 0 "Q1" H 8700 1275 50  0000 C CNN
+F 1 "LM3046M" H 8675 875 50  0000 C CNN
+	4    8700 1050
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q1
+U 3 1 4CF7B7B6
+P 8250 950
+F 0 "Q1" H 8250 1175 50  0000 C CNN
+F 1 "LM3046M" H 8250 775 50  0000 C CNN
+	3    8250 950 
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LM3046M Q1
+U 1 1 4CF7B75C
+P 7800 850
+F 0 "Q1" H 7800 1075 50  0000 C CNN
+F 1 "LM3046M" H 7800 675 50  0000 C CNN
+	1    7800 850 
+	-1   0    0    -1  
+$EndComp
+$Comp
+L R R2
+U 1 1 4CF7A4C1
+P 1750 2800
+F 0 "R2" V 1750 2700 50  0000 C CNN
+F 1 "27R" V 1750 2850 50  0000 C CNN
+	1    1750 2800
+	0    1    1    0   
+$EndComp
+$Comp
+L R R1
+U 1 1 4CF7A4B0
+P 1750 2700
+F 0 "R1" V 1750 2600 50  0000 C CNN
+F 1 "27R" V 1750 2750 50  0000 C CNN
+	1    1750 2700
+	0    1    1    0   
+$EndComp
+Text Label 7100 2800 0    60   ~ 0
+SC_SW
+Text Label 7100 2900 0    60   ~ 0
+I/O_SW
+Text Label 7100 2700 0    60   ~ 0
+I/O_OUT
+Text Label 7100 2600 0    60   ~ 0
+I/O_OUT
+Text Label 7100 2500 0    60   ~ 0
+CLK_OUT
+Text Label 7100 2400 0    60   ~ 0
+RST_OUT
+Text Label 7100 2000 0    60   ~ 0
+CLK_OUT
+Text Label 7100 4300 0    60   ~ 0
+VCC_IN
+Text Label 7100 4800 0    60   ~ 0
+SC2_SW
+Text Label 7100 4000 0    60   ~ 0
+SC1_SW
+$Comp
+L VDD #PWR?
+U 1 1 4CF6A167
+P 9650 4700
+F 0 "#PWR?" H 9650 4800 30  0001 C CNN
+F 1 "VDD" H 9650 4810 30  0000 C CNN
+	1    9650 4700
 	1    0    0    -1  
 $EndComp
 $Comp
-L BC237 Q?
-U 1 1 4CECC3E1
-P 9900 1850
-F 0 "Q?" H 9700 1750 50  0000 C CNN
-F 1 "BC237" H 9800 2000 50  0000 C CNN
-F 2 "TO92-EBC" H 10090 1850 30  0001 C CNN
-	1    9900 1850
+L ISO7816_NC SC2
+U 1 1 4CF6A13B
+P 9000 6350
+F 0 "SC2" H 9000 6600 60  0000 C CNN
+F 1 "SC_ID-000" H 9000 6100 60  0000 C CNN
+	1    9000 6350
+	1    0    0    -1  
+$EndComp
+$Comp
+L ISO7816_NC SC1
+U 1 1 4CF6A0E9
+P 9000 5250
+F 0 "SC1" H 9000 5500 60  0000 C CNN
+F 1 "SC_ID-1" H 9000 5000 60  0000 C CNN
+	1    9000 5250
+	1    0    0    -1  
+$EndComp
+NoConn ~ 8450 6500
+NoConn ~ 9550 6500
+Text Label 3500 4700 0    60   ~ 0
+VDDIO
+$Comp
+L VDD #PWR?
+U 1 1 4CF5485F
+P 3250 4600
+F 0 "#PWR?" H 3250 4700 30  0001 C CNN
+F 1 "VDD" H 3250 4710 30  0000 C CNN
+	1    3250 4600
+	1    0    0    -1  
+$EndComp
+$Comp
+L VDD #PWR?
+U 1 1 4CF54829
+P 5000 1250
+F 0 "#PWR?" H 5000 1350 30  0001 C CNN
+F 1 "VDD" H 5000 1360 30  0000 C CNN
+	1    5000 1250
 	0    -1   -1   0   
 $EndComp
 $Comp
-L BC237 Q?
-U 1 1 4CECC3CE
-P 8900 2900
-F 0 "Q?" H 8700 2800 50  0000 C CNN
-F 1 "BC237" H 8650 3050 50  0000 C CNN
-F 2 "TO92-EBC" H 9090 2900 30  0001 C CNN
-	1    8900 2900
+L GND #PWR?
+U 1 1 4CF5480B
+P 4950 1050
+F 0 "#PWR?" H 4950 1050 30  0001 C CNN
+F 1 "GND" H 4950 980 30  0001 C CNN
+	1    4950 1050
+	0    1    1    0   
+$EndComp
+$Comp
+L SWITCH_INV SW2
+U 1 1 4CF547D1
+P 5650 1150
+F 0 "SW2" H 5450 1300 50  0000 C CNN
+F 1 "SW_READER" H 5500 1000 50  0000 C CNN
+	1    5650 1150
 	-1   0    0    1   
 $EndComp
 $Comp
-L BC237 Q?
-U 1 1 4CECC3A8
-P 10300 2800
-F 0 "Q?" H 10150 2700 50  0000 C CNN
-F 1 "BC237" H 10150 2950 50  0000 C CNN
-F 2 "TO92-EBC" H 10490 2800 30  0001 C CNN
-	1    10300 2800
+L GND #PWR?
+U 1 1 4CF54778
+P 10900 750
+F 0 "#PWR?" H 10900 750 30  0001 C CNN
+F 1 "GND" H 10900 680 30  0001 C CNN
+	1    10900 750 
+	0    -1   -1   0   
+$EndComp
+$Comp
+L LED D5
+U 1 1 4CF54725
+P 10350 1200
+F 0 "D5" H 10200 1150 50  0000 C CNN
+F 1 "LED4" H 10600 1150 50  0000 C CNN
+	1    10350 1200
 	1    0    0    -1  
 $EndComp
 $Comp
-L BC237 Q?
-U 1 1 4CECC337
-P 10250 3450
-F 0 "Q?" H 10050 3350 50  0000 C CNN
-F 1 "BC237" H 10100 3600 50  0000 C CNN
-F 2 "TO92-EBC" H 10440 3450 30  0001 C CNN
-	1    10250 3450
+L LED D4
+U 1 1 4CF5471F
+P 10350 1050
+F 0 "D4" H 10200 1000 50  0000 C CNN
+F 1 "LED3" H 10600 1000 50  0000 C CNN
+	1    10350 1050
 	1    0    0    -1  
 $EndComp
 $Comp
+L LED D3
+U 1 1 4CF54717
+P 10350 900
+F 0 "D3" H 10200 850 50  0000 C CNN
+F 1 "LED2" H 10600 850 50  0000 C CNN
+	1    10350 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L LED D2
+U 1 1 4CF546FA
+P 10350 750
+F 0 "D2" H 10200 700 50  0000 C CNN
+F 1 "LED1" H 10600 700 50  0000 C CNN
+	1    10350 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L 3V3 #PWR?
+U 1 1 4CF546A8
+P 7600 1350
+F 0 "#PWR?" H 7600 1450 40  0001 C CNN
+F 1 "3V3" H 7600 1475 40  0000 C CNN
+	1    7600 1350
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT_SIMPLE P4
+U 1 1 4CEE8D84
+P 9900 3350
+F 0 "P4" H 9900 3550 60  0000 C CNN
+F 1 "SC_OUT" H 9900 3150 60  0000 C CNN
+	1    9900 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L SWITCH_INV SW1
+U 1 1 4CECC87B
+P 3250 5300
+F 0 "SW1" H 3050 5450 50  0000 C CNN
+F 1 "SW_CLASS" H 3100 5150 50  0000 C CNN
+	1    3250 5300
+	0    1    1    0   
+$EndComp
+$Comp
+L 1V8 #PWR01
+U 1 1 4CECC83D
+P 3150 5800
+F 0 "#PWR01" H 3150 5940 20  0001 C CNN
+F 1 "1V8" H 3150 5910 30  0000 C CNN
+	1    3150 5800
+	-1   0    0    1   
+$EndComp
+$Comp
+L 3V3 #PWR02
+U 1 1 4CECC831
+P 3350 5800
+F 0 "#PWR02" H 3350 5900 40  0001 C CNN
+F 1 "3V3" H 3350 5925 40  0000 C CNN
+	1    3350 5800
+	-1   0    0    1   
+$EndComp
+$Comp
 L AT91SAM7S512/256/128/64/321-AU IC1
 U 1 1 4CE84486
-P 5750 3500
-F 0 "IC1" H 4750 5800 50  0000 L BNN
-F 1 "AT91SAM7S512/256/128/64/321-AU" H 4750 1100 50  0000 L BNN
-F 2 "at91sam7sxxx-au-LQFP64" H 5750 3650 50  0001 C CNN
-	1    5750 3500
+P 5750 3800
+F 0 "IC1" H 4750 6100 50  0000 L BNN
+F 1 "AT91SAM7S512/256/128/64/321-AU" H 4750 1400 50  0000 L BNN
+F 2 "at91sam7sxxx-au-LQFP64" H 5750 3950 50  0001 C CNN
+	1    5750 3800
 	1    0    0    -1  
 $EndComp
-$Comp
-L SC P4
-U 1 1 4CEA6040
-P 9500 1500
-F 0 "P4" H 9500 1700 60  0000 C CNN
-F 1 "SC" H 9500 1300 60  0000 C CNN
-	1    9500 1500
-	1    0    0    -1  
-$EndComp
-Text Label 7100 3600 0    60   ~ 0
+Text Label 7100 3900 0    60   ~ 0
 DRXD
-Text Label 7100 3500 0    60   ~ 0
+Text Label 7100 3800 0    60   ~ 0
 DTXD
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR03
 U 1 1 4CE9AE51
-P 7750 3150
-F 0 "#PWR?" H 7750 3250 40  0001 C CNN
-F 1 "3V3" H 7750 3275 40  0000 C CNN
-	1    7750 3150
+P 7950 3450
+F 0 "#PWR03" H 7950 3550 40  0001 C CNN
+F 1 "3V3" H 7950 3575 40  0000 C CNN
+	1    7950 3450
 	1    0    0    -1  
 $EndComp
 $Comp
 L DEBUG P2
 U 1 1 4CE9ADCF
-P 8400 3450
-F 0 "P2" H 8400 3800 60  0000 C CNN
-F 1 "DEBUG" V 8600 3450 60  0000 C CNN
-	1    8400 3450
+P 8600 3750
+F 0 "P2" H 8600 4100 60  0000 C CNN
+F 1 "DEBUG" V 8800 3750 60  0000 C CNN
+	1    8600 3750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR04
 U 1 1 4CE9AA96
-P 7900 3050
-F 0 "#PWR?" H 7900 3050 30  0001 C CNN
-F 1 "GND" H 7900 2980 30  0001 C CNN
-	1    7900 3050
+P 8100 3350
+F 0 "#PWR04" H 8100 3350 30  0001 C CNN
+F 1 "GND" H 8100 3280 30  0001 C CNN
+	1    8100 3350
 	-1   0    0    1   
 $EndComp
-Text Label 3950 2200 0    60   ~ 0
+Text Label 3950 2500 0    60   ~ 0
 TDO
-Text Label 3950 2100 0    60   ~ 0
+Text Label 3950 2400 0    60   ~ 0
 TCK
-Text Label 3950 2000 0    60   ~ 0
+Text Label 3950 2300 0    60   ~ 0
 TMS
-Text Label 3950 1900 0    60   ~ 0
+Text Label 3950 2200 0    60   ~ 0
 TDI
-NoConn ~ 4550 2300
+NoConn ~ 4550 2600
 $Comp
-L GND #PWR?
+L GND #PWR05
 U 1 1 4CE9A7C1
-P 3300 1700
-F 0 "#PWR?" H 3300 1700 30  0001 C CNN
-F 1 "GND" H 3300 1630 30  0001 C CNN
-	1    3300 1700
+P 3300 2000
+F 0 "#PWR05" H 3300 2000 30  0001 C CNN
+F 1 "GND" H 3300 1930 30  0001 C CNN
+	1    3300 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR06
 U 1 1 4CE9A701
-P 1100 650
-F 0 "#PWR?" H 1100 750 40  0001 C CNN
-F 1 "3V3" H 1100 775 40  0000 C CNN
-	1    1100 650 
+P 1100 950
+F 0 "#PWR06" H 1100 1050 40  0001 C CNN
+F 1 "3V3" H 1100 1075 40  0000 C CNN
+	1    1100 950 
 	1    0    0    -1  
 $EndComp
 $Comp
+L R R7
+U 1 1 4CE9A6AE
+P 1500 1600
+F 0 "R7" V 1500 1500 50  0000 C CNN
+F 1 "4K7" V 1500 1650 50  0000 C CNN
+	1    1500 1600
+	0    1    1    0   
+$EndComp
+$Comp
+L R R6
+U 1 1 4CE9A6A9
+P 1500 1400
+F 0 "R6" V 1500 1300 50  0000 C CNN
+F 1 "4K7" V 1500 1450 50  0000 C CNN
+	1    1500 1400
+	0    1    1    0   
+$EndComp
+$Comp
 L R R5
-U 1 1 4CE9A6AE
+U 1 1 4CE9A6A5
 P 1500 1300
 F 0 "R5" V 1500 1200 50  0000 C CNN
 F 1 "4K7" V 1500 1350 50  0000 C CNN
@@ -675,488 +1165,397 @@ F 1 "4K7" V 1500 1350 50  0000 C CNN
 $EndComp
 $Comp
 L R R4
-U 1 1 4CE9A6A9
-P 1500 1100
-F 0 "R4" V 1500 1000 50  0000 C CNN
-F 1 "4K7" V 1500 1150 50  0000 C CNN
-	1    1500 1100
+U 1 1 4CE9A69A
+P 1500 1200
+F 0 "R4" V 1500 1100 50  0000 C CNN
+F 1 "4K7" V 1500 1250 50  0000 C CNN
+	1    1500 1200
 	0    1    1    0   
 $EndComp
 $Comp
 L R R3
-U 1 1 4CE9A6A5
-P 1500 1000
-F 0 "R3" V 1500 900 50  0000 C CNN
-F 1 "4K7" V 1500 1050 50  0000 C CNN
-	1    1500 1000
-	0    1    1    0   
-$EndComp
-$Comp
-L R R2
-U 1 1 4CE9A69A
-P 1500 900
-F 0 "R2" V 1500 800 50  0000 C CNN
-F 1 "4K7" V 1500 950 50  0000 C CNN
-	1    1500 900 
-	0    1    1    0   
-$EndComp
-$Comp
-L R R1
 U 1 1 4CE9A68C
-P 1500 800
-F 0 "R1" V 1500 700 50  0000 C CNN
-F 1 "4K7" V 1500 850 50  0000 C CNN
-	1    1500 800 
+P 1500 1100
+F 0 "R3" V 1500 1000 50  0000 C CNN
+F 1 "4K7" V 1500 1150 50  0000 C CNN
+	1    1500 1100
 	0    1    1    0   
 $EndComp
-NoConn ~ 2400 1600
-NoConn ~ 2400 1500
+NoConn ~ 2400 1900
+NoConn ~ 2400 1800
 $Comp
 L CONN_10X2 P3
 U 1 1 4CE9A47C
-P 2800 1150
-F 0 "P3" H 2800 1700 60  0000 C CNN
-F 1 "JTAG" V 2800 1050 50  0000 C CNN
-	1    2800 1150
+P 2800 1450
+F 0 "P3" H 2800 2000 60  0000 C CNN
+F 1 "JTAG" V 2800 1350 50  0000 C CNN
+	1    2800 1450
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR?
+L 1V8 #PWR07
 U 1 1 4CE94C54
-P 4000 4600
-F 0 "#PWR?" H 4000 4740 20  0001 C CNN
-F 1 "1V8" H 4000 4710 30  0000 C CNN
-	1    4000 4600
+P 4000 4900
+F 0 "#PWR07" H 4000 5040 20  0001 C CNN
+F 1 "1V8" H 4000 5010 30  0000 C CNN
+	1    4000 4900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L USB_2 J1
 U 1 1 4CE945D9
-P 1000 2450
-F 0 "J1" H 925 2700 60  0000 C CNN
-F 1 "USB" H 950 2200 60  0000 C CNN
-F 2 "VCC" H 1350 2650 50  0000 C CNN
-F 3 "D+" H 1350 2550 50  0000 C CNN
-F 4 "D-" H 1350 2450 50  0000 C CNN "Data-"
-F 5 "GND" H 1350 2350 50  0000 C CNN "Ground"
-	1    1000 2450
-	1    0    0    -1  
-$EndComp
-$Comp
-L PWR_FLAG #FLG01
-U 1 1 4CE9389A
-P 3950 5950
-F 0 "#FLG01" H 3950 6220 30  0001 C CNN
-F 1 "PWR_FLAG" H 3950 6180 30  0000 C CNN
-	1    3950 5950
-	-1   0    0    1   
-$EndComp
-$Comp
-L PWR_FLAG #FLG02
-U 1 1 4CE93841
-P 750 6150
-F 0 "#FLG02" H 750 6420 30  0001 C CNN
-F 1 "PWR_FLAG" H 750 6380 30  0000 C CNN
-	1    750  6150
-	1    0    0    -1  
-$EndComp
-$Comp
-L PWR_FLAG #FLG03
-U 1 1 4CE9382A
-P 4000 4800
-F 0 "#FLG03" H 4000 5070 30  0001 C CNN
-F 1 "PWR_FLAG" H 4000 5030 30  0000 C CNN
-	1    4000 4800
-	0    -1   -1   0   
-$EndComp
-$Comp
-L PWR_FLAG #FLG04
-U 1 1 4CE93806
-P 2850 3700
-F 0 "#FLG04" H 2850 3970 30  0001 C CNN
-F 1 "PWR_FLAG" H 2850 3930 30  0000 C CNN
-	1    2850 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L PWR_FLAG #FLG05
-U 1 1 4CE937DD
-P 1350 2150
-F 0 "#FLG05" H 1350 2420 30  0001 C CNN
-F 1 "PWR_FLAG" H 1350 2380 30  0000 C CNN
-	1    1350 2150
+P 1000 2750
+F 0 "J1" H 925 3000 60  0000 C CNN
+F 1 "USB" H 950 2500 60  0000 C CNN
+F 2 "VCC" H 1350 2950 50  0000 C CNN
+F 3 "D+" H 1350 2850 50  0000 C CNN
+F 4 "D-" H 1350 2750 50  0000 C CNN "Data-"
+F 5 "GND" H 1350 2650 50  0000 C CNN "Ground"
+	1    1000 2750
 	1    0    0    -1  
 $EndComp
 NoConn ~ 6950 4500
-NoConn ~ 6950 4200
-NoConn ~ 6950 4000
-NoConn ~ 9050 5050
-NoConn ~ 10150 5050
-NoConn ~ 10150 4350
-NoConn ~ 9050 4350
+NoConn ~ 9550 5400
+NoConn ~ 8450 5400
+NoConn ~ 6950 5600
+NoConn ~ 6950 5400
 NoConn ~ 6950 5300
+NoConn ~ 6950 5200
 NoConn ~ 6950 5100
-NoConn ~ 6950 5000
-NoConn ~ 6950 4900
-NoConn ~ 6950 4800
 NoConn ~ 6950 3700
-NoConn ~ 6950 3400
-NoConn ~ 6950 3300
-NoConn ~ 6950 3200
-NoConn ~ 6950 3100
+NoConn ~ 6950 3600
+NoConn ~ 6950 3500
 NoConn ~ 6950 3000
-NoConn ~ 6950 2900
-NoConn ~ 6950 2800
-NoConn ~ 6950 2700
-NoConn ~ 6950 2000
+NoConn ~ 6950 2300
+NoConn ~ 6950 2200
+NoConn ~ 6950 2100
 NoConn ~ 6950 1900
 NoConn ~ 6950 1800
-NoConn ~ 6950 1600
-NoConn ~ 6950 1500
-NoConn ~ 6950 1400
-NoConn ~ 4550 3500
+NoConn ~ 4550 3800
+Text Label 7100 4700 0    60   ~ 0
+I/O_IN
+Text Label 7100 4200 0    60   ~ 0
+I/O_IN
 Text Label 7100 4400 0    60   ~ 0
-I/O
-Text Label 7100 3900 0    60   ~ 0
-I/O
-Text Label 7100 4100 0    60   ~ 0
-CLK
+CLK_IN
 $Comp
-L GND #PWR06
+L GND #PWR013
 U 1 1 4CE91D99
-P 10750 4050
-F 0 "#PWR06" H 10750 4050 30  0001 C CNN
-F 1 "GND" H 10750 3980 30  0001 C CNN
-	1    10750 4050
+P 10000 5100
+F 0 "#PWR013" H 10000 5100 30  0001 C CNN
+F 1 "GND" H 10000 5030 30  0001 C CNN
+	1    10000 5100
 	0    -1   -1   0   
 $EndComp
-Text Label 7100 4300 0    60   ~ 0
-CLK
-Text Label 7100 3800 0    60   ~ 0
-RST
-Text Label 3950 1600 0    60   ~ 0
+Text Label 7100 4600 0    60   ~ 0
+CLK_IN
+Text Label 7100 4100 0    60   ~ 0
+RST_IN
+Text Label 3950 1900 0    60   ~ 0
 /RESET
-Text Label 3950 1500 0    60   ~ 0
+Text Label 3950 1800 0    60   ~ 0
 TEST
 $Comp
-L GND #PWR07
+L GND #PWR014
 U 1 1 4CE91B1B
-P 3500 1150
-F 0 "#PWR07" H 3500 1150 30  0001 C CNN
-F 1 "GND" H 3500 1080 30  0001 C CNN
-	1    3500 1150
+P 3500 1450
+F 0 "#PWR014" H 3500 1450 30  0001 C CNN
+F 1 "GND" H 3500 1380 30  0001 C CNN
+	1    3500 1450
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR08
+L 3V3 #PWR015
 U 1 1 4CE91B15
-P 4100 1150
-F 0 "#PWR08" H 4100 1250 40  0001 C CNN
-F 1 "3V3" H 4100 1275 40  0000 C CNN
-	1    4100 1150
+P 4100 1450
+F 0 "#PWR015" H 4100 1550 40  0001 C CNN
+F 1 "3V3" H 4100 1575 40  0000 C CNN
+	1    4100 1450
 	0    1    1    0   
 $EndComp
 $Comp
 L CONN_4 P1
 U 1 1 4CE91AE6
-P 3800 700
-F 0 "P1" V 3750 700 50  0000 C CNN
-F 1 "SAM-BA" V 3850 700 50  0000 C CNN
-	1    3800 700 
+P 3800 1000
+F 0 "P1" V 3750 1000 50  0000 C CNN
+F 1 "SAM-BA" V 3850 1000 50  0000 C CNN
+	1    3800 1000
 	0    1    -1   0   
 $EndComp
-NoConn ~ 4550 1400
-Text Label 2350 2500 0    60   ~ 0
+NoConn ~ 4550 1700
+Text Label 2500 2800 0    60   ~ 0
 DDM
-Text Label 2350 2400 0    60   ~ 0
+Text Label 2500 2700 0    60   ~ 0
 DDP
 $Comp
-L 3V3 #PWR09
+L 3V3 #PWR016
 U 1 1 4CE91A30
-P 4000 3800
-F 0 "#PWR09" H 4000 3900 40  0001 C CNN
-F 1 "3V3" H 4000 3925 40  0000 C CNN
-	1    4000 3800
+P 4000 4100
+F 0 "#PWR016" H 4000 4200 40  0001 C CNN
+F 1 "3V3" H 4000 4225 40  0000 C CNN
+	1    4000 4100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR017
 U 1 1 4CE9163C
-P 2800 3100
-F 0 "#PWR010" H 2800 3100 30  0001 C CNN
-F 1 "GND" H 2800 3030 30  0001 C CNN
-	1    2800 3100
+P 2800 3400
+F 0 "#PWR017" H 2800 3400 30  0001 C CNN
+F 1 "GND" H 2800 3330 30  0001 C CNN
+	1    2800 3400
 	0    1    1    0   
 $EndComp
 $Comp
 L C C15
 U 1 1 4CE91633
-P 3400 3400
-F 0 "C15" V 3300 3550 50  0000 L CNN
-F 1 "10pF" V 3450 3550 50  0000 L CNN
-	1    3400 3400
+P 3400 3700
+F 0 "C15" V 3300 3850 50  0000 L CNN
+F 1 "10pF" V 3450 3850 50  0000 L CNN
+	1    3400 3700
 	0    1    1    0   
 $EndComp
 $Comp
 L C C14
 U 1 1 4CE9162F
-P 3400 2800
-F 0 "C14" V 3300 2950 50  0000 L CNN
-F 1 "10pF" V 3450 2950 50  0000 L CNN
-	1    3400 2800
+P 3400 3100
+F 0 "C14" V 3300 3250 50  0000 L CNN
+F 1 "10pF" V 3450 3250 50  0000 L CNN
+	1    3400 3100
 	0    1    1    0   
 $EndComp
 $Comp
 L CRYSTAL X1
 U 1 1 4CE915DE
-P 3950 3100
-F 0 "X1" V 3850 2900 60  0000 C CNN
-F 1 "18.432MHz" V 4000 2700 60  0000 C CNN
-	1    3950 3100
+P 3950 3400
+F 0 "X1" V 3850 3200 60  0000 C CNN
+F 1 "18.432MHz" V 4000 3000 60  0000 C CNN
+	1    3950 3400
 	0    1    1    0   
 $EndComp
 $Comp
 L C C13
 U 1 1 4CE914B7
-P 1850 6450
-F 0 "C13" H 1900 6550 50  0000 L CNN
-F 1 "10uF" H 1900 6350 50  0000 L CNN
-	1    1850 6450
+P 1850 6750
+F 0 "C13" H 1900 6850 50  0000 L CNN
+F 1 "10uF" H 1900 6650 50  0000 L CNN
+	1    1850 6750
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C12
 U 1 1 4CE914B4
-P 1550 6450
-F 0 "C12" H 1600 6550 50  0000 L CNN
-F 1 "100nF" H 1600 6350 50  0000 L CNN
-	1    1550 6450
+P 1550 6750
+F 0 "C12" H 1600 6850 50  0000 L CNN
+F 1 "100nF" H 1600 6650 50  0000 L CNN
+	1    1550 6750
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C11
 U 1 1 4CE914B1
-P 1250 6450
-F 0 "C11" H 1300 6550 50  0000 L CNN
-F 1 "100nF" H 1300 6350 50  0000 L CNN
-	1    1250 6450
+P 1250 6750
+F 0 "C11" H 1300 6850 50  0000 L CNN
+F 1 "100nF" H 1300 6650 50  0000 L CNN
+	1    1250 6750
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C10
 U 1 1 4CE914A0
-P 950 6450
-F 0 "C10" H 1000 6550 50  0000 L CNN
-F 1 "100nF" H 1000 6350 50  0000 L CNN
-	1    950  6450
+P 950 6750
+F 0 "C10" H 1000 6850 50  0000 L CNN
+F 1 "100nF" H 1000 6650 50  0000 L CNN
+	1    950  6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR018
 U 1 1 4CE91494
-P 950 6900
-F 0 "#PWR011" H 950 6900 30  0001 C CNN
-F 1 "GND" H 950 6830 30  0001 C CNN
-	1    950  6900
+P 950 7200
+F 0 "#PWR018" H 950 7200 30  0001 C CNN
+F 1 "GND" H 950 7130 30  0001 C CNN
+	1    950  7200
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR012
+L 1V8 #PWR019
 U 1 1 4CE9148D
-P 950 6050
-F 0 "#PWR012" H 950 6190 20  0001 C CNN
-F 1 "1V8" H 950 6160 30  0000 C CNN
-	1    950  6050
+P 950 6350
+F 0 "#PWR019" H 950 6490 20  0001 C CNN
+F 1 "1V8" H 950 6460 30  0000 C CNN
+	1    950  6350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C9
 U 1 1 4CE91470
-P 2150 5250
-F 0 "C9" H 2200 5350 50  0000 L CNN
-F 1 "100nF" H 2200 5150 50  0000 L CNN
-	1    2150 5250
+P 2150 5550
+F 0 "C9" H 2200 5650 50  0000 L CNN
+F 1 "100nF" H 2200 5450 50  0000 L CNN
+	1    2150 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C8
 U 1 1 4CE91431
-P 1850 5250
-F 0 "C8" H 1900 5350 50  0000 L CNN
-F 1 "100nF" H 1900 5150 50  0000 L CNN
-	1    1850 5250
+P 1850 5550
+F 0 "C8" H 1900 5650 50  0000 L CNN
+F 1 "100nF" H 1900 5450 50  0000 L CNN
+	1    1850 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 4CE9142D
-P 1550 5250
-F 0 "C7" H 1600 5350 50  0000 L CNN
-F 1 "100nF" H 1600 5150 50  0000 L CNN
-	1    1550 5250
+P 1550 5550
+F 0 "C7" H 1600 5650 50  0000 L CNN
+F 1 "100nF" H 1600 5450 50  0000 L CNN
+	1    1550 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C6
 U 1 1 4CE91427
-P 1250 5250
-F 0 "C6" H 1300 5350 50  0000 L CNN
-F 1 "100nF" H 1300 5150 50  0000 L CNN
-	1    1250 5250
+P 1250 5550
+F 0 "C6" H 1300 5650 50  0000 L CNN
+F 1 "100nF" H 1300 5450 50  0000 L CNN
+	1    1250 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C5
 U 1 1 4CE91414
-P 950 5250
-F 0 "C5" H 1000 5350 50  0000 L CNN
-F 1 "100nF" H 1000 5150 50  0000 L CNN
-	1    950  5250
+P 950 5550
+F 0 "C5" H 1000 5650 50  0000 L CNN
+F 1 "100nF" H 1000 5450 50  0000 L CNN
+	1    950  5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR020
 U 1 1 4CE91408
-P 950 5700
-F 0 "#PWR013" H 950 5700 30  0001 C CNN
-F 1 "GND" H 950 5630 30  0001 C CNN
-	1    950  5700
+P 950 6000
+F 0 "#PWR020" H 950 6000 30  0001 C CNN
+F 1 "GND" H 950 5930 30  0001 C CNN
+	1    950  6000
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR014
+L 3V3 #PWR021
 U 1 1 4CE91404
-P 950 4900
-F 0 "#PWR014" H 950 5000 40  0001 C CNN
-F 1 "3V3" H 950 5025 40  0000 C CNN
-	1    950  4900
+P 950 5200
+F 0 "#PWR021" H 950 5300 40  0001 C CNN
+F 1 "3V3" H 950 5325 40  0000 C CNN
+	1    950  5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP1 C4
 U 1 1 4CE91269
-P 2600 4100
-F 0 "C4" H 2650 4200 50  0000 L CNN
-F 1 "470uF 6V3" H 2650 4000 50  0000 L CNN
-	1    2600 4100
+P 2600 4400
+F 0 "C4" H 2650 4500 50  0000 L CNN
+F 1 "470uF 6V3" H 2650 4300 50  0000 L CNN
+	1    2600 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR022
 U 1 1 4CE91255
-P 950 4600
-F 0 "#PWR015" H 950 4600 30  0001 C CNN
-F 1 "GND" H 950 4530 30  0001 C CNN
-	1    950  4600
+P 950 4900
+F 0 "#PWR022" H 950 4900 30  0001 C CNN
+F 1 "GND" H 950 4830 30  0001 C CNN
+	1    950  4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR016
+L 3V3 #PWR023
 U 1 1 4CE9124D
-P 2600 3500
-F 0 "#PWR016" H 2600 3600 40  0001 C CNN
-F 1 "3V3" H 2600 3625 40  0000 C CNN
-	1    2600 3500
+P 2600 3800
+F 0 "#PWR023" H 2600 3900 40  0001 C CNN
+F 1 "3V3" H 2600 3925 40  0000 C CNN
+	1    2600 3800
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR017
+L +5V #PWR024
 U 1 1 4CE91241
-P 950 3500
-F 0 "#PWR017" H 950 3590 20  0001 C CNN
-F 1 "+5V" H 950 3590 30  0000 C CNN
-	1    950  3500
+P 950 3800
+F 0 "#PWR024" H 950 3890 20  0001 C CNN
+F 1 "+5V" H 950 3890 30  0000 C CNN
+	1    950  3800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP1 C3
 U 1 1 4CE911D6
-P 1350 4100
-F 0 "C3" H 1400 4200 50  0000 L CNN
-F 1 "100uF 6V3" H 1400 4000 50  0000 L CNN
-	1    1350 4100
+P 1350 4400
+F 0 "C3" H 1400 4500 50  0000 L CNN
+F 1 "100uF 6V3" H 1400 4300 50  0000 L CNN
+	1    1350 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D1
 U 1 1 4CE910BD
-P 950 4100
-F 0 "D1" H 950 4200 40  0000 C CNN
-F 1 "Z-DIODE 5V6" H 950 4000 40  0000 C CNN
-	1    950  4100
+P 950 4400
+F 0 "D1" H 950 4500 40  0000 C CNN
+F 1 "Z-DIODE 5V6" H 950 4300 40  0000 C CNN
+	1    950  4400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L LM1117 IC2
 U 1 1 4CE90F69
-P 1900 3700
-F 0 "IC2" H 2000 3400 50  0000 L BNN
-F 1 "LM1117 3V3" H 2000 3300 50  0000 L BNN
-F 2 "v-reg-2-SOT223" H 1900 3850 50  0001 C CNN
-	1    1900 3700
+P 1900 4000
+F 0 "IC2" H 2000 3700 50  0000 L BNN
+F 1 "LM1117 3V3" H 2000 3600 50  0000 L BNN
+F 2 "v-reg-2-SOT223" H 1900 4150 50  0001 C CNN
+	1    1900 4000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR025
 U 1 1 4CE8FFA5
-P 4250 6050
-F 0 "#PWR018" H 4250 6050 30  0001 C CNN
-F 1 "GND" H 4250 5980 30  0001 C CNN
-	1    4250 6050
+P 4250 6350
+F 0 "#PWR025" H 4250 6350 30  0001 C CNN
+F 1 "GND" H 4250 6280 30  0001 C CNN
+	1    4250 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR026
 U 1 1 4CE8FE6C
-P 1550 3350
-F 0 "#PWR019" H 1550 3350 30  0001 C CNN
-F 1 "GND" H 1550 3280 30  0001 C CNN
-	1    1550 3350
+P 1800 3650
+F 0 "#PWR026" H 1800 3650 30  0001 C CNN
+F 1 "GND" H 1800 3580 30  0001 C CNN
+	1    1800 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C2
 U 1 1 4CE8FE65
-P 2200 2850
-F 0 "C2" H 2250 2950 50  0000 L CNN
-F 1 "15pF" H 2250 2750 50  0000 L CNN
-	1    2200 2850
+P 2450 3150
+F 0 "C2" H 2500 3250 50  0000 L CNN
+F 1 "15pF" H 2500 3050 50  0000 L CNN
+	1    2450 3150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1
 U 1 1 4CE8FE5F
-P 1850 2850
-F 0 "C1" H 1900 2950 50  0000 L CNN
-F 1 "15pF" H 1900 2750 50  0000 L CNN
-	1    1850 2850
+P 2100 3150
+F 0 "C1" H 2150 3250 50  0000 L CNN
+F 1 "15pF" H 2150 3050 50  0000 L CNN
+	1    2100 3150
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR020
+L +5V #PWR027
 U 1 1 4CE8FE3E
-P 1550 2050
-F 0 "#PWR020" H 1550 2140 20  0001 C CNN
-F 1 "+5V" H 1550 2140 30  0000 C CNN
-	1    1550 2050
-	1    0    0    -1  
-$EndComp
-$Comp
-L ISO7816 SC2
-U 1 1 4CE8469D
-P 9600 4900
-F 0 "SC2" H 9600 5150 60  0000 C CNN
-F 1 "SC_ID-000" H 9600 4650 60  0000 C CNN
-	1    9600 4900
-	1    0    0    -1  
-$EndComp
-$Comp
-L ISO7816 SC1
-U 1 1 4CE84691
-P 9600 4200
-F 0 "SC1" H 9600 4450 60  0000 C CNN
-F 1 "SC_ID-1" H 9600 3950 60  0000 C CNN
-	1    9600 4200
+P 1550 2350
+F 0 "#PWR027" H 1550 2440 20  0001 C CNN
+F 1 "+5V" H 1550 2440 30  0000 C CNN
+	1    1550 2350
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/hardware/kicad/lib/SIMtrace.bak b/hardware/kicad/lib/SIMtrace.bak
new file mode 100644
index 0000000..12b3d01
--- /dev/null
+++ b/hardware/kicad/lib/SIMtrace.bak
@@ -0,0 +1,53 @@
+EESchema-LIBRARY Version 2.3  Date: Do 02 Dez 2010 16:17:01 CET
+#
+# DEBUG
+#
+DEF DEBUG P 0 30 Y Y 1 F N
+F0 "P" 0 350 60 H V C CNN
+F1 "DEBUG" 200 0 60 V V C CNN
+DRAW
+S -100 300 150 -300 0 1 0 N
+X GND 1 -350 250 250 R 60 60 1 1 W I
+X CTS 2 -350 150 250 R 60 60 1 1 O I
+X VCC 3 -350 50 250 R 60 60 1 1 O I
+X TXD 4 -350 -50 250 R 60 60 1 1 O I
+X RXD 5 -350 -150 250 R 60 60 1 1 I I
+X RTS 6 -350 -250 250 R 60 60 1 1 I I
+ENDDRAW
+ENDDEF
+#
+# LM3046M
+#
+DEF LM3046M Q 0 40 Y Y 5 F N
+F0 "Q" 0 225 50 H V C CNN
+F1 "LM3046M" 0 -175 50 H V C CNN
+$FPLIST
+ SO14E
+$ENDFPLIST
+DRAW
+T 0 100 50 40 0 0 0 B  Normal 0 C C
+T 0 150 -100 40 0 0 0 C  Normal 0 C C
+T 0 -150 -100 40 0 0 0 E  Normal 0 C C
+P 3 0 1 0  -100 -50  -25 25  -25 25 N
+P 3 0 1 0  -75 25  75 25  75 25 N
+P 3 0 1 0  25 25  100 -50  100 -50 N
+P 6 0 1 0  -100 -25  -100 -50  -75 -50  -100 -25  -100 -25  -100 -25 F
+X ~ 1 200 -50 100 L 50 50 1 1 I
+X ~ 2 0 150 125 D 50 50 1 1 I
+X ~ 3 -200 -50 100 R 50 50 1 1 O
+X ~ 3 -200 -50 100 R 50 50 2 1 O
+X ~ 4 0 150 125 D 50 50 2 1 I
+X ~ 5 200 -50 100 L 50 50 2 1 I
+X ~ 6 0 150 125 D 50 50 3 1 I
+X ~ 7 -200 -50 100 R 50 50 3 1 O
+X ~ 8 200 -50 100 L 50 50 3 1 I
+X ~ 9 0 150 125 D 50 50 4 1 I
+X ~ 10 -200 -50 100 R 50 50 4 1 O
+X ~ 11 200 -50 100 L 50 50 4 1 I
+X ~ 12 0 150 125 D 50 50 5 1 I
+X ~ 13 -200 -50 100 R 50 50 5 1 O
+X ~ 14 200 -50 100 L 50 50 5 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/hardware/kicad/lib/SIMtrace.bck b/hardware/kicad/lib/SIMtrace.bck
new file mode 100644
index 0000000..1141efc
--- /dev/null
+++ b/hardware/kicad/lib/SIMtrace.bck
@@ -0,0 +1,7 @@
+EESchema-DOCLIB  Version 2.0  Date: Do 02 Dez 2010 16:17:01 CET
+#
+$CMP LM3046M
+F datasheet/LM3046.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/hardware/kicad/lib/SIMtrace.dcm b/hardware/kicad/lib/SIMtrace.dcm
new file mode 100644
index 0000000..3a13cdf
--- /dev/null
+++ b/hardware/kicad/lib/SIMtrace.dcm
@@ -0,0 +1,7 @@
+EESchema-DOCLIB  Version 2.0  Date: Do 02 Dez 2010 17:59:22 CET
+#
+$CMP LM3046M
+F datasheet/LM3046.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/hardware/kicad/lib/SIMtrace.lib b/hardware/kicad/lib/SIMtrace.lib
new file mode 100644
index 0000000..a061dd7
--- /dev/null
+++ b/hardware/kicad/lib/SIMtrace.lib
@@ -0,0 +1,53 @@
+EESchema-LIBRARY Version 2.3  Date: Do 02 Dez 2010 17:59:22 CET
+#
+# DEBUG
+#
+DEF DEBUG P 0 30 Y Y 1 F N
+F0 "P" 0 350 60 H V C CNN
+F1 "DEBUG" 200 0 60 V V C CNN
+DRAW
+S -100 300 150 -300 0 1 0 N
+X GND 1 -350 250 250 R 60 60 1 1 W I
+X CTS 2 -350 150 250 R 60 60 1 1 O I
+X VCC 3 -350 50 250 R 60 60 1 1 O I
+X TXD 4 -350 -50 250 R 60 60 1 1 O I
+X RXD 5 -350 -150 250 R 60 60 1 1 I I
+X RTS 6 -350 -250 250 R 60 60 1 1 I I
+ENDDRAW
+ENDDEF
+#
+# LM3046M
+#
+DEF LM3046M Q 0 40 Y Y 5 F N
+F0 "Q" 0 225 50 H V C CNN
+F1 "LM3046M" 0 -175 50 H V C CNN
+$FPLIST
+ SO14E
+$ENDFPLIST
+DRAW
+T 0 100 50 40 0 0 0 B  Normal 0 C C
+T 0 50 -100 40 0 0 0 C  Normal 0 C C
+T 0 -50 -100 40 0 0 0 E  Normal 0 C C
+P 3 0 1 0  -100 -50  -25 25  -25 25 N
+P 3 0 1 0  -75 25  75 25  75 25 N
+P 3 0 1 0  25 25  100 -50  100 -50 N
+P 6 0 1 0  -100 -25  -100 -50  -75 -50  -100 -25  -100 -25  -100 -25 F
+X ~ 1 200 -50 100 L 50 50 1 1 I
+X ~ 2 0 150 125 D 50 50 1 1 I
+X ~ 3 -200 -50 100 R 50 50 1 1 O
+X ~ 3 -200 -50 100 R 50 50 2 1 O
+X ~ 4 0 150 125 D 50 50 2 1 I
+X ~ 5 200 -50 100 L 50 50 2 1 I
+X ~ 6 0 150 125 D 50 50 3 1 I
+X ~ 7 -200 -50 100 R 50 50 3 1 O
+X ~ 8 200 -50 100 L 50 50 3 1 I
+X ~ 9 0 150 125 D 50 50 4 1 I
+X ~ 10 -200 -50 100 R 50 50 4 1 O
+X ~ 11 200 -50 100 L 50 50 4 1 I
+X ~ 12 0 150 125 D 50 50 5 1 I
+X ~ 13 -200 -50 100 R 50 50 5 1 O
+X ~ 14 200 -50 100 L 50 50 5 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/hardware/kicad/lib/imported/smart_cards.mod b/hardware/kicad/lib/imported/smart_cards.mod
new file mode 100644
index 0000000..510ef91
--- /dev/null
+++ b/hardware/kicad/lib/imported/smart_cards.mod
@@ -0,0 +1,323 @@
+PCBNEW-LibModule-V1  27/5/2007-21:31:42
+$INDEX
+smart_card_16_2
+smart_card_8_2
+$EndINDEX
+$MODULE smart_card_16_2
+Po 0 0 0 15 4655E4E4 00000000 ~~
+Li smart_card_16_2
+Cd AMPHENOL CONNECTOR
+Kw AMPHENOL CONNECTOR
+Sc 00000000
+Op 0 0 0
+At VIRTUAL
+T0 0 -4500 500 500 0 35 N V 21 "SMART CARD 16 Pi"
+T1 0 2000 500 500 0 35 N V 21 "SC*"
+DS 10375 -7751 10375 -6276 150 21
+DS 10375 -6276 -10025 -6276 150 21
+DS -10025 -6276 -10025 -7801 150 21
+DS 12340 7883 12340 5167 80 21
+DS 12340 5167 11592 5167 80 21
+DS 11592 5167 11592 4773 80 21
+DS 11592 3198 11592 2017 80 21
+DS 11592 2017 12379 2017 80 21
+DS 12379 2017 12379 -1919 80 21
+DS 12379 -1919 11592 -1919 80 21
+DS 11592 -1919 11592 -3100 80 21
+DS 11592 -4675 11592 -5069 80 21
+DS 11592 -5069 12340 -5069 80 21
+DS 12340 -5069 12340 -7785 80 21
+DS 12340 -7785 -11990 -7785 80 21
+DS -11990 7883 12340 7883 80 21
+DS -11990 7883 -11990 5167 80 21
+DS -11990 5167 -11242 5167 80 21
+DS -11242 3198 -11242 2017 80 21
+DS -11242 2017 -12029 2017 80 21
+DS -12029 2017 -12029 -1919 80 21
+DS -12029 -1919 -11242 -1919 80 21
+DS -11242 -1919 -11242 -3100 80 21
+DS -11242 -4675 -11242 -5069 80 21
+DS -11242 -5069 -11990 -5069 80 21
+DS -11990 -5069 -11990 -7785 80 21
+DS -11242 5167 -11242 4773 80 21
+DC 11592 3986 11906 4300 50 21
+DS 11592 4615 11592 3356 50 21
+DS 12222 3986 10962 3986 50 21
+DC 11592 -3888 11906 -4202 50 21
+DS 11592 -3258 11592 -4517 50 21
+DS 12222 -3888 10962 -3888 50 21
+DC -11242 -3888 -11556 -4202 50 21
+DS -11242 -3258 -11242 -4517 50 21
+DS -10612 -3888 -11872 -3888 50 21
+DC -11242 3986 -11556 4300 50 21
+DS -11242 4615 -11242 3356 50 21
+DS -10612 3986 -11872 3986 50 21
+DC 11592 5954 11700 6062 50 21
+DS 11592 6171 11592 5737 50 21
+DS 11808 5954 11375 5954 50 21
+DC -11242 -5856 -11350 -5964 50 21
+DS -11242 -5639 -11242 -6073 50 21
+DS -11025 -5856 -11458 -5856 50 21
+DA -11242 3986 -11242 4773 5400 80 21
+DA -11242 -3888 -11242 -3100 5400 80 21
+DA 11592 -3888 11592 -4675 5400 80 21
+DA 11592 3986 11592 3198 5400 80 21
+T2 0 2000 500 500 0 35 N V 21 ""
+$PAD
+Sh "C1" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 2883 7549
+$EndPAD
+$PAD
+Sh "C2" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 1883 7549
+$EndPAD
+$PAD
+Sh "C3" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 883 7549
+$EndPAD
+$PAD
+Sh "C4" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -116 7549
+$EndPAD
+$PAD
+Sh "C5" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 2883 -7451
+$EndPAD
+$PAD
+Sh "C6" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 1883 -7451
+$EndPAD
+$PAD
+Sh "C7" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 883 -7451
+$EndPAD
+$PAD
+Sh "C8" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -116 -7451
+$EndPAD
+$PAD
+Sh "C_1" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 3883 -7451
+$EndPAD
+$PAD
+Sh "C_2" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 4883 -7451
+$EndPAD
+$PAD
+Sh "C_3" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 5883 -7451
+$EndPAD
+$PAD
+Sh "C_4" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 6883 -7451
+$EndPAD
+$PAD
+Sh "C_5" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 3883 7549
+$EndPAD
+$PAD
+Sh "C_6" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 4883 7549
+$EndPAD
+$PAD
+Sh "C_7" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 5883 7549
+$EndPAD
+$PAD
+Sh "C_8" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 6883 7549
+$EndPAD
+$PAD
+Sh "S1" O 649 984 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -1616 7549
+$EndPAD
+$PAD
+Sh "S2" O 649 984 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -1616 6549
+$EndPAD
+$EndMODULE  smart_card_16_2
+$MODULE smart_card_8_2
+Po 0 0 0 15 4655E50C 00000000 ~~
+Li smart_card_8_2
+Cd AMPHENOL CONNECTOR
+Kw AMPHENOL CONNECTOR
+Sc 00000000
+Op 0 0 0
+At VIRTUAL
+T0 -550 -5100 500 500 0 35 N V 21 "SMART CARD 8 Pin"
+T1 0 2000 500 500 0 35 N V 21 "SC*"
+DS 10375 -7751 10375 -6276 150 21
+DS 10375 -6276 -10025 -6276 150 21
+DS -10025 -6276 -10025 -7801 150 21
+DS 12340 7883 12340 5167 80 21
+DS 12340 5167 11592 5167 80 21
+DS 11592 5167 11592 4773 80 21
+DS 11592 3198 11592 2017 80 21
+DS 11592 2017 12379 2017 80 21
+DS 12379 2017 12379 -1919 80 21
+DS 12379 -1919 11592 -1919 80 21
+DS 11592 -1919 11592 -3100 80 21
+DS 11592 -4675 11592 -5069 80 21
+DS 11592 -5069 12340 -5069 80 21
+DS 12340 -5069 12340 -7785 80 21
+DS 12340 -7785 -11990 -7785 80 21
+DS -11990 7883 12340 7883 80 21
+DS -11990 7883 -11990 5167 80 21
+DS -11990 5167 -11242 5167 80 21
+DS -11242 3198 -11242 2017 80 21
+DS -11242 2017 -12029 2017 80 21
+DS -12029 2017 -12029 -1919 80 21
+DS -12029 -1919 -11242 -1919 80 21
+DS -11242 -1919 -11242 -3100 80 21
+DS -11242 -4675 -11242 -5069 80 21
+DS -11242 -5069 -11990 -5069 80 21
+DS -11990 -5069 -11990 -7785 80 21
+DS -11242 5167 -11242 4773 80 21
+DC 11592 3986 11906 4300 50 21
+DS 11592 4615 11592 3356 50 21
+DS 12222 3986 10962 3986 50 21
+DC 11592 -3888 11906 -4202 50 21
+DS 11592 -3258 11592 -4517 50 21
+DS 12222 -3888 10962 -3888 50 21
+DC -11242 -3888 -11556 -4202 50 21
+DS -11242 -3258 -11242 -4517 50 21
+DS -10612 -3888 -11872 -3888 50 21
+DC -11242 3986 -11556 4300 50 21
+DS -11242 4615 -11242 3356 50 21
+DS -10612 3986 -11872 3986 50 21
+DC 11592 5954 11700 6062 50 21
+DS 11592 6171 11592 5737 50 21
+DS 11808 5954 11375 5954 50 21
+DC -11242 -5856 -11350 -5964 50 21
+DS -11242 -5639 -11242 -6073 50 21
+DS -11025 -5856 -11458 -5856 50 21
+DA -11242 3986 -11242 4773 5400 80 21
+DA -11242 -3888 -11242 -3100 5400 80 21
+DA 11592 -3888 11592 -4675 5400 80 21
+DA 11592 3986 11592 3198 5400 80 21
+$PAD
+Sh "C1" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 2883 7549
+$EndPAD
+$PAD
+Sh "C2" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 1883 7549
+$EndPAD
+$PAD
+Sh "C3" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 883 7549
+$EndPAD
+$PAD
+Sh "C4" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -116 7549
+$EndPAD
+$PAD
+Sh "C5" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 2883 -7451
+$EndPAD
+$PAD
+Sh "C6" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 1883 -7451
+$EndPAD
+$PAD
+Sh "C7" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po 883 -7451
+$EndPAD
+$PAD
+Sh "C8" O 984 649 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -116 -7451
+$EndPAD
+$PAD
+Sh "S1" O 649 984 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -1616 7549
+$EndPAD
+$PAD
+Sh "S2" O 649 984 0 0 900
+Dr 433 0 0
+At STD N 00A8FFFF
+Ne 0 ""
+Po -1616 6549
+$EndPAD
+$EndMODULE  smart_card_8_2
+$EndLIBRARY
diff --git a/hardware/kicad/lib/imported/smartcard.lib b/hardware/kicad/lib/imported/smartcard.lib
new file mode 100644
index 0000000..72f9a39
--- /dev/null
+++ b/hardware/kicad/lib/imported/smartcard.lib
@@ -0,0 +1,33 @@
+EESchema-LIBRARY Version 2.3  29/04/2008-12:24:02
+# Converted with eagle2kicad.ulp Version 0.9
+# Device count = 1
+#
+# Dev Name: ISO7816-SMARTCARD
+# Package Name: CARDSOCKET
+# Dev Tech: ''
+# Dev Prefix: 
+# Gate count = 1
+#
+DEF ISO7816-SMARTCARD ?? 0 40 Y Y 1 L N
+# Gate Name: G$1
+# Symbol Name: ISO7816
+DRAW
+P 2 1 0 0 -500 500 -500 -300
+P 2 1 0 0 -500 -300 100 -300
+P 2 1 0 0 100 -300 100 500
+P 2 1 0 0 100 500 -500 500
+T 0 -155 -165 70 0 1 0 ISO7816
+X CLK CLK 300 200 200 L 40 40 1 1 B 
+X GND GND -700 0 200 R 40 40 1 1 B 
+X I/O I/O -700 200 200 R 40 40 1 1 B 
+X PIN4 PIN4 300 300 200 L 40 40 1 1 B 
+X PIN6 PIN6 -700 100 200 R 40 40 1 1 B 
+X PIN8 PIN8 -700 300 200 R 40 40 1 1 B 
+X RST RST 300 100 200 L 40 40 1 1 B 
+X SW1 SW1 -700 400 200 R 40 40 1 1 B 
+X SW2 SW2 300 400 200 L 40 40 1 1 B 
+X VCC VCC 300 0 200 L 40 40 1 1 B 
+ENDDRAW
+ENDDEF
+
+#End Library
diff --git a/hardware/kicad/lib/imported/smartcard.mod b/hardware/kicad/lib/imported/smartcard.mod
new file mode 100644
index 0000000..81b4354
--- /dev/null
+++ b/hardware/kicad/lib/imported/smartcard.mod
@@ -0,0 +1,112 @@
+PCBNEW-LibModule-V1   29/04/2008-12:24:02
+$INDEX
+smartcard-CARDSOCKET
+$EndINDEX
+$MODULE smartcard-CARDSOCKET
+Po 0 0 0 15 00200000 00000000 ~~
+Li smartcard-CARDSOCKET
+Cd ISO 7816 CARD SOCKET
+Kw ISO 7816 CARD SOCKET
+Sc 00000000
+Op 0 0 0
+At VIRTUAL
+DS -11000 -1000 -11000 -1500 50 21
+DS -11000 -1500 -11000 -14500 50 21
+DS -11000 -14500 6000 -14500 50 21
+DS 6000 -14500 6000 10500 50 21
+DS 6000 10500 -11000 10500 50 21
+DS -11000 10500 -11000 -1500 50 21
+DC 1500 -13500 1750 -13750 50 21
+DS 1000 -13500 2000 -13500 50 21
+DS 1500 -13000 1500 -14000 50 21
+DC -6500 -13500 -6750 -13750 50 21
+DS -7000 -13500 -6000 -13500 50 21
+DS -6500 -13000 -6500 -14000 50 21
+DC 1500 9500 1750 9750 50 21
+DS 1000 9500 2000 9500 50 21
+DS 1500 10000 1500 9000 50 21
+DC -6500 9500 -6750 9750 50 21
+DS -7000 9500 -6000 9500 50 21
+DS -6500 10000 -6500 9000 50 21
+T0 -3250 -5250 500 500 900 35 N V "Card Socket"
+T1 -10000 -4250 500 500 0 35 N V "S1"
+T2 -8500 -4250 500 500 0 35 N V "S2"
+T3 -8500 1250 500 500 0 35 N V "C1"
+T4 -8500 250 500 500 0 35 N V "C2"
+T5 -8500 -750 500 500 0 35 N V "C3"
+T6 -8500 -1750 500 500 0 35 N V "C4"
+T7 4000 1250 500 500 0 35 N V "C5"
+T8 4000 250 500 500 0 35 N V "C6"
+T9 4000 -750 500 500 0 35 N V "C7"
+T10 4000 -1750 500 500 0 35 N V "C8"
+$PAD
+Sh "CLK" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po -10000 -1000 
+$EndPAD
+$PAD
+Sh "GND" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po 5000 1000 
+$EndPAD
+$PAD
+Sh "I/O" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po 5000 -1000 
+$EndPAD
+$PAD
+Sh "PIN4" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po -10000 -2000 
+$EndPAD
+$PAD
+Sh "PIN6" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po 5000 0 
+$EndPAD
+$PAD
+Sh "PIN8" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po 5000 -2000 
+$EndPAD
+$PAD
+Sh "RST" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po -10000 0 
+$EndPAD
+$PAD
+Sh "SW1" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po -10000 -3500 
+$EndPAD
+$PAD
+Sh "SW2" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po -9000 -3500 
+$EndPAD
+$PAD
+Sh "VCC" R 760 0 0 0 0
+Dr 320 0 0 
+At STD N 00A88001
+Ne 0 ""
+Po -10000 1000 
+$EndPAD
+$EndMODULE CARDSOCKET
diff --git a/hardware/kicad/lib/imported/smartwed.lib b/hardware/kicad/lib/imported/smartwed.lib
new file mode 100644
index 0000000..bfda425
--- /dev/null
+++ b/hardware/kicad/lib/imported/smartwed.lib
@@ -0,0 +1,87 @@
+EESchema-LIBRARY Version 2.3  29/04/2008-12:24:02
+# Converted with eagle2kicad.ulp Version 0.9
+# Device count = 2
+#
+# Dev Name: ISO7816
+# Package Name: ISO7816
+# Dev Tech: ''
+# Dev Prefix: 
+# Gate count = 1
+#
+DEF ISO7816 ?? 0 40 Y Y 1 L N
+# Gate Name: G$1
+# Symbol Name: ISO7816
+DRAW
+P 2 1 0 0 -700 0 -700 -800
+P 2 1 0 0 500 0 500 -800
+T 1 -100 -350 50 0 1 0 ISO7816
+T 0 -575 -50 50 0 1 0 C1
+T 0 -575 -250 50 0 1 0 C2
+T 0 -575 -450 50 0 1 0 C3
+T 0 -575 -650 50 0 1 0 C4
+T 0 625 -650 50 0 1 0 C5
+T 0 625 -450 50 0 1 0 C6
+T 0 625 -250 50 0 1 0 C7
+T 0 625 -50 50 0 1 0 C8
+X CLK P$3 -500 -500 200 L 40 40 1 1 I 
+X GND P$5 700 -100 200 L 40 40 1 1 w 
+X I/O P$7 700 -500 200 L 40 40 1 1 B 
+X RFU1 P$4 -500 -700 200 L 40 40 1 1 B 
+X RFU2 P$8 700 -700 200 L 40 40 1 1 B 
+X RST P$2 -500 -300 200 L 40 40 1 1 I 
+X VCC P$1 -500 -100 200 L 40 40 1 1 w 
+X VPP P$6 700 -300 200 L 40 40 1 1 B 
+ENDDRAW
+ENDDEF
+
+#
+# Dev Name: SMARTCARD
+# Package Name: SMARTCARD
+# Dev Tech: ''
+# Dev Prefix: 
+# Gate count = 1
+#
+DEF SMARTCARD ?? 0 40 Y Y 1 L N
+# Gate Name: 1
+# Symbol Name: SMARTCARD
+DRAW
+P 2 1 0 0 -700 1000 -700 -800
+P 2 1 0 0 500 1000 500 -800
+T 1 -100 -350 50 0 1 0 ISO7816
+T 1 -100 625 50 0 1 0 AFNOR
+T 0 -575 -50 50 0 1 0 C1
+T 0 -575 -250 50 0 1 0 C2
+T 0 -575 -450 50 0 1 0 C3
+T 0 -575 -650 50 0 1 0 C4
+T 0 625 -650 50 0 1 0 C5
+T 0 625 -450 50 0 1 0 C6
+T 0 625 -250 50 0 1 0 C7
+T 0 625 -50 50 0 1 0 C8
+T 0 625 350 50 0 1 0 C1
+T 0 625 550 50 0 1 0 C2
+T 0 625 750 50 0 1 0 C3
+T 0 625 950 50 0 1 0 C4
+T 0 -575 350 50 0 1 0 C5
+T 0 -575 550 50 0 1 0 C6
+T 0 -575 750 50 0 1 0 C7
+T 0 -575 950 50 0 1 0 C8
+X CLK P$3 -500 -500 200 L 40 40 1 1 I 
+X CLK2 P$11 700 700 200 L 40 40 1 1 I 
+X GND P$5 700 -100 200 L 40 40 1 1 w 
+X GND2 P$13 -500 300 200 L 40 40 1 1 w 
+X I/O P$7 700 -500 200 L 40 40 1 1 B 
+X I/O2 P$15 -500 700 200 L 40 40 1 1 B 
+X RFU1 P$4 -500 -700 200 L 40 40 1 1 B 
+X RFU2 P$8 700 -700 200 L 40 40 1 1 B 
+X RFU3 P$12 700 900 200 L 40 40 1 1 B 
+X RFU4 P$16 -500 900 200 L 40 40 1 1 B 
+X RST P$2 -500 -300 200 L 40 40 1 1 I 
+X RST2 P$10 700 500 200 L 40 40 1 1 I 
+X VCC P$1 -500 -100 200 L 40 40 1 1 w 
+X VCC2 P$9 700 300 200 L 40 40 1 1 w 
+X VPP P$6 700 -300 200 L 40 40 1 1 B 
+X VPP2 P$14 -500 500 200 L 40 40 1 1 B 
+ENDDRAW
+ENDDEF
+
+#End Library
diff --git a/hardware/kicad/lib/imported/smartwed.mod b/hardware/kicad/lib/imported/smartwed.mod
new file mode 100644
index 0000000..d8e9a63
--- /dev/null
+++ b/hardware/kicad/lib/imported/smartwed.mod
@@ -0,0 +1,215 @@
+PCBNEW-LibModule-V1   29/04/2008-12:24:02
+$INDEX
+smartwed-ISO7816
+smartwed-SMARTCARD
+$EndINDEX
+$MODULE smartwed-ISO7816
+Po 0 0 0 15 00200000 00000000 ~~
+Li smartwed-ISO7816
+Cd 
+Kw 
+Sc 00000000
+Op 0 0 0
+At SMD
+DS 16850 8993 16850 -8993 50 21
+DS 15217 -10625 -15217 -10625 50 21
+DS -16850 -8993 -16850 8993 50 21
+DS -15217 10625 15217 10625 50 21
+DS -12000 -2750 -11750 -3000 50 0
+DS -11750 -3000 -11750 -2500 50 0
+DS -11750 -2500 -12000 -2750 50 0
+DA 15217 8993 16850 8993 4500 50 21 
+DA 15217 -8993 15217 -10625 4500 50 21 
+DA -15217 -8993 -16850 -8993 4500 50 21 
+DA -15217 8993 -15217 10625 4500 50 21 
+$PAD
+Sh "P$1" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -2720 
+$EndPAD
+$PAD
+Sh "P$2" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -1720 
+$EndPAD
+$PAD
+Sh "P$3" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -720 
+$EndPAD
+$PAD
+Sh "P$4" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 279 
+$EndPAD
+$PAD
+Sh "P$5" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -2720 
+$EndPAD
+$PAD
+Sh "P$6" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -1720 
+$EndPAD
+$PAD
+Sh "P$7" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -720 
+$EndPAD
+$PAD
+Sh "P$8" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 279 
+$EndPAD
+$EndMODULE ISO7816
+$MODULE smartwed-SMARTCARD
+Po 0 0 0 15 00200000 00000000 ~~
+Li smartwed-SMARTCARD
+Cd 
+Kw 
+Sc 00000000
+Op 0 0 0
+At SMD
+DS 16850 8993 16850 -8993 50 21
+DS 15217 -10625 -15217 -10625 50 21
+DS -16850 -8993 -16850 8993 50 21
+DS -15217 10625 15217 10625 50 21
+DS -12000 -2750 -11750 -3000 50 0
+DS -11750 -3000 -11750 -2500 50 0
+DS -11750 -2500 -12000 -2750 50 0
+DA 15217 8993 16850 8993 4500 50 21 
+DA 15217 -8993 15217 -10625 4500 50 21 
+DA -15217 -8993 -16850 -8993 4500 50 21 
+DA -15217 8993 -15217 10625 4500 50 21 
+T0 -8250 -1500 500 500 900 35 N V "7816"
+T1 -8250 -5250 500 500 900 35 N V "AFNOR"
+$PAD
+Sh "P$1" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -2720 
+$EndPAD
+$PAD
+Sh "P$2" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -1720 
+$EndPAD
+$PAD
+Sh "P$3" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -720 
+$EndPAD
+$PAD
+Sh "P$4" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 279 
+$EndPAD
+$PAD
+Sh "P$5" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -2720 
+$EndPAD
+$PAD
+Sh "P$6" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -1720 
+$EndPAD
+$PAD
+Sh "P$7" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -720 
+$EndPAD
+$PAD
+Sh "P$8" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 279 
+$EndPAD
+$PAD
+Sh "P$9" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -3720 
+$EndPAD
+$PAD
+Sh "P$10" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -4720 
+$EndPAD
+$PAD
+Sh "P$11" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -5720 
+$EndPAD
+$PAD
+Sh "P$12" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -9421 -6720 
+$EndPAD
+$PAD
+Sh "P$13" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -3720 
+$EndPAD
+$PAD
+Sh "P$14" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -4720 
+$EndPAD
+$PAD
+Sh "P$15" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -5720 
+$EndPAD
+$PAD
+Sh "P$16" R 787 669 0 0 0
+Dr 0 0 0 
+At SMD N 00888000
+Ne 0 ""
+Po -12421 -6720 
+$EndPAD
+$EndMODULE SMARTCARD
diff --git a/hardware/kicad/lib/smartcard.bak b/hardware/kicad/lib/smartcard.bak
index 73f9aa9..a3e87a3 100644
--- a/hardware/kicad/lib/smartcard.bak
+++ b/hardware/kicad/lib/smartcard.bak
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mo 22 Nov 2010 13:18:43 CET
+EESchema-LIBRARY Version 2.3  Date: Do 25 Nov 2010 18:04:30 CET
 #
 # ISO7816
 #
@@ -26,19 +26,97 @@ X RFU C8 550 -150 300 L 50 50 1 1 U
 ENDDRAW
 ENDDEF
 #
-# SC
+# ISO7816_NC
 #
-DEF SC P 0 40 Y Y 1 F N
-F0 "P" 0 200 50 H V C CNN
-F1 "SC" 0 -200 40 H V C CNN
+DEF ISO7816_NC P 0 40 Y Y 1 F N
+F0 "P" 0 250 60 H V C CNN
+F1 "ISO7816_NC" 0 -250 60 H V C CNN
+DRAW
+C -150 450 50 0 1 0 N
+C 150 450 50 0 1 0 N
+S -250 200 250 -200 0 1 0 N
+P 3 0 1 0  -250 -100  250 -100  250 -100 N
+P 3 0 1 0  -250 0  -50 0  -50 0 N
+P 3 0 1 0  -50 100  -250 100  -250 100 N
+P 3 0 1 0  0 -100  0 -200  0 -200 N
+P 3 0 1 0  50 -100  50 100  50 100 N
+P 3 0 1 0  50 0  250 0  250 0 N
+P 3 0 1 0  50 100  250 100  250 100 N
+P 4 0 1 0  -100 450  150 500  150 500  150 500 N
+P 5 0 1 0  0 200  0 100  -50 100  -50 -100  -50 -100 N
+X VCC C1 -550 150 300 R 50 50 1 1 w
+X RST C2 -550 50 300 R 50 50 1 1 I
+X CLK C3 -550 -50 300 R 50 50 1 1 I
+X RFU C4 -550 -150 300 R 50 50 1 1 U
+X GND C5 550 150 300 L 50 50 1 1 W
+X VPP C6 550 50 300 L 50 50 1 1 B
+X I/O C7 550 -50 300 L 50 50 1 1 B
+X RFU C8 550 -150 300 L 50 50 1 1 U
+X ~ SW1 -500 450 300 R 60 60 1 1 P
+X ~ SW2 500 450 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ISO7816_NO
+#
+DEF ISO7816_NO P 0 40 Y Y 1 F N
+F0 "P" 0 250 60 H V C CNN
+F1 "ISO7816_NO" 0 -250 60 H V C CNN
+DRAW
+C -150 450 50 0 1 0 N
+C 150 450 50 0 1 0 N
+S -250 200 250 -200 0 1 0 N
+P 3 0 1 0  -250 -100  250 -100  250 -100 N
+P 3 0 1 0  -250 0  -50 0  -50 0 N
+P 3 0 1 0  -50 100  -250 100  -250 100 N
+P 3 0 1 0  0 -100  0 -200  0 -200 N
+P 3 0 1 0  50 -100  50 100  50 100 N
+P 3 0 1 0  50 0  250 0  250 0 N
+P 3 0 1 0  50 100  250 100  250 100 N
+P 4 0 1 0  -100 450  100 550  100 550  100 550 N
+P 5 0 1 0  0 200  0 100  -50 100  -50 -100  -50 -100 N
+X VCC C1 -550 150 300 R 50 50 1 1 w
+X RST C2 -550 50 300 R 50 50 1 1 I
+X CLK C3 -550 -50 300 R 50 50 1 1 I
+X RFU C4 -550 -150 300 R 50 50 1 1 U
+X GND C5 550 150 300 L 50 50 1 1 W
+X VPP C6 550 50 300 L 50 50 1 1 B
+X I/O C7 550 -50 300 L 50 50 1 1 B
+X RFU C8 550 -150 300 L 50 50 1 1 U
+X ~ SW1 -500 450 300 R 50 50 1 1 P
+X ~ SW2 500 450 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ISO7816_SIMPLE
+#
+DEF ISO7816_SIMPLE P 0 40 Y Y 1 F N
+F0 "P" 0 200 60 H V C CNN
+F1 "ISO7816_SIMPLE" 0 -200 60 H V C CNN
 DRAW
 S -250 150 250 -150 0 1 0 N
-X VCC 1 -550 100 300 R 60 60 1 1 W I
-X RST 2 550 100 300 L 60 60 1 1 O I
-X CLK 3 -550 0 300 R 60 60 1 1 O I
-X GND 4 550 0 300 L 60 60 1 1 W I
-X VPP 5 -550 -100 300 R 60 60 1 1 w I
-X I/O 6 550 -100 300 L 60 60 1 1 P I
+X VCC C1 -550 100 300 R 60 60 1 1 W I
+X RST C2 -550 0 300 R 60 60 1 1 O I
+X CLK C3 -550 -100 300 R 60 60 1 1 O I
+X GND C4 550 100 300 L 60 60 1 1 W I
+X VPP C5 550 0 300 L 60 60 1 1 w I
+X I/O C6 550 -100 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# PORT_SIMPLE
+#
+DEF PORT_SIMPLE P 0 40 Y Y 1 F N
+F0 "P" 0 200 60 H V C CNN
+F1 "PORT_SIMPLE" 0 -200 60 H V C CNN
+DRAW
+S -250 150 250 -150 0 1 0 N
+X VCC C1 -550 100 300 R 60 60 1 1 W I
+X RST C2 550 100 300 L 60 60 1 1 O I
+X CLK C3 -550 0 300 R 60 60 1 1 O I
+X GND C4 550 0 300 L 60 60 1 1 W I
+X VPP C5 -550 -100 300 R 60 60 1 1 w I
+X I/O C6 550 -100 300 L 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
diff --git a/hardware/kicad/lib/smartcard.bck b/hardware/kicad/lib/smartcard.bck
index 5870887..e6718a9 100644
--- a/hardware/kicad/lib/smartcard.bck
+++ b/hardware/kicad/lib/smartcard.bck
@@ -1,6 +1,19 @@
-EESchema-DOCLIB  Version 2.0  Date: Mo 22 Nov 2010 13:18:43 CET
+EESchema-DOCLIB  Version 2.0  Date: Do 25 Nov 2010 18:04:30 CET
 #
-$CMP SC
+$CMP ISO7816_NC
+D smart card with normally closed presence switch
+$ENDCMP
+#
+$CMP ISO7816_NO
+D smart card with normally closed presence switch
+$ENDCMP
+#
+$CMP ISO7816_SIMPLE
+D Symbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP PORT_SIMPLE
 D Symbole general de connecteur
 K CONN
 $ENDCMP
diff --git a/hardware/kicad/lib/smartcard.dcm b/hardware/kicad/lib/smartcard.dcm
index 1685ea4..f2e98ad 100644
--- a/hardware/kicad/lib/smartcard.dcm
+++ b/hardware/kicad/lib/smartcard.dcm
@@ -1,6 +1,19 @@
-EESchema-DOCLIB  Version 2.0  Date: Mo 22 Nov 2010 13:21:06 CET
+EESchema-DOCLIB  Version 2.0  Date: Do 25 Nov 2010 18:05:11 CET
 #
-$CMP SC
+$CMP ISO7816_NC
+D smart card with normally closed presence switch
+$ENDCMP
+#
+$CMP ISO7816_NO
+D smart card with normally closed presence switch
+$ENDCMP
+#
+$CMP ISO7816_SIMPLE
+D Symbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP PORT_SIMPLE
 D Symbole general de connecteur
 K CONN
 $ENDCMP
diff --git a/hardware/kicad/lib/smartcard.lib b/hardware/kicad/lib/smartcard.lib
index 6380e69..b247cc2 100644
--- a/hardware/kicad/lib/smartcard.lib
+++ b/hardware/kicad/lib/smartcard.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mo 22 Nov 2010 13:21:06 CET
+EESchema-LIBRARY Version 2.3  Date: Do 25 Nov 2010 18:05:11 CET
 #
 # ISO7816
 #
@@ -26,19 +26,97 @@ X RFU C8 550 -150 300 L 50 50 1 1 U
 ENDDRAW
 ENDDEF
 #
-# SC
+# ISO7816_NC
 #
-DEF SC P 0 40 Y Y 1 F N
+DEF ISO7816_NC P 0 40 Y Y 1 F N
+F0 "P" 0 250 60 H V C CNN
+F1 "ISO7816_NC" 0 -250 60 H V C CNN
+DRAW
+C -150 450 50 0 1 0 N
+C 150 450 50 0 1 0 N
+S -250 200 250 -200 0 1 0 N
+P 3 0 1 0  -250 -100  250 -100  250 -100 N
+P 3 0 1 0  -250 0  -50 0  -50 0 N
+P 3 0 1 0  -50 100  -250 100  -250 100 N
+P 3 0 1 0  0 -100  0 -200  0 -200 N
+P 3 0 1 0  50 -100  50 100  50 100 N
+P 3 0 1 0  50 0  250 0  250 0 N
+P 3 0 1 0  50 100  250 100  250 100 N
+P 4 0 1 0  -100 450  150 500  150 500  150 500 N
+P 5 0 1 0  0 200  0 100  -50 100  -50 -100  -50 -100 N
+X VCC C1 -550 150 300 R 50 50 1 1 w
+X RST C2 -550 50 300 R 50 50 1 1 I
+X CLK C3 -550 -50 300 R 50 50 1 1 I
+X RFU C4 -550 -150 300 R 50 50 1 1 U
+X GND C5 550 150 300 L 50 50 1 1 W
+X VPP C6 550 50 300 L 50 50 1 1 B
+X I/O C7 550 -50 300 L 50 50 1 1 B
+X RFU C8 550 -150 300 L 50 50 1 1 U
+X ~ SW1 -500 450 300 R 50 50 1 1 P
+X ~ SW2 500 450 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ISO7816_NO
+#
+DEF ISO7816_NO P 0 40 Y Y 1 F N
+F0 "P" 0 250 60 H V C CNN
+F1 "ISO7816_NO" 0 -250 60 H V C CNN
+DRAW
+C -150 450 50 0 1 0 N
+C 150 450 50 0 1 0 N
+S -250 200 250 -200 0 1 0 N
+P 3 0 1 0  -250 -100  250 -100  250 -100 N
+P 3 0 1 0  -250 0  -50 0  -50 0 N
+P 3 0 1 0  -50 100  -250 100  -250 100 N
+P 3 0 1 0  0 -100  0 -200  0 -200 N
+P 3 0 1 0  50 -100  50 100  50 100 N
+P 3 0 1 0  50 0  250 0  250 0 N
+P 3 0 1 0  50 100  250 100  250 100 N
+P 4 0 1 0  -100 450  100 550  100 550  100 550 N
+P 5 0 1 0  0 200  0 100  -50 100  -50 -100  -50 -100 N
+X VCC C1 -550 150 300 R 50 50 1 1 w
+X RST C2 -550 50 300 R 50 50 1 1 I
+X CLK C3 -550 -50 300 R 50 50 1 1 I
+X RFU C4 -550 -150 300 R 50 50 1 1 U
+X GND C5 550 150 300 L 50 50 1 1 W
+X VPP C6 550 50 300 L 50 50 1 1 B
+X I/O C7 550 -50 300 L 50 50 1 1 B
+X RFU C8 550 -150 300 L 50 50 1 1 U
+X ~ SW1 -500 450 300 R 50 50 1 1 P
+X ~ SW2 500 450 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ISO7816_SIMPLE
+#
+DEF ISO7816_SIMPLE P 0 40 Y Y 1 F N
 F0 "P" 0 200 60 H V C CNN
-F1 "SC" 0 -200 60 H V C CNN
+F1 "ISO7816_SIMPLE" 0 -200 60 H V C CNN
 DRAW
 S -250 150 250 -150 0 1 0 N
-X VCC 1 -550 100 300 R 60 60 1 1 W I
-X RST 2 550 100 300 L 60 60 1 1 O I
-X CLK 3 -550 0 300 R 60 60 1 1 O I
-X GND 4 550 0 300 L 60 60 1 1 W I
-X VPP 5 -550 -100 300 R 60 60 1 1 w I
-X I/O 6 550 -100 300 L 60 60 1 1 P I
+X VCC C1 -550 100 300 R 60 60 1 1 W I
+X RST C2 -550 0 300 R 60 60 1 1 O I
+X CLK C3 -550 -100 300 R 60 60 1 1 O I
+X GND C4 550 100 300 L 60 60 1 1 W I
+X VPP C5 550 0 300 L 60 60 1 1 w I
+X I/O C6 550 -100 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# PORT_SIMPLE
+#
+DEF PORT_SIMPLE P 0 40 Y Y 1 F N
+F0 "P" 0 200 60 H V C CNN
+F1 "PORT_SIMPLE" 0 -200 60 H V C CNN
+DRAW
+S -250 150 250 -150 0 1 0 N
+X VCC C1 -550 100 300 R 60 60 1 1 W I
+X RST C2 550 100 300 L 60 60 1 1 O I
+X CLK C3 -550 0 300 R 60 60 1 1 O I
+X GND C4 550 0 300 L 60 60 1 1 W I
+X VPP C5 -550 -100 300 R 60 60 1 1 w I
+X I/O C6 550 -100 300 L 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #