From: girst <girst@users.noreply.github.com>
Date: Wed, 18 Jan 2017 23:06:47 +0000 (+0100)
Subject: moving stuff around the tda8029
X-Git-Url: https://git.gir.st/hardpass.git/commitdiff_plain/95f598165cced564be36fc9feb332040f41900c4

moving stuff around the tda8029

rotated schema back to normal
---

diff --git a/kicad/hardpass-pcb/hardpass-pcb-cache.lib b/kicad/hardpass-pcb/hardpass-pcb-cache.lib
index 2f8ac52..2f1a43d 100644
--- a/kicad/hardpass-pcb/hardpass-pcb-cache.lib
+++ b/kicad/hardpass-pcb/hardpass-pcb-cache.lib
@@ -215,22 +215,24 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Crystal_Small
+# Crystal
 #
-DEF Crystal_Small Y 0 40 N N 1 F N
-F0 "Y" 0 100 50 H V C CNN
-F1 "Crystal_Small" 0 -100 50 H V C CNN
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
  Crystal*
 $ENDFPLIST
 DRAW
-S -30 -60 30 60 0 1 0 N
-P 2 0 1 15 -50 -30 -50 30 N
-P 2 0 1 15 50 -30 50 30 N
-X 1 1 -100 0 50 R 50 50 1 1 P
-X 2 2 100 0 50 L 50 50 1 1 P
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/kicad/hardpass-pcb/hardpass-pcb.bak b/kicad/hardpass-pcb/hardpass-pcb.bak
index 8494826..69b98b3 100644
--- a/kicad/hardpass-pcb/hardpass-pcb.bak
+++ b/kicad/hardpass-pcb/hardpass-pcb.bak
@@ -277,126 +277,126 @@ ROW_4
 $Comp
 L C_Small C6
 U 1 1 576AB858
-P 6050 1100
-F 0 "C6" V 6100 1150 50  0000 L CNN
-F 1 "1µF" H 6050 950 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 5900 350 50  0000 C CNN
-F 3 "" H 6050 1100 50  0000 C CNN
-	1    6050 1100
+P 5150 1150
+F 0 "C6" V 5200 1200 50  0000 L CNN
+F 1 "1µF" H 5150 1000 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5000 400 50  0000 C CNN
+F 3 "" H 5150 1150 50  0000 C CNN
+	1    5150 1150
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C5
 U 1 1 576AB9B6
-P 6050 1300
-F 0 "C5" V 6100 1350 50  0000 L CNN
-F 1 "1µF" H 6050 1150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 6050 2800 50  0001 C CNN
-F 3 "" H 6050 1300 50  0000 C CNN
-	1    6050 1300
+P 5150 1350
+F 0 "C5" V 5200 1400 50  0000 L CNN
+F 1 "1µF" H 5150 1200 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5150 2850 50  0001 C CNN
+F 3 "" H 5150 1350 50  0000 C CNN
+	1    5150 1350
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C2
 U 1 1 576ABF65
-P 5500 1800
-F 0 "C2" V 5550 1850 50  0000 L CNN
-F 1 "1µF" V 5450 1600 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 5500 -250 50  0001 C CNN
-F 3 "" H 5500 1800 50  0000 C CNN
-	1    5500 1800
+P 4600 1850
+F 0 "C2" V 4650 1900 50  0000 L CNN
+F 1 "1µF" V 4550 1650 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 4600 -200 50  0001 C CNN
+F 3 "" H 4600 1850 50  0000 C CNN
+	1    4600 1850
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C3
 U 1 1 576AC79A
-P 6050 3700
-F 0 "C3" V 6100 3750 50  0000 L CNN
-F 1 "2.2µF" V 6100 3450 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 6050 5200 50  0001 C CNN
-F 3 "" H 6050 3700 50  0000 C CNN
-	1    6050 3700
+P 5150 3750
+F 0 "C3" V 5200 3800 50  0000 L CNN
+F 1 "2.2µF" V 5200 3500 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5150 5250 50  0001 C CNN
+F 3 "" H 5150 3750 50  0000 C CNN
+	1    5150 3750
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C4
 U 1 1 576ACF95
-P 6050 3600
-F 0 "C4" V 6100 3650 50  0000 L CNN
-F 1 "4.7µF" V 6100 3350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 6050 5100 50  0001 C CNN
-F 3 "" H 6050 3600 50  0000 C CNN
-	1    6050 3600
+P 5150 3650
+F 0 "C4" V 5200 3700 50  0000 L CNN
+F 1 "4.7µF" V 5200 3400 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5150 5150 50  0001 C CNN
+F 3 "" H 5150 3650 50  0000 C CNN
+	1    5150 3650
 	0    1    1    0   
 $EndComp
 $Comp
 L R_Small R1
 U 1 1 576AE193
-P 6050 3500
-F 0 "R1" V 6100 3600 50  0000 L CNN
-F 1 "390k" V 6100 3250 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 6050 5000 50  0001 C CNN
-F 3 "" H 6050 3500 50  0000 C CNN
-	1    6050 3500
+P 5150 3550
+F 0 "R1" V 5200 3650 50  0000 L CNN
+F 1 "390k" V 5200 3300 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 5150 5050 50  0001 C CNN
+F 3 "" H 5150 3550 50  0000 C CNN
+	1    5150 3550
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR14
 U 1 1 576AFDF4
-P 6050 850
-F 0 "#PWR14" H 6050 600 50  0001 C CNN
-F 1 "GND" H 6050 700 50  0001 C CNN
-F 2 "" H 6050 850 50  0000 C CNN
-F 3 "" H 6050 850 50  0000 C CNN
-	1    6050 850 
+P 5150 900
+F 0 "#PWR14" H 5150 650 50  0001 C CNN
+F 1 "GND" H 5150 750 50  0001 C CNN
+F 2 "" H 5150 900 50  0000 C CNN
+F 3 "" H 5150 900 50  0000 C CNN
+	1    5150 900 
 	1    0    0    -1  
 $EndComp
-Text GLabel 5550 2800 0    60   Input ~ 0
+Text GLabel 4650 2850 0    60   Input ~ 0
 OLED_SDA
-Text GLabel 5550 2700 0    60   Input ~ 0
+Text GLabel 4650 2750 0    60   Input ~ 0
 OLED_SCL
 $Comp
 L +3.3V #PWR11
 U 1 1 576B9B60
-P 5750 2600
-F 0 "#PWR11" H 5750 2450 50  0001 C CNN
-F 1 "+3.3V" H 5750 2740 50  0001 C CNN
-F 2 "" H 5750 2600 50  0000 C CNN
-F 3 "" H 5750 2600 50  0000 C CNN
-	1    5750 2600
+P 4850 2650
+F 0 "#PWR11" H 4850 2500 50  0001 C CNN
+F 1 "+3.3V" H 4850 2790 50  0001 C CNN
+F 2 "" H 4850 2650 50  0000 C CNN
+F 3 "" H 4850 2650 50  0000 C CNN
+	1    4850 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR12
 U 1 1 576B9D6C
-P 5850 3900
-F 0 "#PWR12" H 5850 3650 50  0001 C CNN
-F 1 "GND" H 5850 3750 50  0001 C CNN
-F 2 "" H 5850 3900 50  0000 C CNN
-F 3 "" H 5850 3900 50  0000 C CNN
-	1    5850 3900
+P 4950 3950
+F 0 "#PWR12" H 4950 3700 50  0001 C CNN
+F 1 "GND" H 4950 3800 50  0001 C CNN
+F 2 "" H 4950 3950 50  0000 C CNN
+F 3 "" H 4950 3950 50  0000 C CNN
+	1    4950 3950
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_Small R11
 U 1 1 576BAD7F
-P 5950 2750
-F 0 "R11" V 5950 2850 50  0000 L CNN
-F 1 "10k" V 5950 2500 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 5950 4350 50  0001 C CNN
-F 3 "" H 5950 2750 50  0000 C CNN
-	1    5950 2750
+P 5050 2800
+F 0 "R11" V 5050 2900 50  0000 L CNN
+F 1 "10k" V 5050 2550 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 5050 4400 50  0001 C CNN
+F 3 "" H 5050 2800 50  0000 C CNN
+	1    5050 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L R_Small R10
 U 1 1 576BB1ED
-P 5950 2650
-F 0 "R10" V 5950 2750 50  0000 L CNN
-F 1 "10k" V 5950 2400 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 4350 2000 50  0000 C CNN
-F 3 "" H 5950 2650 50  0000 C CNN
-	1    5950 2650
+P 5050 2700
+F 0 "R10" V 5050 2800 50  0000 L CNN
+F 1 "10k" V 5050 2450 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 3450 2050 50  0000 C CNN
+F 3 "" H 5050 2700 50  0000 C CNN
+	1    5050 2700
 	0    1    1    0   
 $EndComp
 $Comp
@@ -428,78 +428,78 @@ Wifi Pants: \n    pin 27-->
 $Comp
 L GND #PWR6
 U 1 1 58333C64
-P 5400 1800
-F 0 "#PWR6" H 5400 1550 50  0001 C CNN
-F 1 "GND" H 5400 1650 50  0001 C CNN
-F 2 "" H 5400 1800 50  0000 C CNN
-F 3 "" H 5400 1800 50  0000 C CNN
-	1    5400 1800
+P 4500 1850
+F 0 "#PWR6" H 4500 1600 50  0001 C CNN
+F 1 "GND" H 4500 1700 50  0001 C CNN
+F 2 "" H 4500 1850 50  0000 C CNN
+F 3 "" H 4500 1850 50  0000 C CNN
+	1    4500 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR10
 U 1 1 58333EC0
-P 5600 1800
-F 0 "#PWR10" H 5600 1650 50  0001 C CNN
-F 1 "+3.3V" H 5600 1940 50  0001 C CNN
-F 2 "" H 5600 1800 50  0000 C CNN
-F 3 "" H 5600 1800 50  0000 C CNN
-	1    5600 1800
+P 4700 1850
+F 0 "#PWR10" H 4700 1700 50  0001 C CNN
+F 1 "+3.3V" H 4700 1990 50  0001 C CNN
+F 2 "" H 4700 1850 50  0000 C CNN
+F 3 "" H 4700 1850 50  0000 C CNN
+	1    4700 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C7
 U 1 1 58337245
-P 5450 2400
-F 0 "C7" H 5500 2350 50  0000 L CNN
-F 1 "0.1µF" H 5200 2350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" H 8050 2400 50  0001 C CNN
-F 3 "" H 5450 2400 50  0000 C CNN
-	1    5450 2400
+P 4550 2450
+F 0 "C7" H 4600 2400 50  0000 L CNN
+F 1 "0.1µF" H 4300 2400 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" H 7150 2450 50  0001 C CNN
+F 3 "" H 4550 2450 50  0000 C CNN
+	1    4550 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_Small R2
 U 1 1 583372D3
-P 5450 2200
-F 0 "R2" V 5350 2150 50  0000 L CNN
-F 1 "100k" V 5550 2100 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" H 2850 2200 50  0001 C CNN
-F 3 "" H 5450 2200 50  0000 C CNN
-	1    5450 2200
+P 4550 2250
+F 0 "R2" V 4450 2200 50  0000 L CNN
+F 1 "100k" V 4650 2150 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" H 1950 2250 50  0001 C CNN
+F 3 "" H 4550 2250 50  0000 C CNN
+	1    4550 2250
 	-1   0    0    1   
 $EndComp
 $Comp
 L R_Small R3
 U 1 1 58337469
-P 5700 2300
-F 0 "R3" V 5800 2300 50  0000 L CNN
-F 1 "100k" V 5600 2250 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 5700 4650 50  0001 C CNN
-F 3 "" H 5700 2300 50  0000 C CNN
-	1    5700 2300
+P 4800 2350
+F 0 "R3" V 4900 2350 50  0000 L CNN
+F 1 "100k" V 4700 2300 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 4800 4700 50  0001 C CNN
+F 3 "" H 4800 2350 50  0000 C CNN
+	1    4800 2350
 	0    1    1    0   
 $EndComp
 $Comp
 L +3.3V #PWR7
 U 1 1 58337E9C
-P 5450 2100
-F 0 "#PWR7" H 5450 1950 50  0001 C CNN
-F 1 "+3.3V" H 5450 2240 50  0001 C CNN
-F 2 "" H 5450 2100 50  0000 C CNN
-F 3 "" H 5450 2100 50  0000 C CNN
-	1    5450 2100
+P 4550 2150
+F 0 "#PWR7" H 4550 2000 50  0001 C CNN
+F 1 "+3.3V" H 4550 2290 50  0001 C CNN
+F 2 "" H 4550 2150 50  0000 C CNN
+F 3 "" H 4550 2150 50  0000 C CNN
+	1    4550 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR8
 U 1 1 58337F0D
-P 5450 2500
-F 0 "#PWR8" H 5450 2250 50  0001 C CNN
-F 1 "GND" H 5450 2350 50  0001 C CNN
-F 2 "" H 5450 2500 50  0000 C CNN
-F 3 "" H 5450 2500 50  0000 C CNN
-	1    5450 2500
+P 4550 2550
+F 0 "#PWR8" H 4550 2300 50  0001 C CNN
+F 1 "GND" H 4550 2400 50  0001 C CNN
+F 2 "" H 4550 2550 50  0000 C CNN
+F 3 "" H 4550 2550 50  0000 C CNN
+	1    4550 2550
 	1    0    0    -1  
 $EndComp
 Text GLabel 5950 6400 3    60   Input ~ 0
@@ -631,571 +631,480 @@ $EndComp
 $Comp
 L CONN_01X30 P2
 U 1 1 58700E5C
