Skip to content
Snippets Groups Projects
Commit 2ee5cdb5 authored by Otto Kalliorinne's avatar Otto Kalliorinne
Browse files

PCB fixed

parents 2e1f4a6f 1b1f6167
No related branches found
No related tags found
No related merge requests found
BOM.xlsx 0 → 100644
File added
Whole group: Initial eschema Whole group: Initial eschema<br>
Carl: Added TODO.md and CHANGELOG.md according to assignment instructions. Carl: Added TODO.md and CHANGELOG.md according to assignment instructions.<br>
\ No newline at end of file Carl + Alba: Purchase list BOM.xlsx. <br>
Otto: PCB design. <br>
\ No newline at end of file
<<<<<<< HEAD
19099307843104334 19099307843104334
Battery Battery
BatteryHolder_Bulgin_BX0036_1xC BatteryHolder_Bulgin_BX0036_1xC
...@@ -83026,6 +83027,9 @@ varistor SIOV ...@@ -83026,6 +83027,9 @@ varistor SIOV
0 0
2 2
2 2
=======
3225411375060
>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5
pmw pmw
D2F-L2 D2F-L2
   
...@@ -1411,10 +1411,17 @@ NoConn ~ 6350 5000 ...@@ -1411,10 +1411,17 @@ NoConn ~ 6350 5000
NoConn ~ 4950 4200 NoConn ~ 4950 4200
NoConn ~ 4950 4100 NoConn ~ 4950 4100
$Comp $Comp
<<<<<<< HEAD
L Connector:Conn_01x05_Male Mextras1 L Connector:Conn_01x05_Male Mextras1
U 1 1 601D4B07 U 1 1 601D4B07
P 8300 5300 P 8300 5300
F 0 "Mextras1" H 8408 5681 50 0000 C CNN F 0 "Mextras1" H 8408 5681 50 0000 C CNN
=======
L Connector:Conn_01x05_Male J3
U 1 1 601D4B07
P 8300 5300
F 0 "J3" H 8408 5681 50 0000 C CNN
>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5
F 1 "Conn_01x05_Male" H 8408 5590 50 0000 C CNN F 1 "Conn_01x05_Male" H 8408 5590 50 0000 C CNN
F 2 "Connector_PinHeader_2.00mm:PinHeader_1x05_P2.00mm_Vertical" H 8300 5300 50 0001 C CNN F 2 "Connector_PinHeader_2.00mm:PinHeader_1x05_P2.00mm_Vertical" H 8300 5300 50 0001 C CNN
F 3 "~" H 8300 5300 50 0001 C CNN F 3 "~" H 8300 5300 50 0001 C CNN
...@@ -1422,10 +1429,17 @@ F 3 "~" H 8300 5300 50 0001 C CNN ...@@ -1422,10 +1429,17 @@ F 3 "~" H 8300 5300 50 0001 C CNN
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
<<<<<<< HEAD
L Connector:Conn_01x05_Male USB1 L Connector:Conn_01x05_Male USB1
U 1 1 601F6908 U 1 1 601F6908
P 1200 1700 P 1200 1700
F 0 "USB1" H 1308 2081 50 0000 C CNN F 0 "USB1" H 1308 2081 50 0000 C CNN
=======
L Connector:Conn_01x05_Male J1
U 1 1 601F6908
P 1200 1700
F 0 "J1" H 1308 2081 50 0000 C CNN
>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5
F 1 "Conn_01x05_Male" H 1308 1990 50 0000 C CNN F 1 "Conn_01x05_Male" H 1308 1990 50 0000 C CNN
F 2 "Connector_PinHeader_2.00mm:PinHeader_1x05_P2.00mm_Vertical" H 1200 1700 50 0001 C CNN F 2 "Connector_PinHeader_2.00mm:PinHeader_1x05_P2.00mm_Vertical" H 1200 1700 50 0001 C CNN
F 3 "~" H 1200 1700 50 0001 C CNN F 3 "~" H 1200 1700 50 0001 C CNN
...@@ -1449,6 +1463,37 @@ F 3 "~" H 9850 5350 50 0001 C CNN ...@@ -1449,6 +1463,37 @@ F 3 "~" H 9850 5350 50 0001 C CNN
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
<<<<<<< HEAD
=======
L Device:C_Small C25
U 1 1 6023EAE1
P 10450 5150
F 0 "C25" H 10542 5196 50 0000 L CNN
F 1 "100n" H 10542 5105 50 0000 L CNN
F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10450 5150 50 0001 C CNN
F 3 "~" H 10450 5150 50 0001 C CNN
1 10450 5150
1 0 0 -1
$EndComp
Wire Wire Line
10450 5050 10450 4950
Wire Wire Line
10450 4950 9850 4950
$Comp
L power:GND #PWR0141
U 1 1 6023EAEA
P 10450 5600
F 0 "#PWR0141" H 10450 5350 50 0001 C CNN
F 1 "GND" H 10455 5427 50 0000 C CNN
F 2 "" H 10450 5600 50 0001 C CNN
F 3 "" H 10450 5600 50 0001 C CNN
1 10450 5600
1 0 0 -1
$EndComp
Wire Wire Line
10450 5600 10450 5250
$Comp
>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5
L power:GND #PWR0142 L power:GND #PWR0142
U 1 1 6023EAF1 U 1 1 6023EAF1
P 9850 5600 P 9850 5600
...@@ -1485,6 +1530,37 @@ F 3 "~" H 9850 4050 50 0001 C CNN ...@@ -1485,6 +1530,37 @@ F 3 "~" H 9850 4050 50 0001 C CNN
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
<<<<<<< HEAD
=======
L Device:C_Small C24
U 1 1 60249EAA
P 10450 3850
F 0 "C24" H 10542 3896 50 0000 L CNN
F 1 "100n" H 10542 3805 50 0000 L CNN
F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10450 3850 50 0001 C CNN
F 3 "~" H 10450 3850 50 0001 C CNN
1 10450 3850
1 0 0 -1
$EndComp
Wire Wire Line
10450 3750 10450 3650
Wire Wire Line
10450 3650 9850 3650
$Comp
L power:GND #PWR0143
U 1 1 60249EB3
P 10450 4300
F 0 "#PWR0143" H 10450 4050 50 0001 C CNN
F 1 "GND" H 10455 4127 50 0000 C CNN
F 2 "" H 10450 4300 50 0001 C CNN
F 3 "" H 10450 4300 50 0001 C CNN
1 10450 4300
1 0 0 -1
$EndComp
Wire Wire Line
10450 4300 10450 3950
$Comp
>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5
L power:GND #PWR0144 L power:GND #PWR0144
U 1 1 60249EBA U 1 1 60249EBA
P 9850 4300 P 9850 4300
...@@ -1536,6 +1612,10 @@ F 3 "" H 8650 5550 50 0001 C CNN ...@@ -1536,6 +1612,10 @@ F 3 "" H 8650 5550 50 0001 C CNN
1 8650 5550 1 8650 5550
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
<<<<<<< HEAD
=======
Connection ~ 9850 4950
>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5
Text GLabel 4950 4900 0 50 Input ~ 0 Text GLabel 4950 4900 0 50 Input ~ 0
SCLK SCLK
Text GLabel 4950 5100 0 50 Output ~ 0 Text GLabel 4950 5100 0 50 Output ~ 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment