diff --git a/lab1/E7020E_lab1.sch b/lab1/E7020E_lab1.sch
index 28e34d9768c3a78c87323750462e49acfac6d1b1..c2bb9b0dbf918c31e43ba7d00e76b4b0fcededd2 100644
--- a/lab1/E7020E_lab1.sch
+++ b/lab1/E7020E_lab1.sch
@@ -16,59 +16,59 @@ $EndDescr
 $Comp
 L Device:C C10
 U 1 1 600A63C6
-P 6600 1200
-F 0 "C10" H 6715 1246 50  0000 L CNN
-F 1 "100nF" H 6715 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6638 1050 50  0001 C CNN
-F 3 "~" H 6600 1200 50  0001 C CNN
-	1    6600 1200
+P 6800 1200
+F 0 "C10" H 6915 1246 50  0000 L CNN
+F 1 "100nF" H 6915 1155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6838 1050 50  0001 C CNN
+F 3 "~" H 6800 1200 50  0001 C CNN
+	1    6800 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C11
 U 1 1 600A693C
-P 7050 1200
-F 0 "C11" H 7165 1246 50  0000 L CNN
-F 1 "100nF" H 7165 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7088 1050 50  0001 C CNN
-F 3 "~" H 7050 1200 50  0001 C CNN
-	1    7050 1200
+P 7250 1200
+F 0 "C11" H 7365 1246 50  0000 L CNN
+F 1 "100nF" H 7365 1155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7288 1050 50  0001 C CNN
+F 3 "~" H 7250 1200 50  0001 C CNN
+	1    7250 1200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6150 1350 6150 1450
+	6350 1350 6350 1450
 Wire Wire Line
-	7050 1350 7050 1450
-Connection ~ 7050 1450
+	7250 1350 7250 1450
+Connection ~ 7250 1450
 Wire Wire Line
-	7050 1450 7500 1450
+	7250 1450 7700 1450
 Wire Wire Line
-	5700 1050 6150 1050
-Connection ~ 6150 1450
+	5900 1050 6350 1050
+Connection ~ 6350 1450
 Wire Wire Line
-	5700 1450 6150 1450
+	5900 1450 6350 1450
 Wire Wire Line
-	5700 1350 5700 1450
+	5900 1350 5900 1450
 $Comp
 L Device:C C9
 U 1 1 600A5A7E
-P 6150 1200
-F 0 "C9" H 6265 1246 50  0000 L CNN
-F 1 "100nF" H 6265 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6188 1050 50  0001 C CNN
-F 3 "~" H 6150 1200 50  0001 C CNN
-	1    6150 1200
+P 6350 1200
+F 0 "C9" H 6465 1246 50  0000 L CNN
+F 1 "100nF" H 6465 1155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6388 1050 50  0001 C CNN
+F 3 "~" H 6350 1200 50  0001 C CNN
+	1    6350 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C8
 U 1 1 600A4313
-P 5700 1200
-F 0 "C8" H 5815 1246 50  0000 L CNN
-F 1 "100nF" H 5815 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5738 1050 50  0001 C CNN
-F 3 "~" H 5700 1200 50  0001 C CNN
-	1    5700 1200
+P 5900 1200
+F 0 "C8" H 6015 1246 50  0000 L CNN
+F 1 "100nF" H 6015 1155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5938 1050 50  0001 C CNN
+F 3 "~" H 5900 1200 50  0001 C CNN
+	1    5900 1200
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -82,7 +82,6 @@ F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/da
 	1    5000 3200
 	1    0    0    -1  
 $EndComp
-Connection ~ 5700 1050
 Wire Wire Line
 	4900 5300 4900 5000
 Wire Wire Line
@@ -100,48 +99,35 @@ Wire Wire Line
 $Comp
 L power:+3.3V #PWR0102
 U 1 1 600F0086
-P 8750 900
-F 0 "#PWR0102" H 8750 750 50  0001 C CNN
-F 1 "+3.3V" H 8765 1073 50  0000 C CNN
-F 2 "" H 8750 900 50  0001 C CNN
-F 3 "" H 8750 900 50  0001 C CNN
-	1    8750 900 
+P 8600 850
+F 0 "#PWR0102" H 8600 700 50  0001 C CNN
+F 1 "+3.3V" H 8615 1023 50  0000 C CNN
+F 2 "" H 8600 850 50  0001 C CNN
+F 3 "" H 8600 850 50  0001 C CNN
+	1    8600 850 
 	1    0    0    -1  
 $EndComp
-Connection ~ 7050 1050
-Wire Wire Line
-	5000 1500 5000 1050
-Connection ~ 5000 1050
-Wire Wire Line
-	5000 1050 5100 1050
-Wire Wire Line
-	5100 1500 5100 1050
-Connection ~ 5100 1050
-Wire Wire Line
-	5200 1500 5200 1050
-Connection ~ 5200 1050
-Wire Wire Line
-	5200 1050 5300 1050
+Connection ~ 7250 1050
 $Comp
 L Device:R R4
 U 1 1 6011C94B
-P 8650 2950
-F 0 "R4" V 8443 2950 50  0000 C CNN
-F 1 "10k" V 8534 2950 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 8580 2950 50  0001 C CNN
-F 3 "~" H 8650 2950 50  0001 C CNN
-	1    8650 2950
+P 10250 2950
+F 0 "R4" V 10043 2950 50  0000 C CNN
+F 1 "10k" V 10134 2950 50  0000 C CNN
+F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 10180 2950 50  0001 C CNN
+F 3 "~" H 10250 2950 50  0001 C CNN
+	1    10250 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Jumper:Jumper_3_Open JP1
 U 1 1 60122387
-P 8650 2550
-F 0 "JP1" V 8696 2637 50  0000 L CNN
-F 1 "Jumper_3_Open" V 8605 2637 50  0000 L CNN
-F 2 "Connector_PinSocket_2.54mm:PinSocket_2x01_P2.54mm_Vertical_SMD" H 8650 2550 50  0001 C CNN
-F 3 "~" H 8650 2550 50  0001 C CNN
-	1    8650 2550
+P 10250 2550
+F 0 "JP1" V 10296 2637 50  0000 L CNN
+F 1 "Jumper_3_Open" V 10205 2637 50  0000 L CNN
+F 2 "Connector_PinSocket_2.54mm:PinSocket_2x01_P2.54mm_Vertical_SMD" H 10250 2550 50  0001 C CNN
+F 3 "~" H 10250 2550 50  0001 C CNN
+	1    10250 2550
 	0    1    1    0   
 $EndComp
 $Comp
@@ -324,55 +310,52 @@ Connection ~ 2550 1200
 $Comp
 L Switch:SW_MEC_5G SW1
 U 1 1 601EA0D4
-P 6900 3800
-F 0 "SW1" V 6854 3948 50  0000 L CNN
-F 1 "RESET" V 6945 3948 50  0000 L CNN
-F 2 "Button_Switch_SMD:SW_SPST_B3U-1000P-B" H 6900 4000 50  0001 C CNN
-F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6900 4000 50  0001 C CNN
-	1    6900 3800
+P 8500 2450
+F 0 "SW1" V 8454 2598 50  0000 L CNN
+F 1 "RESET" V 8545 2598 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_B3U-1000P-B" H 8500 2650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8500 2650 50  0001 C CNN
+	1    8500 2450
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	4800 1500 4800 1050
-Connection ~ 5300 1050
 $Comp
 L power:GND #PWR0105
 U 1 1 60206858
-P 7950 1550
-F 0 "#PWR0105" H 7950 1300 50  0001 C CNN
-F 1 "GND" H 7955 1377 50  0000 C CNN
-F 2 "" H 7950 1550 50  0001 C CNN
-F 3 "" H 7950 1550 50  0001 C CNN
-	1    7950 1550
+P 8150 1550
+F 0 "#PWR0105" H 8150 1300 50  0001 C CNN
+F 1 "GND" H 8155 1377 50  0000 C CNN
+F 2 "" H 8150 1550 50  0001 C CNN
+F 3 "" H 8150 1550 50  0001 C CNN
+	1    8150 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C12
 U 1 1 6020A494
-P 7500 1200
-F 0 "C12" H 7615 1246 50  0000 L CNN
-F 1 "100nF" H 7615 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7538 1050 50  0001 C CNN
-F 3 "~" H 7500 1200 50  0001 C CNN
-	1    7500 1200
+P 7700 1200
+F 0 "C12" H 7815 1246 50  0000 L CNN
+F 1 "100nF" H 7815 1155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7738 1050 50  0001 C CNN
+F 3 "~" H 7700 1200 50  0001 C CNN
+	1    7700 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C14
 U 1 1 6020A7A4
-P 7950 1200
-F 0 "C14" H 8065 1246 50  0000 L CNN
-F 1 "100nF" H 8065 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7988 1050 50  0001 C CNN
-F 3 "~" H 7950 1200 50  0001 C CNN
-	1    7950 1200
+P 8150 1200
+F 0 "C14" H 8265 1246 50  0000 L CNN
+F 1 "100nF" H 8265 1155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8188 1050 50  0001 C CNN
+F 3 "~" H 8150 1200 50  0001 C CNN
+	1    8150 1200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7500 1450 7500 1350
-Connection ~ 7500 1450
+	7700 1450 7700 1350
+Connection ~ 7700 1450
 Wire Wire Line
-	7050 1050 7500 1050
+	7250 1050 7700 1050
 $Comp
 L new_components:+1.9V #PWR0106
 U 1 1 6022E61C
@@ -386,48 +369,48 @@ F 3 "" H 2550 1050 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	2550 1050 2550 1200
-Text GLabel 6800 3600 0    50   Output ~ 0
+Text GLabel 8400 2250 0    50   Output ~ 0
 NRST
 Wire Wire Line
-	6800 3600 6900 3600
+	8400 2250 8500 2250
 $Comp
 L power:GND #PWR0107
 U 1 1 6023B918
-P 6900 4150
-F 0 "#PWR0107" H 6900 3900 50  0001 C CNN
-F 1 "GND" H 6905 3977 50  0000 C CNN
-F 2 "" H 6900 4150 50  0001 C CNN
-F 3 "" H 6900 4150 50  0001 C CNN
-	1    6900 4150
+P 8500 2800
+F 0 "#PWR0107" H 8500 2550 50  0001 C CNN
+F 1 "GND" H 8505 2627 50  0000 C CNN
+F 2 "" H 8500 2800 50  0001 C CNN
+F 3 "" H 8500 2800 50  0001 C CNN
+	1    8500 2800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6900 4000 6900 4100
+	8500 2650 8500 2750
 $Comp
 L Device:C_Small C13
 U 1 1 6023F0F8
-P 7550 3700
-F 0 "C13" H 7642 3746 50  0000 L CNN
-F 1 "100n" H 7642 3655 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7550 3700 50  0001 C CNN
-F 3 "~" H 7550 3700 50  0001 C CNN
-	1    7550 3700
+P 8950 2350
+F 0 "C13" H 9042 2396 50  0000 L CNN
+F 1 "100n" H 9042 2305 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8950 2350 50  0001 C CNN
+F 3 "~" H 8950 2350 50  0001 C CNN
+	1    8950 2350
 	1    0    0    -1  
 $EndComp
-Connection ~ 6900 3600
+Connection ~ 8500 2250
 $Comp
 L power:GND #PWR0108
 U 1 1 60245A48
-P 7550 4200
-F 0 "#PWR0108" H 7550 3950 50  0001 C CNN
-F 1 "GND" H 7555 4027 50  0000 C CNN
-F 2 "" H 7550 4200 50  0001 C CNN
-F 3 "" H 7550 4200 50  0001 C CNN
-	1    7550 4200
+P 8950 2850
+F 0 "#PWR0108" H 8950 2600 50  0001 C CNN
+F 1 "GND" H 8955 2677 50  0000 C CNN
+F 2 "" H 8950 2850 50  0001 C CNN
+F 3 "" H 8950 2850 50  0001 C CNN
+	1    8950 2850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7550 3800 7550 4200
+	8950 2450 8950 2850
 Wire Wire Line
 	7350 2700 7350 2650
 $Comp
@@ -454,16 +437,14 @@ Vref(1+R1/R2) = V_out (V_ref = 1.24V) => \n1.24/1+(10000/18000) = 1.93
 $Comp
 L power:GND #PWR0110
 U 1 1 602E27F5
-P 8650 3100
-F 0 "#PWR0110" H 8650 2850 50  0001 C CNN
-F 1 "GND" H 8655 2927 50  0000 C CNN
-F 2 "" H 8650 3100 50  0001 C CNN
-F 3 "" H 8650 3100 50  0001 C CNN
-	1    8650 3100
+P 10250 3100
+F 0 "#PWR0110" H 10250 2850 50  0001 C CNN
+F 1 "GND" H 10255 2927 50  0000 C CNN
+F 2 "" H 10250 3100 50  0001 C CNN
+F 3 "" H 10250 3100 50  0001 C CNN
+	1    10250 3100
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5300 1050 5700 1050
 $Comp
 L power:GND #PWR0111
 U 1 1 6031239E