-P 6350 2450
-F 0 "P2" H 6350 4000 50  0000 C CNN
-F 1 "OLED_I2C" V 6450 2450 50  0000 C CNN
-F 2 "adafruit-oled:UG-2864HSWEG01_0.96IN_WRAPAROUND" V 6550 2450 50  0000 C CNN
-F 3 "" H 6350 2450 50  0000 C CNN
-	1    6350 2450
+P 5450 2500
+F 0 "P2" H 5450 4050 50  0000 C CNN
+F 1 "OLED_I2C" V 5550 2500 50  0000 C CNN
+F 2 "adafruit-oled:UG-2864HSWEG01_0.96IN_WRAPAROUND" V 5650 2500 50  0000 C CNN
+F 3 "" H 5450 2500 50  0000 C CNN
+	1    5450 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C1
 U 1 1 58702958
-P 5500 1500
-F 0 "C1" V 5550 1550 50  0000 L CNN
-F 1 "1µF" V 5450 1300 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 5500 -550 50  0001 C CNN
-F 3 "" H 5500 1500 50  0000 C CNN
-	1    5500 1500
+P 4600 1550
+F 0 "C1" V 4650 1600 50  0000 L CNN
+F 1 "1µF" V 4550 1350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 4600 -500 50  0001 C CNN
+F 3 "" H 4600 1550 50  0000 C CNN
+	1    4600 1550
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR5
 U 1 1 5870295E
-P 5400 1500
-F 0 "#PWR5" H 5400 1250 50  0001 C CNN
-F 1 "GND" H 5400 1350 50  0001 C CNN
-F 2 "" H 5400 1500 50  0000 C CNN
-F 3 "" H 5400 1500 50  0000 C CNN
-	1    5400 1500
+P 4500 1550
+F 0 "#PWR5" H 4500 1300 50  0001 C CNN
+F 1 "GND" H 4500 1400 50  0001 C CNN
+F 2 "" H 4500 1550 50  0000 C CNN
+F 3 "" H 4500 1550 50  0000 C CNN
+	1    4500 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR9
 U 1 1 58702964
-P 5600 1500
-F 0 "#PWR9" H 5600 1350 50  0001 C CNN
-F 1 "+3.3V" H 5600 1640 50  0001 C CNN
-F 2 "" H 5600 1500 50  0000 C CNN
-F 3 "" H 5600 1500 50  0000 C CNN
-	1    5600 1500
+P 4700 1550
+F 0 "#PWR9" H 4700 1400 50  0001 C CNN
+F 1 "+3.3V" H 4700 1690 50  0001 C CNN
+F 2 "" H 4700 1550 50  0000 C CNN
+F 3 "" H 4700 1550 50  0000 C CNN
+	1    4700 1550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 6150 1600
+NoConn ~ 5250 1650
 $Comp
 L GND #PWR13
 U 1 1 58702A61
-P 5900 1950
-F 0 "#PWR13" H 5900 1700 50  0001 C CNN
-F 1 "GND" H 5900 1800 50  0001 C CNN
-F 2 "" H 5900 1950 50  0000 C CNN
-F 3 "" H 5900 1950 50  0000 C CNN
-	1    5900 1950
+P 5000 2000
+F 0 "#PWR13" H 5000 1750 50  0001 C CNN
+F 1 "GND" H 5000 1850 50  0001 C CNN
+F 2 "" H 5000 2000 50  0000 C CNN
+F 3 "" H 5000 2000 50  0000 C CNN
+	1    5000 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR16
 U 1 1 58702DF8
-P 6050 2050
-F 0 "#PWR16" H 6050 1900 50  0001 C CNN
-F 1 "+3.3V" H 6050 2190 50  0001 C CNN
-F 2 "" H 6050 2050 50  0000 C CNN
-F 3 "" H 6050 2050 50  0000 C CNN
-	1    6050 2050
+P 5150 2100
+F 0 "#PWR16" H 5150 1950 50  0001 C CNN
+F 1 "+3.3V" H 5150 2240 50  0001 C CNN
+F 2 "" H 5150 2100 50  0000 C CNN
+F 3 "" H 5150 2100 50  0000 C CNN
+	1    5150 2100
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR15
 U 1 1 58702F8A
-P 6050 1650
-F 0 "#PWR15" H 6050 1400 50  0001 C CNN
-F 1 "GND" H 6050 1500 50  0001 C CNN
-F 2 "" H 6050 1650 50  0000 C CNN
-F 3 "" H 6050 1650 50  0000 C CNN
-	1    6050 1650
+P 5150 1700
+F 0 "#PWR15" H 5150 1450 50  0001 C CNN
+F 1 "GND" H 5150 1550 50  0001 C CNN
+F 2 "" H 5150 1700 50  0000 C CNN
+F 3 "" H 5150 1700 50  0000 C CNN
+	1    5150 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR17
 U 1 1 58705FA1
-P 6050 2400
-F 0 "#PWR17" H 6050 2150 50  0001 C CNN
-F 1 "GND" H 6050 2250 50  0001 C CNN
-F 2 "" H 6050 2400 50  0000 C CNN
-F 3 "" H 6050 2400 50  0000 C CNN
-	1    6050 2400
+P 5150 2450
+F 0 "#PWR17" H 5150 2200 50  0001 C CNN
+F 1 "GND" H 5150 2300 50  0001 C CNN
+F 2 "" H 5150 2450 50  0000 C CNN
+F 3 "" H 5150 2450 50  0000 C CNN
+	1    5150 2450
 	1    0    0    -1  
 $EndComp
-Text Notes 5150 3300 0    60   ~ 0
+Text Notes 4250 3350 0    60   ~ 0
 Switching to SPI4:\n - pull 11 down\n - disconnect 20
 $Comp
-L TDA8029 U?
-U 1 1 5880AAA0
-P 9250 2000
-F 0 "U?" H 9250 1900 60  0000 C CNN
-F 1 "TDA8029" H 9250 2100 60  0000 C CNN
-F 2 "" H 9250 2000 60  0001 C CNN
-F 3 "" H 9250 2000 60  0001 C CNN
-	1    9250 2000
-	0    -1   -1   0   
-$EndComp
-$Comp
-L C_Small C?
-U 1 1 5880B191
-P 7800 1900
-F 0 "C?" H 7810 1970 50  0000 L CNN
-F 1 "22pF" V 7750 1700 50  0000 L CNN
-F 2 "" H 7800 1900 50  0000 C CNN
-F 3 "" H 7800 1900 50  0000 C CNN
-	1    7800 1900
-	0    -1   -1   0   
-$EndComp
-$Comp
-L C_Small C?
-U 1 1 5880B335
-P 7800 1700
-F 0 "C?" H 7810 1770 50  0000 L CNN
-F 1 "22pF" V 7850 1500 50  0000 L CNN
-F 2 "" H 7800 1700 50  0000 C CNN
-F 3 "" H 7800 1700 50  0000 C CNN
-	1    7800 1700
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5880B3CD
-P 7700 2000
-F 0 "#PWR?" H 7700 1750 50  0001 C CNN
-F 1 "GND" H 7700 1850 50  0000 C CNN
-F 2 "" H 7700 2000 50  0000 C CNN
-F 3 "" H 7700 2000 50  0000 C CNN
-	1    7700 2000
-	1    0    0    -1  
-$EndComp
-$Comp
 L C_Small C?
 U 1 1 5880B4CE
-P 9850 1150
-F 0 "C?" H 9860 1220 50  0000 L CNN
-F 1 "220nF" H 9860 1070 50  0000 L CNN
-F 2 "" H 9850 1150 50  0000 C CNN
-F 3 "" H 9850 1150 50  0000 C CNN
-	1    9850 1150
-	0    -1   -1   0   
+P 10500 3150
+F 0 "C?" H 10510 3220 50  0000 L CNN
+F 1 "220nF" H 10510 3070 50  0000 L CNN
+F 2 "" H 10500 3150 50  0000 C CNN
+F 3 "" H 10500 3150 50  0000 C CNN
+	1    10500 3150
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880B97A
-P 9850 900
-F 0 "C?" H 9860 970 50  0000 L CNN
-F 1 "220nF" H 9860 820 50  0000 L CNN
-F 2 "" H 9850 900 50  0000 C CNN
-F 3 "" H 9850 900 50  0000 C CNN
-	1    9850 900 
-	0    -1   -1   0   
+P 10750 3150
+F 0 "C?" H 10760 3220 50  0000 L CNN
+F 1 "220nF" H 10760 3070 50  0000 L CNN
+F 2 "" H 10750 3150 50  0000 C CNN
+F 3 "" H 10750 3150 50  0000 C CNN
+	1    10750 3150
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BA0C
-P 10500 1450
-F 0 "C?" H 10510 1520 50  0000 L CNN
-F 1 "100nF" V 10400 1300 50  0000 L CNN
-F 2 "" H 10500 1450 50  0000 C CNN
-F 3 "" H 10500 1450 50  0000 C CNN
-	1    10500 1450
-	1    0    0    -1  
+P 10100 3800
+F 0 "C?" H 10110 3870 50  0000 L CNN
+F 1 "100nF" V 10000 3650 50  0000 L CNN
+F 2 "" H 10100 3800 50  0000 C CNN
+F 3 "" H 10100 3800 50  0000 C CNN
+	1    10100 3800
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BB0F
-P 10700 1450
-F 0 "C?" H 10710 1520 50  0000 L CNN
-F 1 "10µF" V 10800 1300 50  0000 L CNN
-F 2 "" H 10700 1450 50  0000 C CNN
-F 3 "" H 10700 1450 50  0000 C CNN
-	1    10700 1450
-	1    0    0    -1  
+P 10100 4000
+F 0 "C?" H 10110 4070 50  0000 L CNN
+F 1 "10µF" V 10200 3850 50  0000 L CNN
+F 2 "" H 10100 4000 50  0000 C CNN
+F 3 "" H 10100 4000 50  0000 C CNN
+	1    10100 4000
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BBA9
-P 10300 1950
-F 0 "C?" H 10310 2020 50  0000 L CNN
-F 1 "220nF" H 10310 1870 50  0000 L CNN
-F 2 "" H 10300 1950 50  0000 C CNN
-F 3 "" H 10300 1950 50  0000 C CNN
-	1    10300 1950
-	0    -1   -1   0   
+P 9700 3600
+F 0 "C?" H 9710 3670 50  0000 L CNN
+F 1 "220nF" H 9710 3520 50  0000 L CNN
+F 2 "" H 9700 3600 50  0000 C CNN
+F 3 "" H 9700 3600 50  0000 C CNN
+	1    9700 3600
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BC62
-P 10300 3300
-F 0 "C?" H 10310 3370 50  0000 L CNN
-F 1 "100pF" H 10310 3220 50  0000 L CNN
-F 2 "" H 10300 3300 50  0000 C CNN
-F 3 "" H 10300 3300 50  0000 C CNN
-	1    10300 3300
-	0    -1   -1   0   
+P 8350 3600
+F 0 "C?" H 8360 3670 50  0000 L CNN
+F 1 "100pF" H 8360 3520 50  0000 L CNN
+F 2 "" H 8350 3600 50  0000 C CNN
+F 3 "" H 8350 3600 50  0000 C CNN
+	1    8350 3600
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BE78
-P 10100 4000
-F 0 "C?" H 10110 4070 50  0000 L CNN
-F 1 "220nF" H 10110 3920 50  0000 L CNN
-F 2 "" H 10100 4000 50  0000 C CNN
-F 3 "" H 10100 4000 50  0000 C CNN
-	1    10100 4000
-	1    0    0    -1  
+P 7650 3400
+F 0 "C?" H 7660 3470 50  0000 L CNN
+F 1 "220nF" H 7660 3320 50  0000 L CNN
+F 2 "" H 7650 3400 50  0000 C CNN
+F 3 "" H 7650 3400 50  0000 C CNN
+	1    7650 3400
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880C0C1
-P 9400 2950
-F 0 "C?" H 9410 3020 50  0000 L CNN
-F 1 "22nF" H 9410 2870 50  0000 L CNN
-F 2 "" H 9400 2950 50  0000 C CNN
-F 3 "" H 9400 2950 50  0000 C CNN
-	1    9400 2950
-	1    0    0    -1  
+P 8700 2700
+F 0 "C?" V 8750 2750 50  0000 L CNN
+F 1 "22nF" V 8750 2500 50  0000 L CNN
+F 2 "" H 8700 2700 50  0000 C CNN
+F 3 "" H 8700 2700 50  0000 C CNN
+	1    8700 2700
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880C189
-P 8350 3050
-F 0 "C?" H 8360 3120 50  0000 L CNN
-F 1 "100nF" V 8250 2950 50  0000 L CNN
-F 2 "" H 8350 3050 50  0000 C CNN
-F 3 "" H 8350 3050 50  0000 C CNN
-	1    8350 3050
+P 8450 2200
+F 0 "C?" H 8460 2270 50  0000 L CNN
+F 1 "100nF" V 8350 2100 50  0000 L CNN
+F 2 "" H 8450 2200 50  0000 C CNN
+F 3 "" H 8450 2200 50  0000 C CNN
+	1    8450 2200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880C234
-P 8350 2850
-F 0 "C?" H 8360 2920 50  0000 L CNN
-F 1 "10µF" V 8250 2750 50  0000 L CNN
-F 2 "" H 8350 2850 50  0000 C CNN
-F 3 "" H 8350 2850 50  0000 C CNN
-	1    8350 2850
-	0    1    1    0   
-$EndComp
-$Comp
-L Crystal_Small Y?
-U 1 1 5880C2B0
-P 8050 1800
-F 0 "Y?" H 8050 1900 50  0000 C CNN
-F 1 "14.745MHz" H 8050 1700 50  0000 C CNN
-F 2 "" H 8050 1800 50  0000 C CNN
-F 3 "" H 8050 1800 50  0000 C CNN
-	1    8050 1800
+P 8450 1950
+F 0 "C?" H 8460 2020 50  0000 L CNN
+F 1 "10µF" V 8350 1850 50  0000 L CNN
+F 2 "" H 8450 1950 50  0000 C CNN
+F 3 "" H 8450 1950 50  0000 C CNN
+	1    8450 1950
 	0    -1   -1   0   
 $EndComp
