diff --git a/lab1/E7020E_lab1-cache.lib b/lab1/E7020E_lab1-cache.lib
index 89d169ee1671353f2d2b3def1351ac992ba0c430..12f84ff26c93253fd8838a2a8556fb5113d7c015 100644
--- a/lab1/E7020E_lab1-cache.lib
+++ b/lab1/E7020E_lab1-cache.lib
@@ -461,7 +461,7 @@ X MOSI 11 350 -200 100 L 50 50 1 1 I
 X MISO 12 350 -100 100 L 50 50 1 1 O
 X NCS 13 350 0 100 L 50 50 1 1 I
 X NC_3 14 350 100 100 L 50 50 1 1 N
-X LED1_P 15 350 200 100 L 50 50 1 1 W
+X LED1_P 15 350 200 100 L 50 50 1 1 I
 X NC 16 350 300 100 L 50 50 1 1 N
 X CN_1 2 -450 200 100 R 50 50 1 1 N
 X VDDPIX 3 -450 100 100 R 50 50 1 1 w
diff --git a/lab1/E7020E_lab1.sch b/lab1/E7020E_lab1.sch
index cb18b21b8b994898ae5ef1cf08b14583401fe8ee..28e34d9768c3a78c87323750462e49acfac6d1b1 100644
--- a/lab1/E7020E_lab1.sch
+++ b/lab1/E7020E_lab1.sch
@@ -100,12 +100,12 @@ Wire Wire Line
 $Comp
 L power:+3.3V #PWR0102
 U 1 1 600F0086
-P 7950 950
-F 0 "#PWR0102" H 7950 800 50  0001 C CNN
-F 1 "+3.3V" H 7965 1123 50  0000 C CNN
-F 2 "" H 7950 950 50  0001 C CNN
-F 3 "" H 7950 950 50  0001 C CNN
-	1    7950 950 
+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 
 	1    0    0    -1  
 $EndComp
 Connection ~ 7050 1050
@@ -125,24 +125,24 @@ Wire Wire Line
 $Comp
 L Device:R R4
 U 1 1 6011C94B
-P 3550 2300
-F 0 "R4" V 3343 2300 50  0000 C CNN
-F 1 "10k" V 3434 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 3480 2300 50  0001 C CNN
-F 3 "~" H 3550 2300 50  0001 C CNN
-	1    3550 2300
-	-1   0    0    1   
+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
+	1    0    0    -1  
 $EndComp
 $Comp
 L Jumper:Jumper_3_Open JP1
 U 1 1 60122387
-P 3550 1900
-F 0 "JP1" V 3596 1987 50  0000 L CNN
-F 1 "Jumper_3_Open" V 3505 1987 50  0000 L CNN
-F 2 "" H 3550 1900 50  0001 C CNN
-F 3 "~" H 3550 1900 50  0001 C CNN
-	1    3550 1900
-	0    -1   -1   0   
+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
+	0    1    1    0   
 $EndComp
 $Comp
 L Device:Crystal Y1
@@ -181,27 +181,27 @@ F 3 "~" H 3700 3000 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	3300 2700 3550 2700
-Text GLabel 5800 3100 2    50   Output ~ 0
+Text GLabel 5750 3100 2    50   Output ~ 0
 SWCLK
 Wire Wire Line
-	5800 3100 5700 3100
-Text GLabel 5800 3000 2    50   BiDi ~ 0
+	5750 3100 5700 3100
+Text GLabel 5750 3000 2    50   BiDi ~ 0
 SWDIO
 Wire Wire Line
-	5700 3000 5800 3000
-Text GLabel 5850 3700 2    50   Output ~ 0
+	5700 3000 5750 3000
+Text GLabel 5750 3700 2    50   Output ~ 0
 SWO
 Wire Wire Line
-	5700 3700 5850 3700
+	5700 3700 5750 3700
 $Comp
 L power:+3.3V #PWR0103
 U 1 1 6015A85D
-P 7400 2350
-F 0 "#PWR0103" H 7400 2200 50  0001 C CNN
-F 1 "+3.3V" H 7415 2523 50  0000 C CNN
-F 2 "" H 7400 2350 50  0001 C CNN
-F 3 "" H 7400 2350 50  0001 C CNN
-	1    7400 2350
+P 7300 2350
+F 0 "#PWR0103" H 7300 2200 50  0001 C CNN
+F 1 "+3.3V" H 7315 2523 50  0000 C CNN
+F 2 "" H 7300 2350 50  0001 C CNN
+F 3 "" H 7300 2350 50  0001 C CNN
+	1    7300 2350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -209,34 +209,34 @@ Wire Wire Line
 Connection ~ 3900 2700
 Wire Wire Line
 	3900 2700 4300 2700
-Text Notes 2550 3200 0    50   ~ 0
+Text Notes 2650 3200 0    50   ~ 0
 C = 2*(Cload - Cstray)\n2*(18 - 6) = 24pF
 $Comp
 L new_components:PMW3389 U2
 U 1 1 6018AE70
-P 2850 5100
-F 0 "U2" H 2800 5665 50  0000 C CNN
-F 1 "PMW3389" H 2800 5574 50  0000 C CNN
-F 2 "" H 2850 4550 50  0001 C CNN
-F 3 "" H 2850 4550 50  0001 C CNN
-	1    2850 5100
+P 2350 5550
+F 0 "U2" H 2300 6115 50  0000 C CNN
+F 1 "PMW3389" H 2300 6024 50  0000 C CNN
+F 2 "" H 2350 5000 50  0001 C CNN
+F 3 "" H 2350 5000 50  0001 C CNN
+	1    2350 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+5V #PWR0104
 U 1 1 60190990
