diff --git a/BOM.xlsx b/BOM.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..c2d4b4fe83ff57811cc955952aee43de23219b5d Binary files /dev/null and b/BOM.xlsx differ diff --git a/CHANGELOG.md b/CHANGELOG.md index fa09f3d443ec1fff0fdeea6a7da6316e0a904929..82a06bdcc14c2f4be765a886f2ce3aacc7211a3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,4 @@ -Whole group: Initial eschema -Carl: Added TODO.md and CHANGELOG.md according to assignment instructions. \ No newline at end of file +Whole group: Initial eschema<br> +Carl: Added TODO.md and CHANGELOG.md according to assignment instructions.<br> +Carl + Alba: Purchase list BOM.xlsx. <br> +Otto: PCB design. <br> \ No newline at end of file diff --git a/kicad/fp-info-cache b/kicad/fp-info-cache index 78ec0ea325a25e8997d2b48f383440d86720ba5b..5de680ab9a2f67d1debc6287f612ddf3b0022690 100644 --- a/kicad/fp-info-cache +++ b/kicad/fp-info-cache @@ -1,3 +1,4 @@ +<<<<<<< HEAD 19099307843104334 Battery BatteryHolder_Bulgin_BX0036_1xC @@ -83026,6 +83027,9 @@ varistor SIOV 0 2 2 +======= +3225411375060 +>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5 pmw D2F-L2 diff --git a/kicad/mouse.sch b/kicad/mouse.sch index 34c2a9ae403c05e5e6b640f01880e5e2d7c568f5..438e0f6afaece8404eb2295923d3b363a71e923e 100644 --- a/kicad/mouse.sch +++ b/kicad/mouse.sch @@ -1411,10 +1411,17 @@ NoConn ~ 6350 5000 NoConn ~ 4950 4200 NoConn ~ 4950 4100 $Comp +<<<<<<< HEAD L Connector:Conn_01x05_Male Mextras1 U 1 1 601D4B07 P 8300 5300 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 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 @@ -1422,10 +1429,17 @@ F 3 "~" H 8300 5300 50 0001 C CNN 1 0 0 -1 $EndComp $Comp +<<<<<<< HEAD L Connector:Conn_01x05_Male USB1 U 1 1 601F6908 P 1200 1700 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 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 @@ -1449,6 +1463,37 @@ F 3 "~" H 9850 5350 50 0001 C CNN 0 1 1 0 $EndComp $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 U 1 1 6023EAF1 P 9850 5600 @@ -1485,6 +1530,37 @@ F 3 "~" H 9850 4050 50 0001 C CNN 0 1 1 0 $EndComp $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 U 1 1 60249EBA P 9850 4300 @@ -1536,6 +1612,10 @@ F 3 "" H 8650 5550 50 0001 C CNN 1 8650 5550 1 0 0 -1 $EndComp +<<<<<<< HEAD +======= +Connection ~ 9850 4950 +>>>>>>> 1b1f6167b2f0255b4b7074daec4af4d1f2225aa5 Text GLabel 4950 4900 0 50 Input ~ 0 SCLK Text GLabel 4950 5100 0 50 Output ~ 0