@@ -481,32 +462,23 @@ Connection ~ 3300 2850
 Wire Wire Line
 	3300 2850 3300 3000
 Wire Wire Line
-	7950 1450 7950 1550
+	8150 1450 8150 1550
 Wire Wire Line
-	7500 1450 7950 1450
+	7700 1450 8150 1450
 Wire Wire Line
-	7950 1350 7950 1450
-Connection ~ 7950 1450
+	8150 1350 8150 1450
+Connection ~ 8150 1450
 $Comp
 L Device:C_Small C6
 U 1 1 6037A61B
-P 4900 1300
-F 0 "C6" H 4992 1346 50  0000 L CNN
-F 1 "4.7uF" H 4992 1255 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4900 1300 50  0001 C CNN
-F 3 "~" H 4900 1300 50  0001 C CNN
-	1    4900 1300
-	1    0    0    -1  
+P 4550 1050
+F 0 "C6" H 4642 1096 50  0000 L CNN
+F 1 "4.7uF" H 4642 1005 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4550 1050 50  0001 C CNN
+F 3 "~" H 4550 1050 50  0001 C CNN
+	1    4550 1050
+	0    1    1    0   
 $EndComp
-Wire Wire Line
-	4800 1050 4900 1050
-Wire Wire Line
-	4900 1050 4900 1200
-Connection ~ 4900 1050
-Wire Wire Line
-	4900 1050 5000 1050
-Wire Wire Line
-	4900 1400 4900 1500
 $Comp
 L Device:C_Small C5
 U 1 1 6038AAB5
@@ -527,17 +499,6 @@ Connection ~ 5200 5300
 Wire Wire Line
 	5200 5300 5200 5400
 $Comp
-L Device:C_Small C7
-U 1 1 603D28E5
-P 8450 1200
-F 0 "C7" H 8542 1246 50  0000 L CNN
-F 1 "1.1uF" H 8542 1155 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8450 1200 50  0001 C CNN
-F 3 "~" H 8450 1200 50  0001 C CNN
-	1    8450 1200
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:LED D1
 U 1 1 600AD06C
 P 750 1600
@@ -631,42 +592,42 @@ Wire Wire Line
 $Comp
 L Device:LED D3
 U 1 1 60106AA4
-P 9100 1300
-F 0 "D3" H 9093 1517 50  0000 C CNN
-F 1 "LED" H 9093 1426 50  0000 C CNN
-F 2 "Diode_SMD:D_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9100 1300 50  0001 C CNN
-F 3 "~" H 9100 1300 50  0001 C CNN
-	1    9100 1300
+P 9000 1300
+F 0 "D3" H 8993 1517 50  0000 C CNN
+F 1 "LED" H 8993 1426 50  0000 C CNN
+F 2 "Diode_SMD:D_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9000 1300 50  0001 C CNN
+F 3 "~" H 9000 1300 50  0001 C CNN
+	1    9000 1300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R_Small R6
 U 1 1 6010926A
-P 9000 1050
-F 0 "R6" V 8804 1050 50  0000 C CNN
-F 1 "68" V 8895 1050 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 9000 1050 50  0001 C CNN
-F 3 "~" H 9000 1050 50  0001 C CNN
-	1    9000 1050
+P 8900 1050
+F 0 "R6" V 8704 1050 50  0000 C CNN
+F 1 "68" V 8795 1050 50  0000 C CNN
+F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 8900 1050 50  0001 C CNN
+F 3 "~" H 8900 1050 50  0001 C CNN
+	1    8900 1050
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	9100 1050 9100 1150
+	9000 1050 9000 1150
 $Comp
 L power:GND #PWR0117
 U 1 1 601115D6
-P 9100 1550
-F 0 "#PWR0117" H 9100 1300 50  0001 C CNN
-F 1 "GND" H 9105 1377 50  0000 C CNN
-F 2 "" H 9100 1550 50  0001 C CNN
-F 3 "" H 9100 1550 50  0001 C CNN
-	1    9100 1550
+P 9000 1550
+F 0 "#PWR0117" H 9000 1300 50  0001 C CNN
+F 1 "GND" H 9005 1377 50  0000 C CNN
+F 2 "" H 9000 1550 50  0001 C CNN
+F 3 "" H 9000 1550 50  0001 C CNN
+	1    9000 1550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 1450 9100 1550
-Text Notes 8000 1950 0    50   ~ 0
-red LED, voltagedrop 1.8V, forward current 2mA
+	9000 1450 9000 1550
+Text Notes 8250 1900 0    50   ~ 0
+red LED, voltagedrop 1.95V, forward current 20mA. From datasheet.
 Wire Wire Line
 	7300 2350 7300 2450
 $Comp