-P 950 1000
-F 0 "#PWR0104" H 950 850 50  0001 C CNN
-F 1 "+5V" H 965 1173 50  0000 C CNN
-F 2 "" H 950 1000 50  0001 C CNN
-F 3 "" H 950 1000 50  0001 C CNN
-	1    950  1000
+P 1000 1000
+F 0 "#PWR0104" H 1000 850 50  0001 C CNN
+F 1 "+5V" H 1015 1173 50  0000 C CNN
+F 2 "" H 1000 1000 50  0001 C CNN
+F 3 "" H 1000 1000 50  0001 C CNN
+	1    1000 1000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	950  1000 950  1200
+	1000 1000 1000 1200
 Wire Wire Line
-	950  1200 1150 1200
+	1000 1200 1150 1200
 $Comp
 L Device:C_Small C2
 U 1 1 60197D01
@@ -253,7 +253,7 @@ L Device:R_Small R2
 U 1 1 60198F52
 P 2050 1350
 F 0 "R2" H 2109 1396 50  0000 L CNN
-F 1 "10000" H 2109 1305 50  0000 L CNN
+F 1 "100" H 2109 1305 50  0000 L CNN
 F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 2050 1350 50  0001 C CNN
 F 3 "~" H 2050 1350 50  0001 C CNN
 	1    2050 1350
@@ -264,7 +264,7 @@ L Device:R_Small R3
 U 1 1 6019A085
 P 2050 1650
 F 0 "R3" H 2109 1696 50  0000 L CNN
-F 1 "18000" H 2109 1605 50  0000 L CNN
+F 1 "180" H 2109 1605 50  0000 L CNN
 F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 2050 1650 50  0001 C CNN
 F 3 "~" H 2050 1650 50  0001 C CNN
 	1    2050 1650
@@ -295,17 +295,17 @@ Wire Wire Line
 $Comp
 L Device:C_Small C1
 U 1 1 601B6209
-P 950 1550
-F 0 "C1" H 1042 1596 50  0000 L CNN
-F 1 "1uF" H 1042 1505 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 950 1550 50  0001 C CNN
-F 3 "~" H 950 1550 50  0001 C CNN
-	1    950  1550
+P 1000 1550
+F 0 "C1" H 1092 1596 50  0000 L CNN
+F 1 "1uF" H 1092 1505 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1000 1550 50  0001 C CNN
+F 3 "~" H 1000 1550 50  0001 C CNN
+	1    1000 1550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	950  1200 950  1450
-Connection ~ 950  1200
+	1000 1200 1000 1450
+Connection ~ 1000 1200
 Wire Wire Line
 	1300 1300 1150 1300
 Wire Wire Line
@@ -327,7 +327,7 @@ 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 "" H 6900 4000 50  0001 C 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
 	0    1    1    0   
@@ -386,7 +386,7 @@ F 3 "" H 2550 1050 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	2550 1050 2550 1200
-Text GLabel 6800 3600 0    50   Input ~ 0
+Text GLabel 6800 3600 0    50   Output ~ 0
 NRST
 Wire Wire Line
 	6800 3600 6900 3600
@@ -402,7 +402,7 @@ F 3 "" H 6900 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6900 4000 6900 4150
+	6900 4000 6900 4100
 $Comp
 L Device:C_Small C13
 U 1 1 6023F0F8
@@ -414,8 +414,6 @@ F 3 "~" H 7550 3700 50  0001 C CNN
 	1    7550 3700
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6900 3600 7150 3600
 Connection ~ 6900 3600
 $Comp
 L power:GND #PWR0108
@@ -431,57 +429,37 @@ $EndComp
 Wire Wire Line
 	7550 3800 7550 4200
 Wire Wire Line
-	4200 1700 4300 1700
-Wire Wire Line
-	7650 2650 7650 2550
-Wire Wire Line
-	7650 2550 6950 2550
+	7350 2700 7350 2650
 $Comp
 L power:GND #PWR0109
 U 1 1 6026659F
-P 7650 2650
-F 0 "#PWR0109" H 7650 2400 50  0001 C CNN
-F 1 "GND" H 7655 2477 50  0000 C CNN
-F 2 "" H 7650 2650 50  0001 C CNN
-F 3 "" H 7650 2650 50  0001 C CNN
-	1    7650 2650
+P 7350 2700
+F 0 "#PWR0109" H 7350 2450 50  0001 C CNN
+F 1 "GND" H 7355 2527 50  0000 C CNN
+F 2 "" H 7350 2700 50  0001 C CNN
+F 3 "" H 7350 2700 50  0001 C CNN
+	1    7350 2700
 	1    0    0    -1  
 $EndComp
-Text GLabel 7100 2650 2    50   Input ~ 0
+Text GLabel 6950 2550 2    50   Input ~ 0
 SWCLK
-Wire Wire Line
-	6950 2650 7100 2650
-Text GLabel 7100 2750 2    50   BiDi ~ 0
+Text GLabel 6950 2750 2    50   BiDi ~ 0
 SWDIO
-Text GLabel 7100 2950 2    50   Input ~ 0
+Text GLabel 6950 2950 2    50   Input ~ 0
 SWO
-Text GLabel 7100 2850 2    50   Input ~ 0
+Text GLabel 6950 2850 2    50   Input ~ 0
 NRST
-Wire Wire Line
-	6950 2750 7100 2750
-Wire Wire Line
-	6950 2950 7100 2950
-Text Notes 6450 3100 0    50   ~ 0
-Kanske behöver byta plats om det inte fungerar.
 Text Notes 850  2300 0    50   ~ 0
 Vref(1+R1/R2) = V_out (V_ref = 1.24V) => \n1.24/1+(10000/18000) = 1.93
-Wire Wire Line
-	4400 1900 4300 1900
-Wire Wire Line
-	3550 1650 3550 1050
-Connection ~ 4800 1050
-Wire Wire Line
-	3550 2150 3550 2200
-Connection ~ 3550 2150
 $Comp
 L power:GND #PWR0110
 U 1 1 602E27F5
-P 3550 2450
-F 0 "#PWR0110" H 3550 2200 50  0001 C CNN
-F 1 "GND" H 3555 2277 50  0000 C CNN
-F 2 "" H 3550 2450 50  0001 C CNN
-F 3 "" H 3550 2450 50  0001 C CNN
-	1    3550 2450
+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
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -502,14 +480,6 @@ Wire Wire Line
 Connection ~ 3300 2850
 Wire Wire Line
 	3300 2850 3300 3000
-Wire Wire Line
-	3800 2100 4300 2100
-Wire Wire Line
-	7950 1050 7500 1050
-Connection ~ 7500 1050
-Wire Wire Line
-	7950 950  7950 1050
-Connection ~ 7950 1050
 Wire Wire Line
 	7950 1450 7950 1550
 Wire Wire Line
@@ -517,8 +487,6 @@ Wire Wire Line
 Wire Wire Line
 	7950 1350 7950 1450
 Connection ~ 7950 1450
-Wire Wire Line
-	3550 1050 3800 1050
 $Comp
 L Device:C_Small C6
 U 1 1 6037A61B
@@ -542,21 +510,14 @@ Wire Wire Line
 $Comp
 L Device:C_Small C5
 U 1 1 6038AAB5
-P 3800 1300
-F 0 "C5" H 3892 1346 50  0000 L CNN
-F 1 "4.7uF" H 3892 1255 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3800 1300 50  0001 C CNN
-F 3 "~" H 3800 1300 50  0001 C CNN
-	1    3800 1300
+P 4050 2200
+F 0 "C5" H 4142 2246 50  0000 L CNN
+F 1 "4.7uF" H 4142 2155 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4050 2200 50  0001 C CNN
+F 3 "~" H 4050 2200 50  0001 C CNN
+	1    4050 2200
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3800 1050 3800 1200
-Connection ~ 3800 1050
-Wire Wire Line
-	3800 1050 4800 1050
-Wire Wire Line
-	3800 1400 3800 2100
 Wire Wire Line
 	5200 5000 5200 5300
 Wire Wire Line
@@ -582,7 +543,7 @@ U 1 1 600AD06C
 P 750 1600
 F 0 "D1" H 743 1817 50  0000 C CNN
 F 1 "LED" H 743 1726 50  0000 C CNN
-F 2 "" H 750 1600 50  0001 C CNN
+F 2 "Diode_SMD:D_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 750 1600 50  0001 C CNN
 F 3 "~" H 750 1600 50  0001 C CNN
 	1    750  1600
 	0    -1   -1   0   
@@ -592,14 +553,14 @@ L Device:R_Small R1
 U 1 1 600B2048
 P 750 1350
 F 0 "R1" H 809 1396 50  0000 L CNN
-F 1 "1600" H 809 1305 50  0000 L CNN
+F 1 "153" H 809 1305 50  0000 L CNN
 F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 750 1350 50  0001 C CNN
 F 3 "~" H 750 1350 50  0001 C CNN
 	1    750  1350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	950  1200 750  1200
+	1000 1200 750  1200
 Wire Wire Line
 	750  1200 750  1250
 $Comp
@@ -618,12 +579,12 @@ Wire Wire Line
 $Comp
 L power:GND #PWR0113
 U 1 1 600D0160
-P 950 1850
-F 0 "#PWR0113" H 950 1600 50  0001 C CNN
-F 1 "GND" H 955 1677 50  0000 C CNN
-F 2 "" H 950 1850 50  0001 C CNN
-F 3 "" H 950 1850 50  0001 C CNN
-	1    950  1850
+P 1000 1850
+F 0 "#PWR0113" H 1000 1600 50  0001 C CNN
+F 1 "GND" H 1005 1677 50  0000 C CNN
+F 2 "" H 1000 1850 50  0001 C CNN
+F 3 "" H 1000 1850 50  0001 C CNN
+	1    1000 1850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -660,26 +621,20 @@ F 3 "" H 2550 1850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	950  1650 950  1850
+	1000 1650 1000 1850
 Wire Wire Line
 	1600 1600 1600 1850
 Wire Wire Line
 	2050 1750 2050 1850
 Wire Wire Line
-	2550 1600 2550 1850
-Connection ~ 4300 1900
-Wire Wire Line
-	4300 1900 3700 1900
-Connection ~ 4300 2100
-Wire Wire Line
-	4300 2100 4400 2100
+	2550 1600 2550 1700
 $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 "" H 9100 1300 50  0001 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
 	0    -1   -1   0   
