Added LEDs, buttons, DC connector.

diff --git a/can.sch b/can.sch
index 1fc044461e11d6790ad4e34640ac948a82a90edc..976f6e305d6dc92dd6357c1630ec59fdf4621c94 100644 (file)
--- a/can.sch
+++ b/can.sch
@@ -74,7 +74,6 @@ LIBS:Zilog
 LIBS:conn_100pin
 LIBS:MCP2562FD
 LIBS:vccio
-LIBS:canbench-hw-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268

diff --git a/canbench-hw.sch b/canbench-hw.sch
index 7f63a9ba478e9903de7ad2778168f11e7488d376..e21ba2b891cab0acb813adc25ec69aa4f1495392 100644 (file)
--- a/canbench-hw.sch
+++ b/canbench-hw.sch
@@ -74,7 +74,6 @@ LIBS:Zilog
 LIBS:conn_100pin
 LIBS:MCP2562FD
 LIBS:vccio
-LIBS:canbench-hw-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -207,7 +206,29 @@ Wire Wire Line
        10600 3700 10450 3700
 Connection ~ 10600 3700
 Wire Wire Line
-       10600 1900 10600 6300
+       10600 1900 10600 2200
+Wire Wire Line
+       10600 2200 10600 2500
+Wire Wire Line
+       10600 2500 10600 2800
+Wire Wire Line
+       10600 2800 10600 3100
+Wire Wire Line
+       10600 3100 10600 3400
+Wire Wire Line
+       10600 3400 10600 3700
+Wire Wire Line
+       10600 3700 10600 4400
+Wire Wire Line
+       10600 4400 10600 4700
+Wire Wire Line
+       10600 4700 10600 5000
+Wire Wire Line
+       10600 5000 10600 5400
+Wire Wire Line
+       10600 5400 10600 5900
+Wire Wire Line
+       10600 5900 10600 6300
 Wire Wire Line
        10450 4400 10600 4400
 Connection ~ 10600 4400
@@ -226,7 +247,27 @@ Connection ~ 10600 5900
 Wire Wire Line
        10050 1900 9900 1900
 Wire Wire Line
-       9900 1900 9900 6300
+       9900 1900 9900 2200
+Wire Wire Line
+       9900 2200 9900 2500
+Wire Wire Line
+       9900 2500 9900 2800
+Wire Wire Line
+       9900 2800 9900 3100
+Wire Wire Line
+       9900 3100 9900 3400
+Wire Wire Line
+       9900 3400 9900 3700
+Wire Wire Line
+       9900 3700 9900 4400
+Wire Wire Line
+       9900 4400 9900 4700
+Wire Wire Line
+       9900 4700 9900 5400
+Wire Wire Line
+       9900 5400 9900 5900
+Wire Wire Line
+       9900 5900 9900 6300
 Wire Wire Line
        10050 2200 9900 2200
 Connection ~ 9900 2200
@@ -258,14 +299,18 @@ Wire Wire Line
        10050 5900 9900 5900
 Connection ~ 9900 5900
 Wire Wire Line
-       10450 4100 10900 4100
+       10450 4100 10700 4100
+Wire Wire Line
+       10700 4100 10900 4100
 Wire Wire Line
        10450 4000 10700 4000
 Wire Wire Line
        10700 4000 10700 4100
 Connection ~ 10700 4100
 Wire Wire Line
-       9500 4100 10050 4100
+       9500 4100 9750 4100
+Wire Wire Line
+       9750 4100 10050 4100
 Wire Wire Line
        9500 4100 9500 4000
 Wire Wire Line
@@ -274,7 +319,9 @@ Wire Wire Line
        9750 4000 9750 4100
 Connection ~ 9750 4100
 Wire Wire Line
-       9550 5100 10050 5100
+       9550 5100 9750 5100
+Wire Wire Line
+       9750 5100 10050 5100
 Wire Wire Line
        9550 5100 9550 5000
 Wire Wire Line
@@ -406,7 +453,29 @@ Wire Wire Line
        8250 3700 8100 3700
 Connection ~ 8250 3700
 Wire Wire Line