@@ -675,7 +636,7 @@ U 1 1 6014002F
 P 2950 1600
 F 0 "TP1" H 3008 1718 50  0000 L CNN
 F 1 "TestPoint" H 3008 1627 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 3150 1600 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3150 1600 50  0001 C CNN
 F 3 "~" H 3150 1600 50  0001 C CNN
 	1    2950 1600
 	1    0    0    -1  
@@ -688,7 +649,7 @@ U 1 1 6014A90A
 P 5400 5400
 F 0 "TP2" H 5458 5518 50  0000 L CNN
 F 1 "TestPoint" H 5458 5427 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 5600 5400 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5600 5400 50  0001 C CNN
 F 3 "~" H 5600 5400 50  0001 C CNN
 	1    5400 5400
 	1    0    0    -1  
@@ -699,7 +660,7 @@ U 1 1 6014F164
 P 7500 2650
 F 0 "TP3" H 7558 2768 50  0000 L CNN
 F 1 "TestPoint" H 7558 2677 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 7700 2650 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7700 2650 50  0001 C CNN
 F 3 "~" H 7700 2650 50  0001 C CNN
 	1    7500 2650
 	1    0    0    -1  
@@ -707,33 +668,29 @@ $EndComp
 $Comp
 L Connector:TestPoint TP4
 U 1 1 60158444
-P 6700 4100
-F 0 "TP4" H 6758 4218 50  0000 L CNN
-F 1 "TestPoint" H 6758 4127 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 6900 4100 50  0001 C CNN
-F 3 "~" H 6900 4100 50  0001 C CNN
-	1    6700 4100
+P 8300 2750
+F 0 "TP4" H 8358 2868 50  0000 L CNN
+F 1 "TestPoint" H 8358 2777 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 8500 2750 50  0001 C CNN
+F 3 "~" H 8500 2750 50  0001 C CNN
+	1    8300 2750
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	6700 4100 6900 4100
-Wire Wire Line
-	5150 1050 5200 1050
-Wire Wire Line
-	5100 1050 5200 1050
+	8300 2750 8500 2750
 Wire Wire Line
-	6150 1450 6600 1450
+	6350 1450 6800 1450
 Wire Wire Line
-	6600 1050 6150 1050
-Connection ~ 6150 1050
+	6800 1050 6350 1050
+Connection ~ 6350 1050
 Wire Wire Line
-	6600 1350 6600 1450
+	6800 1350 6800 1450
 Wire Wire Line
-	6600 1050 7050 1050
-Connection ~ 6600 1050
+	6800 1050 7250 1050
+Connection ~ 6800 1050
 Wire Wire Line
-	6600 1450 7050 1450
-Connection ~ 6600 1450
+	6800 1450 7250 1450
+Connection ~ 6800 1450
 Wire Wire Line
 	3300 3000 3550 3000
 Wire Wire Line
@@ -754,43 +711,43 @@ Wire Wire Line
 $Comp
 L Power_Protection:USBLC6-2SC6 U4
 U 1 1 60264BD7
-P 9750 4650
-F 0 "U4" V 9704 5094 50  0000 L CNN
-F 1 "USBLC6-2SC6" V 9795 5094 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23-6" H 9750 4150 50  0001 C CNN
-F 3 "https://www.st.com/resource/en/datasheet/usblc6-2.pdf" H 9950 5000 50  0001 C CNN
-	1    9750 4650
-	1    0    0    -1  
+P 8550 4600
+F 0 "U4" V 8504 5044 50  0000 L CNN
+F 1 "USBLC6-2SC6" V 8595 5044 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-6" H 8550 4100 50  0001 C CNN
+F 3 "https://www.st.com/resource/en/datasheet/usblc6-2.pdf" H 8750 4950 50  0001 C CNN
+	1    8550 4600
+	0    -1   -1   0   
 $EndComp
 $Comp
 L power:+5V #PWR0120
 U 1 1 602A8F95
