add secondary crystal and hopefully connect magjack correctly?

2026-02-05 18:01:21 +08:00 · 2017-08-30 13:22:45 +02:00
parent fcd0bafd5e
commit 30bd57ffb7
10 changed files with 3098 additions and 2585 deletions
--- a/hw/kicad/bob/ethernet_bob/ethernet_bob-cache.lib
+++ b/hw/kicad/bob/ethernet_bob/ethernet_bob-cache.lib
@@ -86,18 +86,38 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_01X01
+#
+DEF CONN_01X01 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "CONN_01X01" 100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Pin_Header_Straight_1X*
+ Pin_Header_Angled_1X*
+ Socket_Strip_Straight_1X*
+ Socket_Strip_Angled_1X*
+$ENDFPLIST
+DRAW
+S -50 5 10 -5 0 1 0 N
+S -50 50 50 -50 0 1 0 N
+X P1 1 -200 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_01X04
 #
-DEF CONN_01X04 P 0 40 Y N 1 F N
-F0 "P" 0 250 50 H V C CNN
+DEF CONN_01X04 J 0 40 Y N 1 F N
+F0 "J" 0 250 50 H V C CNN
 F1 "CONN_01X04" 100 0 50 V V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_1X04
- Pin_Header_Angled_1X04
- Socket_Strip_Straight_1X04
- Socket_Strip_Angled_1X04
+ Pin_Header_Straight_1X*
+ Pin_Header_Angled_1X*
+ Socket_Strip_Straight_1X*
+ Socket_Strip_Angled_1X*
 $ENDFPLIST
 DRAW
 S -50 -145 10 -155 0 1 0 N
@@ -114,16 +134,17 @@ ENDDEF
 #
 # CONN_02X25
 #
-DEF CONN_02X25 P 0 1 Y N 1 F N
-F0 "P" 0 1300 50 H V C CNN
+DEF CONN_02X25 J 0 1 Y N 1 F N
+F0 "J" 0 1300 50 H V C CNN
 F1 "CONN_02X25" 0 0 50 V V C CNN
 F2 "" 0 -750 50 H I C CNN
 F3 "" 0 -750 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_2X25
- Pin_Header_Angled_2X25
- Socket_Strip_Straight_2X25
- Socket_Strip_Angled_2X25
+ Pin_Header_Straight_2X*
+ Pin_Header_Angled_2X*
+ Socket_Strip_Straight_2X*
+ Socket_Strip_Angled_2X*
+ IDC_Header_Straight_*
 $ENDFPLIST
 DRAW
 S -100 -1195 -50 -1205 0 1 0 N
@@ -230,6 +251,25 @@ X P49 49 -250 -1200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CRYSTAL_SMD
+#
+DEF CRYSTAL_SMD X 0 40 Y N 1 F N
+F0 "X" 0 90 50 H V C CNN
+F1 "CRYSTAL_SMD" 30 -110 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -70 -70 70 -70 N
+P 2 0 1 16 -70 50 -70 -50 N
+P 2 0 1 16 70 50 70 -50 N
+P 5 0 1 12 -40 40 40 40 40 -40 -40 -40 -40 40 f
+X 1 1 -200 0 130 R 25 20 1 1 P
+X case 2 -50 -100 30 U 25 20 1 1 P
+X 3 3 200 0 130 L 25 20 1 1 P
+X case 4 50 -100 30 U 25 20 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CRYSTAL_SMD_4pin
 #
 DEF CRYSTAL_SMD_4pin X 0 40 Y N 1 F N
@@ -630,51 +670,69 @@ ENDDEF
 #
 # USB_A
 #