-Text GLabel 8400 2250 0    60   Input ~ 0
+Text GLabel 9400 1700 1    60   Input ~ 0
 CARD_TX
-Text GLabel 8400 2350 0    60   Input ~ 0
+Text GLabel 9300 1700 1    60   Input ~ 0
 CARD_RX
-NoConn ~ 8400 2150
-NoConn ~ 8400 2050
+NoConn ~ 9500 1700
+NoConn ~ 9600 1700
 $Comp
 L GND #PWR?
 U 1 1 5880D50E
-P 8300 1500
-F 0 "#PWR?" H 8300 1250 50  0001 C CNN
-F 1 "GND" H 8300 1350 50  0000 C CNN
-F 2 "" H 8300 1500 50  0000 C CNN
-F 3 "" H 8300 1500 50  0000 C CNN
-	1    8300 1500
+P 10150 1700
+F 0 "#PWR?" H 10150 1450 50  0001 C CNN
+F 1 "GND" H 10150 1550 50  0000 C CNN
+F 2 "" H 10150 1700 50  0000 C CNN
+F 3 "" H 10150 1700 50  0000 C CNN
+	1    10150 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR?
 U 1 1 5880FFCE
-P 8450 2750
-F 0 "#PWR?" H 8450 2600 50  0001 C CNN
-F 1 "+3V3" H 8450 2890 50  0000 C CNN
-F 2 "" H 8450 2750 50  0000 C CNN
-F 3 "" H 8450 2750 50  0000 C CNN
-	1    8450 2750
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 58810A43
-P 9400 3050
-F 0 "#PWR?" H 9400 2800 50  0001 C CNN
-F 1 "GND" H 9400 2900 50  0000 C CNN
-F 2 "" H 9400 3050 50  0000 C CNN
-F 3 "" H 9400 3050 50  0000 C CNN
-	1    9400 3050
+P 8600 1950
+F 0 "#PWR?" H 8600 1800 50  0001 C CNN
+F 1 "+3V3" H 8600 2090 50  0001 C CNN
+F 2 "" H 8600 1950 50  0000 C CNN
+F 3 "" H 8600 1950 50  0000 C CNN
+	1    8600 1950
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR?
 U 1 1 588135B2
-P 9200 1150
-F 0 "#PWR?" H 9200 1000 50  0001 C CNN
-F 1 "+3V3" H 9200 1290 50  0000 C CNN
-F 2 "" H 9200 1150 50  0000 C CNN
-F 3 "" H 9200 1150 50  0000 C CNN
-	1    9200 1150
+P 10650 2500
+F 0 "#PWR?" H 10650 2350 50  0001 C CNN
+F 1 "+3V3" H 10650 2640 50  0000 C CNN
+F 2 "" H 10650 2500 50  0000 C CNN
+F 3 "" H 10650 2500 50  0000 C CNN
+	1    10650 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5881377E
-P 9200 750
-F 0 "#PWR?" H 9200 500 50  0001 C CNN
-F 1 "GND" H 9200 600 50  0000 C CNN
-F 2 "" H 9200 750 50  0000 C CNN
-F 3 "" H 9200 750 50  0000 C CNN
-	1    9200 750 
+P 10900 2600
+F 0 "#PWR?" H 10900 2350 50  0001 C CNN
+F 1 "GND" H 10900 2450 50  0000 C CNN
+F 2 "" H 10900 2600 50  0000 C CNN
+F 3 "" H 10900 2600 50  0000 C CNN
+	1    10900 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5881836B
-P 10400 1950
-F 0 "#PWR?" H 10400 1700 50  0001 C CNN
-F 1 "GND" H 10400 1800 50  0000 C CNN
-F 2 "" H 10400 1950 50  0000 C CNN
-F 3 "" H 10400 1950 50  0000 C CNN
-	1    10400 1950
-	0    -1   -1   0   
+P 9700 3700
+F 0 "#PWR?" H 9700 3450 50  0001 C CNN
+F 1 "GND" H 9700 3550 50  0000 C CNN
+F 2 "" H 9700 3700 50  0000 C CNN
+F 3 "" H 9700 3700 50  0000 C CNN
+	1    9700 3700
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5881F197
-P 8250 3200
-F 0 "#PWR?" H 8250 2950 50  0001 C CNN
-F 1 "GND" H 8250 3050 50  0000 C CNN
-F 2 "" H 8250 3200 50  0000 C CNN
-F 3 "" H 8250 3200 50  0000 C CNN
-	1    8250 3200
+P 8450 2550
+F 0 "#PWR?" H 8450 2300 50  0001 C CNN
+F 1 "GND" H 8450 2400 50  0001 C CNN
+F 2 "" H 8450 2550 50  0000 C CNN
+F 3 "" H 8450 2550 50  0000 C CNN
+	1    8450 2550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 9000 1150
-NoConn ~ 9100 1150
-NoConn ~ 9000 2900
-NoConn ~ 8900 1100
+NoConn ~ 10500 2300
+NoConn ~ 10500 2400
+NoConn ~ 8750 2300
+NoConn ~ 10550 2200
 $Comp
 L ISO7816 U?
 U 1 1 58821579
-P 9850 4600
-F 0 "U?" H 9850 5000 60  0000 C CNN
-F 1 "ISO7816" H 9850 4200 60  0000 C CNN
-F 2 "" H 9850 4700 60  0001 C CNN
-F 3 "" H 9850 4700 60  0001 C CNN
-	1    9850 4600
-	0    1    -1   0   
+P 7050 3150
+F 0 "U?" H 7050 3550 60  0000 C CNN
+F 1 "ISO7816" H 7050 2750 60  0000 C CNN
+F 2 "" H 7050 3250 60  0001 C CNN
+F 3 "" H 7050 3250 60  0001 C CNN
+	1    7050 3150
+	1    0    0    1   
 $EndComp
 $Comp
 L +3V3 #PWR?
 U 1 1 58821E3C
-P 9600 4200
-F 0 "#PWR?" H 9600 4050 50  0001 C CNN
-F 1 "+3V3" H 9600 4340 50  0000 C CNN
-F 2 "" H 9600 4200 50  0000 C CNN
-F 3 "" H 9600 4200 50  0000 C CNN
-	1    9600 4200
+P 7550 2900
+F 0 "#PWR?" H 7550 2750 50  0001 C CNN
+F 1 "+3V3" H 7550 3040 50  0001 C CNN
+F 2 "" H 7550 2900 50  0000 C CNN
+F 3 "" H 7550 2900 50  0000 C CNN
+	1    7550 2900
 	1    0    0    -1  
 $EndComp
-NoConn ~ 9800 4200
-NoConn ~ 9800 5000
+NoConn ~ 7450 3100
+NoConn ~ 6650 3100
 $Comp
 L R_Small R?
 U 1 1 58823E8F
-P 9500 3450
-F 0 "R?" H 9530 3470 50  0000 L CNN
-F 1 "180" H 9530 3410 50  0000 L CNN
-F 2 "" H 9500 3450 50  0000 C CNN
-F 3 "" H 9500 3450 50  0000 C CNN
-	1    9500 3450
-	-1   0    0    1   
+P 8200 2800
+F 0 "R?" H 8230 2820 50  0000 L CNN
+F 1 "180" H 8230 2760 50  0000 L CNN
+F 2 "" H 8200 2800 50  0000 C CNN
+F 3 "" H 8200 2800 50  0000 C CNN
+	1    8200 2800
+	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5882B77E
-P 9900 3600
-F 0 "C?" H 9910 3670 50  0000 L CNN
-F 1 "33pF" H 9910 3520 50  0000 L CNN
-F 2 "" H 9900 3600 50  0000 C CNN
-F 3 "" H 9900 3600 50  0000 C CNN
-	1    9900 3600
-	-1   0    0    1   
+P 8050 3200
+F 0 "C?" H 8060 3270 50  0000 L CNN
+F 1 "33pF" H 8060 3120 50  0000 L CNN
+F 2 "" H 8050 3200 50  0000 C CNN
+F 3 "" H 8050 3200 50  0000 C CNN
+	1    8050 3200
+	0    -1   -1   0   
 $EndComp
-Connection ~ 10100 3500
-Wire Wire Line
-	9900 3500 10100 3500
-Wire Wire Line
-	10550 3900 10100 3900
-Wire Wire Line
-	10550 5150 10550 3900
+Connection ~ 8150 3400
 Wire Wire Line
-	10100 5150 10550 5150
+	8150 3200 8150 3400
 Wire Wire Line
-	10100 5000 10100 5150
+	7750 3850 7750 3400
 Wire Wire Line
-	10100 3900 10100 2350
+	6500 3850 7750 3850
 Wire Wire Line
-	9700 3950 9700 4200
+	6500 3400 6500 3850
 Wire Wire Line
-	9600 3950 9700 3950
+	6650 3400 6500 3400
 Wire Wire Line
-	9600 2850 9600 3950
+	7750 3400 9300 3400
 Wire Wire Line
-	9500 3950 9350 3950
+	7700 3000 7450 3000
 Wire Wire Line
-	9500 3550 9500 3950
+	7700 2900 7700 3000
 Wire Wire Line
-	9500 2850 9500 3350
+	8800 2900 7700 2900
 Wire Wire Line
-	10100 2150 10650 2150
-Connection ~ 10650 4200
+	7700 2800 7700 2650
 Wire Wire Line
-	10100 4200 10650 4200
+	8100 2800 7700 2800
 Wire Wire Line
-	10000 5250 10000 5000
+	8800 2800 8300 2800
 Wire Wire Line
-	10650 5250 10000 5250
+	9500 3400 9500 3950
+Connection ~ 7450 3950
 Wire Wire Line
-	10650 2150 10650 5250
+	7450 3400 7450 3950
 Wire Wire Line
-	10100 4200 10100 4100
+	6400 3300 6650 3300
 Wire Wire Line
-	9900 3700 9900 4200
+	6400 3950 6400 3300
 Wire Wire Line
-	10450 3700 9900 3700
+	9500 3950 6400 3950
 Wire Wire Line
-	10450 2250 10450 3700
+	7450 3400 7550 3400
 Wire Wire Line
-	10100 2250 10450 2250
+	7950 3750 7950 3200
 Wire Wire Line
-	10000 3800 10000 4200
-Wire Wire Line
-	10550 3800 10000 3800
-Wire Wire Line
-	10550 2050 10550 3800
-Wire Wire Line
-	10100 2050 10550 2050
-Wire Wire Line
-	9900 5250 9900 5000
+	9400 3750 7950 3750
 Wire Wire Line
-	9350 5250 9900 5250
+	9400 3400 9400 3750
 Wire Wire Line
-	9350 3950 9350 5250
+	7850 3300 7450 3300
 Wire Wire Line
-	8250 3200 8250 2850
+	7850 3850 7850 3300
 Wire Wire Line
-	9200 3050 9400 3050
+	9600 3850 7850 3850
 Wire Wire Line
-	9200 2850 9200 3050
+	9600 3400 9600 3850
 Wire Wire Line
-	9000 2900 9000 2850
+	6400 3200 6650 3200
 Wire Wire Line
-	8900 1100 8900 1150
+	6400 2650 6400 3200
 Wire Wire Line
-	9100 3050 9100 2850
+	7700 2650 6400 2650
 Wire Wire Line
-	8450 3050 9100 3050
-Connection ~ 8250 3050
-Connection ~ 8450 2850
+	8600 2500 8600 2700
 Wire Wire Line
-	8450 2750 8450 3050
+	8300 2500 8800 2500
 Wire Wire Line
-	8450 2850 8900 2850
+	8750 2300 8800 2300
 Wire Wire Line
-	9300 750  9200 750 
+	10550 2200 10500 2200
 Wire Wire Line
-	8400 1500 8300 1500
+	8600 2400 8800 2400
 Wire Wire Line
-	7700 1700 7700 2000
-Connection ~ 7700 1900
-Connection ~ 10500 1650
+	9700 3400 9700 3500
 Wire Wire Line
-	10100 1950 10200 1950
+	10900 2600 10500 2600
 Wire Wire Line
-	9300 750  9300 1150
+	10750 3600 9800 3600
 Wire Wire Line
-	10300 900  10300 1850
+	10750 2700 10500 2700
 Wire Wire Line
-	9400 900  9400 1150
+	10750 3250 10750 3600
 Wire Wire Line
-	9950 900  10300 900 
+	10750 3050 10750 2700
 Wire Wire Line
-	9750 900  9400 900 
+	9800 3600 9800 3400
 Wire Wire Line
-	10300 1850 10100 1850
+	10500 3500 10500 3250
 Wire Wire Line
-	10200 1150 9950 1150
+	10500 2900 10500 3050
 Wire Wire Line
-	9600 1150 9750 1150
+	9900 3500 10500 3500
 Wire Wire Line
-	10200 1750 10200 1150
+	9900 3400 9900 3500
 Wire Wire Line
-	10100 1750 10200 1750
+	10000 1700 10150 1700
 Wire Wire Line
-	8400 1650 8400 1500
-Connection ~ 8050 1900
+	9900 1550 10000 1550
 Wire Wire Line
-	8250 1700 7900 1700
+	9900 1700 9900 1550
 Wire Wire Line
-	8250 1750 8250 1700
+	9700 1550 9800 1550
 Wire Wire Line
-	8400 1750 8250 1750
+	9800 1550 9800 1700
 Wire Wire Line
-	8250 1900 7900 1900
+	5150 2450 5250 2450
 Wire Wire Line
-	8250 1850 8250 1900
+	5150 2950 5250 2950
+Connection ~ 5150 2850
 Wire Wire Line
-	8400 1850 8250 1850
+	5150 2800 5150 2950
+Connection ~ 5150 2750
 Wire Wire Line
-	6050 2400 6150 2400
+	5150 2700 5150 2750
 Wire Wire Line
-	6050 2900 6150 2900
-Connection ~ 6050 2800
+	5250 2350 4900 2350
 Wire Wire Line