-       8250 1900 8250 6300
+       8250 1900 8250 2200
+Wire Wire Line
+       8250 2200 8250 2500
+Wire Wire Line
+       8250 2500 8250 2800
+Wire Wire Line
+       8250 2800 8250 3100
+Wire Wire Line
+       8250 3100 8250 3400
+Wire Wire Line
+       8250 3400 8250 3700
+Wire Wire Line
+       8250 3700 8250 4400
+Wire Wire Line
+       8250 4400 8250 4700
+Wire Wire Line
+       8250 4700 8250 5000
+Wire Wire Line
+       8250 5000 8250 5400
+Wire Wire Line
+       8250 5400 8250 5900
+Wire Wire Line
+       8250 5900 8250 6300
 Wire Wire Line
        8100 4400 8250 4400
 Connection ~ 8250 4400
@@ -425,7 +494,27 @@ Connection ~ 8250 5900
 Wire Wire Line
        7700 1900 7550 1900
 Wire Wire Line
-       7550 1900 7550 6300
+       7550 1900 7550 2200
+Wire Wire Line
+       7550 2200 7550 2500
+Wire Wire Line
+       7550 2500 7550 2800
+Wire Wire Line
+       7550 2800 7550 3100
+Wire Wire Line
+       7550 3100 7550 3400
+Wire Wire Line
+       7550 3400 7550 3700
+Wire Wire Line
+       7550 3700 7550 4400
+Wire Wire Line
+       7550 4400 7550 4700
+Wire Wire Line
+       7550 4700 7550 5400
+Wire Wire Line
+       7550 5400 7550 5900
+Wire Wire Line
+       7550 5900 7550 6300
 Wire Wire Line
        7700 2200 7550 2200
 Connection ~ 7550 2200
@@ -457,21 +546,27 @@ Wire Wire Line
        7700 5900 7550 5900
 Connection ~ 7550 5900
 Wire Wire Line
-       8100 4100 8550 4100
+       8100 4100 8350 4100
+Wire Wire Line
+       8350 4100 8550 4100
 Wire Wire Line
        8100 4000 8350 4000
 Wire Wire Line
        8350 4000 8350 4100
 Connection ~ 8350 4100
 Wire Wire Line
-       7150 4100 7700 4100
+       7150 4100 7400 4100
+Wire Wire Line
+       7400 4100 7700 4100
 Wire Wire Line
        7700 4000 7400 4000
 Wire Wire Line
        7400 4000 7400 4100
 Connection ~ 7400 4100
 Wire Wire Line
-       7200 5100 7700 5100
+       7200 5100 7400 5100
+Wire Wire Line
+       7400 5100 7700 5100
 Wire Wire Line
        7700 5000 7400 5000
 Wire Wire Line
@@ -555,7 +650,9 @@ F 3 "" H 1650 3600 50  0000 C CNN
        1    0    0    -1  
 $EndComp
 Wire Wire Line
-       950  3350 950  3850
+       950  3350 950  3800
+Wire Wire Line
+       950  3800 950  3850
 $Comp
 L GND #PWR014
 U 1 1 56EF3876
@@ -568,10 +665,12 @@ F 3 "" H 950 3850 50  0000 C CNN
        1    0    0    -1  
 $EndComp
 Wire Wire Line
-       1550 3350 2150 3350
+       1550 3350 1650 3350
+Wire Wire Line
+       1650 3350 2150 3350
 Text Label 1550 3350 0    50   ~ 0
 CARRIER_SRST#
-Text Notes 1000 3150 0    50   ~ 0
+Text Notes 1000 3150 0    60   ~ 0
 Reset Ctrl
 Wire Wire Line
        1650 3450 1650 3350
@@ -602,4 +701,199 @@ U 56E8FE78
 F0 "Power" 60
 F1 "power.sch" 60
 $EndSheet
