diff --git a/hardware/jellybean/jellybean-cache.lib b/hardware/jellybean/jellybean-cache.lib index a80a41d4..be90b3aa 100644 --- a/hardware/jellybean/jellybean-cache.lib +++ b/hardware/jellybean/jellybean-cache.lib @@ -1,4 +1,4 @@ -EESchema-LIBRARY Version 2.3 Date: Mon Apr 9 23:34:58 2012 +EESchema-LIBRARY Version 2.3 Date: Mon Apr 9 23:43:44 2012 #encoding utf-8 # # +1.8V diff --git a/hardware/jellybean/jellybean.sch b/hardware/jellybean/jellybean.sch index b7aff626..ecd2107e 100644 --- a/hardware/jellybean/jellybean.sch +++ b/hardware/jellybean/jellybean.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Mon Apr 9 23:34:58 2012 +EESchema Schematic File Version 2 date Mon Apr 9 23:43:44 2012 LIBS:power LIBS:device LIBS:transistors @@ -46,19 +46,17 @@ Comment3 "" Comment4 "" $EndDescr Wire Wire Line - 1100 3350 2900 3350 + 1300 3350 3800 3350 Wire Wire Line - 2900 3350 3800 3350 + 1300 3550 3700 3550 Wire Wire Line 4300 3700 4000 3700 Wire Wire Line 4300 4300 4000 4300 Wire Wire Line - 3000 3850 3000 3750 + 3200 3850 3200 3000 Wire Wire Line - 3000 3750 3000 3000 -Wire Wire Line - 3000 5150 3000 5050 + 3200 5150 3200 5050 Wire Wire Line 3450 7400 3450 7500 Wire Wire Line @@ -84,17 +82,9 @@ Connection ~ 12250 2950 Wire Wire Line 12150 2950 12250 2950 Wire Wire Line - 12250 2850 12150 2850 + 12150 2850 12250 2850 Wire Wire Line - 12250 3350 12250 3250 -Wire Wire Line - 12250 3250 12250 3150 -Wire Wire Line - 12250 3150 12250 3050 -Wire Wire Line - 12250 3050 12250 2950 -Wire Wire Line - 12250 2950 12250 2850 + 12250 2850 12250 3350 Wire Wire Line 10900 3250 11350 3250 Wire Wire Line @@ -107,22 +97,18 @@ Wire Wire Line 10350 4700 10350 4300 Wire Wire Line 10350 4300 9700 4300 -Connection ~ 3000 3750 +Connection ~ 3200 3750 Wire Wire Line - 3000 3000 2800 3000 -Connection ~ 1600 3450 + 3200 3000 3000 3000 +Connection ~ 1800 3450 Wire Wire Line - 1600 3100 1600 3450 + 1800 3450 1800 3100 Wire Wire Line - 1600 3100 1700 3100 + 1800 3100 1900 3100 Wire Wire Line - 2100 3750 2200 3750 + 3200 3750 2300 3750 Wire Wire Line - 2200 3750 2500 3750 -Wire Wire Line - 2500 3750 3000 3750 -Wire Wire Line - 3600 3450 3600 4700 + 3600 4700 3600 3450 Wire Wire Line 4300 5800 4000 5800 Wire Wire Line @@ -151,7 +137,7 @@ Connection ~ 1950 7100 Wire Wire Line 1950 7100 1850 7100 Wire Wire Line - 1950 6900 1850 6900 + 1850 6900 1950 6900 Wire Wire Line 1050 8000 750 8000 Wire Wire Line @@ -164,23 +150,17 @@ Wire Wire Line 750 7100 1050 7100 Wire Wire Line 1050 6900 750 6900 -Connection ~ 550 1850 +Connection ~ 750 2000 Wire Wire Line - 550 1850 650 1850 + 750 2000 850 2000 Wire Wire Line - 550 1650 650 1650 + 850 1800 750 1800 Wire Wire Line - 550 2050 550 1950 + 750 1800 750 2200 Wire Wire Line - 550 1950 550 1850 + 1650 2000 1900 2000 Wire Wire Line - 550 1850 550 1750 -Wire Wire Line - 550 1750 550 1650 -Wire Wire Line - 1450 1850 1700 1850 -Wire Wire Line - 1450 1650 1700 1650 + 1650 1800 1900 1800 Wire Wire Line 5350 1750 5350 2050 Connection ~ 2850 2250 @@ -302,9 +282,7 @@ Wire Wire Line Wire Wire Line 4300 8700 3900 8700 Wire Wire Line - 4700 8700 4800 8700 -Wire Wire Line - 4800 8700 5050 8700 + 4700 8700 5050 8700 Wire Wire Line 4800 9300 4800 9200 Wire Wire Line @@ -354,11 +332,7 @@ Connection ~ 13450 3250 Wire Wire Line 13450 3250 13550 3250 Wire Wire Line - 13450 3450 13450 3350 -Wire Wire Line - 13450 3350 13450 3250 -Wire Wire Line - 13450 3250 13450 3150 + 13450 3450 13450 3150 Wire Wire Line 13450 3150 13550 3150 Connection ~ 16150 3200 @@ -368,13 +342,9 @@ Connection ~ 15150 3300 Wire Wire Line 15150 3300 15250 3300 Wire Wire Line - 15150 3100 15250 3100 + 15250 3100 15150 3100 Wire Wire Line - 15150 3400 15150 3300 -Wire Wire Line - 15150 3300 15150 3200 -Wire Wire Line - 15150 3200 15150 3100 + 15150 3100 15150 3400 Wire Wire Line 9700 6500 10000 6500 Wire Wire Line @@ -384,15 +354,13 @@ Wire Wire Line Wire Wire Line 14500 8950 14500 9250 Wire Wire Line - 16000 9350 15650 9350 + 15950 9300 15600 9300 Wire Wire Line - 16000 9150 15650 9150 + 15950 9100 15600 9100 Wire Wire Line - 15800 9450 16000 9450 + 15750 9400 15950 9400 Wire Wire Line - 6650 1300 6650 1400 -Wire Wire Line - 6650 1400 6650 2050 + 6650 1300 6650 2050 Connection ~ 6650 1400 Wire Wire Line 6400 1400 6650 1400 @@ -422,9 +390,7 @@ Wire Wire Line 14700 4950 14700 4650 Connection ~ 11100 1450 Wire Wire Line - 11100 1850 11100 1450 -Wire Wire Line - 11100 1450 11100 1350 + 11100 1850 11100 1350 Wire Wire Line 9900 1650 9600 1650 Wire Wire Line @@ -469,44 +435,24 @@ Wire Wire Line 15800 2050 15800 2150 Connection ~ 16150 1550 Wire Wire Line - 15200 1550 16150 1550 -Wire Wire Line - 16150 1550 16400 1550 + 15200 1550 16400 1550 Wire Wire Line 12800 850 12800 950 Wire Wire Line - 12800 1450 12800 1550 + 12800 1450 12800 1650 Wire Wire Line - 12800 1550 12800 1650 -Wire Wire Line - 12700 1550 12800 1550 -Wire Wire Line - 12800 1550 13900 1550 + 12700 1550 13900 1550 Wire Wire Line 15500 2050 15500 2150 Connection ~ 15500 2650 Connection ~ 15300 2650 Wire Wire Line - 15900 2650 15800 2650 -Wire Wire Line - 15800 2650 15500 2650 -Wire Wire Line - 15500 2650 15300 2650 -Wire Wire Line - 15300 2650 14800 2650 + 15900 2650 14800 2650 Wire Wire Line 15500 1250 15500 1150 Connection ~ 15300 650 Wire Wire Line - 14800 650 14900 650 -Wire Wire Line - 14900 650 15300 650 -Wire Wire Line - 15300 650 15500 650 -Wire Wire Line - 15500 650 15800 650 -Wire Wire Line - 15800 650 15900 650 + 14800 650 15900 650 Wire Wire Line 15300 1950 15300 1850 Wire Wire Line @@ -529,24 +475,18 @@ Wire Wire Line Wire Wire Line 13550 2250 13550 2150 Wire Wire Line - 13900 1650 13550 1650 + 13900 1650 13350 1650 Wire Wire Line - 13550 1650 13350 1650 + 13050 4200 12800 4200 Wire Wire Line - 13300 4200 13050 4200 + 13050 4100 12800 4100 +Connection ~ 14250 3850 Wire Wire Line - 13300 4100 13050 4100 -Connection ~ 14500 3850 + 14550 3850 13850 3850 Wire Wire Line - 14800 3850 14500 3850 + 14900 3800 14900 3850 Wire Wire Line - 14500 3850 14200 3850 -Wire Wire Line - 14200 3850 14100 3850 -Wire Wire Line - 15150 3850 15150 3800 -Wire Wire Line - 15150 4250 15150 4350 + 14900 4350 14900 4250 Wire Wire Line 13600 4950 13600 4700 Wire Wire Line @@ -582,45 +522,7 @@ Wire Wire Line 11200 10050 11100 10050 Connection ~ 11200 10250 Wire Wire Line - 11200 10350 11200 10250 -Wire Wire Line - 11200 10250 11200 10150 -Wire Wire Line - 11200 10150 11200 10050 -Wire Wire Line - 11200 10050 11200 9950 -Wire Wire Line - 11200 9950 11200 9850 -Wire Wire Line - 11200 9850 11200 9750 -Wire Wire Line - 11200 9750 11200 9650 -Wire Wire Line - 11200 9650 11200 9550 -Wire Wire Line - 11200 9550 11200 9450 -Wire Wire Line - 11200 9450 11200 9350 -Wire Wire Line - 11200 9350 11200 9250 -Wire Wire Line - 11200 9250 11200 9150 -Wire Wire Line - 11200 9150 11200 9050 -Wire Wire Line - 11200 9050 11200 8950 -Wire Wire Line - 11200 8950 11200 8850 -Wire Wire Line - 11200 8850 11200 8750 -Wire Wire Line - 11200 8750 11200 8650 -Wire Wire Line - 11200 8650 11200 8550 -Wire Wire Line - 11200 8550 11200 8450 -Wire Wire Line - 11200 8450 11200 8350 + 11200 10350 11200 8350 Wire Wire Line 11200 8350 11100 8350 Wire Wire Line @@ -686,13 +588,9 @@ Wire Wire Line Wire Wire Line 11600 7850 11400 7850 Wire Wire Line - 1100 3450 1600 3450 + 2400 3750 2400 3850 Wire Wire Line - 1600 3450 3600 3450 -Wire Wire Line - 2200 3750 2200 3850 -Wire Wire Line - 2500 4350 2500 4250 + 2700 4350 2700 4250 Wire Wire Line 3800 3350 3800 5100 Wire Wire Line @@ -707,23 +605,17 @@ Connection ~ 1300 4500 Wire Wire Line 1300 4500 1300 4600 Wire Wire Line - 800 4500 800 4600 + 800 4600 800 4500 Wire Wire Line - 800 4500 1100 4500 -Wire Wire Line - 1100 4500 1300 4500 -Wire Wire Line - 1300 4500 1400 4500 + 800 4500 1400 4500 Wire Wire Line 1400 4500 1400 4600 Wire Wire Line 1100 5400 1100 5700 Wire Wire Line - 1300 6000 1300 5400 + 1300 5400 1300 6000 Wire Wire Line - 4300 6000 2100 6000 -Wire Wire Line - 2100 6000 1300 6000 + 1300 6000 4300 6000 Wire Wire Line 1500 5400 1500 5900 Wire Wire Line @@ -731,9 +623,7 @@ Wire Wire Line Wire Wire Line 11950 3900 12050 3900 Wire Wire Line - 6850 1300 6850 1400 -Wire Wire Line - 6850 1400 6850 2050 + 6850 1300 6850 2050 Wire Wire Line 11950 4200 12050 4200 Wire Wire Line @@ -768,14 +658,10 @@ Wire Wire Line 4300 6100 4000 6100 Connection ~ 1150 9450 Wire Wire Line - 1050 9450 1150 9450 -Wire Wire Line - 1150 9450 1450 9450 + 1050 9450 1450 9450 Connection ~ 750 9650 Wire Wire Line - 650 9650 750 9650 -Wire Wire Line - 750 9650 1450 9650 + 650 9650 1450 9650 Wire Wire Line 950 9750 950 9550 Wire Wire Line @@ -784,20 +670,12 @@ Connection ~ 2350 9450 Wire Wire Line 2350 9450 2250 9450 Wire Wire Line - 2350 9650 2250 9650 + 2250 9650 2350 9650 Wire Wire Line - 2350 9250 2350 9350 -Wire Wire Line - 2350 9350 2350 9450 -Wire Wire Line - 2350 9450 2350 9550 -Wire Wire Line - 2350 9550 2350 9650 + 2350 9650 2350 9250 Connection ~ 10650 4500 Wire Wire Line - 11050 4500 10650 4500 -Wire Wire Line - 10650 4500 9700 4500 + 11050 4500 9700 4500 Wire Wire Line 10350 4100 10350 4200 Wire Wire Line @@ -826,35 +704,7 @@ Connection ~ 4450 1200 Connection ~ 3850 1200 Connection ~ 4750 800 Wire Wire Line - 5050 800 4750 800 -Wire Wire Line - 4750 800 4450 800 -Wire Wire Line - 4450 800 4150 800 -Wire Wire Line - 4150 800 3850 800 -Wire Wire Line - 3850 800 3550 800 -Wire Wire Line - 3550 800 3250 800 -Wire Wire Line - 3250 800 2950 800 -Wire Wire Line - 2950 800 2650 800 -Wire Wire Line - 2650 800 2350 800 -Wire Wire Line - 2350 800 2050 800 -Wire Wire Line - 2050 800 1750 800 -Wire Wire Line - 1750 800 1450 800 -Wire Wire Line - 1450 800 1150 800 -Wire Wire Line - 1150 800 850 800 -Wire Wire Line - 850 800 700 800 + 5050 800 700 800 Connection ~ 4150 800 Connection ~ 3550 800 Connection ~ 2950 1200 @@ -868,7 +718,7 @@ Wire Wire Line 700 800 700 750 Connection ~ 1150 1200 Wire Wire Line - 700 1200 700 1300 + 700 1300 700 1200 Wire Wire Line 5950 1950 5950 2050 Wire Wire Line @@ -930,35 +780,7 @@ Connection ~ 4450 800 Connection ~ 3550 1200 Connection ~ 4150 1200 Wire Wire Line - 5050 1200 4750 1200 -Wire Wire Line - 4750 1200 4450 1200 -Wire Wire Line - 4450 1200 4150 1200 -Wire Wire Line - 4150 1200 3850 1200 -Wire Wire Line - 3850 1200 3550 1200 -Wire Wire Line - 3550 1200 3250 1200 -Wire Wire Line - 3250 1200 2950 1200 -Wire Wire Line - 2950 1200 2650 1200 -Wire Wire Line - 2650 1200 2350 1200 -Wire Wire Line - 2350 1200 2050 1200 -Wire Wire Line - 2050 1200 1750 1200 -Wire Wire Line - 1750 1200 1450 1200 -Wire Wire Line - 1450 1200 1150 1200 -Wire Wire Line - 1150 1200 850 1200 -Wire Wire Line - 850 1200 700 1200 + 700 1200 5050 1200 Connection ~ 4750 1200 Wire Wire Line 3400 5300 3500 5300 @@ -990,34 +812,26 @@ Wire Wire Line 750 10250 750 10350 Connection ~ 2100 6000 Wire Wire Line - 10500 4200 10350 4200 -Wire Wire Line - 10350 4200 9700 4200 + 10500 4200 9700 4200 Connection ~ 10350 4200 Wire Wire Line - 11050 4600 10850 4600 -Wire Wire Line - 10850 4600 9700 4600 + 11050 4600 9700 4600 Connection ~ 10850 4600 Wire Wire Line - 2350 9550 2250 9550 + 2250 9550 2350 9550 Connection ~ 2350 9550 Wire Wire Line - 2250 9350 2350 9350 + 2350 9350 2250 9350 Connection ~ 2350 9350 Wire Wire Line 1150 9750 1150 9450 Wire Wire Line 750 9750 750 9650 Wire Wire Line - 850 9550 950 9550 -Wire Wire Line - 950 9550 1450 9550 + 850 9550 1450 9550 Connection ~ 950 9550 Wire Wire Line - 1250 9350 1350 9350 -Wire Wire Line - 1350 9350 1450 9350 + 1250 9350 1450 9350 Connection ~ 1350 9350 Wire Wire Line 4300 6300 4000 6300 @@ -1045,9 +859,7 @@ Wire Wire Line 2500 5400 2500 5600 Connection ~ 2500 5600 Wire Wire Line - 1850 5700 2300 5700 -Wire Wire Line - 2300 5700 4300 5700 + 1850 5700 4300 5700 Connection ~ 2300 5700 Wire Wire Line 11950 4300 12050 4300 @@ -1060,9 +872,7 @@ Wire Wire Line Wire Wire Line 11950 4000 12050 4000 Wire Wire Line - 4300 5600 2500 5600 -Wire Wire Line - 2500 5600 1400 5600 + 4300 5600 1400 5600 Wire Wire Line 1400 5600 1400 5400 Wire Wire Line @@ -1083,23 +893,19 @@ Wire Wire Line Wire Wire Line 3600 4700 4300 4700 Wire Wire Line - 1200 3250 1100 3250 + 1400 3250 1300 3250 Wire Wire Line - 1100 3650 1200 3650 + 1300 3650 1400 3650 Wire Wire Line - 1200 3650 1200 3750 + 1400 3650 1400 3750 Wire Wire Line - 1200 3750 1400 3750 + 1400 3750 1600 3750 Wire Wire Line - 2200 4350 2200 4250 + 2400 4350 2400 4250 Wire Wire Line - 2500 3850 2500 3750 -Wire Wire Line - 1100 3550 1500 3550 -Wire Wire Line - 1500 3550 3700 3550 -Connection ~ 2500 3750 -Connection ~ 2200 3750 + 2700 3850 2700 3750 +Connection ~ 2700 3750 +Connection ~ 2400 3750 Wire Wire Line 11600 7950 11400 7950 Wire Wire Line @@ -1196,44 +1002,32 @@ Wire Wire Line Wire Wire Line 12600 4950 12600 4700 Wire Wire Line - 15550 4250 15250 4250 + 14900 4250 15300 4250 +Connection ~ 15000 4250 Wire Wire Line - 15250 4250 15150 4250 -Connection ~ 15250 4250 + 14900 3850 15300 3850 +Connection ~ 15000 3850 +Connection ~ 15750 3850 Wire Wire Line - 15550 3850 15250 3850 + 16050 3850 15650 3850 +Connection ~ 15750 4250 Wire Wire Line - 15250 3850 15150 3850 -Connection ~ 15250 3850 -Connection ~ 16000 3850 + 16050 4250 15650 4250 Wire Wire Line - 16300 3850 16000 3850 + 15650 4250 15650 4350 Wire Wire Line - 16000 3850 15900 3850 -Connection ~ 16000 4250 + 15650 3850 15650 3600 +Connection ~ 13950 3850 +Connection ~ 13950 4250 Wire Wire Line - 16300 4250 16000 4250 + 13850 4350 13850 4250 Wire Wire Line - 16000 4250 15900 4250 + 13850 3850 13850 3800 Wire Wire Line - 15900 4250 15900 4350 + 13850 4250 14550 4250 +Connection ~ 14250 4250 Wire Wire Line - 15900 3850 15900 3600 -Connection ~ 14200 3850 -Connection ~ 14200 4250 -Wire Wire Line - 14100 4250 14100 4350 -Wire Wire Line - 14100 3850 14100 3800 -Wire Wire Line - 14800 4250 14500 4250 -Wire Wire Line - 14500 4250 14200 4250 -Wire Wire Line - 14200 4250 14100 4250 -Connection ~ 14500 4250 -Wire Wire Line - 13050 4000 13300 4000 + 12800 4000 13050 4000 Wire Wire Line 11500 6150 11600 6150 Wire Wire Line @@ -1246,16 +1040,10 @@ Wire Wire Line Wire Wire Line 13800 1850 13800 2650 Wire Wire Line - 13700 650 13800 650 -Wire Wire Line - 13800 650 14200 650 -Wire Wire Line - 14200 650 14300 650 + 13700 650 14300 650 Connection ~ 13800 650 Wire Wire Line - 13700 2650 13800 2650 -Wire Wire Line - 13800 2650 14300 2650 + 13700 2650 14300 2650 Connection ~ 13800 2650 Wire Wire Line 14350 900 14200 900 @@ -1354,11 +1142,11 @@ Wire Wire Line 7050 1400 6850 1400 Connection ~ 6850 1400 Wire Wire Line - 15950 9550 16000 9550 + 15900 9500 15950 9500 Wire Wire Line - 16000 9050 15650 9050 + 15950 9000 15600 9000 Wire Wire Line - 16000 9250 15650 9250 + 15950 9200 15600 9200 Wire Wire Line 14300 8950 14300 9250 Wire Wire Line @@ -1370,14 +1158,10 @@ Wire Wire Line Wire Wire Line 8450 7450 8450 7750 Wire Wire Line - 15150 3200 15250 3200 + 15250 3200 15150 3200 Connection ~ 15150 3200 Wire Wire Line - 16150 3050 16150 3100 -Wire Wire Line - 16150 3100 16150 3200 -Wire Wire Line - 16150 3200 16150 3300 + 16150 3050 16150 3300 Wire Wire Line 16150 3300 16050 3300 Wire Wire Line @@ -1387,11 +1171,7 @@ Wire Wire Line 13450 3350 13550 3350 Connection ~ 13450 3350 Wire Wire Line - 14450 3100 14450 3150 -Wire Wire Line - 14450 3150 14450 3250 -Wire Wire Line - 14450 3250 14450 3350 + 14450 3100 14450 3350 Wire Wire Line 14450 3350 14350 3350 Wire Wire Line @@ -1455,21 +1235,7 @@ Wire Wire Line Wire Wire Line 8350 9850 8650 9850 Wire Wire Line - 7450 10050 7450 9950 -Wire Wire Line - 7450 9950 7450 9850 -Wire Wire Line - 7450 9850 7450 9750 -Wire Wire Line - 7450 9750 7450 9650 -Wire Wire Line - 7450 9650 7450 9550 -Wire Wire Line - 7450 9550 7450 9450 -Wire Wire Line - 7450 9450 7450 9350 -Wire Wire Line - 7450 9350 7450 9250 + 7450 10050 7450 9250 Wire Wire Line 7450 9250 7550 9250 Wire Wire Line @@ -1522,37 +1288,7 @@ Wire Wire Line Wire Wire Line 5650 10150 5950 10150 Wire Wire Line - 6850 10350 6850 10250 -Wire Wire Line - 6850 10250 6850 10150 -Wire Wire Line - 6850 10150 6850 10050 -Wire Wire Line - 6850 10050 6850 9950 -Wire Wire Line - 6850 9950 6850 9850 -Wire Wire Line - 6850 9850 6850 9750 -Wire Wire Line - 6850 9750 6850 9650 -Wire Wire Line - 6850 9650 6850 9550 -Wire Wire Line - 6850 9550 6850 9450 -Wire Wire Line - 6850 9450 6850 9350 -Wire Wire Line - 6850 9350 6850 9250 -Wire Wire Line - 6850 9250 6850 9150 -Wire Wire Line - 6850 9150 6850 9050 -Wire Wire Line - 6850 9050 6850 8950 -Wire Wire Line - 6850 8950 6850 8850 -Wire Wire Line - 6850 8850 6850 8750 + 6850 10350 6850 8750 Wire Wire Line 6850 8750 6750 8750 Wire Wire Line @@ -1601,21 +1337,7 @@ Wire Wire Line Wire Wire Line 3750 2150 4050 2150 Wire Wire Line - 2850 2350 2850 2250 -Wire Wire Line - 2850 2250 2850 2150 -Wire Wire Line - 2850 2150 2850 2050 -Wire Wire Line - 2850 2050 2850 1950 -Wire Wire Line - 2850 1950 2850 1850 -Wire Wire Line - 2850 1850 2850 1750 -Wire Wire Line - 2850 1750 2850 1650 -Wire Wire Line - 2850 1650 2850 1550 + 2850 2350 2850 1550 Wire Wire Line 2850 1550 2950 1550 Wire Wire Line @@ -1632,15 +1354,15 @@ Wire Wire Line Wire Wire Line 5250 1750 5250 2050 Wire Wire Line - 1450 1750 1700 1750 + 1650 1900 1900 1900 Wire Wire Line - 1450 1950 1700 1950 + 1650 2100 1900 2100 Wire Wire Line - 550 1750 650 1750 -Connection ~ 550 1750 + 850 1900 750 1900 +Connection ~ 750 1900 Wire Wire Line - 650 1950 550 1950 -Connection ~ 550 1950 + 750 2100 850 2100 +Connection ~ 750 2100 Wire Wire Line 750 7000 1050 7000 Wire Wire Line @@ -1674,37 +1396,7 @@ Wire Wire Line 1950 8000 1850 8000 Connection ~ 1950 8000 Wire Wire Line - 1950 8500 1950 8400 -Wire Wire Line - 1950 8400 1950 8300 -Wire Wire Line - 1950 8300 1950 8200 -Wire Wire Line - 1950 8200 1950 8100 -Wire Wire Line - 1950 8100 1950 8000 -Wire Wire Line - 1950 8000 1950 7900 -Wire Wire Line - 1950 7900 1950 7800 -Wire Wire Line - 1950 7800 1950 7700 -Wire Wire Line - 1950 7700 1950 7600 -Wire Wire Line - 1950 7600 1950 7500 -Wire Wire Line - 1950 7500 1950 7400 -Wire Wire Line - 1950 7400 1950 7300 -Wire Wire Line - 1950 7300 1950 7200 -Wire Wire Line - 1950 7200 1950 7100 -Wire Wire Line - 1950 7100 1950 7000 -Wire Wire Line - 1950 7000 1950 6900 + 1950 6900 1950 8500 Wire Wire Line 1950 8300 1850 8300 Connection ~ 1950 8300 @@ -1718,19 +1410,19 @@ Wire Wire Line Wire Wire Line 750 8400 1050 8400 Wire Wire Line - 3700 3550 3700 4900 + 3700 4900 3700 3550 Wire Wire Line - 1600 3000 1700 3000 + 1800 3000 1900 3000 Wire Wire Line - 1700 2900 1500 2900 + 1900 2900 1700 2900 Wire Wire Line - 1500 2900 1500 3550 -Connection ~ 1500 3550 + 1700 2900 1700 3550 +Connection ~ 1700 3550 Wire Wire Line - 2800 3100 2900 3100 + 3000 3100 3100 3100 Wire Wire Line - 2900 3100 2900 3350 -Connection ~ 2900 3350 + 3100 3100 3100 3350 +Connection ~ 3100 3350 Wire Wire Line 10350 5700 10350 5800 Wire Wire Line @@ -1746,10 +1438,10 @@ Wire Wire Line Wire Wire Line 11250 2850 11350 2850 Wire Wire Line - 12150 3050 12250 3050 + 12250 3050 12150 3050 Connection ~ 12250 3050 Wire Wire Line - 12150 3250 12250 3250 + 12250 3250 12150 3250 Connection ~ 12250 3250 Wire Wire Line 2550 6900 2550 6650 @@ -1766,18 +1458,18 @@ Wire Wire Line Wire Wire Line 3750 7400 3750 7500 Wire Wire Line - 3000 4350 3000 4450 + 3200 4350 3200 4550 +Connection ~ 3200 4450 Wire Wire Line - 3000 4450 3000 4550 -Wire Wire Line - 3000 4450 3500 4450 -Connection ~ 3000 4450 -Wire Wire Line - 3500 4450 3500 5000 + 3500 5000 3500 4450 Wire Wire Line 3500 5000 4300 5000 Wire Wire Line 4300 3200 4000 3200 +Wire Wire Line + 3500 4450 3200 4450 +Wire Wire Line + 3600 3450 1300 3450 Text Label 4000 4300 0 40 ~ 0 LED3 Text Label 4000 3700 0 40 ~ 0 @@ -1787,28 +1479,28 @@ LED1 $Comp L GND #PWR01 U 1 1 4F83C49F -P 3000 5150 -F 0 "#PWR01" H 3000 5150 30 0001 C CNN -F 1 "GND" H 3000 5080 30 0001 C CNN - 1 3000 5150 +P 3200 5150 +F 0 "#PWR01" H 3200 5150 30 0001 C CNN +F 1 "GND" H 3200 5080 30 0001 C CNN + 1 3200 5150 1 0 0 -1 $EndComp $Comp L R R11 U 1 1 4F83C495 -P 3000 4800 -F 0 "R11" V 3080 4800 50 0000 C CNN -F 1 "33k" V 3000 4800 50 0000 C CNN - 1 3000 4800 +P 3200 4800 +F 0 "R11" V 3280 4800 50 0000 C CNN +F 1 "33k" V 3200 4800 50 0000 C CNN + 1 3200 4800 1 0 0 -1 $EndComp $Comp L R R10 U 1 1 4F83C48F -P 3000 4100 -F 0 "R10" V 3080 4100 50 0000 C CNN -F 1 "15k" V 3000 4100 50 0000 C CNN - 1 3000 4100 +P 3200 4100 +F 0 "R10" V 3280 4100 50 0000 C CNN +F 1 "15k" V 3200 4100 50 0000 C CNN + 1 3200 4100 1 0 0 -1 $EndComp Text Label 3150 6650 3 40 ~ 0 @@ -2035,14 +1727,14 @@ F 1 "USBLED" H 10350 5400 50 0000 C CNN 1 10350 5500 0 1 1 0 $EndComp -NoConn ~ 2800 2900 +NoConn ~ 3000 2900 $Comp L GND #PWR011 U 1 1 4F83AF62 -P 1600 3000 -F 0 "#PWR011" H 1600 3000 30 0001 C CNN -F 1 "GND" H 1600 2930 30 0001 C CNN - 1 1600 3000 +P 1800 3000 +F 0 "#PWR011" H 1800 3000 30 0001 C CNN +F 1 "GND" H 1800 2930 30 0001 C CNN + 1 1800 3000 0 1 1 0 $EndComp $Comp @@ -2120,27 +1812,27 @@ CTIN_4 $Comp L GND #PWR014 U 1 1 4F83825A -P 550 2050 -F 0 "#PWR014" H 550 2050 30 0001 C CNN -F 1 "GND" H 550 1980 30 0001 C CNN - 1 550 2050 +P 750 2200 +F 0 "#PWR014" H 750 2200 30 0001 C CNN +F 1 "GND" H 750 2130 30 0001 C CNN + 1 750 2200 1 0 0 -1 $EndComp -Text Label 1700 1950 2 40 ~ 0 +Text Label 1900 2100 2 40 ~ 0 ADC0_0 -Text Label 1700 1850 2 40 ~ 0 +Text Label 1900 2000 2 40 ~ 0 ADC0_5 -Text Label 1700 1750 2 40 ~ 0 +Text Label 1900 1900 2 40 ~ 0 ADC0_2 -Text Label 1700 1650 2 40 ~ 0 +Text Label 1900 1800 2 40 ~ 0 ADC0_6 $Comp L CONN_4X2 P1 U 1 1 4F83821B -P 1050 1800 -F 0 "P1" H 1050 2050 50 0000 C CNN -F 1 "ANALOG" V 1050 1800 40 0000 C CNN - 1 1050 1800 +P 1250 1950 +F 0 "P1" H 1250 2200 50 0000 C CNN +F 1 "ANALOG" V 1250 1950 40 0000 C CNN + 1 1250 1950 1 0 0 -1 $EndComp Text Label 5450 1750 3 40 ~ 0 @@ -2578,7 +2270,7 @@ Text Label 10000 6400 2 40 ~ 0 CPLD_TMS Text Label 10000 6000 2 40 ~ 0 CPLD_TDI -Text Notes 13000 3850 0 40 ~ 0 +Text Notes 12750 3850 0 40 ~ 0 bank 2 power selection Text Label 14100 4650 3 40 ~ 0 CPLD_TDO @@ -2588,39 +2280,39 @@ Text Label 14500 9250 1 40 ~ 0 CPLD_TMS Text Label 14300 9250 1 40 ~ 0 CPLD_TDI -Text Label 15650 9350 0 40 ~ 0 +Text Label 15600 9300 0 40 ~ 0 CPLD_TCK -Text Label 15650 9250 0 40 ~ 0 +Text Label 15600 9200 0 40 ~ 0 CPLD_TDO -Text Label 15650 9150 0 40 ~ 0 +Text Label 15600 9100 0 40 ~ 0 CPLD_TDI -Text Label 15650 9050 0 40 ~ 0 +Text Label 15600 9000 0 40 ~ 0 CPLD_TMS $Comp L GND #PWR025 U 1 1 4F82F4DF -P 15800 9450 -F 0 "#PWR025" H 15800 9450 30 0001 C CNN -F 1 "GND" H 15800 9380 30 0001 C CNN - 1 15800 9450 +P 15750 9400 +F 0 "#PWR025" H 15750 9400 30 0001 C CNN +F 1 "GND" H 15750 9330 30 0001 C CNN + 1 15750 9400 0 1 1 0 $EndComp $Comp L VCC #PWR026 U 1 1 4F82F4D6 -P 15950 9550 -F 0 "#PWR026" H 15950 9650 30 0001 C CNN -F 1 "VCC" H 15950 9650 30 0000 C CNN - 1 15950 9550 +P 15900 9500 +F 0 "#PWR026" H 15900 9600 30 0001 C CNN +F 1 "VCC" H 15900 9600 30 0000 C CNN + 1 15900 9500 0 -1 -1 0 $EndComp $Comp L CONN_6 P18 U 1 1 4F82F4C0 -P 16350 9300 -F 0 "P18" V 16300 9300 60 0000 C CNN -F 1 "CPLD_JTAG" V 16400 9300 60 0000 C CNN - 1 16350 9300 +P 16300 9250 +F 0 "P18" V 16250 9250 60 0000 C CNN +F 1 "CPLD_JTAG" V 16350 9250 60 0000 C CNN + 1 16300 9250 1 0 0 -1 $EndComp Text Label 6400 1400 0 40 ~ 0 @@ -3110,75 +2802,75 @@ $EndComp $Comp L 1V8 #PWR051 U 1 1 4F81F898 -P 13050 4200 -F 0 "#PWR051" H 13050 4340 20 0001 C CNN -F 1 "1V8" H 13050 4310 30 0000 C CNN - 1 13050 4200 +P 12800 4200 +F 0 "#PWR051" H 12800 4340 20 0001 C CNN +F 1 "1V8" H 12800 4310 30 0000 C CNN + 1 12800 4200 0 -1 -1 0 $EndComp $Comp L VCC #PWR052 U 1 1 4F81F87F -P 13050 4000 -F 0 "#PWR052" H 13050 4100 30 0001 C CNN -F 1 "VCC" H 13050 4100 30 0000 C CNN - 1 13050 4000 +P 12800 4000 +F 0 "#PWR052" H 12800 4100 30 0001 C CNN +F 1 "VCC" H 12800 4100 30 0000 C CNN + 1 12800 4000 0 -1 -1 0 $EndComp -Text Label 13050 4100 0 40 ~ 0 +Text Label 12800 4100 0 40 ~ 0 VCCIO2 $Comp L CONN_3 K1 U 1 1 4F81F868 -P 13650 4100 -F 0 "K1" V 13600 4100 50 0000 C CNN -F 1 "BANK2_PWR" V 13700 4100 40 0000 C CNN - 1 13650 4100 +P 13400 4100 +F 0 "K1" V 13350 4100 50 0000 C CNN +F 1 "BANK2_PWR" V 13450 4100 40 0000 C CNN + 1 13400 4100 1 0 0 -1 $EndComp $Comp L VCC #PWR053 U 1 1 4F81F829 -P 14100 3800 -F 0 "#PWR053" H 14100 3900 30 0001 C CNN -F 1 "VCC" H 14100 3900 30 0000 C CNN - 1 14100 3800 +P 13850 3800 +F 0 "#PWR053" H 13850 3900 30 0001 C CNN +F 1 "VCC" H 13850 3900 30 0000 C CNN + 1 13850 3800 1 0 0 -1 $EndComp $Comp L C C25 U 1 1 4F81F81B -P 14800 4050 -F 0 "C25" H 14850 4150 50 0000 L CNN -F 1 "100nF" H 14850 3950 50 0000 L CNN - 1 14800 4050 +P 14550 4050 +F 0 "C25" H 14600 4150 50 0000 L CNN +F 1 "100nF" H 14600 3950 50 0000 L CNN + 1 14550 4050 1 0 0 -1 $EndComp $Comp L C C22 U 1 1 4F81F81A -P 14200 4050 -F 0 "C22" H 14250 4150 50 0000 L CNN -F 1 "100nF" H 14250 3950 50 0000 L CNN - 1 14200 4050 +P 13950 4050 +F 0 "C22" H 14000 4150 50 0000 L CNN +F 1 "100nF" H 14000 3950 50 0000 L CNN + 1 13950 4050 1 0 0 -1 $EndComp $Comp L C C23 U 1 1 4F81F819 -P 14500 4050 -F 0 "C23" H 14550 4150 50 0000 L CNN -F 1 "100nF" H 14550 3950 50 0000 L CNN - 1 14500 4050 +P 14250 4050 +F 0 "C23" H 14300 4150 50 0000 L CNN +F 1 "100nF" H 14300 3950 50 0000 L CNN + 1 14250 4050 1 0 0 -1 $EndComp $Comp L GND #PWR054 U 1 1 4F81F817 -P 14100 4350 -F 0 "#PWR054" H 14100 4350 30 0001 C CNN -F 1 "GND" H 14100 4280 30 0001 C CNN - 1 14100 4350 +P 13850 4350 +F 0 "#PWR054" H 13850 4350 30 0001 C CNN +F 1 "GND" H 13850 4280 30 0001 C CNN + 1 13850 4350 1 0 0 -1 $EndComp Text Label 15900 3600 3 40 ~ 0 @@ -3186,64 +2878,64 @@ VCCIO2 $Comp L C C32 U 1 1 4F81F7F3 -P 16000 4050 -F 0 "C32" H 16050 4150 50 0000 L CNN -F 1 "100nF" H 16050 3950 50 0000 L CNN - 1 16000 4050 +P 15750 4050 +F 0 "C32" H 15800 4150 50 0000 L CNN +F 1 "100nF" H 15800 3950 50 0000 L CNN + 1 15750 4050 1 0 0 -1 $EndComp $Comp L C C33 U 1 1 4F81F7F2 -P 16300 4050 -F 0 "C33" H 16350 4150 50 0000 L CNN -F 1 "100nF" H 16350 3950 50 0000 L CNN - 1 16300 4050 +P 16050 4050 +F 0 "C33" H 16100 4150 50 0000 L CNN +F 1 "100nF" H 16100 3950 50 0000 L CNN + 1 16050 4050 1 0 0 -1 $EndComp $Comp L GND #PWR055 U 1 1 4F81F7F0 -P 15900 4350 -F 0 "#PWR055" H 15900 4350 30 0001 C CNN -F 1 "GND" H 15900 4280 30 0001 C CNN - 1 15900 4350 +P 15650 4350 +F 0 "#PWR055" H 15650 4350 30 0001 C CNN +F 1 "GND" H 15650 4280 30 0001 C CNN + 1 15650 4350 1 0 0 -1 $EndComp $Comp L GND #PWR056 U 1 1 4F81F7DB -P 15150 4350 -F 0 "#PWR056" H 15150 4350 30 0001 C CNN -F 1 "GND" H 15150 4280 30 0001 C CNN - 1 15150 4350 +P 14900 4350 +F 0 "#PWR056" H 14900 4350 30 0001 C CNN +F 1 "GND" H 14900 4280 30 0001 C CNN + 1 14900 4350 1 0 0 -1 $EndComp $Comp L 1V8 #PWR057 U 1 1 4F81F7CF -P 15150 3800 -F 0 "#PWR057" H 15150 3940 20 0001 C CNN -F 1 "1V8" H 15150 3910 30 0000 C CNN - 1 15150 3800 +P 14900 3800 +F 0 "#PWR057" H 14900 3940 20 0001 C CNN +F 1 "1V8" H 14900 3910 30 0000 C CNN + 1 14900 3800 1 0 0 -1 $EndComp $Comp L C C29 U 1 1 4F81F7AF -P 15550 4050 -F 0 "C29" H 15600 4150 50 0000 L CNN -F 1 "100nF" H 15600 3950 50 0000 L CNN - 1 15550 4050 +P 15300 4050 +F 0 "C29" H 15350 4150 50 0000 L CNN +F 1 "100nF" H 15350 3950 50 0000 L CNN + 1 15300 4050 1 0 0 -1 $EndComp $Comp L C C26 U 1 1 4F81F7A0 -P 15250 4050 -F 0 "C26" H 15300 4150 50 0000 L CNN -F 1 "100nF" H 15300 3950 50 0000 L CNN - 1 15250 4050 +P 15000 4050 +F 0 "C26" H 15050 4150 50 0000 L CNN +F 1 "100nF" H 15050 3950 50 0000 L CNN + 1 15000 4050 1 0 0 -1 $EndComp $Comp @@ -3518,73 +3210,73 @@ $EndComp $Comp L GND #PWR065 U 1 1 4F787903 -P 2500 4350 -F 0 "#PWR065" H 2500 4350 30 0001 C CNN -F 1 "GND" H 2500 4280 30 0001 C CNN - 1 2500 4350 +P 2700 4350 +F 0 "#PWR065" H 2700 4350 30 0001 C CNN +F 1 "GND" H 2700 4280 30 0001 C CNN + 1 2700 4350 1 0 0 -1 $EndComp $Comp L GND #PWR066 U 1 1 4F787901 -P 2200 4350 -F 0 "#PWR066" H 2200 4350 30 0001 C CNN -F 1 "GND" H 2200 4280 30 0001 C CNN - 1 2200 4350 +P 2400 4350 +F 0 "#PWR066" H 2400 4350 30 0001 C CNN +F 1 "GND" H 2400 4280 30 0001 C CNN + 1 2400 4350 1 0 0 -1 $EndComp $Comp L C C8 U 1 1 4F766FAD -P 2500 4050 -F 0 "C8" H 2550 4150 50 0000 L CNN -F 1 "100nF" H 2550 3950 50 0000 L CNN - 1 2500 4050 +P 2700 4050 +F 0 "C8" H 2750 4150 50 0000 L CNN +F 1 "100nF" H 2750 3950 50 0000 L CNN + 1 2700 4050 1 0 0 -1 $EndComp $Comp L C C6 U 1 1 4F766FA9 -P 2200 4050 -F 0 "C6" H 2250 4150 50 0000 L CNN -F 1 "4u7" H 2250 3950 50 0000 L CNN - 1 2200 4050 +P 2400 4050 +F 0 "C6" H 2450 4150 50 0000 L CNN +F 1 "4u7" H 2450 3950 50 0000 L CNN + 1 2400 4050 1 0 0 -1 $EndComp $Comp L FILTER FB1 U 1 1 4F766F5E -P 1750 3750 -F 0 "FB1" H 1750 3900 60 0000 C CNN -F 1 "FILTER" H 1750 3650 60 0000 C CNN - 1 1750 3750 +P 1950 3750 +F 0 "FB1" H 1950 3900 60 0000 C CNN +F 1 "FILTER" H 1950 3650 60 0000 C CNN + 1 1950 3750 1 0 0 -1 $EndComp $Comp L GSG-IP4220CZ6 U1 U 1 1 4F766D4B -P 2250 3000 -F 0 "U1" H 2250 3250 60 0000 C CNN -F 1 "GSG-IP4220CZ6" H 2250 2750 60 0000 C CNN - 1 2250 3000 +P 2450 3000 +F 0 "U1" H 2450 3250 60 0000 C CNN +F 1 "GSG-IP4220CZ6" H 2450 2750 60 0000 C CNN + 1 2450 3000 1 0 0 -1 $EndComp $Comp L GND #PWR067 U 1 1 4F766C2C -P 1200 3250 -F 0 "#PWR067" H 1200 3250 30 0001 C CNN -F 1 "GND" H 1200 3180 30 0001 C CNN - 1 1200 3250 +P 1400 3250 +F 0 "#PWR067" H 1400 3250 30 0001 C CNN +F 1 "GND" H 1400 3180 30 0001 C CNN + 1 1400 3250 0 -1 -1 0 $EndComp $Comp L GSG-USB-MICRO-B J1 U 1 1 4F766BDF -P 850 3450 -F 0 "J1" H 850 3750 60 0000 C CNN -F 1 "GSG-USB-MICRO-B" H 850 3100 60 0000 C CNN - 1 850 3450 +P 1050 3450 +F 0 "J1" H 1050 3750 60 0000 C CNN +F 1 "GSG-USB-MICRO-B" H 1050 3100 60 0000 C CNN + 1 1050 3450 -1 0 0 1 $EndComp Text Label 7650 1950 1 40 ~ 0 @@ -4025,7 +3717,7 @@ F 1 "12k" V 3750 5300 50 0000 C CNN $EndComp Text Label 4000 5100 0 40 ~ 0 ID -Text Label 2250 3750 0 40 ~ 0 +Text Label 2450 3750 0 40 ~ 0 VBUS Text Label 4000 4900 0 40 ~ 0 DM