-	6050 2750 6050 2900
-Connection ~ 6050 2700
+	4950 3950 5250 3950
 Wire Wire Line
-	6050 2650 6050 2700
+	4950 3550 4950 3950
 Wire Wire Line
-	6150 2300 5800 2300
+	5250 1700 5150 1700
 Wire Wire Line
-	5850 3900 6150 3900
+	5250 1750 5250 1700
+Connection ~ 5100 1950
 Wire Wire Line
-	5850 3500 5850 3900
+	5000 1950 5000 2000
 Wire Wire Line
-	6150 1650 6050 1650
+	5100 2150 5100 1950
 Wire Wire Line
-	6150 1700 6150 1650
-Connection ~ 6000 1900
+	5250 2100 5250 2050
 Wire Wire Line
-	5900 1900 5900 1950
+	5150 2100 5250 2100
 Wire Wire Line
-	6000 2100 6000 1900
+	5000 1950 5250 1950
 Wire Wire Line
-	6150 2050 6150 2000
+	5100 2150 5250 2150
 Wire Wire Line
-	6050 2050 6150 2050
+	4700 1550 5250 1550
 Wire Wire Line
-	5900 1900 6150 1900
+	5250 900  5150 900 
 Wire Wire Line
-	6000 2100 6150 2100
+	5250 1050 5250 900 
+Connection ~ 4950 3750
 Wire Wire Line
-	5600 1500 6150 1500
+	5050 3750 4950 3750
+Connection ~ 4950 3650
 Wire Wire Line
-	6150 850  6050 850 
+	5050 3650 4950 3650
+Connection ~ 4950 3850
 Wire Wire Line
-	6150 1000 6150 850 
-Connection ~ 5850 3700
+	5050 3550 4950 3550
 Wire Wire Line
-	5950 3700 5850 3700
-Connection ~ 5850 3600
+	5250 2750 4650 2750
 Wire Wire Line
-	5950 3600 5850 3600
-Connection ~ 5850 3800
+	5250 2850 4650 2850
 Wire Wire Line
-	5950 3500 5850 3500
-Wire Wire Line
-	6150 2700 5550 2700
-Wire Wire Line
-	6150 2800 5550 2800
-Wire Wire Line
-	5600 1800 6150 1800
+	4700 1850 5250 1850
 Connection ~ 2700 6100
 Connection ~ 2250 6100
 Connection ~ 1800 6100
@@ -1204,15 +1113,15 @@ Connection ~ 2000 5900
 Connection ~ 2000 5500
 Connection ~ 2000 5100
 Wire Wire Line
-	5850 3800 6150 3800
+	4950 3850 5250 3850
 Wire Wire Line
-	5950 1400 5950 1300
+	5050 1450 5050 1350
 Wire Wire Line
-	6150 1400 5950 1400
+	5250 1450 5050 1450
 Wire Wire Line
-	5950 1200 5950 1100
+	5050 1250 5050 1150
 Wire Wire Line
-	6150 1200 5950 1200
+	5250 1250 5050 1250
 Connection ~ 2900 6300
 Connection ~ 2450 6300
 Connection ~ 2450 5900
@@ -1278,76 +1187,285 @@ Wire Wire Line
 Wire Wire Line
 	1750 1500 1000 1500
 Wire Wire Line
-	5850 2600 5850 2750
+	4950 2650 4950 2800
 Wire Wire Line
-	5750 2600 5850 2600
-Connection ~ 5850 2650
+	4850 2650 4950 2650
+Connection ~ 4950 2700
 Wire Wire Line
-	5600 2300 5450 2300
+	4700 2350 4550 2350
 Wire Wire Line
 	4600 5700 4800 5700
-Connection ~ 8050 1700
 Wire Wire Line
-	10400 3300 10550 3300
-Connection ~ 10550 3300
+	8350 3700 8350 3850
+Connection ~ 8350 3850
 Wire Wire Line
-	10200 3300 10100 3300
-Connection ~ 10100 3300
+	8350 3500 8350 3400
+Connection ~ 8350 3400
 $Comp
 L C_Small C?
 U 1 1 588317FD
-P 10300 2800
-F 0 "C?" H 10310 2870 50  0000 L CNN
-F 1 "100pF" H 10310 2720 50  0000 L CNN
-F 2 "" H 10300 2800 50  0000 C CNN
-F 3 "" H 10300 2800 50  0000 C CNN
-	1    10300 2800
-	0    -1   -1   0   
+P 8850 3600
+F 0 "C?" H 8860 3670 50  0000 L CNN
+F 1 "100pF" H 8860 3520 50  0000 L CNN
+F 2 "" H 8850 3600 50  0000 C CNN
+F 3 "" H 8850 3600 50  0000 C CNN
+	1    8850 3600
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10200 2800 10100 2800
-Connection ~ 10100 2800
+	8850 3500 8850 3400
+Connection ~ 8850 3400
 Wire Wire Line
-	10400 2800 10650 2800
-Connection ~ 10650 2800
+	8850 3700 8850 3950
+Connection ~ 8850 3950
+$Comp
+L GND #PWR?
+U 1 1 58833208
+P 10000 4200
+F 0 "#PWR?" H 10000 3950 50  0001 C CNN
+F 1 "GND" H 10000 4050 50  0000 C CNN
+F 2 "" H 10000 4200 50  0000 C CNN
+F 3 "" H 10000 4200 50  0000 C CNN
+	1    10000 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 58833391
+P 10200 3400
+F 0 "#PWR?" H 10200 3250 50  0001 C CNN
+F 1 "+3V3" H 10200 3540 50  0000 C CNN
+F 2 "" H 10200 3400 50  0000 C CNN
+F 3 "" H 10200 3400 50  0000 C CNN
+	1    10200 3400
+	1    0    0    -1  
+$EndComp
+Text Notes 6450 4300 0    60   ~ 0
+http://www.nxp.com/documents/application_note/AN10207.pdf\nhttp://www.nxp.com/documents/data_sheet/TDA8029.pdf
+Text Notes 7000 2000 0    60   ~ 0
+TODO: less Caps?
+Wire Notes Line
+	6900 1850 6900 2100
+Wire Notes Line
+	6900 2100 7900 2100
+Wire Notes Line
+	7900 2100 7900 1800
+Wire Notes Line
+	7900 1800 6900 1800
+Wire Notes Line
+	6900 1800 6900 1900
+$Comp
+L GND #PWR?
+U 1 1 58839D11
+P 9300 3400
+F 0 "#PWR?" H 9300 3150 50  0001 C CNN
+F 1 "GND" H 9300 3250 50  0000 C CNN
+F 2 "" H 9300 3400 50  0000 C CNN
+F 3 "" H 9300 3400 50  0000 C CNN
+	1    9300 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Crystal Y?
+U 1 1 58839E8A
+P 9850 1300
+F 0 "Y?" H 9850 1450 50  0000 C CNN
+F 1 "14.745MHz" H 9850 1150 50  0000 C CNN
+F 2 "" H 9850 1300 50  0000 C CNN
+F 3 "" H 9850 1300 50  0000 C CNN
+	1    9850 1300
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	9500 1150 9500 1000
+	9700 1300 9700 1550
 Wire Wire Line
-	9500 1000 10600 1000
+	10000 1550 10000 1300
+$Comp
+L C_Small C?
+U 1 1 5883A764
+P 10000 1200
+F 0 "C?" H 10010 1270 50  0000 L CNN
+F 1 "22pF" H 10010 1120 50  0000 L CNN
+F 2 "" H 10000 1200 50  0000 C CNN
+F 3 "" H 10000 1200 50  0000 C CNN
+	1    10000 1200
+	1    0    0    -1  
+$EndComp
+$Comp
+L C_Small C?
+U 1 1 5883A85B
+P 9700 1200
+F 0 "C?" H 9710 1270 50  0000 L CNN
+F 1 "22pF" H 9710 1120 50  0000 L CNN
+F 2 "" H 9700 1200 50  0000 C CNN
+F 3 "" H 9700 1200 50  0000 C CNN
+	1    9700 1200
+	-1   0    0    -1  
+$EndComp
 $Comp
 L GND #PWR?
-U 1 1 58833208
-P 10600 1000
-F 0 "#PWR?" H 10600 750 50  0001 C CNN
-F 1 "GND" H 10600 850 50  0000 C CNN
-F 2 "" H 10600 1000 50  0000 C CNN
-F 3 "" H 10600 1000 50  0000 C CNN
-	1    10600 1000
+U 1 1 5883AC0F
+P 9850 900
+F 0 "#PWR?" H 9850 650 50  0001 C CNN
+F 1 "GND" H 9850 750 50  0000 C CNN
+F 2 "" H 9850 900 50  0000 C CNN
+F 3 "" H 9850 900 50  0000 C CNN
+	1    9850 900 
 	1    0    0    -1  
 $EndComp
-Connection ~ 10500 1000
-Connection ~ 10700 1650
 Wire Wire Line
-	10500 1550 10500 1650
+	9700 1100 9700 900 
 Wire Wire Line
-	10700 1550 10700 1650
+	9700 900  10000 900 
 Wire Wire Line
-	10700 1350 10500 1350
+	10000 900  10000 1100
+Connection ~ 9850 900 
 Wire Wire Line
-	10500 1350 10500 1000
+	10500 2500 10650 2500
+$Comp
+L GND #PWR?
+U 1 1 5883C802
+P 10650 2800
+F 0 "#PWR?" H 10650 2550 50  0001 C CNN
+F 1 "GND" H 10650 2650 50  0000 C CNN
+F 2 "" H 10650 2800 50  0000 C CNN
+F 3 "" H 10650 2800 50  0000 C CNN
+	1    10650 2800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10650 2800 10500 2800
+Wire Wire Line
+	10200 3400 10200 4000
+Connection ~ 10200 3800
+Wire Wire Line
+	10000 3400 10200 3400
+Wire Wire Line
+	10000 3800 10000 4200
+Connection ~ 10000 4000
+$Comp
+L SW_PUSH_SMALL SW?
+U 1 1 5883F21C
+P 9600 1600
+F 0 "SW?" H 9550 1600 50  0001 C CNN
+F 1 "SW_PUSH_SMALL" H 9600 1521 50  0001 C CNN
+F 2 "" H 9600 1600 50  0000 C CNN
+F 3 "" H 9600 1600 50  0000 C CNN
+	1    9600 1600
+	1    0    0    -1  
+$EndComp
 $Comp
 L +3V3 #PWR?
-U 1 1 58833391
-P 11000 1650
-F 0 "#PWR?" H 11000 1500 50  0001 C CNN
-F 1 "+3V3" H 11000 1790 50  0000 C CNN
-F 2 "" H 11000 1650 50  0000 C CNN
-F 3 "" H 11000 1650 50  0000 C CNN
-	1    11000 1650
+U 1 1 58840082
+P 9500 1500
+F 0 "#PWR?" H 9500 1350 50  0001 C CNN
+F 1 "+3V3" H 9500 1640 50  0001 C CNN
+F 2 "" H 9500 1500 50  0000 C CNN
+F 3 "" H 9500 1500 50  0000 C CNN
+	1    9500 1500
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 58843822
+P 8800 2200
+F 0 "#PWR?" H 8800 2050 50  0001 C CNN
+F 1 "+3V3" H 8800 2340 50  0001 C CNN
+F 2 "" H 8800 2200 50  0000 C CNN
+F 3 "" H 8800 2200 50  0000 C CNN
+	1    8800 2200
+	1    0    0    -1  
+$EndComp
+$Comp
+L TDA8029 U?
+U 1 1 5880AAA0
+P 9650 2550
+F 0 "U?" H 9650 2450 60  0000 C CNN
+F 1 "TDA8029" H 9650 2650 60  0000 C CNN
+F 2 "" H 9650 2550 60  0001 C CNN
+F 3 "" H 9650 2550 60  0001 C CNN
+	1    9650 2550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10100 1650 11000 1650
-Text Notes 11000 5200 1    60   ~ 0
-http://www.nxp.com/documents/application_note/AN10207.pdf\nhttp://www.nxp.com/documents/data_sheet/TDA8029.pdf
+	8600 1950 8600 2400
+Connection ~ 8600 2200
+Connection ~ 8300 2200
+Connection ~ 8300 2500
+Connection ~ 8600 2500
+Wire Wire Line
+	8800 2600 8600 2600
+Connection ~ 8600 2600
+Wire Wire Line
+	7450 2900 7550 2900
+Wire Notes Line
+	8250 3500 8250 3700
+Wire Notes Line
+	8250 3700 8450 3700
+Wire Notes Line
+	8450 3700 8450 3500
+Wire Notes Line
+	8450 3500 8250 3500
+$Comp
+L R_Small R?
+U 1 1 5884B8AE
+P 7700 3200
+F 0 "R?" H 7730 3220 50  0000 L CNN
+F 1 "100" H 7730 3160 50  0000 L CNN
+F 2 "" H 7700 3200 50  0000 C CNN
+F 3 "" H 7700 3200 50  0000 C CNN
+	1    7700 3200
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	7450 3200 7600 3200
+Wire Wire Line
+	7950 3200 7800 3200
+Wire Notes Line
+	8750 3500 8750 3700
+Wire Notes Line
+	8750 3700 8950 3700
+Wire Notes Line
+	8950 3700 8950 3500
+Wire Notes Line
+	8950 3500 8750 3500
+Wire Notes Line
+	8000 3300 8100 3300
+Wire Notes Line
+	8100 3300 8100 3100
+Wire Notes Line
+	8100 3100 8000 3100
+Wire Notes Line
+	8000 3100 8000 3300
+Wire Notes Line
+	7600 3250 7600 3500
+Wire Notes Line
+	7600 3500 7700 3500
+Wire Notes Line
+	7700 3500 7700 3250
+Wire Notes Line
+	7700 3250 7600 3250
+Wire Notes Line
+	6150 650  6150 4550
+Wire Notes Line
+	6150 4550 11100 4550
+Wire Notes Line
+	11100 4550 11100 650 
+Wire Notes Line
+	11100 650  6150 650 
+Text Notes 6400 900  0    60   ~ 0
+No Place on main PCB - has to go on another one
+Wire Wire Line
+	8350 1950 8300 1950
+Wire Wire Line
+	8550 1950 8600 1950
+Wire Wire Line
+	8550 2200 8600 2200
+Wire Wire Line
+	8350 2200 8300 2200
+Wire Wire Line
+	8450 2550 8450 2500
+Connection ~ 8450 2500
+Wire Wire Line
+	8300 1950 8300 2500
 $EndSCHEMATC