+Wire Wire Line
+       3600 4000 3600 4150
+$Comp
+L GND #PWR?
+U 1 1 56E95A7A
+P 3600 4150
+F 0 "#PWR?" H 3600 3900 50  0001 C CNN
+F 1 "GND" H 3600 4000 50  0000 C CNN
+F 2 "" H 3600 4150 50  0000 C CNN
+F 3 "" H 3600 4150 50  0000 C CNN
+       1    3600 4150
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       2750 3450 2750 3300
+Wire Wire Line
+       2850 3450 2750 3450
+Wire Wire Line
+       3150 3450 3200 3450
+$Comp
+L R R?
+U 1 1 56E95842
+P 3000 3450
+F 0 "R?" V 3080 3450 50  0000 C CNN
+F 1 "R" V 3000 3450 50  0000 C CNN
+F 2 "" V 2930 3450 50  0000 C CNN
+F 3 "" H 3000 3450 50  0000 C CNN
+       1    3000 3450
+       0    1    1    0   
+$EndComp
+Wire Wire Line
+       3600 3450 3600 3600
+Text Label 2650 3850 0    60   ~ 0
+FPGA_DONE
+Wire Wire Line
+       2650 3850 3300 3850
+$Comp
+L BSS138 Q?
+U 1 1 56E9545A
+P 3500 3800
+F 0 "Q?" H 3700 3875 50  0000 L CNN
+F 1 "BSS138" H 3700 3800 50  0000 L CNN
+F 2 "SOT-23" H 3700 3725 50  0000 L CIN
+F 3 "" H 3500 3800 50  0000 L CNN
+       1    3500 3800
+       1    0    0    -1  
+$EndComp
+$Comp
+L +5V #PWR?
+U 1 1 56E95277
+P 2750 3300
+F 0 "#PWR?" H 2750 3150 50  0001 C CNN
+F 1 "+5V" H 2750 3440 50  0000 C CNN
+F 2 "" H 2750 3300 50  0000 C CNN
+F 3 "" H 2750 3300 50  0000 C CNN
+       1    2750 3300
+       1    0    0    -1  
+$EndComp
+$Comp
+L LED D?
+U 1 1 56E93C73
+P 3400 3450
+F 0 "D?" H 3400 3550 50  0000 C CNN
+F 1 "LED" H 3400 3350 50  0000 C CNN
+F 2 "" H 3400 3450 50  0000 C CNN
+F 3 "" H 3400 3450 50  0000 C CNN
+       1    3400 3450
+       -1   0    0    1   
+$EndComp
+Text Notes 3150 3150 0    60   ~ 0
+DONE LED
+Wire Wire Line
+       5350 4000 5350 4150
+$Comp
+L GND #PWR?
+U 1 1 56E95ECC
+P 5350 4150
+F 0 "#PWR?" H 5350 3900 50  0001 C CNN
+F 1 "GND" H 5350 4000 50  0000 C CNN
+F 2 "" H 5350 4150 50  0000 C CNN
+F 3 "" H 5350 4150 50  0000 C CNN
+       1    5350 4150
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       4500 3450 4500 3300
+Wire Wire Line
+       4600 3450 4500 3450
+Wire Wire Line
+       4900 3450 4950 3450
+$Comp
+L R R?
+U 1 1 56E95ED5
+P 4750 3450
+F 0 "R?" V 4830 3450 50  0000 C CNN
+F 1 "R" V 4750 3450 50  0000 C CNN
+F 2 "" V 4680 3450 50  0000 C CNN
+F 3 "" H 4750 3450 50  0000 C CNN
+       1    4750 3450
+       0    1    1    0   
+$EndComp
+Wire Wire Line
+       5350 3450 5350 3600
+Text Label 4400 3850 0    60   ~ 0
+PG_CARRIER
+Wire Wire Line
+       4400 3850 5050 3850
+$Comp
+L BSS138 Q?
+U 1 1 56E95EDE
+P 5250 3800
+F 0 "Q?" H 5450 3875 50  0000 L CNN
+F 1 "BSS138" H 5450 3800 50  0000 L CNN
+F 2 "SOT-23" H 5450 3725 50  0000 L CIN
+F 3 "" H 5250 3800 50  0000 L CNN
+       1    5250 3800
+       1    0    0    -1  
+$EndComp
+$Comp
+L +5V #PWR?
+U 1 1 56E95EE4
+P 4500 3300
+F 0 "#PWR?" H 4500 3150 50  0001 C CNN
+F 1 "+5V" H 4500 3440 50  0000 C CNN
+F 2 "" H 4500 3300 50  0000 C CNN
+F 3 "" H 4500 3300 50  0000 C CNN
+       1    4500 3300
+       1    0    0    -1  
+$EndComp
+$Comp
+L LED D?
+U 1 1 56E95EEA
+P 5150 3450
+F 0 "D?" H 5150 3550 50  0000 C CNN
+F 1 "LED" H 5150 3350 50  0000 C CNN
+F 2 "" H 5150 3450 50  0000 C CNN
+F 3 "" H 5150 3450 50  0000 C CNN
+       1    5150 3450
+       -1   0    0    1   
+$EndComp
+Text Notes 4900 3150 0    60   ~ 0
+System Power Good
+$Comp
+L SW_PUSH SW?
+U 1 1 56E96850
+P 1150 4500
+F 0 "SW?" H 1300 4610 50  0000 C CNN
+F 1 "SW_PUSH" H 1150 4420 50  0000 C CNN
+F 2 "" H 1150 4500 50  0000 C CNN
+F 3 "" H 1150 4500 50  0000 C CNN
+       1    1150 4500
+       1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 56E96856
+P 1550 4750
+F 0 "C?" H 1575 4850 50  0000 L CNN
+F 1 "100nF" H 1575 4650 50  0000 L CNN
+F 2 "" H 1588 4600 50  0000 C CNN
+F 3 "" H 1550 4750 50  0000 C CNN
+       1    1550 4750
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       850  4500 850  4950
+Wire Wire Line
+       850  4950 850  5000
+$Comp
+L GND #PWR?
+U 1 1 56E9685E
+P 850 5000
+F 0 "#PWR?" H 850 4750 50  0001 C CNN
+F 1 "GND" H 850 4850 50  0000 C CNN
+F 2 "" H 850 5000 50  0000 C CNN
+F 3 "" H 850 5000 50  0000 C CNN
+       1    850  5000
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       1450 4500 1550 4500
+Wire Wire Line
+       1550 4500 2050 4500
+Text Label 1450 4500 0    50   ~ 0
+PG_CARRIER
+Text Notes 900  4300 0    60   ~ 0
+POR# Button
+Wire Wire Line
+       1550 4600 1550 4500
+Connection ~ 1550 4500
+Wire Wire Line
+       1550 4950 850  4950
+Connection ~ 850  4950
+Wire Wire Line
+       1550 4950 1550 4900
 $EndSCHEMATC