-DEF USB_A P 0 40 Y Y 1 F N
-F0 "P" 200 -200 50 H V C CNN
-F1 "USB_A" -50 200 50 H V C CNN
-F2 "" -50 -100 50 V I C CNN
-F3 "" -50 -100 50 V I C CNN
+DEF USB_A J 0 40 Y Y 1 F N
+F0 "J" -200 450 50 H V L CNN
+F1 "USB_A" -200 350 50 H V L CNN
+F2 "" 150 -50 50 H I C CNN
+F3 "" 150 -50 50 H I C CNN
 $FPLIST
 USB*
 $ENDFPLIST
 DRAW
-S -250 -150 150 150 0 1 0 N
-S -205 -150 -195 -120 0 1 0 N
-S -105 -150 -95 -120 0 1 0 N
-S -5 -150 5 -120 0 1 0 N
-S 95 -150 105 -120 0 1 0 N
-X VBUS 1 -200 -300 150 U 50 50 1 1 W
-X D- 2 -100 -300 150 U 50 50 1 1 P
-X D+ 3 0 -300 150 U 50 50 1 1 P
-X GND 4 100 -300 150 U 50 50 1 1 W
-X shield 5 300 100 150 L 50 50 1 1 P
+C -150 85 25 0 1 10 F
+C -25 135 15 0 1 10 F
+S -200 -300 200 300 0 1 10 f
+S -60 190 -170 210 0 1 0 F
+S -50 180 -180 230 0 1 0 N
+S -5 -300 5 -270 0 1 0 N
+S 10 50 -20 20 0 1 10 F
+S 200 -105 170 -95 0 1 0 N
+S 200 -5 170 5 0 1 0 N
+S 200 195 170 205 0 1 0 N
+P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
+P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
+P 4 0 1 10 25 110 25 60 75 85 25 110 F
+P 2 1 1 10 -75 85 25 85 N
+X VBUS 1 300 200 100 L 50 50 1 1 W
+X D- 2 300 -100 100 L 50 50 1 1 P
+X D+ 3 300 0 100 L 50 50 1 1 P
+X GND 4 0 -400 100 U 50 50 1 1 W
+X Shield 5 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
 # USB_OTG
 #
-DEF USB_OTG P 0 40 Y Y 1 F N
-F0 "P" 325 -125 50 H V C CNN
-F1 "USB_OTG" 0 200 50 H V C CNN
-F2 "" -50 -100 50 V I C CNN
-F3 "" -50 -100 50 V I C CNN
+DEF USB_OTG J 0 40 Y Y 1 F N
+F0 "J" -200 450 50 H V L CNN
+F1 "USB_OTG" -200 350 50 H V L CNN
+F2 "" 150 -50 50 H I C CNN
+F3 "" 150 -50 50 H I C CNN
 $FPLIST
 USB*
 $ENDFPLIST
 DRAW
-S -250 -150 250 150 0 1 0 N
-S -205 -150 -195 -120 0 1 0 N
-S -105 -150 -95 -120 0 1 0 N
-S -5 -150 5 -120 0 1 0 N
-S 95 -150 105 -120 0 1 0 N
-S 195 -150 205 -120 0 1 0 N
-X VBUS 1 -200 -300 150 U 50 50 1 1 w
-X D- 2 -100 -300 150 U 50 50 1 1 P
-X D+ 3 0 -300 150 U 50 50 1 1 P
-X ID 4 100 -300 150 U 50 50 1 1 W
-X GND 5 200 -300 150 U 50 50 1 1 W
-X shield 6 400 100 150 L 50 50 1 1 P
+C -150 85 25 0 1 10 F
+C -25 135 15 0 1 10 F
+S -200 -300 200 300 0 1 10 f
+S -5 -300 5 -270 0 1 0 N
+S 10 50 -20 20 0 1 10 F
+S 200 -205 170 -195 0 1 0 N
+S 200 -105 170 -95 0 1 0 N
+S 200 -5 170 5 0 1 0 N
+S 200 195 170 205 0 1 0 N
+P 2 0 1 10 -75 85 25 85 N
+P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
+P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
+P 4 0 1 10 25 110 25 60 75 85 25 110 F
+P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
+P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
+X VBUS 1 300 200 100 L 50 50 1 1 W
+X D- 2 300 -100 100 L 50 50 1 1 P
+X D+ 3 300 0 100 L 50 50 1 1 P
+X ID 4 300 -200 100 L 50 50 1 1 P
+X GND 5 0 -400 100 U 50 50 1 1 W
+X Shield 6 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
--- a/hw/kicad/bob/ethernet_bob/ethernet_bob.kicad_pcb
+++ b/hw/kicad/bob/ethernet_bob/ethernet_bob.kicad_pcb
--- a/hw/kicad/bob/ethernet_bob/ethernet_bob.net
+++ b/hw/kicad/bob/ethernet_bob/ethernet_bob.net
--- a/hw/kicad/bob/ethernet_bob/ethernet_bob.pro
+++ b/hw/kicad/bob/ethernet_bob/ethernet_bob.pro
@@ -1,4 +1,4 @@
-update=Do 20 Okt 2016 14:51:20 CEST
+update=Di 29 Aug 2017 16:10:53 CEST
 version=1
 last_client=kicad
 [pcbnew]