diff --git a/kicad/hardpass-pcb/hardpass-pcb.sch b/kicad/hardpass-pcb/hardpass-pcb.sch
index 39098ab..b2af93d 100644
--- a/kicad/hardpass-pcb/hardpass-pcb.sch
+++ b/kicad/hardpass-pcb/hardpass-pcb.sch
@@ -277,126 +277,126 @@ ROW_4
 $Comp
 L C_Small C6
 U 1 1 576AB858
-P 6050 1100
-F 0 "C6" V 6100 1150 50  0000 L CNN
-F 1 "1µF" H 6050 950 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 5900 350 50  0000 C CNN
-F 3 "" H 6050 1100 50  0000 C CNN
-	1    6050 1100
+P 5150 1150
+F 0 "C6" V 5200 1200 50  0000 L CNN
+F 1 "1µF" H 5150 1000 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5000 400 50  0000 C CNN
+F 3 "" H 5150 1150 50  0000 C CNN
+	1    5150 1150
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C5
 U 1 1 576AB9B6
-P 6050 1300
-F 0 "C5" V 6100 1350 50  0000 L CNN
-F 1 "1µF" H 6050 1150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 6050 2800 50  0001 C CNN
-F 3 "" H 6050 1300 50  0000 C CNN
-	1    6050 1300
+P 5150 1350
+F 0 "C5" V 5200 1400 50  0000 L CNN
+F 1 "1µF" H 5150 1200 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5150 2850 50  0001 C CNN
+F 3 "" H 5150 1350 50  0000 C CNN
+	1    5150 1350
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C2
 U 1 1 576ABF65
-P 5500 1800
-F 0 "C2" V 5550 1850 50  0000 L CNN
-F 1 "1µF" V 5450 1600 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 5500 -250 50  0001 C CNN
-F 3 "" H 5500 1800 50  0000 C CNN
-	1    5500 1800
+P 4600 1850
+F 0 "C2" V 4650 1900 50  0000 L CNN
+F 1 "1µF" V 4550 1650 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 4600 -200 50  0001 C CNN
+F 3 "" H 4600 1850 50  0000 C CNN
+	1    4600 1850
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C3
 U 1 1 576AC79A
-P 6050 3700
-F 0 "C3" V 6100 3750 50  0000 L CNN
-F 1 "2.2µF" V 6100 3450 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 6050 5200 50  0001 C CNN
-F 3 "" H 6050 3700 50  0000 C CNN
-	1    6050 3700
+P 5150 3750
+F 0 "C3" V 5200 3800 50  0000 L CNN
+F 1 "2.2µF" V 5200 3500 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5150 5250 50  0001 C CNN
+F 3 "" H 5150 3750 50  0000 C CNN
+	1    5150 3750
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C4
 U 1 1 576ACF95
-P 6050 3600
-F 0 "C4" V 6100 3650 50  0000 L CNN
-F 1 "4.7µF" V 6100 3350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 6050 5100 50  0001 C CNN
-F 3 "" H 6050 3600 50  0000 C CNN
-	1    6050 3600
+P 5150 3650
+F 0 "C4" V 5200 3700 50  0000 L CNN
+F 1 "4.7µF" V 5200 3400 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 5150 5150 50  0001 C CNN
+F 3 "" H 5150 3650 50  0000 C CNN
+	1    5150 3650
 	0    1    1    0   
 $EndComp
 $Comp
 L R_Small R1
 U 1 1 576AE193
-P 6050 3500
-F 0 "R1" V 6100 3600 50  0000 L CNN
-F 1 "390k" V 6100 3250 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 6050 5000 50  0001 C CNN
-F 3 "" H 6050 3500 50  0000 C CNN
-	1    6050 3500
+P 5150 3550
+F 0 "R1" V 5200 3650 50  0000 L CNN
+F 1 "390k" V 5200 3300 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 5150 5050 50  0001 C CNN
+F 3 "" H 5150 3550 50  0000 C CNN
+	1    5150 3550
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR14
 U 1 1 576AFDF4
-P 6050 850
-F 0 "#PWR14" H 6050 600 50  0001 C CNN
-F 1 "GND" H 6050 700 50  0001 C CNN
-F 2 "" H 6050 850 50  0000 C CNN
-F 3 "" H 6050 850 50  0000 C CNN
-	1    6050 850 
+P 5150 900
+F 0 "#PWR14" H 5150 650 50  0001 C CNN
+F 1 "GND" H 5150 750 50  0001 C CNN
+F 2 "" H 5150 900 50  0000 C CNN
+F 3 "" H 5150 900 50  0000 C CNN
+	1    5150 900 
 	1    0    0    -1  
 $EndComp
-Text GLabel 5550 2800 0    60   Input ~ 0
+Text GLabel 4650 2850 0    60   Input ~ 0
 OLED_SDA
-Text GLabel 5550 2700 0    60   Input ~ 0
+Text GLabel 4650 2750 0    60   Input ~ 0
 OLED_SCL
 $Comp
 L +3.3V #PWR11
 U 1 1 576B9B60
-P 5750 2600
-F 0 "#PWR11" H 5750 2450 50  0001 C CNN
-F 1 "+3.3V" H 5750 2740 50  0001 C CNN
-F 2 "" H 5750 2600 50  0000 C CNN
-F 3 "" H 5750 2600 50  0000 C CNN
-	1    5750 2600
+P 4850 2650
+F 0 "#PWR11" H 4850 2500 50  0001 C CNN
+F 1 "+3.3V" H 4850 2790 50  0001 C CNN
+F 2 "" H 4850 2650 50  0000 C CNN
+F 3 "" H 4850 2650 50  0000 C CNN
+	1    4850 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR12
 U 1 1 576B9D6C
-P 5850 3900
-F 0 "#PWR12" H 5850 3650 50  0001 C CNN
-F 1 "GND" H 5850 3750 50  0001 C CNN
-F 2 "" H 5850 3900 50  0000 C CNN
-F 3 "" H 5850 3900 50  0000 C CNN
-	1    5850 3900
+P 4950 3950
+F 0 "#PWR12" H 4950 3700 50  0001 C CNN
+F 1 "GND" H 4950 3800 50  0001 C CNN
+F 2 "" H 4950 3950 50  0000 C CNN
+F 3 "" H 4950 3950 50  0000 C CNN
+	1    4950 3950
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_Small R11
 U 1 1 576BAD7F
-P 5950 2750
-F 0 "R11" V 5950 2850 50  0000 L CNN
-F 1 "10k" V 5950 2500 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 5950 4350 50  0001 C CNN
-F 3 "" H 5950 2750 50  0000 C CNN
-	1    5950 2750
+P 5050 2800
+F 0 "R11" V 5050 2900 50  0000 L CNN
+F 1 "10k" V 5050 2550 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 5050 4400 50  0001 C CNN
+F 3 "" H 5050 2800 50  0000 C CNN
+	1    5050 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L R_Small R10
 U 1 1 576BB1ED
-P 5950 2650
-F 0 "R10" V 5950 2750 50  0000 L CNN
-F 1 "10k" V 5950 2400 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 4350 2000 50  0000 C CNN
-F 3 "" H 5950 2650 50  0000 C CNN
-	1    5950 2650
+P 5050 2700
+F 0 "R10" V 5050 2800 50  0000 L CNN
+F 1 "10k" V 5050 2450 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 3450 2050 50  0000 C CNN
+F 3 "" H 5050 2700 50  0000 C CNN
+	1    5050 2700
 	0    1    1    0   
 $EndComp
 $Comp
@@ -428,78 +428,78 @@ Wifi Pants: \n    pin 27-->
 $Comp
 L GND #PWR6
 U 1 1 58333C64
-P 5400 1800
-F 0 "#PWR6" H 5400 1550 50  0001 C CNN
-F 1 "GND" H 5400 1650 50  0001 C CNN
-F 2 "" H 5400 1800 50  0000 C CNN
-F 3 "" H 5400 1800 50  0000 C CNN
-	1    5400 1800
+P 4500 1850
+F 0 "#PWR6" H 4500 1600 50  0001 C CNN
+F 1 "GND" H 4500 1700 50  0001 C CNN
+F 2 "" H 4500 1850 50  0000 C CNN
+F 3 "" H 4500 1850 50  0000 C CNN
+	1    4500 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR10
 U 1 1 58333EC0
-P 5600 1800
-F 0 "#PWR10" H 5600 1650 50  0001 C CNN
-F 1 "+3.3V" H 5600 1940 50  0001 C CNN
-F 2 "" H 5600 1800 50  0000 C CNN
-F 3 "" H 5600 1800 50  0000 C CNN
-	1    5600 1800
+P 4700 1850
+F 0 "#PWR10" H 4700 1700 50  0001 C CNN
+F 1 "+3.3V" H 4700 1990 50  0001 C CNN
+F 2 "" H 4700 1850 50  0000 C CNN
+F 3 "" H 4700 1850 50  0000 C CNN
+	1    4700 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C7
 U 1 1 58337245
-P 5450 2400
-F 0 "C7" H 5500 2350 50  0000 L CNN
-F 1 "0.1µF" H 5200 2350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" H 8050 2400 50  0001 C CNN
-F 3 "" H 5450 2400 50  0000 C CNN
-	1    5450 2400
+P 4550 2450
+F 0 "C7" H 4600 2400 50  0000 L CNN
+F 1 "0.1µF" H 4300 2400 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" H 7150 2450 50  0001 C CNN
+F 3 "" H 4550 2450 50  0000 C CNN
+	1    4550 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_Small R2
 U 1 1 583372D3
-P 5450 2200
-F 0 "R2" V 5350 2150 50  0000 L CNN
-F 1 "100k" V 5550 2100 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" H 2850 2200 50  0001 C CNN
-F 3 "" H 5450 2200 50  0000 C CNN
-	1    5450 2200
+P 4550 2250
+F 0 "R2" V 4450 2200 50  0000 L CNN
+F 1 "100k" V 4650 2150 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" H 1950 2250 50  0001 C CNN
+F 3 "" H 4550 2250 50  0000 C CNN
+	1    4550 2250
 	-1   0    0    1   
 $EndComp
 $Comp
 L R_Small R3
 U 1 1 58337469
-P 5700 2300
-F 0 "R3" V 5800 2300 50  0000 L CNN
-F 1 "100k" V 5600 2250 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206" V 5700 4650 50  0001 C CNN
-F 3 "" H 5700 2300 50  0000 C CNN
-	1    5700 2300
+P 4800 2350
+F 0 "R3" V 4900 2350 50  0000 L CNN
+F 1 "100k" V 4700 2300 50  0000 L CNN
+F 2 "Resistors_SMD:R_1206" V 4800 4700 50  0001 C CNN
+F 3 "" H 4800 2350 50  0000 C CNN
+	1    4800 2350
 	0    1    1    0   
 $EndComp
 $Comp
 L +3.3V #PWR7
 U 1 1 58337E9C
-P 5450 2100
-F 0 "#PWR7" H 5450 1950 50  0001 C CNN
-F 1 "+3.3V" H 5450 2240 50  0001 C CNN
-F 2 "" H 5450 2100 50  0000 C CNN
-F 3 "" H 5450 2100 50  0000 C CNN
-	1    5450 2100
+P 4550 2150
+F 0 "#PWR7" H 4550 2000 50  0001 C CNN
+F 1 "+3.3V" H 4550 2290 50  0001 C CNN
+F 2 "" H 4550 2150 50  0000 C CNN
+F 3 "" H 4550 2150 50  0000 C CNN
+	1    4550 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR8
 U 1 1 58337F0D
-P 5450 2500
-F 0 "#PWR8" H 5450 2250 50  0001 C CNN
-F 1 "GND" H 5450 2350 50  0001 C CNN
-F 2 "" H 5450 2500 50  0000 C CNN
-F 3 "" H 5450 2500 50  0000 C CNN
-	1    5450 2500
+P 4550 2550
+F 0 "#PWR8" H 4550 2300 50  0001 C CNN
+F 1 "GND" H 4550 2400 50  0001 C CNN
+F 2 "" H 4550 2550 50  0000 C CNN
+F 3 "" H 4550 2550 50  0000 C CNN
+	1    4550 2550
 	1    0    0    -1  
 $EndComp
 Text GLabel 5950 6400 3    60   Input ~ 0
@@ -631,571 +631,480 @@ $EndComp
 $Comp
 L CONN_01X30 P2
 U 1 1 58700E5C
-P 6350 2450
-F 0 "P2" H 6350 4000 50  0000 C CNN
-F 1 "OLED_I2C" V 6450 2450 50  0000 C CNN
-F 2 "adafruit-oled:UG-2864HSWEG01_0.96IN_WRAPAROUND" V 6550 2450 50  0000 C CNN
-F 3 "" H 6350 2450 50  0000 C CNN
-	1    6350 2450
+P 5450 2500
+F 0 "P2" H 5450 4050 50  0000 C CNN
+F 1 "OLED_I2C" V 5550 2500 50  0000 C CNN
+F 2 "adafruit-oled:UG-2864HSWEG01_0.96IN_WRAPAROUND" V 5650 2500 50  0000 C CNN
+F 3 "" H 5450 2500 50  0000 C CNN
+	1    5450 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C1
 U 1 1 58702958