@@ -689,14 +644,12 @@ L Device:R_Small R6
 U 1 1 6010926A
 P 9000 1050
 F 0 "R6" V 8804 1050 50  0000 C CNN
-F 1 "750" V 8895 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
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	7950 1050 8450 1050
 Wire Wire Line
 	9100 1050 9100 1150
 $Comp
@@ -712,114 +665,58 @@ F 3 "" H 9100 1550 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	9100 1450 9100 1550
-Text Notes 9250 2200 0    50   ~ 0
+Text Notes 8000 1950 0    50   ~ 0
 red LED, voltagedrop 1.8V, forward current 2mA
-$Comp
-L Device:LED D2
-U 1 1 6011EDBA
-P 7950 2450
-F 0 "D2" H 7943 2195 50  0000 C CNN
-F 1 "LED" H 7943 2286 50  0000 C CNN
-F 2 "" H 7950 2450 50  0001 C CNN
-F 3 "~" H 7950 2450 50  0001 C CNN
-	1    7950 2450
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R5
-U 1 1 6011F8D3
-P 7650 2450
-F 0 "R5" V 7454 2450 50  0000 C CNN
-F 1 "750" V 7545 2450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 7650 2450 50  0001 C CNN
-F 3 "~" H 7650 2450 50  0001 C CNN
-	1    7650 2450
-	0    1    1    0   
-$EndComp
 Wire Wire Line
-	7750 2450 7800 2450
-$Comp
-L power:GND #PWR0118
-U 1 1 6012A39D
-P 8100 2650
-F 0 "#PWR0118" H 8100 2400 50  0001 C CNN
-F 1 "GND" H 8105 2477 50  0000 C CNN
-F 2 "" H 8100 2650 50  0001 C CNN
-F 3 "" H 8100 2650 50  0001 C CNN
-	1    8100 2650
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	8100 2450 8100 2650
-Wire Wire Line
-	6950 2450 7000 2450
-Wire Wire Line
-	7400 2350 7400 2450
-Connection ~ 7400 2450
-Wire Wire Line
-	7400 2450 7550 2450
+	7300 2350 7300 2450
 $Comp
 L Connector:TestPoint TP1
 U 1 1 6014002F
-P 500 1000
-F 0 "TP1" H 558 1118 50  0000 L CNN
-F 1 "TestPoint" H 558 1027 50  0000 L CNN
-F 2 "" H 700 1000 50  0001 C CNN
-F 3 "~" H 700 1000 50  0001 C CNN
-	1    500  1000
+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 3 "~" H 3150 1600 50  0001 C CNN
+	1    2950 1600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	500  1000 500  1200
-Wire Wire Line
-	500  1200 750  1200
-Connection ~ 750  1200
+	2950 1600 2950 1700
 $Comp
 L Connector:TestPoint TP2
 U 1 1 6014A90A
-P 3550 900
-F 0 "TP2" H 3608 1018 50  0000 L CNN
-F 1 "TestPoint" H 3608 927 50  0000 L CNN
-F 2 "" H 3750 900 50  0001 C CNN
-F 3 "~" H 3750 900 50  0001 C CNN
-	1    3550 900 
+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 3 "~" H 5600 5400 50  0001 C CNN
+	1    5400 5400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3550 1050 3550 900 
-Connection ~ 3550 1050
 $Comp
 L Connector:TestPoint TP3
 U 1 1 6014F164
-P 7000 2100
-F 0 "TP3" H 7058 2218 50  0000 L CNN
-F 1 "TestPoint" H 7058 2127 50  0000 L CNN
-F 2 "" H 7200 2100 50  0001 C CNN
-F 3 "~" H 7200 2100 50  0001 C CNN
-	1    7000 2100
+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 3 "~" H 7700 2650 50  0001 C CNN
+	1    7500 2650
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7000 2100 7000 2450
-Connection ~ 7000 2450
-Wire Wire Line
-	7000 2450 7400 2450
 $Comp
 L Connector:TestPoint TP4
 U 1 1 60158444
-P 7150 3400
-F 0 "TP4" H 7208 3518 50  0000 L CNN
-F 1 "TestPoint" H 7208 3427 50  0000 L CNN
-F 2 "" H 7350 3400 50  0001 C CNN
-F 3 "~" H 7350 3400 50  0001 C CNN
-	1    7150 3400
-	1    0    0    -1  
+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
+	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	7150 3400 7150 3600
-Connection ~ 7150 3600
-Wire Wire Line
-	7150 3600 7550 3600
+	6700 4100 6900 4100
 Wire Wire Line
 	5150 1050 5200 1050
 Wire Wire Line
@@ -846,14 +743,14 @@ Wire Wire Line
 Connection ~ 3900 3000
 Wire Wire Line
 	3900 3000 4300 3000
-Text GLabel 3850 3500 0    50   Output ~ 0
+Text GLabel 4250 3500 0    50   Output ~ 0
 MISO
 Wire Wire Line
-	3850 3500 4300 3500
-Text GLabel 3850 3600 0    50   Output ~ 0
+	4250 3500 4300 3500
+Text GLabel 4250 3600 0    50   Output ~ 0
 MOSI
 Wire Wire Line
-	4300 3600 3850 3600
+	4300 3600 4250 3600
 $Comp
 L Power_Protection:USBLC6-2SC6 U4
 U 1 1 60264BD7
@@ -891,16 +788,16 @@ Wire Wire Line
 	8450 5550 8450 5650
 Text GLabel 10300 4550 2    50   BiDi ~ 0
 DM
-Text GLabel 5800 2800 2    50   BiDi ~ 0
+Text GLabel 5750 2800 2    50   BiDi ~ 0
 DM
 Text GLabel 10300 4750 2    50   BiDi ~ 0
 DP
-Text GLabel 5800 2900 2    50   BiDi ~ 0
+Text GLabel 5750 2900 2    50   BiDi ~ 0
 DP
 Wire Wire Line
-	5800 2800 5700 2800
+	5750 2800 5700 2800
 Wire Wire Line
-	5800 2900 5700 2900
+	5750 2900 5700 2900
 $Comp
 L power:GND #PWR0119
 U 1 1 60305071
@@ -915,12 +812,12 @@ $EndComp
 $Comp
 L power:+5V #PWR0122
 U 1 1 6030589C
-P 950 2600
-F 0 "#PWR0122" H 950 2450 50  0001 C CNN
-F 1 "+5V" H 965 2773 50  0000 C CNN
-F 2 "" H 950 2600 50  0001 C CNN
-F 3 "" H 950 2600 50  0001 C CNN
-	1    950  2600
+P 1050 2600
+F 0 "#PWR0122" H 1050 2450 50  0001 C CNN
+F 1 "+5V" H 1065 2773 50  0000 C CNN
+F 2 "" H 1050 2600 50  0001 C CNN
+F 3 "" H 1050 2600 50  0001 C CNN
+	1    1050 2600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -937,12 +834,12 @@ $EndComp
 $Comp
 L Device:C_Small C15
 U 1 1 60309A1A
-P 950 3050
-F 0 "C15" H 1042 3096 50  0000 L CNN
-F 1 "1uF" H 1042 3005 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 950 3050 50  0001 C CNN
-F 3 "~" H 950 3050 50  0001 C CNN
-	1    950  3050
+P 1050 3050
+F 0 "C15" H 1142 3096 50  0000 L CNN
+F 1 "1uF" H 1142 3005 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1050 3050 50  0001 C CNN
+F 3 "~" H 1050 3050 50  0001 C CNN
+	1    1050 3050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -968,12 +865,12 @@ F 3 "https://www.diodes.com/assets/Datasheets/AP2127.pdf" H 1550 2800 50  0001 C
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	950  2600 950  2800
+	1050 2600 1050 2800
 Wire Wire Line
-	1250 2800 950  2800
-Connection ~ 950  2800
+	1250 2800 1050 2800
+Connection ~ 1050 2800
 Wire Wire Line
-	950  2800 950  2950
+	1050 2800 1050 2950
 Wire Wire Line
 	1850 2800 2050 2800
 Wire Wire Line
@@ -984,12 +881,12 @@ Connection ~ 2050 2800
 $Comp
 L power:GND #PWR0124
 U 1 1 60363B5F
-P 950 3300
-F 0 "#PWR0124" H 950 3050 50  0001 C CNN
-F 1 "GND" H 955 3127 50  0000 C CNN
-F 2 "" H 950 3300 50  0001 C CNN
-F 3 "" H 950 3300 50  0001 C CNN
-	1    950  3300
+P 1050 3300
+F 0 "#PWR0124" H 1050 3050 50  0001 C CNN
+F 1 "GND" H 1055 3127 50  0000 C CNN
+F 2 "" H 1050 3300 50  0001 C CNN
+F 3 "" H 1050 3300 50  0001 C CNN
+	1    1050 3300
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1008,32 +905,24 @@ Wire Wire Line
 Wire Wire Line
 	1550 3100 1550 3300
 Wire Wire Line
-	950  3150 950  3300
-Text Notes 8250 6000 0    50   ~ 0
-Kanske behöver byta plats på DM och DP
-Wire Wire Line
-	3200 5400 3350 5400
-Text GLabel 3350 5400 2    50   Input ~ 0
+	1050 3150 1050 3300
+Text GLabel 2700 5850 2    50   Input ~ 0
 SCK
-Text GLabel 3350 5100 2    50   Input ~ 0
+Text GLabel 2700 5550 2    50   Input ~ 0
 NCS
 Wire Wire Line
-	3350 5100 3200 5100
-Wire Wire Line
-	3200 5300 3350 5300
-Wire Wire Line
-	3200 5200 3350 5200
-Text GLabel 3350 5300 2    50   Input ~ 0
+	2700 5650 3250 5650
+Text GLabel 2700 5750 2    50   Input ~ 0
 MOSI
-Text GLabel 3350 5200 2    50   Input ~ 0
+Text GLabel 3350 5650 2    50   Output ~ 0
 MISO
 Wire Wire Line
-	5850 4500 5700 4500
+	5750 4500 5700 4500
 Wire Wire Line
-	5850 4400 5700 4400
-Text GLabel 5850 4500 2    50   Output ~ 0
+	5750 4400 5700 4400
+Text GLabel 5750 4500 2    50   Output ~ 0
 NCS
-Text GLabel 5850 4400 2    50   Output ~ 0
+Text GLabel 5750 4400 2    50   Output ~ 0
 SCK
 $Comp
 L power:GND #PWR0126
@@ -1084,7 +973,7 @@ F 3 "" H 10600 5150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10600 4800 10600 5150
+	10600 4800 10600 5050
 $Comp
 L Connector:USB_C_Plug_USB2.0 P1
 U 1 1 60509045