diff --git a/lib/vccio.lib b/lib/vccio.lib
index df9a5404733e695f11bb4478b61913bbebc54001..38f7231b38f028fe1622f8819c48f411c8dc5a5b 100644 (file)
--- a/lib/vccio.lib
+++ b/lib/vccio.lib
@@ -29,4 +29,18 @@ X VCCIO_35 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# VIN
+#
+DEF VIN #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VIN" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0  0 0  0 50 N
+P 2 0 1 0  50 50  -50 50 N
+X VIN 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 #End Library

diff --git a/power.sch b/power.sch
index b6d50ea8a319c6bdfa75fada20b25d99f8c34e3e..2cb177aaa58c4ca088e8e1548002d3e5f0bb0b40 100644 (file)
--- a/power.sch
+++ b/power.sch
@@ -74,7 +74,6 @@ LIBS:Zilog
 LIBS:conn_100pin
 LIBS:MCP2562FD
 LIBS:vccio
-LIBS:canbench-hw-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -112,17 +111,6 @@ F 3 "" H 1050 1150 50  0000 C CNN
        -1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR045
-U 1 1 56E7307E
-P 1900 1150
-F 0 "#PWR045" H 1900 900 50  0001 C CNN
-F 1 "GND" H 1900 1000 50  0000 C CNN
-F 2 "" H 1900 1150 50  0000 C CNN
-F 3 "" H 1900 1150 50  0000 C CNN
-       1    1900 1150
-       1    0    0    -1  
-$EndComp
-$Comp
 L PWR_FLAG #FLG046
 U 1 1 56E7310C
 P 1050 1050