-P 5500 1500
-F 0 "C1" V 5550 1550 50  0000 L CNN
-F 1 "1µF" V 5450 1300 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1206" V 5500 -550 50  0001 C CNN
-F 3 "" H 5500 1500 50  0000 C CNN
-	1    5500 1500
+P 4600 1550
+F 0 "C1" V 4650 1600 50  0000 L CNN
+F 1 "1µF" V 4550 1350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" V 4600 -500 50  0001 C CNN
+F 3 "" H 4600 1550 50  0000 C CNN
+	1    4600 1550
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR5
 U 1 1 5870295E
-P 5400 1500
-F 0 "#PWR5" H 5400 1250 50  0001 C CNN
-F 1 "GND" H 5400 1350 50  0001 C CNN
-F 2 "" H 5400 1500 50  0000 C CNN
-F 3 "" H 5400 1500 50  0000 C CNN
-	1    5400 1500
+P 4500 1550
+F 0 "#PWR5" H 4500 1300 50  0001 C CNN
+F 1 "GND" H 4500 1400 50  0001 C CNN
+F 2 "" H 4500 1550 50  0000 C CNN
+F 3 "" H 4500 1550 50  0000 C CNN
+	1    4500 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR9
 U 1 1 58702964
-P 5600 1500
-F 0 "#PWR9" H 5600 1350 50  0001 C CNN
-F 1 "+3.3V" H 5600 1640 50  0001 C CNN
-F 2 "" H 5600 1500 50  0000 C CNN
-F 3 "" H 5600 1500 50  0000 C CNN
-	1    5600 1500
+P 4700 1550
+F 0 "#PWR9" H 4700 1400 50  0001 C CNN
+F 1 "+3.3V" H 4700 1690 50  0001 C CNN
+F 2 "" H 4700 1550 50  0000 C CNN
+F 3 "" H 4700 1550 50  0000 C CNN
+	1    4700 1550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 6150 1600
+NoConn ~ 5250 1650
 $Comp
 L GND #PWR13
 U 1 1 58702A61
-P 5900 1950
-F 0 "#PWR13" H 5900 1700 50  0001 C CNN
-F 1 "GND" H 5900 1800 50  0001 C CNN
-F 2 "" H 5900 1950 50  0000 C CNN
-F 3 "" H 5900 1950 50  0000 C CNN
-	1    5900 1950
+P 5000 2000
+F 0 "#PWR13" H 5000 1750 50  0001 C CNN
+F 1 "GND" H 5000 1850 50  0001 C CNN
+F 2 "" H 5000 2000 50  0000 C CNN
+F 3 "" H 5000 2000 50  0000 C CNN
+	1    5000 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR16
 U 1 1 58702DF8
-P 6050 2050
-F 0 "#PWR16" H 6050 1900 50  0001 C CNN
-F 1 "+3.3V" H 6050 2190 50  0001 C CNN
-F 2 "" H 6050 2050 50  0000 C CNN
-F 3 "" H 6050 2050 50  0000 C CNN
-	1    6050 2050
+P 5150 2100
+F 0 "#PWR16" H 5150 1950 50  0001 C CNN
+F 1 "+3.3V" H 5150 2240 50  0001 C CNN
+F 2 "" H 5150 2100 50  0000 C CNN
+F 3 "" H 5150 2100 50  0000 C CNN
+	1    5150 2100
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR15
 U 1 1 58702F8A
-P 6050 1650
-F 0 "#PWR15" H 6050 1400 50  0001 C CNN
-F 1 "GND" H 6050 1500 50  0001 C CNN
-F 2 "" H 6050 1650 50  0000 C CNN
-F 3 "" H 6050 1650 50  0000 C CNN
-	1    6050 1650
+P 5150 1700
+F 0 "#PWR15" H 5150 1450 50  0001 C CNN
+F 1 "GND" H 5150 1550 50  0001 C CNN
+F 2 "" H 5150 1700 50  0000 C CNN
+F 3 "" H 5150 1700 50  0000 C CNN
+	1    5150 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR17
 U 1 1 58705FA1
-P 6050 2400
-F 0 "#PWR17" H 6050 2150 50  0001 C CNN
-F 1 "GND" H 6050 2250 50  0001 C CNN
-F 2 "" H 6050 2400 50  0000 C CNN
-F 3 "" H 6050 2400 50  0000 C CNN
-	1    6050 2400
+P 5150 2450
+F 0 "#PWR17" H 5150 2200 50  0001 C CNN
+F 1 "GND" H 5150 2300 50  0001 C CNN
+F 2 "" H 5150 2450 50  0000 C CNN
+F 3 "" H 5150 2450 50  0000 C CNN
+	1    5150 2450
 	1    0    0    -1  
 $EndComp
-Text Notes 5150 3300 0    60   ~ 0
+Text Notes 4250 3350 0    60   ~ 0
 Switching to SPI4:\n - pull 11 down\n - disconnect 20
 $Comp
-L TDA8029 U?
-U 1 1 5880AAA0
-P 8900 2050
-F 0 "U?" H 8900 1950 60  0000 C CNN
-F 1 "TDA8029" H 8900 2150 60  0000 C CNN
-F 2 "" H 8900 2050 60  0001 C CNN
-F 3 "" H 8900 2050 60  0001 C CNN
-	1    8900 2050
-	0    -1   -1   0   
-$EndComp
-$Comp
-L C_Small C?
-U 1 1 5880B191
-P 7450 1950
-F 0 "C?" H 7460 2020 50  0000 L CNN
-F 1 "22pF" V 7400 1750 50  0000 L CNN
-F 2 "" H 7450 1950 50  0000 C CNN
-F 3 "" H 7450 1950 50  0000 C CNN
-	1    7450 1950
-	0    -1   -1   0   
-$EndComp
-$Comp
-L C_Small C?
-U 1 1 5880B335
-P 7450 1750
-F 0 "C?" H 7460 1820 50  0000 L CNN
-F 1 "22pF" V 7500 1550 50  0000 L CNN
-F 2 "" H 7450 1750 50  0000 C CNN
-F 3 "" H 7450 1750 50  0000 C CNN
-	1    7450 1750
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5880B3CD
-P 7350 2050
-F 0 "#PWR?" H 7350 1800 50  0001 C CNN
-F 1 "GND" H 7350 1900 50  0000 C CNN
-F 2 "" H 7350 2050 50  0000 C CNN
-F 3 "" H 7350 2050 50  0000 C CNN
-	1    7350 2050
-	1    0    0    -1  
-$EndComp
-$Comp
 L C_Small C?
 U 1 1 5880B4CE
-P 9500 1200
-F 0 "C?" H 9510 1270 50  0000 L CNN
-F 1 "220nF" H 9510 1120 50  0000 L CNN
-F 2 "" H 9500 1200 50  0000 C CNN
-F 3 "" H 9500 1200 50  0000 C CNN
-	1    9500 1200
-	0    -1   -1   0   
+P 10500 3150
+F 0 "C?" H 10510 3220 50  0000 L CNN
+F 1 "220nF" H 10510 3070 50  0000 L CNN
+F 2 "" H 10500 3150 50  0000 C CNN
+F 3 "" H 10500 3150 50  0000 C CNN
+	1    10500 3150
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880B97A
-P 9500 950
-F 0 "C?" H 9510 1020 50  0000 L CNN
-F 1 "220nF" H 9510 870 50  0000 L CNN
-F 2 "" H 9500 950 50  0000 C CNN
-F 3 "" H 9500 950 50  0000 C CNN
-	1    9500 950 
-	0    -1   -1   0   
+P 10750 3150
+F 0 "C?" H 10760 3220 50  0000 L CNN
+F 1 "220nF" H 10760 3070 50  0000 L CNN
+F 2 "" H 10750 3150 50  0000 C CNN
+F 3 "" H 10750 3150 50  0000 C CNN
+	1    10750 3150
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BA0C
-P 10150 1500
-F 0 "C?" H 10160 1570 50  0000 L CNN
-F 1 "100nF" V 10050 1350 50  0000 L CNN
-F 2 "" H 10150 1500 50  0000 C CNN
-F 3 "" H 10150 1500 50  0000 C CNN
-	1    10150 1500
-	1    0    0    -1  
+P 10100 3800
+F 0 "C?" H 10110 3870 50  0000 L CNN
+F 1 "100nF" V 10000 3650 50  0000 L CNN
+F 2 "" H 10100 3800 50  0000 C CNN
+F 3 "" H 10100 3800 50  0000 C CNN
+	1    10100 3800
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BB0F
-P 10350 1500
-F 0 "C?" H 10360 1570 50  0000 L CNN
-F 1 "10µF" V 10450 1350 50  0000 L CNN
-F 2 "" H 10350 1500 50  0000 C CNN
-F 3 "" H 10350 1500 50  0000 C CNN
-	1    10350 1500
-	1    0    0    -1  
+P 10100 4000
+F 0 "C?" H 10110 4070 50  0000 L CNN
+F 1 "10µF" V 10200 3850 50  0000 L CNN
+F 2 "" H 10100 4000 50  0000 C CNN
+F 3 "" H 10100 4000 50  0000 C CNN
+	1    10100 4000
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BBA9
-P 9950 2000
-F 0 "C?" H 9960 2070 50  0000 L CNN
-F 1 "220nF" H 9960 1920 50  0000 L CNN
-F 2 "" H 9950 2000 50  0000 C CNN
-F 3 "" H 9950 2000 50  0000 C CNN
-	1    9950 2000
-	0    -1   -1   0   
+P 9700 3600
+F 0 "C?" H 9710 3670 50  0000 L CNN
+F 1 "220nF" H 9710 3520 50  0000 L CNN
+F 2 "" H 9700 3600 50  0000 C CNN
+F 3 "" H 9700 3600 50  0000 C CNN
+	1    9700 3600
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BC62
-P 9950 3350
-F 0 "C?" H 9960 3420 50  0000 L CNN
-F 1 "100pF" H 9960 3270 50  0000 L CNN
-F 2 "" H 9950 3350 50  0000 C CNN
-F 3 "" H 9950 3350 50  0000 C CNN
-	1    9950 3350
-	0    -1   -1   0   
+P 8350 3600
+F 0 "C?" H 8360 3670 50  0000 L CNN
+F 1 "100pF" H 8360 3520 50  0000 L CNN
+F 2 "" H 8350 3600 50  0000 C CNN
+F 3 "" H 8350 3600 50  0000 C CNN
+	1    8350 3600
+	1    0    0    -1  
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880BE78
-P 9750 4050
-F 0 "C?" H 9760 4120 50  0000 L CNN
-F 1 "220nF" H 9760 3970 50  0000 L CNN
-F 2 "" H 9750 4050 50  0000 C CNN
-F 3 "" H 9750 4050 50  0000 C CNN
-	1    9750 4050
-	1    0    0    -1  
+P 7650 3400
+F 0 "C?" H 7660 3470 50  0000 L CNN
+F 1 "220nF" H 7660 3320 50  0000 L CNN
+F 2 "" H 7650 3400 50  0000 C CNN
+F 3 "" H 7650 3400 50  0000 C CNN
+	1    7650 3400
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880C0C1
-P 9050 3000
-F 0 "C?" H 9060 3070 50  0000 L CNN
-F 1 "22nF" H 9060 2920 50  0000 L CNN
-F 2 "" H 9050 3000 50  0000 C CNN
-F 3 "" H 9050 3000 50  0000 C CNN
-	1    9050 3000
-	1    0    0    -1  
+P 8700 2700
+F 0 "C?" V 8750 2750 50  0000 L CNN
+F 1 "22nF" V 8750 2450 50  0000 L CNN
+F 2 "" H 8700 2700 50  0000 C CNN
+F 3 "" H 8700 2700 50  0000 C CNN
+	1    8700 2700
+	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880C189
-P 8000 3100
-F 0 "C?" H 8010 3170 50  0000 L CNN
-F 1 "100nF" V 7900 3000 50  0000 L CNN
-F 2 "" H 8000 3100 50  0000 C CNN
-F 3 "" H 8000 3100 50  0000 C CNN
-	1    8000 3100
+P 8450 2200
+F 0 "C?" H 8460 2270 50  0000 L CNN
+F 1 "100nF" V 8350 2100 50  0000 L CNN
+F 2 "" H 8450 2200 50  0000 C CNN
+F 3 "" H 8450 2200 50  0000 C CNN
+	1    8450 2200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5880C234
-P 8000 2900
-F 0 "C?" H 8010 2970 50  0000 L CNN
-F 1 "10µF" V 7900 2800 50  0000 L CNN
-F 2 "" H 8000 2900 50  0000 C CNN
-F 3 "" H 8000 2900 50  0000 C CNN
-	1    8000 2900
-	0    1    1    0   
-$EndComp
-$Comp
-L Crystal_Small Y?
-U 1 1 5880C2B0
-P 7700 1850
-F 0 "Y?" H 7700 1950 50  0000 C CNN
-F 1 "14.745MHz" H 7700 1750 50  0000 C CNN
-F 2 "" H 7700 1850 50  0000 C CNN
-F 3 "" H 7700 1850 50  0000 C CNN
-	1    7700 1850
+P 8450 1950
+F 0 "C?" H 8460 2020 50  0000 L CNN
+F 1 "10µF" V 8350 1850 50  0000 L CNN
+F 2 "" H 8450 1950 50  0000 C CNN
+F 3 "" H 8450 1950 50  0000 C CNN
+	1    8450 1950
 	0    -1   -1   0   
 $EndComp
-Text GLabel 8050 2300 0    60   Input ~ 0
+Text GLabel 9400 1700 1    60   Input ~ 0
 CARD_TX
-Text GLabel 8050 2400 0    60   Input ~ 0
+Text GLabel 9300 1700 1    60   Input ~ 0
 CARD_RX
-NoConn ~ 8050 2200
-NoConn ~ 8050 2100
+NoConn ~ 9500 1700
+NoConn ~ 9600 1700
 $Comp
 L GND #PWR?
 U 1 1 5880D50E