@@ -23,8 +23,6 @@ ModuleOutlineThickness=0.150000000000
 [cvpcb]
 version=1
 NetIExt=net
-[general]
-version=1
 [eeschema]
 version=1
 LibDir=crystal_lib;hr911104;ksz8081_lib
@@ -65,3 +63,5 @@ LibName33=hr911104/hr911105_rj45
 LibName34=stm32
 LibName35=crystal_lib/crystal_smd
 LibName36=usblc
+[general]
+version=1
--- a/hw/kicad/bob/ethernet_bob/ethernet_bob.sch
+++ b/hw/kicad/bob/ethernet_bob/ethernet_bob.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ethernet_bob-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -49,16 +50,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Wire Wire Line
-	7700 3150 8150 3150
-Wire Wire Line
-	7700 3250 8150 3250
-Wire Wire Line
-	7700 3350 8150 3350
-Wire Wire Line
-	7700 3500 8150 3500
-Wire Wire Line
-	7700 3600 8150 3600
 $Sheet
 S 8150 2900 1500 1850
 U 57A86254
@@ -78,19 +69,12 @@ F12 "PHY_XI" I L 8150 4400 60
 F13 "PHY_X0" I L 8150 4500 60 
 F14 "PHY_INTRP" I L 8150 4650 60 
 F15 "PHY_RXC" I L 8150 3800 60 
+F16 "LED1A" I R 9650 3050 60 
+F17 "LED1K" I R 9650 3150 60 
+F18 "LED2A" I R 9650 3250 60 
+F19 "LED2K" I R 9650 3350 60 
+F20 "PHY_REFCLK" I L 8150 3950 60 
 $EndSheet
-Wire Wire Line
-	7700 3800 8150 3800
-Wire Wire Line
-	7700 4100 8150 4100
-Wire Wire Line
-	7700 4200 8150 4200
-Wire Wire Line
-	7700 4300 8150 4300
-Wire Wire Line
-	7700 4400 8150 4400
-Wire Wire Line
-	7700 3700 8150 3700
 $Sheet
 S 4300 3900 1000 150 
 U 57FEA2FD
@@ -130,19 +114,74 @@ F14 "STM_SPI1MOSI" I L 6100 3550 60
 F15 "STM_SPI1MISO" I L 6100 3650 60 
 F16 "STM_SPI1SCK" I L 6100 3450 60 
 F17 "STM_CS" I L 6100 3350 60 
+F18 "STM_REFCLK" I R 7700 3950 60 
 $EndSheet
-Wire Wire Line
-	5400 3450 6100 3450
-Wire Wire Line
-	5400 3550 6100 3550
-Wire Wire Line
-	5400 3650 6100 3650
 $Sheet
 S 4300 4300 1000 400 
 U 58076FA4
 F0 "rs485" 60
 F1 "rs485.sch" 60
 $EndSheet
+$Comp
+L CONN_01X01 J3
+U 1 1 59A7C874
+P 8050 2500
+F 0 "J3" V 8015 2412 50  0000 R CNN
+F 1 "CONN_01X01" V 7924 2412 50  0000 R CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Big" H 8050 2500 50  0001 C CNN
+F 3 "" H 8050 2500 50  0001 C CNN
+	1    8050 2500
+	0    -1   -1   0   
+$EndComp
+$Comp
+L CONN_01X01 J2
+U 1 1 59A81F51
+P 7950 4850
+F 0 "J2" V 7822 4928 50  0000 L CNN
+F 1 "CONN_01X01" V 7913 4928 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Big" H 7950 4850 50  0001 C CNN
+F 3 "" H 7950 4850 50  0001 C CNN
+	1    7950 4850
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7700 3150 8150 3150
+Wire Wire Line
+	7700 3250 8150 3250
+Wire Wire Line
+	7700 3350 8150 3350
+Wire Wire Line
+	7700 3500 8150 3500
+Wire Wire Line
+	7700 3600 8150 3600
+Wire Wire Line
+	7700 3800 8150 3800
+Wire Wire Line
+	7700 4100 8150 4100
+Wire Wire Line
+	7700 4200 8150 4200
+Wire Wire Line
+	7700 4300 8150 4300
+Wire Wire Line
+	7700 4400 8150 4400
+Wire Wire Line
+	7700 3700 8150 3700
+Wire Wire Line
+	5400 3450 6100 3450
+Wire Wire Line
+	5400 3550 6100 3550
+Wire Wire Line
+	5400 3650 6100 3650
 Wire Wire Line
 	5400 3350 6100 3350
+Wire Wire Line
+	8050 2700 8050 3000
+Wire Wire Line
+	8050 3000 8150 3000
+Wire Wire Line
+	8150 4500 7950 4500
+Wire Wire Line
+	7950 4500 7950 4650
+Wire Wire Line
+	7700 3950 8150 3950
 $EndSCHEMATC
--- a/hw/kicad/bob/ethernet_bob/flash.sch
+++ b/hw/kicad/bob/ethernet_bob/flash.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ethernet_bob-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/hw/kicad/bob/ethernet_bob/phy_plug.sch
+++ b/hw/kicad/bob/ethernet_bob/phy_plug.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ethernet_bob-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -78,13 +79,13 @@ Wire Wire Line
 	1700 4800 1900 4800
 Wire Wire Line
 	1700 4900 1900 4900
-Text GLabel 8650 2950 0    60   Input ~ 0
-TX_P
 Text GLabel 8650 3150 0    60   Input ~ 0
+TX_P
+Text GLabel 8650 2950 0    60   Input ~ 0
 TX_N
-Text GLabel 8650 3300 0    60   Input ~ 0
-RX_P
 Text GLabel 8650 3500 0    60   Input ~ 0
+RX_P
+Text GLabel 8650 3300 0    60   Input ~ 0
 RX_N
 Wire Wire Line
 	8650 2950 8750 2950
@@ -705,4 +706,71 @@ Wire Wire Line
 	8700 4000 8750 4000
 Wire Wire Line
 	8700 4100 8750 4100
+$Comp
+L CRYSTAL_SMD X2
+U 1 1 59AB4D47
+P 1700 5950
+F 0 "X2" H 1700 6170 50  0000 C CNN
+F 1 "CRYSTAL_SMD" H 1700 6079 50  0000 C CNN
+F 2 "Crystals:Crystal_SMD_0603-4pin_6.0x3.5mm" H 1700 5950 50  0001 C CNN
+F 3 "" H 1700 5950 50  0000 C CNN
+	1    1700 5950
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C27
+U 1 1 59AB4F41
+P 1500 6200
+F 0 "C27" H 1550 6300 40  0000 L CNN
+F 1 "100n" H 1500 6100 40  0000 L CNN
+F 2 "stmbl:C_0603" H 1538 6050 30  0001 C CNN
+F 3 "" H 1500 6200 60  0000 C CNN
+	1    1500 6200
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C28
+U 1 1 59AB4FB7
+P 1900 6200
+F 0 "C28" H 1950 6300 40  0000 L CNN
+F 1 "100n" H 1900 6100 40  0000 L CNN
+F 2 "stmbl:C_0603" H 1938 6050 30  0001 C CNN
+F 3 "" H 1900 6200 60  0000 C CNN
+	1    1900 6200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1500 5700 1500 6050
+Wire Wire Line
+	1900 5850 1900 6050
+Wire Wire Line
+	2600 5700 1500 5700
+Connection ~ 1500 5950
+Wire Wire Line
+	1900 5850 2700 5850
+Connection ~ 2700 5850
+Connection ~ 1900 5950
+Wire Wire Line
+	1500 6350 1900 6350
+Wire Wire Line
+	1650 6050 1650 6350
+Connection ~ 1650 6350
+Wire Wire Line
+	1750 6050 1750 6350
+Connection ~ 1750 6350
+$Comp
+L GND #PWR067
+U 1 1 59AB8568
+P 1650 6350
+F 0 "#PWR067" H 1650 6100 50  0001 C CNN
+F 1 "GND" H 1655 6177 50  0000 C CNN
+F 2 "" H 1650 6350 50  0000 C CNN
+F 3 "" H 1650 6350 50  0000 C CNN
+	1    1650 6350
+	1    0    0    -1  
+$EndComp
+Text HLabel 3600 6100 3    60   Input ~ 0
+PHY_REFCLK
+Wire Wire Line
+	3600 5700 3600 6100
 $EndSCHEMATC
--- a/hw/kicad/bob/ethernet_bob/psu.sch
+++ b/hw/kicad/bob/ethernet_bob/psu.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ethernet_bob-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/hw/kicad/bob/ethernet_bob/rs485.sch
+++ b/hw/kicad/bob/ethernet_bob/rs485.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ethernet_bob-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/hw/kicad/bob/ethernet_bob/stm32.sch
+++ b/hw/kicad/bob/ethernet_bob/stm32.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ethernet_bob-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -1684,4 +1685,47 @@ F 3 "" H 6900 7600 50  0000 C CNN
 $EndComp
 Connection ~ 6650 7450
 Connection ~ 6650 7750
+$Comp
+L CONN_01X01 J4
+U 1 1 59A7399E
+P 10950 1300
+F 0 "J4" H 11028 1341 50  0000 L CNN
+F 1 "CONN_01X01" H 11028 1250 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Big" H 10950 1300 50  0001 C CNN
+F 3 "" H 10950 1300 50  0001 C CNN
+	1    10950 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR068
+U 1 1 59ABCEF1
+P 13100 4350
+F 0 "#PWR068" H 13100 4200 50  0001 C CNN
+F 1 "+3V3" H 13115 4523 50  0000 C CNN
+F 2 "" H 13100 4350 50  0000 C CNN
+F 3 "" H 13100 4350 50  0000 C CNN
+	1    13100 4350
+	1    0    0    -1  
+$EndComp
+Text HLabel 13150 4700 2    60   Input ~ 0
+STM_MDIO
+$Comp
+L R R22
+U 1 1 59ABD33A
+P 13100 4500
+F 0 "R22" H 13170 4546 50  0000 L CNN
+F 1 "R" H 13170 4455 50  0000 L CNN
+F 2 "stmbl:R_0603" V 13030 4500 50  0001 C CNN
+F 3 "" H 13100 4500 50  0001 C CNN
+	1    13100 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	13100 4650 13100 4700
+Wire Wire Line
+	13100 4700 13150 4700
+Text HLabel 10750 1200 2    60   Input ~ 0
+STM_REFCLK
+Wire Wire Line
+	10750 1300 10750 1200
 $EndSCHEMATC