-P 9400 3850
-F 0 "#PWR0120" H 9400 3700 50  0001 C CNN
-F 1 "+5V" H 9415 4023 50  0000 C CNN
-F 2 "" H 9400 3850 50  0001 C CNN
-F 3 "" H 9400 3850 50  0001 C CNN
-	1    9400 3850
+P 8000 3750
+F 0 "#PWR0120" H 8000 3600 50  0001 C CNN
+F 1 "+5V" H 8015 3923 50  0000 C CNN
+F 2 "" H 8000 3750 50  0001 C CNN
+F 3 "" H 8000 3750 50  0001 C CNN
+	1    8000 3750
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0121
 U 1 1 602D0EA3
-P 8450 5650
-F 0 "#PWR0121" H 8450 5400 50  0001 C CNN
-F 1 "GND" H 8455 5477 50  0000 C CNN
-F 2 "" H 8450 5650 50  0001 C CNN
-F 3 "" H 8450 5650 50  0001 C CNN
-	1    8450 5650
+P 7050 5550
+F 0 "#PWR0121" H 7050 5300 50  0001 C CNN
+F 1 "GND" H 7055 5377 50  0000 C CNN
+F 2 "" H 7050 5550 50  0001 C CNN
+F 3 "" H 7050 5550 50  0001 C CNN
+	1    7050 5550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8450 5550 8450 5650
-Text GLabel 10300 4550 2    50   BiDi ~ 0
+	7050 5450 7050 5550
+Text GLabel 8450 5000 3    50   BiDi ~ 0
 DM
 Text GLabel 5750 2800 2    50   BiDi ~ 0
 DM
-Text GLabel 10300 4750 2    50   BiDi ~ 0
+Text GLabel 8450 4200 1    50   BiDi ~ 0
 DP
 Text GLabel 5750 2900 2    50   BiDi ~ 0
 DP
@@ -927,77 +884,36 @@ SCK
 $Comp
 L power:GND #PWR0126
 U 1 1 60456608
-P 9750 5150
-F 0 "#PWR0126" H 9750 4900 50  0001 C CNN
-F 1 "GND" H 9755 4977 50  0000 C CNN
-F 2 "" H 9750 5150 50  0001 C CNN
-F 3 "" H 9750 5150 50  0001 C CNN
-	1    9750 5150
+P 8950 5550
+F 0 "#PWR0126" H 8950 5300 50  0001 C CNN
+F 1 "GND" H 8955 5377 50  0000 C CNN
+F 2 "" H 8950 5550 50  0001 C CNN
+F 3 "" H 8950 5550 50  0001 C CNN
+	1    8950 5550
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9750 4250 9400 4250
-Wire Wire Line
-	9750 5050 9750 5150
-Wire Wire Line
-	9050 4750 9350 4750
-Wire Wire Line
-	10150 4550 10300 4550
-Wire Wire Line
-	10150 4750 10300 4750
-$Comp
-L Device:C C17
-U 1 1 604A166A
-P 10600 4650
-F 0 "C17" H 10715 4696 50  0000 L CNN
-F 1 "100nF" H 10715 4605 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10638 4500 50  0001 C CNN
-F 3 "~" H 10600 4650 50  0001 C CNN
-	1    10600 4650
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	9750 4250 10600 4250
-Wire Wire Line
-	10600 4250 10600 4500
-Connection ~ 9750 4250
-$Comp
-L power:GND #PWR0127
-U 1 1 604A92C9
-P 10600 5150
-F 0 "#PWR0127" H 10600 4900 50  0001 C CNN
-F 1 "GND" H 10605 4977 50  0000 C CNN
-F 2 "" H 10600 5150 50  0001 C CNN
-F 3 "" H 10600 5150 50  0001 C CNN
-	1    10600 5150
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	10600 4800 10600 5050
 $Comp
 L Connector:USB_C_Plug_USB2.0 P1
 U 1 1 60509045
-P 8450 4650
-F 0 "P1" H 8557 5517 50  0000 C CNN
-F 1 "USB_C_Plug_USB2.0" H 8557 5426 50  0000 C CNN
-F 2 "Connector_USB:USB_C_Receptacle_Amphenol_12401548E4-2A" H 8600 4650 50  0001 C CNN
-F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 8600 4650 50  0001 C CNN
-	1    8450 4650
+P 7050 4550
+F 0 "P1" H 7157 5417 50  0000 C CNN
+F 1 "USB_C_Plug_USB2.0" H 7157 5326 50  0000 C CNN
+F 2 "Connector_USB:USB_C_Receptacle_Amphenol_12401548E4-2A" H 7200 4550 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 7200 4550 50  0001 C CNN
+	1    7050 4550
 	1    0    0    -1  
 $EndComp
 NoConn ~ 6700 6450
 Wire Wire Line