@@ -1125,7 +1014,6 @@ NoConn ~ 4300 4600
 NoConn ~ 4300 4700
 NoConn ~ 4300 4800
 NoConn ~ 5700 4800
-NoConn ~ 5700 4700
 NoConn ~ 5700 4600
 NoConn ~ 5700 4300
 NoConn ~ 5700 4200
@@ -1148,27 +1036,18 @@ NoConn ~ 5700 2000
 NoConn ~ 5700 1900
 NoConn ~ 5700 1800
 NoConn ~ 5700 1700
-NoConn ~ 3200 4900
-NoConn ~ 3200 5500
-NoConn ~ 2400 5500
-NoConn ~ 2400 5400
-NoConn ~ 2400 5200
-NoConn ~ 2400 5100
-NoConn ~ 2400 5000
 $Comp
 L Connector:Conn_01x06_Male J1
 U 1 1 601365F9
 P 6750 2650
 F 0 "J1" H 6858 3031 50  0000 C CNN
 F 1 "SWD" H 6858 2940 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" H 6750 2650 50  0001 C CNN
+F 2 "Button_Switch_SMD:SW_DIP_SPSTx06_Slide_9.78x17.42mm_W8.61mm_P2.54mm" H 6750 2650 50  0001 C CNN
 F 3 "~" H 6750 2650 50  0001 C CNN
 	1    6750 2650
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6950 2850 7100 2850
-Text GLabel 4200 1700 0    50   Output ~ 0
+Text GLabel 4300 1700 0    50   Input ~ 0
 NRST
 Wire Wire Line
 	4800 5000 4800 5300
@@ -1189,9 +1068,422 @@ Wire Wire Line
 	8450 1450 8450 1300
 Wire Wire Line
 	8450 1100 8450 1050
-Connection ~ 8450 1050
 Wire Wire Line
-	8450 1050 8900 1050
+	8450 1050 8750 1050
 Wire Wire Line
 	5300 1050 5300 1500