@@ -134,17 +122,6 @@ F 3 "" H 1050 1050 50  0000 C CNN
        1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG047
-U 1 1 56E73153
-P 1900 1050
-F 0 "#FLG047" H 1900 1145 50  0001 C CNN
-F 1 "PWR_FLAG" H 1900 1230 50  0000 C CNN
-F 2 "" H 1900 1050 50  0000 C CNN
-F 3 "" H 1900 1050 50  0000 C CNN
-       1    1900 1050
-       1    0    0    -1  
-$EndComp
-$Comp
 L VCCIO_34 #PWR048
 U 1 1 56E902C1
 P 1500 1150
@@ -159,8 +136,6 @@ Wire Wire Line
        1050 1050 1050 1150
 Wire Wire Line
        1500 1050 1500 1150
-Wire Wire Line
-       1900 1050 1900 1150
 $Comp
 L PWR_FLAG #FLG049
 U 1 1 56E902E8
@@ -185,4 +160,76 @@ F 3 "" H 2300 1150 50  0000 C CNN
 $EndComp
 Wire Wire Line
        2300 1050 2300 1150
+$Comp
+L BARREL_JACK CON?
+U 1 1 56E9345D
+P 1600 3000
+F 0 "CON?" H 1600 3250 50  0000 C CNN
+F 1 "BARREL_JACK" H 1600 2800 50  0000 C CNN
+F 2 "" H 1600 3000 50  0000 C CNN
+F 3 "" H 1600 3000 50  0000 C CNN
+       1    1600 3000
+       1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 56E93546
+P 2500 3250
+F 0 "#PWR?" H 2500 3000 50  0001 C CNN
+F 1 "GND" H 2500 3100 50  0000 C CNN
+F 2 "" H 2500 3250 50  0000 C CNN
+F 3 "" H 2500 3250 50  0000 C CNN
+       1    2500 3250
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       1900 3100 2500 3100
+Wire Wire Line
+       2500 3100 2500 3250
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 56E93565
+P 2150 3250
+F 0 "#FLG?" H 2150 3345 50  0001 C CNN
+F 1 "PWR_FLAG" H 2150 3430 50  0000 C CNN
+F 2 "" H 2150 3250 50  0000 C CNN
+F 3 "" H 2150 3250 50  0000 C CNN
+       1    2150 3250
+       -1   0    0    1   
+$EndComp
+Wire Wire Line
+       2150 3250 2150 3100
+Connection ~ 2150 3100
+$Comp
+L VIN #PWR?
+U 1 1 56E93642
+P 2500 2750
+F 0 "#PWR?" H 2500 2600 50  0001 C CNN
+F 1 "VIN" H 2500 2900 50  0000 C CNN
+F 2 "" H 2500 2750 50  0000 C CNN
+F 3 "" H 2500 2750 50  0000 C CNN
+       1    2500 2750
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       2500 2750 2500 2900
+Wire Wire Line
+       2500 2900 1900 2900
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 56E93666
+P 2100 2700
+F 0 "#FLG?" H 2100 2795 50  0001 C CNN
+F 1 "PWR_FLAG" H 2100 2880 50  0000 C CNN
+F 2 "" H 2100 2700 50  0000 C CNN
+F 3 "" H 2100 2700 50  0000 C CNN
+       1    2100 2700
+       1    0    0    -1  
+$EndComp
+Wire Wire Line
+       2100 2700 2100 2900
+Connection ~ 2100 2900
+NoConn ~ 1900 3000
+Text Notes 1500 700  0    60   ~ 0
+TODO
 $EndSCHEMATC