-	9050 4050 9400 4050
-Connection ~ 9400 4050
-Wire Wire Line
-	9400 4050 9400 4250
+	7650 3950 8000 3950
+Connection ~ 8000 3950
 Wire Wire Line
-	9400 3850 9400 4050
+	8000 3950 8000 4150
 Wire Wire Line
-	9050 4550 9350 4550
-NoConn ~ 8150 5550
-NoConn ~ 9050 4250
-NoConn ~ 9050 4350
+	8000 3750 8000 3950
+NoConn ~ 6750 5450
+NoConn ~ 7650 4150
+NoConn ~ 7650 4250
 NoConn ~ 4300 3100
 NoConn ~ 4300 3300
 NoConn ~ 4300 3400
@@ -1062,16 +978,6 @@ F 3 "" H 5200 5400 50  0001 C CNN
 	1    5200 5400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7950 1450 8450 1450
-Wire Wire Line
-	8450 1450 8450 1300
-Wire Wire Line
-	8450 1100 8450 1050
-Wire Wire Line
-	8450 1050 8750 1050
-Wire Wire Line
-	5300 1050 5300 1500
 $Comp
 L power:GND #PWR0128
 U 1 1 6012545A
@@ -1085,11 +991,11 @@ F 3 "" H 4050 2300 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	6950 2650 7350 2650
-Connection ~ 6900 4100
+Connection ~ 8500 2750
 Wire Wire Line
-	6900 4100 6900 4150
+	8500 2750 8500 2800
 Wire Wire Line
-	6900 3600 7550 3600
+	8500 2250 8950 2250
 Wire Wire Line
 	7500 2650 7350 2650
 Wire Wire Line
@@ -1103,19 +1009,14 @@ Wire Wire Line
 $Comp
 L Connector:TestPoint TP6
 U 1 1 6018CCCD
-P 10750 5050
-F 0 "TP6" H 10808 5168 50  0000 L CNN
-F 1 "TestPoint" H 10808 5077 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 10950 5050 50  0001 C CNN
-F 3 "~" H 10950 5050 50  0001 C CNN
-	1    10750 5050
+P 9100 5300
+F 0 "TP6" H 9158 5418 50  0000 L CNN
+F 1 "TestPoint" H 9158 5327 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 9300 5300 50  0001 C CNN
+F 3 "~" H 9300 5300 50  0001 C CNN
+	1    9100 5300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	10750 5050 10600 5050
-Connection ~ 10600 5050
-Wire Wire Line
-	10600 5050 10600 5150
 Wire Wire Line
 	6950 2450 7300 2450
 Text GLabel 1500 6850 2    50   Input ~ 0
@@ -1345,7 +1246,7 @@ U 1 1 6058376A
 P 1400 6050
 F 0 "TP5" H 1458 6168 50  0000 L CNN
 F 1 "TestPoint" H 1458 6077 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 1600 6050 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 1600 6050 50  0001 C CNN
 F 3 "~" H 1600 6050 50  0001 C CNN
 	1    1400 6050
 	1    0    0    -1  
@@ -1381,17 +1282,14 @@ Wire Wire Line
 Text GLabel 2700 5950 2    50   Output ~ 0
 MOTION
 Wire Wire Line
-	8750 900  8750 1050
-Connection ~ 8750 1050
-Wire Wire Line
-	8750 1050 8900 1050
+	8600 850  8600 1050
+Connection ~ 8600 1050
 Wire Wire Line
-	7500 1050 7950 1050
-Connection ~ 7500 1050
-Connection ~ 8450 1050
-Connection ~ 7950 1050
+	8600 1050 8800 1050
 Wire Wire Line
-	7950 1050 8450 1050
+	7700 1050 8150 1050
+Connection ~ 7700 1050
+Connection ~ 8150 1050
 Wire Wire Line
 	2350 6700 2350 6750
 $Comp
@@ -1428,7 +1326,7 @@ U 1 1 6021FF94
 P 600 3200
 F 0 "TP7" H 658 3318 50  0000 L CNN
 F 1 "TestPoint" H 658 3227 50  0000 L CNN
-F 2 "MountingHole:MountingHole_2.2mm_M2_DIN965_Pad" H 800 3200 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 800 3200 50  0001 C CNN
 F 3 "~" H 800 3200 50  0001 C CNN
 	1    600  3200
 	1    0    0    -1  