+$Comp
+L power:GND #PWR0128
+U 1 1 6012545A
+P 4050 2300
+F 0 "#PWR0128" H 4050 2050 50  0001 C CNN
+F 1 "GND" H 4055 2127 50  0000 C CNN
+F 2 "" H 4050 2300 50  0001 C CNN
+F 3 "" H 4050 2300 50  0001 C CNN
+	1    4050 2300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6950 2650 7350 2650
+Connection ~ 6900 4100
+Wire Wire Line
+	6900 4100 6900 4150
+Wire Wire Line
+	6900 3600 7550 3600
+Wire Wire Line
+	7500 2650 7350 2650
+Wire Wire Line
+	5400 5400 5200 5400
+Connection ~ 5200 5400
+Wire Wire Line
+	2950 1700 2550 1700
+Connection ~ 2550 1700
+Wire Wire Line
+	2550 1700 2550 1850
+$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
+	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
+VDD_3.3V
+Text GLabel 3200 6750 2    50   Input ~ 0
+VDD_1.9V
+$Comp
+L power:+3.3V #PWR0129
+U 1 1 601CA174
+P 700 6850
+F 0 "#PWR0129" H 700 6700 50  0001 C CNN
+F 1 "+3.3V" H 715 7023 50  0000 C CNN
+F 2 "" H 700 6850 50  0001 C CNN
+F 3 "" H 700 6850 50  0001 C CNN
+	1    700  6850
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0130
+U 1 1 601D69E8
+P 1200 7400
+F 0 "#PWR0130" H 1200 7150 50  0001 C CNN
+F 1 "GND" H 1205 7227 50  0000 C CNN
+F 2 "" H 1200 7400 50  0001 C CNN
+F 3 "" H 1200 7400 50  0001 C CNN
+	1    1200 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C18
+U 1 1 601D73A1
+P 1000 7050
+F 0 "C18" H 1092 7096 50  0000 L CNN
+F 1 "10uF" H 1092 7005 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1000 7050 50  0001 C CNN
+F 3 "~" H 1000 7050 50  0001 C CNN
+	1    1000 7050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C19
+U 1 1 601D7B4F
+P 1400 7050
+F 0 "C19" H 1492 7096 50  0000 L CNN
+F 1 "100nF" H 1492 7005 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1400 7050 50  0001 C CNN
+F 3 "~" H 1400 7050 50  0001 C CNN
+	1    1400 7050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1400 6850 1400 6950
+Wire Wire Line
+	1000 6850 1000 6950
+Wire Wire Line
+	1400 7250 1200 7250
+Connection ~ 1200 7250
+Wire Wire Line
+	1000 7250 1200 7250
+Connection ~ 1000 6950
+Wire Wire Line
+	1000 6950 1000 7050
+Connection ~ 1400 6950
+Wire Wire Line
+	1400 6950 1400 7050
+Wire Wire Line
+	1400 7250 1400 7150
+Wire Wire Line
+	1000 7150 1000 7250
+Wire Wire Line
+	1400 6850 1500 6850
+Connection ~ 1400 6850
+$Comp
+L Device:C_Small C20
+U 1 1 6031E03B
+P 2650 7000
+F 0 "C20" H 2742 7046 50  0000 L CNN
+F 1 "10uF" H 2742 6955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 2650 7000 50  0001 C CNN
+F 3 "~" H 2650 7000 50  0001 C CNN
+	1    2650 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C21
+U 1 1 6031E9B0
+P 3100 7000
+F 0 "C21" H 3192 7046 50  0000 L CNN
+F 1 "100nF" H 3192 6955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3100 7000 50  0001 C CNN
+F 3 "~" H 3100 7000 50  0001 C CNN
+	1    3100 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L new_components:+1.9V #PWR0131
+U 1 1 60327483
+P 2350 6700
+F 0 "#PWR0131" H 2350 6550 50  0001 C CNN
+F 1 "+1.9V" H 2365 6873 50  0000 C CNN
+F 2 "" H 2350 6700 50  0001 C CNN
+F 3 "" H 2350 6700 50  0001 C CNN
+	1    2350 6700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2650 6900 2650 6750
+Wire Wire Line
+	3100 6900 3100 6750
+$Comp
+L power:GND #PWR0132
+U 1 1 60347D48
+P 2900 7450
+F 0 "#PWR0132" H 2900 7200 50  0001 C CNN
+F 1 "GND" H 2905 7277 50  0000 C CNN
+F 2 "" H 2900 7450 50  0001 C CNN
+F 3 "" H 2900 7450 50  0001 C CNN
+	1    2900 7450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2650 7300 2900 7300
+Wire Wire Line
+	2650 7100 2650 7300
+Wire Wire Line
+	3100 7100 3100 7300
+Wire Wire Line
+	3100 7300 2900 7300
+Connection ~ 2900 7300
+Wire Wire Line
+	3100 6750 3200 6750
+Wire Wire Line
+	1000 6850 1400 6850
+Wire Wire Line
+	700  6850 1000 6850
+Connection ~ 1000 6850
+Wire Wire Line
+	2350 6750 2650 6750
+Connection ~ 3100 6750
+Connection ~ 2650 6750
+Wire Wire Line
+	2650 6750 3100 6750
+$Comp
+L Device:R_Small R8
+U 1 1 6042B769
+P 3250 5350
+F 0 "R8" H 3309 5396 50  0000 L CNN
+F 1 "10k" H 3309 5305 50  0000 L CNN
+F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 3250 5350 50  0001 C CNN
+F 3 "~" H 3250 5350 50  0001 C CNN
+	1    3250 5350
+	1    0    0    -1  
+$EndComp
+Text GLabel 1900 5650 0    50   Output ~ 0
+VDD_3.3V
+Text GLabel 1900 5550 0    50   Output ~ 0
+VDD_1.9V
+$Comp
+L Device:C_Small C22
+U 1 1 60473AC3
+P 3850 7000
+F 0 "C22" H 3942 7046 50  0000 L CNN
+F 1 "10uF" H 3942 6955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3850 7000 50  0001 C CNN
+F 3 "~" H 3850 7000 50  0001 C CNN
+	1    3850 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C23
+U 1 1 60474221
+P 4250 7000
+F 0 "C23" H 4342 7046 50  0000 L CNN
+F 1 "100nF" H 4342 6955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4250 7000 50  0001 C CNN
+F 3 "~" H 4250 7000 50  0001 C CNN
+	1    4250 7000
+	1    0    0    -1  
+$EndComp
+Text GLabel 4550 6900 2    50   Output ~ 0
+VDDPIX
+Wire Wire Line
+	3850 6900 4250 6900
+Connection ~ 4250 6900
+Wire Wire Line
+	4250 6900 4550 6900
+$Comp
+L power:GND #PWR0133
+U 1 1 604A1848
+P 4050 7400
+F 0 "#PWR0133" H 4050 7150 50  0001 C CNN
+F 1 "GND" H 4055 7227 50  0000 C CNN
+F 2 "" H 4050 7400 50  0001 C CNN
+F 3 "" H 4050 7400 50  0001 C CNN
+	1    4050 7400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3850 7100 3850 7250
+Wire Wire Line
+	4250 7100 4250 7250
+Wire Wire Line
+	3850 7250 4050 7250
+Wire Wire Line
+	4050 7250 4050 7400
+Connection ~ 4050 7250
+Wire Wire Line
+	4050 7250 4250 7250
+Text GLabel 1900 5450 0    50   Output ~ 0
+VDDPIX
+Text GLabel 3050 4950 0    50   Output ~ 0
+VDD_1.9V
+$Comp
+L power:GND #PWR0134
+U 1 1 60578859
+P 1900 6200
+F 0 "#PWR0134" H 1900 5950 50  0001 C CNN
+F 1 "GND" H 1905 6027 50  0000 C CNN
+F 2 "" H 1900 6200 50  0001 C CNN
+F 3 "" H 1900 6200 50  0001 C CNN
+	1    1900 6200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP5
+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 3 "~" H 1600 6050 50  0001 C CNN
+	1    1400 6050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3250 5450 3250 5650
+Connection ~ 3250 5650
+Wire Wire Line
+	3250 5650 3350 5650
+Text GLabel 3300 5000 2    50   Output ~ 0
+VDD_3.3V
+Wire Wire Line
+	3300 5000 3250 5000
+Wire Wire Line
+	3250 5000 3250 5250
+Text GLabel 1900 5850 0    50   Input ~ 0
+NRST
+$Comp
+L Device:R_Small R7
+U 1 1 606AEFA9
+P 3100 5200
+F 0 "R7" H 3159 5246 50  0000 L CNN
+F 1 "13" H 3159 5155 50  0000 L CNN
+F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" H 3100 5200 50  0001 C CNN
+F 3 "~" H 3100 5200 50  0001 C CNN
+	1    3100 5200
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3050 4950 3100 4950
+Wire Wire Line
+	3100 4950 3100 5100
+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
+Wire Wire Line
+	7500 1050 7950 1050
+Connection ~ 7500 1050
+Connection ~ 8450 1050
+Connection ~ 7950 1050
+Wire Wire Line
+	7950 1050 8450 1050
+Wire Wire Line
+	2350 6700 2350 6750
+$Comp
+L Device:LED D2
+U 1 1 6013E7AA
+P 2350 7000
+F 0 "D2" H 2343 7217 50  0000 C CNN
+F 1 "LED" H 2343 7126 50  0000 C CNN
+F 2 "Diode_SMD:D_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2350 7000 50  0001 C CNN
+F 3 "~" H 2350 7000 50  0001 C CNN
+	1    2350 7000
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GND #PWR0118
+U 1 1 6018C485
+P 2350 7400
+F 0 "#PWR0118" H 2350 7150 50  0001 C CNN
+F 1 "GND" H 2355 7227 50  0000 C CNN
+F 2 "" H 2350 7400 50  0001 C CNN
+F 3 "" H 2350 7400 50  0001 C CNN
+	1    2350 7400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2350 7150 2350 7400
+Wire Wire Line
+	2350 6750 2350 6850
+Connection ~ 2350 6750
+Connection ~ 7350 2650
+$Comp
+L Connector:TestPoint TP7
+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 3 "~" H 800 3200 50  0001 C CNN
+	1    600  3200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1050 3300 600  3300
+Wire Wire Line
+	600  3300 600  3200
+Connection ~ 1050 3300
+Wire Wire Line
+	1900 5950 1900 6100
+Wire Wire Line
+	1400 6050 1400 6100
+Wire Wire Line
+	1400 6100 1900 6100
+Connection ~ 1900 6100
+Wire Wire Line
+	1900 6100 1900 6200
+Wire Wire Line
+	2900 7300 2900 7450
+Wire Wire Line
+	1200 7250 1200 7400
+Wire Wire Line
+	3100 5300 3100 5350
+Wire Wire Line
+	2700 5350 3100 5350
+Wire Wire Line
+	4050 2100 4300 2100
+Text GLabel 5750 4700 2    50   Input ~ 0
+MOTION
+Wire Wire Line
+	5700 4700 5750 4700
+$Comp
+L power:+3.3V #PWR?
+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
+	1    0    0    -1  
+$EndComp
+Text GLabel 4300 1900 0    50   Output ~ 0
+BOOT0
+Text GLabel 8350 2550 0    50   Input ~ 0
+BOOT0
+Wire Wire Line
+	8350 2550 8400 2550
+Wire Wire Line
+	8650 2800 8400 2800
+Wire Wire Line
+	8400 2800 8400 2550
+Connection ~ 8650 2800
+Connection ~ 8400 2550
+Wire Wire Line
+	8400 2550 8500 2550
 $EndSCHEMATC