-P 7950 1550
-F 0 "#PWR?" H 7950 1300 50  0001 C CNN
-F 1 "GND" H 7950 1400 50  0000 C CNN
-F 2 "" H 7950 1550 50  0000 C CNN
-F 3 "" H 7950 1550 50  0000 C CNN
-	1    7950 1550
+P 10150 1700
+F 0 "#PWR?" H 10150 1450 50  0001 C CNN
+F 1 "GND" H 10150 1550 50  0000 C CNN
+F 2 "" H 10150 1700 50  0000 C CNN
+F 3 "" H 10150 1700 50  0000 C CNN
+	1    10150 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR?
 U 1 1 5880FFCE
-P 8100 2800
-F 0 "#PWR?" H 8100 2650 50  0001 C CNN
-F 1 "+3V3" H 8100 2940 50  0000 C CNN
-F 2 "" H 8100 2800 50  0000 C CNN
-F 3 "" H 8100 2800 50  0000 C CNN
-	1    8100 2800
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 58810A43
-P 9050 3100
-F 0 "#PWR?" H 9050 2850 50  0001 C CNN
-F 1 "GND" H 9050 2950 50  0000 C CNN
-F 2 "" H 9050 3100 50  0000 C CNN
-F 3 "" H 9050 3100 50  0000 C CNN
-	1    9050 3100
+P 8600 1950
+F 0 "#PWR?" H 8600 1800 50  0001 C CNN
+F 1 "+3V3" H 8600 2090 50  0001 C CNN
+F 2 "" H 8600 1950 50  0000 C CNN
+F 3 "" H 8600 1950 50  0000 C CNN
+	1    8600 1950
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR?
 U 1 1 588135B2
-P 8850 1200
-F 0 "#PWR?" H 8850 1050 50  0001 C CNN
-F 1 "+3V3" H 8850 1340 50  0000 C CNN
-F 2 "" H 8850 1200 50  0000 C CNN
-F 3 "" H 8850 1200 50  0000 C CNN
-	1    8850 1200
+P 10650 2500
+F 0 "#PWR?" H 10650 2350 50  0001 C CNN
+F 1 "+3V3" H 10650 2640 50  0000 C CNN
+F 2 "" H 10650 2500 50  0000 C CNN
+F 3 "" H 10650 2500 50  0000 C CNN
+	1    10650 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5881377E
-P 8850 800
-F 0 "#PWR?" H 8850 550 50  0001 C CNN
-F 1 "GND" H 8850 650 50  0000 C CNN
-F 2 "" H 8850 800 50  0000 C CNN
-F 3 "" H 8850 800 50  0000 C CNN
-	1    8850 800 
+P 10900 2600
+F 0 "#PWR?" H 10900 2350 50  0001 C CNN
+F 1 "GND" H 10900 2450 50  0000 C CNN
+F 2 "" H 10900 2600 50  0000 C CNN
+F 3 "" H 10900 2600 50  0000 C CNN
+	1    10900 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5881836B
-P 10050 2000
-F 0 "#PWR?" H 10050 1750 50  0001 C CNN
-F 1 "GND" H 10050 1850 50  0000 C CNN
-F 2 "" H 10050 2000 50  0000 C CNN
-F 3 "" H 10050 2000 50  0000 C CNN
-	1    10050 2000
-	0    -1   -1   0   
+P 9700 3700
+F 0 "#PWR?" H 9700 3450 50  0001 C CNN
+F 1 "GND" H 9700 3550 50  0000 C CNN
+F 2 "" H 9700 3700 50  0000 C CNN
+F 3 "" H 9700 3700 50  0000 C CNN
+	1    9700 3700
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5881F197
-P 7900 3250
-F 0 "#PWR?" H 7900 3000 50  0001 C CNN
-F 1 "GND" H 7900 3100 50  0000 C CNN
-F 2 "" H 7900 3250 50  0000 C CNN
-F 3 "" H 7900 3250 50  0000 C CNN
-	1    7900 3250
+P 8450 2550
+F 0 "#PWR?" H 8450 2300 50  0001 C CNN
+F 1 "GND" H 8450 2400 50  0001 C CNN
+F 2 "" H 8450 2550 50  0000 C CNN
+F 3 "" H 8450 2550 50  0000 C CNN
+	1    8450 2550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 8650 1200
-NoConn ~ 8750 1200
-NoConn ~ 8650 2950
-NoConn ~ 8550 1150
+NoConn ~ 10500 2300
+NoConn ~ 10500 2400
+NoConn ~ 8750 2300
+NoConn ~ 10550 2200
 $Comp
 L ISO7816 U?
 U 1 1 58821579
-P 9500 4650
-F 0 "U?" H 9500 5050 60  0000 C CNN
-F 1 "ISO7816" H 9500 4250 60  0000 C CNN
-F 2 "" H 9500 4750 60  0001 C CNN
-F 3 "" H 9500 4750 60  0001 C CNN
-	1    9500 4650
-	0    1    -1   0   
+P 7050 3150
+F 0 "U?" H 7050 3550 60  0000 C CNN
+F 1 "ISO7816" H 7050 2750 60  0000 C CNN
+F 2 "" H 7050 3250 60  0001 C CNN
+F 3 "" H 7050 3250 60  0001 C CNN
+	1    7050 3150
+	1    0    0    1   
 $EndComp
 $Comp
 L +3V3 #PWR?
 U 1 1 58821E3C
-P 9250 4250
-F 0 "#PWR?" H 9250 4100 50  0001 C CNN
-F 1 "+3V3" H 9250 4390 50  0000 C CNN
-F 2 "" H 9250 4250 50  0000 C CNN
-F 3 "" H 9250 4250 50  0000 C CNN
-	1    9250 4250
+P 7550 2900
+F 0 "#PWR?" H 7550 2750 50  0001 C CNN
+F 1 "+3V3" H 7550 3040 50  0001 C CNN
+F 2 "" H 7550 2900 50  0000 C CNN
+F 3 "" H 7550 2900 50  0000 C CNN
+	1    7550 2900
 	1    0    0    -1  
 $EndComp
-NoConn ~ 9450 4250
-NoConn ~ 9450 5050
+NoConn ~ 7450 3100
+NoConn ~ 6650 3100
 $Comp
 L R_Small R?
 U 1 1 58823E8F
-P 9150 3500
-F 0 "R?" H 9180 3520 50  0000 L CNN
-F 1 "180" H 9180 3460 50  0000 L CNN
-F 2 "" H 9150 3500 50  0000 C CNN
-F 3 "" H 9150 3500 50  0000 C CNN
-	1    9150 3500
-	-1   0    0    1   
+P 8200 2800
+F 0 "R?" H 8230 2820 50  0000 L CNN
+F 1 "180" H 8230 2760 50  0000 L CNN
+F 2 "" H 8200 2800 50  0000 C CNN
+F 3 "" H 8200 2800 50  0000 C CNN
+	1    8200 2800
+	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C?
 U 1 1 5882B77E
-P 9550 3650
-F 0 "C?" H 9560 3720 50  0000 L CNN
-F 1 "33pF" H 9560 3570 50  0000 L CNN
-F 2 "" H 9550 3650 50  0000 C CNN
-F 3 "" H 9550 3650 50  0000 C CNN
-	1    9550 3650
-	-1   0    0    1   
+P 8050 3200
+F 0 "C?" H 8060 3270 50  0000 L CNN
+F 1 "33pF" H 8060 3120 50  0000 L CNN
+F 2 "" H 8050 3200 50  0000 C CNN
+F 3 "" H 8050 3200 50  0000 C CNN
+	1    8050 3200
+	0    -1   -1   0   
 $EndComp
-Connection ~ 9750 3550
-Wire Wire Line
-	9550 3550 9750 3550
-Wire Wire Line
-	10200 3950 9750 3950
-Wire Wire Line
-	10200 5200 10200 3950
-Wire Wire Line
-	9750 5200 10200 5200
-Wire Wire Line
-	9750 5050 9750 5200
-Wire Wire Line
-	9750 3950 9750 2400
-Wire Wire Line
-	9350 4000 9350 4250
-Wire Wire Line
-	9250 4000 9350 4000
-Wire Wire Line
-	9250 2900 9250 4000
+Connection ~ 8150 3400
 Wire Wire Line
-	9150 4000 9000 4000
+	8150 3200 8150 3400
 Wire Wire Line
-	9150 3600 9150 4000
+	7750 3850 7750 3400
 Wire Wire Line
-	9150 2900 9150 3400
+	6500 3850 7750 3850
 Wire Wire Line
-	9750 2200 10300 2200
-Connection ~ 10300 4250
+	6500 3400 6500 3850
 Wire Wire Line
-	9750 4250 10300 4250
+	6650 3400 6500 3400
 Wire Wire Line
-	9650 5300 9650 5050
+	7750 3400 9300 3400
 Wire Wire Line
-	10300 5300 9650 5300
+	7700 3000 7450 3000
 Wire Wire Line
-	10300 2200 10300 5300
+	7700 2900 7700 3000
 Wire Wire Line
-	9750 4250 9750 4150
+	8800 2900 7700 2900
 Wire Wire Line
-	9550 3750 9550 4250
+	7700 2800 7700 2650
 Wire Wire Line
-	10100 3750 9550 3750
+	8100 2800 7700 2800
 Wire Wire Line
-	10100 2300 10100 3750
+	8800 2800 8300 2800
 Wire Wire Line
-	9750 2300 10100 2300
+	9500 3400 9500 3950
+Connection ~ 7450 3950
 Wire Wire Line
-	9650 3850 9650 4250
+	7450 3400 7450 3950
 Wire Wire Line
-	10200 3850 9650 3850
+	6400 3300 6650 3300
 Wire Wire Line
-	10200 2100 10200 3850
+	6400 3950 6400 3300
 Wire Wire Line
-	9750 2100 10200 2100
+	9500 3950 6400 3950
 Wire Wire Line
-	9550 5300 9550 5050
+	7450 3400 7550 3400
 Wire Wire Line
-	9000 5300 9550 5300
+	7950 3750 7950 3200
 Wire Wire Line
-	9000 4000 9000 5300
+	9400 3750 7950 3750
 Wire Wire Line
-	7900 3250 7900 2900
+	9400 3400 9400 3750
 Wire Wire Line
-	8850 3100 9050 3100
+	7850 3300 7450 3300
 Wire Wire Line
-	8850 2900 8850 3100
+	7850 3850 7850 3300
 Wire Wire Line
-	8650 2950 8650 2900
+	9600 3850 7850 3850
 Wire Wire Line
-	8550 1150 8550 1200
+	9600 3400 9600 3850
 Wire Wire Line
-	8750 3100 8750 2900
+	6400 3200 6650 3200
 Wire Wire Line
-	8100 3100 8750 3100
-Connection ~ 7900 3100
-Connection ~ 8100 2900
+	6400 2650 6400 3200
 Wire Wire Line
-	8100 2800 8100 3100
+	7700 2650 6400 2650
 Wire Wire Line
-	8100 2900 8550 2900
+	8600 2500 8600 2700
 Wire Wire Line
-	8950 800  8850 800 
+	8300 2500 8800 2500
 Wire Wire Line
-	8050 1550 7950 1550
+	8750 2300 8800 2300
 Wire Wire Line
-	7350 1750 7350 2050
-Connection ~ 7350 1950
-Connection ~ 10150 1700
+	10550 2200 10500 2200
 Wire Wire Line
-	9750 2000 9850 2000
+	8600 2400 8800 2400
 Wire Wire Line
-	8950 800  8950 1200
+	9700 3400 9700 3500
 Wire Wire Line
-	9950 950  9950 1900
+	10900 2600 10500 2600
 Wire Wire Line
-	9050 950  9050 1200
+	10750 3600 9800 3600
 Wire Wire Line
-	9600 950  9950 950 
+	10750 2700 10500 2700
 Wire Wire Line
-	9400 950  9050 950 
+	10750 3250 10750 3600
 Wire Wire Line
-	9950 1900 9750 1900
+	10750 3050 10750 2700
 Wire Wire Line
-	9850 1200 9600 1200
+	9800 3600 9800 3400
 Wire Wire Line
-	9250 1200 9400 1200
+	10500 3500 10500 3250
 Wire Wire Line
-	9850 1800 9850 1200
+	10500 2900 10500 3050
 Wire Wire Line
-	9750 1800 9850 1800
+	9900 3500 10500 3500
 Wire Wire Line
-	8050 1700 8050 1550
-Connection ~ 7700 1950
+	9900 3400 9900 3500
 Wire Wire Line
-	7900 1750 7550 1750
+	10000 1700 10150 1700
 Wire Wire Line
-	7900 1800 7900 1750
+	9900 1550 10000 1550
 Wire Wire Line
-	8050 1800 7900 1800
+	9900 1700 9900 1550
 Wire Wire Line
-	7900 1950 7550 1950
+	9700 1550 9800 1550
 Wire Wire Line
-	7900 1900 7900 1950
+	9800 1550 9800 1700
 Wire Wire Line
-	8050 1900 7900 1900
+	5150 2450 5250 2450
 Wire Wire Line
-	6050 2400 6150 2400
+	5150 2950 5250 2950
+Connection ~ 5150 2850
 Wire Wire Line
-	6050 2900 6150 2900
-Connection ~ 6050 2800
+	5150 2800 5150 2950
+Connection ~ 5150 2750
 Wire Wire Line
-	6050 2750 6050 2900
-Connection ~ 6050 2700
+	5150 2700 5150 2750
 Wire Wire Line
-	6050 2650 6050 2700
+	5250 2350 4900 2350
 Wire Wire Line
-	6150 2300 5800 2300
+	4950 3950 5250 3950
 Wire Wire Line
-	5850 3900 6150 3900
+	4950 3550 4950 3950
 Wire Wire Line
-	5850 3500 5850 3900
+	5250 1700 5150 1700
 Wire Wire Line
-	6150 1650 6050 1650
+	5250 1750 5250 1700
+Connection ~ 5100 1950
 Wire Wire Line
-	6150 1700 6150 1650
-Connection ~ 6000 1900
+	5000 1950 5000 2000
 Wire Wire Line