@@ -1462,28 +1360,102 @@ MOTION
 Wire Wire Line
 	5700 4700 5750 4700
 $Comp
-L power:+3.3V #PWR?
+L power:+3.3V #PWR0135
 U 1 1 605B5FA8
-P 8650 2300
-F 0 "#PWR?" H 8650 2150 50  0001 C CNN
-F 1 "+3.3V" H 8665 2473 50  0000 C CNN
-F 2 "" H 8650 2300 50  0001 C CNN
-F 3 "" H 8650 2300 50  0001 C CNN
-	1    8650 2300
+P 10250 2300
+F 0 "#PWR0135" H 10250 2150 50  0001 C CNN
+F 1 "+3.3V" H 10265 2473 50  0000 C CNN
+F 2 "" H 10250 2300 50  0001 C CNN
+F 3 "" H 10250 2300 50  0001 C CNN
+	1    10250 2300
 	1    0    0    -1  
 $EndComp
 Text GLabel 4300 1900 0    50   Output ~ 0
 BOOT0
-Text GLabel 8350 2550 0    50   Input ~ 0
+Text GLabel 9950 2550 0    50   Input ~ 0
 BOOT0
 Wire Wire Line
-	8350 2550 8400 2550
+	9950 2550 10000 2550
+Wire Wire Line
+	10250 2800 10000 2800
+Wire Wire Line
+	10000 2800 10000 2550
+Connection ~ 10250 2800
+Connection ~ 10000 2550
+Wire Wire Line
+	10000 2550 10100 2550
+Wire Wire Line
+	8150 1050 8600 1050
+Wire Wire Line
+	9100 5300 8950 5300
+$Comp
+L Device:C C17
+U 1 1 604A166A
+P 8150 5300
+F 0 "C17" H 8265 5346 50  0000 L CNN
+F 1 "100nF" H 8265 5255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8188 5150 50  0001 C CNN
+F 3 "~" H 8150 5300 50  0001 C CNN
+	1    8150 5300
+	1    0    0    -1  
+$EndComp
+Text GLabel 7650 4450 2    50   Input ~ 0
+DM_ESD
+Text GLabel 8650 4200 1    50   Output ~ 0
+DM_ESD
+Text GLabel 7650 4650 2    50   Input ~ 0
+DP_ESD
+Text GLabel 8650 5000 3    50   Output ~ 0
+DP_ESD
+Wire Wire Line
+	8000 4150 8150 4150
+Wire Wire Line
+	8150 4150 8150 4600
+Wire Wire Line
+	8950 4600 8950 5300
+Wire Wire Line
+	8150 4600 8150 5150
+Connection ~ 8150 4600
+Wire Wire Line
+	8150 5450 8950 5450
+Connection ~ 8950 5450
+Wire Wire Line
+	8950 5450 8950 5550
+Connection ~ 8950 5300
+Wire Wire Line
+	8950 5300 8950 5450
+Text GLabel 5800 1050 0    50   Input ~ 0
+VDD_3.3
+Connection ~ 5900 1050
+Wire Wire Line
+	5800 1050 5900 1050
+Text GLabel 5300 1500 1    50   Output ~ 0
+VDD_3.3
+Text GLabel 5200 1500 1    50   Output ~ 0
+VDD_3.3
+Text GLabel 4800 1500 1    50   Output ~ 0
+VDD_3.3
+Text GLabel 5100 1500 1    50   Output ~ 0
+VDD_3.3
+Text GLabel 5000 1500 1    50   Output ~ 0
+VDD_3.3
+Wire Wire Line
+	4900 1050 4900 1500
+$Comp
+L power:GND #PWR0127
+U 1 1 6020FF9F
+P 4100 1350
+F 0 "#PWR0127" H 4100 1100 50  0001 C CNN
+F 1 "GND" H 4105 1177 50  0000 C CNN
+F 2 "" H 4100 1350 50  0001 C CNN
+F 3 "" H 4100 1350 50  0001 C CNN
+	1    4100 1350
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	8650 2800 8400 2800
+	4100 1050 4100 1350
 Wire Wire Line
-	8400 2800 8400 2550
-Connection ~ 8650 2800
-Connection ~ 8400 2550
+	4650 1050 4900 1050
 Wire Wire Line
-	8400 2550 8500 2550
+	4100 1050 4450 1050
 $EndSCHEMATC