diff --git a/lab1/PMW.pretty/PMW3389.kicad_mod b/lab1/PMW.pretty/PMW3389.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..0dd8ff33d24520007c7b54b4161c0fd4961626f3
--- /dev/null
+++ b/lab1/PMW.pretty/PMW3389.kicad_mod
@@ -0,0 +1,29 @@
+(module PMW3389 (layer F.Cu) (tedit 600FD70B)
+  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PMW3389 (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 0.35 -2.78) (end 1.45 -2.78) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.45 -2.78) (end 9.65 -2.78) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.05 -2.78) (end 1.05 14.48) (layer F.SilkS) (width 0.12))
+  (fp_line (start 9.65 14.48) (end 1 14.48) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.95 -2.78) (end 6.95 14.48) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole circle (at 0 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 0 1.78) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 0 3.56) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 4 thru_hole circle (at 0 5.34) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 5 thru_hole circle (at 0 7.12) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 6 thru_hole circle (at 0 8.9) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 7 thru_hole circle (at 0 10.68) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 8 thru_hole circle (at 0 12.46) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 9 thru_hole circle (at 10.7 13.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 10 thru_hole circle (at 10.7 11.57) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 11 thru_hole circle (at 10.7 9.79) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 12 thru_hole circle (at 10.7 8.01) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 13 thru_hole circle (at 10.7 6.23) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 14 thru_hole circle (at 10.7 4.45) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 15 thru_hole circle (at 10.7 2.67) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 16 thru_hole circle (at 10.7 0.89) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/lab1/new_components.lib b/lab1/new_components.lib
index 101f24e86a384cc8993b95a37453d5e9cd9cf3e7..5eba95b12b81063cfca8dfd9ed164de328821798 100644
--- a/lab1/new_components.lib
+++ b/lab1/new_components.lib
@@ -31,7 +31,7 @@ X MOSI 11 350 -200 100 L 50 50 1 1 I
 X MISO 12 350 -100 100 L 50 50 1 1 O
 X NCS 13 350 0 100 L 50 50 1 1 I
 X NC_3 14 350 100 100 L 50 50 1 1 N
-X LED1_P 15 350 200 100 L 50 50 1 1 W
+X LED1_P 15 350 200 100 L 50 50 1 1 I
 X NC 16 350 300 100 L 50 50 1 1 N
 X CN_1 2 -450 200 100 R 50 50 1 1 N
 X VDDPIX 3 -450 100 100 R 50 50 1 1 w