-	5900 1900 5900 1950
+	5100 2150 5100 1950
 Wire Wire Line
-	6000 2100 6000 1900
+	5250 2100 5250 2050
 Wire Wire Line
-	6150 2050 6150 2000
+	5150 2100 5250 2100
 Wire Wire Line
-	6050 2050 6150 2050
+	5000 1950 5250 1950
 Wire Wire Line
-	5900 1900 6150 1900
+	5100 2150 5250 2150
 Wire Wire Line
-	6000 2100 6150 2100
+	4700 1550 5250 1550
 Wire Wire Line
-	5600 1500 6150 1500
+	5250 900  5150 900 
 Wire Wire Line
-	6150 850  6050 850 
+	5250 1050 5250 900 
+Connection ~ 4950 3750
 Wire Wire Line
-	6150 1000 6150 850 
-Connection ~ 5850 3700
+	5050 3750 4950 3750
+Connection ~ 4950 3650
 Wire Wire Line
-	5950 3700 5850 3700
-Connection ~ 5850 3600
+	5050 3650 4950 3650
+Connection ~ 4950 3850
 Wire Wire Line
-	5950 3600 5850 3600
-Connection ~ 5850 3800
+	5050 3550 4950 3550
 Wire Wire Line
-	5950 3500 5850 3500
+	5250 2750 4650 2750
 Wire Wire Line
-	6150 2700 5550 2700
+	5250 2850 4650 2850
 Wire Wire Line
-	6150 2800 5550 2800
-Wire Wire Line
-	5600 1800 6150 1800
+	4700 1850 5250 1850
 Connection ~ 2700 6100
 Connection ~ 2250 6100
 Connection ~ 1800 6100
@@ -1204,15 +1113,15 @@ Connection ~ 2000 5900
 Connection ~ 2000 5500
 Connection ~ 2000 5100
 Wire Wire Line
-	5850 3800 6150 3800
+	4950 3850 5250 3850
 Wire Wire Line
-	5950 1400 5950 1300
+	5050 1450 5050 1350
 Wire Wire Line
-	6150 1400 5950 1400
+	5250 1450 5050 1450
 Wire Wire Line
-	5950 1200 5950 1100
+	5050 1250 5050 1150
 Wire Wire Line
-	6150 1200 5950 1200
+	5250 1250 5050 1250
 Connection ~ 2900 6300
 Connection ~ 2450 6300
 Connection ~ 2450 5900
@@ -1278,78 +1187,285 @@ Wire Wire Line
 Wire Wire Line
 	1750 1500 1000 1500
 Wire Wire Line
-	5850 2600 5850 2750
+	4950 2650 4950 2800
 Wire Wire Line
-	5750 2600 5850 2600
-Connection ~ 5850 2650
+	4850 2650 4950 2650
+Connection ~ 4950 2700
 Wire Wire Line
-	5600 2300 5450 2300
+	4700 2350 4550 2350
 Wire Wire Line
 	4600 5700 4800 5700
-Connection ~ 7700 1750
 Wire Wire Line
-	10050 3350 10200 3350
-Connection ~ 10200 3350
+	8350 3700 8350 3850
+Connection ~ 8350 3850
 Wire Wire Line
-	9850 3350 9750 3350
-Connection ~ 9750 3350
+	8350 3500 8350 3400
+Connection ~ 8350 3400
 $Comp
 L C_Small C?
 U 1 1 588317FD
-P 9950 2850
-F 0 "C?" H 9960 2920 50  0000 L CNN
-F 1 "100pF" H 9960 2770 50  0000 L CNN
-F 2 "" H 9950 2850 50  0000 C CNN
-F 3 "" H 9950 2850 50  0000 C CNN
-	1    9950 2850
-	0    -1   -1   0   
+P 8850 3600
+F 0 "C?" H 8860 3670 50  0000 L CNN
+F 1 "100pF" H 8860 3520 50  0000 L CNN
+F 2 "" H 8850 3600 50  0000 C CNN
+F 3 "" H 8850 3600 50  0000 C CNN
+	1    8850 3600
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9850 2850 9750 2850
-Connection ~ 9750 2850
+	8850 3500 8850 3400
+Connection ~ 8850 3400
 Wire Wire Line
-	10050 2850 10300 2850
-Connection ~ 10300 2850
+	8850 3700 8850 3950
+Connection ~ 8850 3950
+$Comp
+L GND #PWR?
+U 1 1 58833208
+P 10000 4200
+F 0 "#PWR?" H 10000 3950 50  0001 C CNN
+F 1 "GND" H 10000 4050 50  0000 C CNN
+F 2 "" H 10000 4200 50  0000 C CNN
+F 3 "" H 10000 4200 50  0000 C CNN
+	1    10000 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 58833391
+P 10200 3400
+F 0 "#PWR?" H 10200 3250 50  0001 C CNN
+F 1 "+3V3" H 10200 3540 50  0000 C CNN
+F 2 "" H 10200 3400 50  0000 C CNN
+F 3 "" H 10200 3400 50  0000 C CNN
+	1    10200 3400
+	1    0    0    -1  
+$EndComp
+Text Notes 6450 4300 0    60   ~ 0
+http://www.nxp.com/documents/application_note/AN10207.pdf\nhttp://www.nxp.com/documents/data_sheet/TDA8029.pdf
+Text Notes 7000 2000 0    60   ~ 0
+TODO: less Caps?
+Wire Notes Line
+	6900 1850 6900 2100
+Wire Notes Line
+	6900 2100 7900 2100
+Wire Notes Line
+	7900 2100 7900 1800
+Wire Notes Line
+	7900 1800 6900 1800
+Wire Notes Line
+	6900 1800 6900 1900
+$Comp
+L GND #PWR?
+U 1 1 58839D11
+P 9300 3400
+F 0 "#PWR?" H 9300 3150 50  0001 C CNN
+F 1 "GND" H 9300 3250 50  0000 C CNN
+F 2 "" H 9300 3400 50  0000 C CNN
+F 3 "" H 9300 3400 50  0000 C CNN
+	1    9300 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Crystal Y?
+U 1 1 58839E8A
+P 9850 1300
+F 0 "Y?" H 9850 1450 50  0000 C CNN
+F 1 "14.745MHz" H 9850 1150 50  0000 C CNN
+F 2 "" H 9850 1300 50  0000 C CNN
+F 3 "" H 9850 1300 50  0000 C CNN
+	1    9850 1300
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	9150 1200 9150 1050
+	9700 1300 9700 1550
 Wire Wire Line
-	9150 1050 10250 1050
+	10000 1550 10000 1300
+$Comp
+L C_Small C?
+U 1 1 5883A764
+P 10000 1200
+F 0 "C?" H 10010 1270 50  0000 L CNN
+F 1 "22pF" H 10010 1120 50  0000 L CNN
+F 2 "" H 10000 1200 50  0000 C CNN
+F 3 "" H 10000 1200 50  0000 C CNN
+	1    10000 1200
+	1    0    0    -1  
+$EndComp
+$Comp
+L C_Small C?
+U 1 1 5883A85B
+P 9700 1200
+F 0 "C?" H 9710 1270 50  0000 L CNN
+F 1 "22pF" H 9710 1120 50  0000 L CNN
+F 2 "" H 9700 1200 50  0000 C CNN
+F 3 "" H 9700 1200 50  0000 C CNN
+	1    9700 1200
+	-1   0    0    -1  
+$EndComp
 $Comp
 L GND #PWR?
-U 1 1 58833208
-P 10250 1050
-F 0 "#PWR?" H 10250 800 50  0001 C CNN
-F 1 "GND" H 10250 900 50  0000 C CNN
-F 2 "" H 10250 1050 50  0000 C CNN
-F 3 "" H 10250 1050 50  0000 C CNN
-	1    10250 1050
+U 1 1 5883AC0F
+P 9850 900
+F 0 "#PWR?" H 9850 650 50  0001 C CNN
+F 1 "GND" H 9850 750 50  0000 C CNN
+F 2 "" H 9850 900 50  0000 C CNN
+F 3 "" H 9850 900 50  0000 C CNN
+	1    9850 900 
 	1    0    0    -1  
 $EndComp
-Connection ~ 10150 1050
-Connection ~ 10350 1700
 Wire Wire Line
-	10150 1600 10150 1700
+	9700 1100 9700 900 
 Wire Wire Line
-	10350 1600 10350 1700
+	9700 900  10000 900 
 Wire Wire Line
-	10350 1400 10150 1400
+	10000 900  10000 1100
+Connection ~ 9850 900 
 Wire Wire Line
-	10150 1400 10150 1050
+	10500 2500 10650 2500
+$Comp
+L GND #PWR?
+U 1 1 5883C802
+P 10650 2800
+F 0 "#PWR?" H 10650 2550 50  0001 C CNN
+F 1 "GND" H 10650 2650 50  0000 C CNN
+F 2 "" H 10650 2800 50  0000 C CNN
+F 3 "" H 10650 2800 50  0000 C CNN
+	1    10650 2800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10650 2800 10500 2800
+Wire Wire Line
+	10200 3400 10200 4000
+Connection ~ 10200 3800
+Wire Wire Line
+	10000 3400 10200 3400
+Wire Wire Line
+	10000 3800 10000 4200
+Connection ~ 10000 4000
+$Comp
+L SW_PUSH_SMALL SW?
+U 1 1 5883F21C
+P 9600 1600
+F 0 "SW?" H 9550 1600 50  0001 C CNN
+F 1 "SW_PUSH_SMALL" H 9600 1521 50  0001 C CNN
+F 2 "" H 9600 1600 50  0000 C CNN
+F 3 "" H 9600 1600 50  0000 C CNN
+	1    9600 1600
+	1    0    0    -1  
+$EndComp
 $Comp
 L +3V3 #PWR?
-U 1 1 58833391
-P 10650 1700
-F 0 "#PWR?" H 10650 1550 50  0001 C CNN
-F 1 "+3V3" H 10650 1840 50  0000 C CNN
-F 2 "" H 10650 1700 50  0000 C CNN
-F 3 "" H 10650 1700 50  0000 C CNN
-	1    10650 1700
+U 1 1 58840082
+P 9500 1500
+F 0 "#PWR?" H 9500 1350 50  0001 C CNN
+F 1 "+3V3" H 9500 1640 50  0001 C CNN
+F 2 "" H 9500 1500 50  0000 C CNN
+F 3 "" H 9500 1500 50  0000 C CNN
+	1    9500 1500
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 58843822
+P 8800 2200
+F 0 "#PWR?" H 8800 2050 50  0001 C CNN
+F 1 "+3V3" H 8800 2340 50  0001 C CNN
+F 2 "" H 8800 2200 50  0000 C CNN
+F 3 "" H 8800 2200 50  0000 C CNN
+	1    8800 2200
+	1    0    0    -1  
+$EndComp
+$Comp
+L TDA8029 U?
+U 1 1 5880AAA0
+P 9650 2550
+F 0 "U?" H 9650 2450 60  0000 C CNN
+F 1 "TDA8029" H 9650 2650 60  0000 C CNN
+F 2 "" H 9650 2550 60  0001 C CNN
+F 3 "" H 9650 2550 60  0001 C CNN
+	1    9650 2550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9750 1700 10650 1700
-Text Notes 10650 5250 1    60   ~ 0
-http://www.nxp.com/documents/application_note/AN10207.pdf\nhttp://www.nxp.com/documents/data_sheet/TDA8029.pdf
-Text Notes 8000 3800 0    60   ~ 0
-TODO: less Caps?
+	8600 1950 8600 2400
+Connection ~ 8600 2200
+Connection ~ 8300 2200
+Connection ~ 8300 2500
+Connection ~ 8600 2500
+Wire Wire Line
+	8800 2600 8600 2600
+Connection ~ 8600 2600
+Wire Wire Line
+	7450 2900 7550 2900
+Wire Notes Line
+	8250 3500 8250 3700
+Wire Notes Line
+	8250 3700 8450 3700
+Wire Notes Line
+	8450 3700 8450 3500
+Wire Notes Line
+	8450 3500 8250 3500
+$Comp
+L R_Small R?
+U 1 1 5884B8AE
+P 7700 3200
+F 0 "R?" H 7730 3220 50  0000 L CNN
+F 1 "100" H 7730 3160 50  0000 L CNN
+F 2 "" H 7700 3200 50  0000 C CNN
+F 3 "" H 7700 3200 50  0000 C CNN
+	1    7700 3200
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	7450 3200 7600 3200
+Wire Wire Line
+	7950 3200 7800 3200
+Wire Notes Line
+	8750 3500 8750 3700
+Wire Notes Line
+	8750 3700 8950 3700
+Wire Notes Line
+	8950 3700 8950 3500
+Wire Notes Line
+	8950 3500 8750 3500
+Wire Notes Line
+	8000 3300 8100 3300
+Wire Notes Line
+	8100 3300 8100 3100
+Wire Notes Line
+	8100 3100 8000 3100
+Wire Notes Line
+	8000 3100 8000 3300
+Wire Notes Line
+	7600 3250 7600 3500
+Wire Notes Line
+	7600 3500 7700 3500
+Wire Notes Line
+	7700 3500 7700 3250
+Wire Notes Line
+	7700 3250 7600 3250
+Wire Notes Line
+	6150 650  6150 4550
+Wire Notes Line
+	6150 4550 11100 4550
+Wire Notes Line
+	11100 4550 11100 650 
+Wire Notes Line
+	11100 650  6150 650 
+Text Notes 6400 900  0    60   ~ 0
+No Place on main PCB - has to go on another one
+Wire Wire Line
+	8350 1950 8300 1950
+Wire Wire Line
+	8550 1950 8600 1950
+Wire Wire Line
+	8550 2200 8600 2200
+Wire Wire Line
+	8350 2200 8300 2200
+Wire Wire Line
+	8450 2550 8450 2500
+Connection ~ 8450 2500
+Wire Wire Line
+	8300 1950 8300 2500
 $EndSCHEMATC