Merge branch 'master' of https://github.com/emard/ulx3s

6 years ago · 034d1258e1
parent 2dba7d3caa 996a12ae32
commit 034d1258e1
3 changed files with 73 additions and 33 deletions
--- a/gpio.bak
+++ b/gpio.bak
@ -516,8 +516,8 @@ Text Notes 950  7550 0    60   ~ 0
 GPIO route only A/B pairs as those are differential bidirectional\ndon't route C/D pairs to GPIO as those can be differential input only 
 Text GLabel 5700 2800 2    60   Input ~ 0
 BTN_PWRn
-Text Notes 7050 5750 0    60   ~ 0
-GP,GN 14-21 connected to  BANK2,3 on "ram" sheet\nJ2_25-J2_35 connected to BANK1 on "gpdi" sheet
+Text Notes 7200 5950 0    60   ~ 0
+GP,GN 14-21 connected to BANK2,3 on "ram" sheet\nGP,GN 22-27 connected to BANK1 on "gpdi" sheet
 Text GLabel 4200 2500 0    60   Input ~ 0
 SW1
 Text GLabel 5700 2500 2    60   Input ~ 0
@ -639,34 +639,50 @@ Text GLabel 2650 4400 2    60   Input ~ 0
 Text GLabel 2700 3500 2    60   Input ~ 0
 2V5_3V3
 Wire Notes Line
-	7550 5100 7450 5100
+	7600 5500 7500 5500
 Wire Notes Line
-	7450 5150 7450 5050
+	7500 5550 7500 5450
 Wire Notes Line
-	7450 5150 7400 5100
+	7500 5550 7450 5500
 Wire Notes Line
-	7400 5100 7450 5050
+	7450 5500 7500 5450
 Wire Notes Line
-	7400 5050 7400 5150
+	7450 5450 7450 5550
 Wire Notes Line
-	7400 5100 7300 5100
-Text Notes 7150 5050 0    60   ~ 0
+	7450 5500 7350 5500
+Text Notes 7200 5650 0    60   ~ 0
 STPS2L30AF
 Wire Notes Line
-	9550 5100 9450 5100
+	9550 5500 9450 5500
 Wire Notes Line
-	9450 5150 9450 5050
+	9450 5550 9450 5450
 Wire Notes Line
-	9450 5150 9400 5100
+	9450 5550 9400 5500
 Wire Notes Line
-	9400 5100 9450 5050
+	9400 5500 9450 5450
 Wire Notes Line
-	9400 5050 9400 5150
+	9400 5450 9400 5550
 Wire Notes Line
-	9400 5100 9300 5100
-Text Notes 9150 5050 0    60   ~ 0
+	9400 5500 9300 5500
+Text Notes 9150 5650 0    60   ~ 0
 STPS2L30AF
 NoConn ~ 4200 3000
 NoConn ~ 4200 3100
 NoConn ~ 5700 3000
+Text Notes 7250 4000 0    60   ~ 0
+GR_PCLK3_0
+Text Notes 2450 5250 0    60   ~ 0
+GR_PCLK7_1
+Text Notes 2450 5150 0    60   ~ 0
+PCLKT7_1
+Text Notes 800  5150 0    60   ~ 0
+PCLKC7_1
+Text Notes 2400 3750 0    60   ~ 0
+PCLKT0_0
+Text Notes 850  3750 0    60   ~ 0
+PCLKC0_0
+Text Notes 2400 3850 0    60   ~ 0
+PCLKT0_1
+Text Notes 850  3850 0    60   ~ 0
+PCLKC0_1
 $EndSCHEMATC
--- a/gpio.sch
+++ b/gpio.sch
@ -516,8 +516,8 @@ Text Notes 950  7550 0    60   ~ 0
 GPIO route only A/B pairs as those are differential bidirectional\ndon't route C/D pairs to GPIO as those can be differential input only 
 Text GLabel 5700 2800 2    60   Input ~ 0
 BTN_PWRn
-Text Notes 7050 5750 0    60   ~ 0
-GP,GN 14-21 connected to  BANK2,3 on "ram" sheet\nJ2_25-J2_35 connected to BANK1 on "gpdi" sheet
+Text Notes 7200 5950 0    60   ~ 0
+GP,GN 14-21 connected to BANK2,3 on "ram" sheet\nGP,GN 22-27 connected to BANK1 on "gpdi" sheet
 Text GLabel 4200 2500 0    60   Input ~ 0
 SW1
 Text GLabel 5700 2500 2    60   Input ~ 0
@ -639,34 +639,54 @@ Text GLabel 2650 4400 2    60   Input ~ 0
 Text GLabel 2700 3500 2    60   Input ~ 0
 2V5_3V3
 Wire Notes Line
-	7550 5100 7450 5100
+	7600 5500 7500 5500
 Wire Notes Line
-	7450 5150 7450 5050
+	7500 5550 7500 5450
 Wire Notes Line
-	7450 5150 7400 5100
+	7500 5550 7450 5500
 Wire Notes Line
-	7400 5100 7450 5050
+	7450 5500 7500 5450
 Wire Notes Line
-	7400 5050 7400 5150
+	7450 5450 7450 5550
 Wire Notes Line
-	7400 5100 7300 5100
-Text Notes 7150 5050 0    60   ~ 0
+	7450 5500 7350 5500
+Text Notes 7200 5650 0    60   ~ 0
 STPS2L30AF
 Wire Notes Line
-	9550 5100 9450 5100
+	9550 5500 9450 5500
 Wire Notes Line
-	9450 5150 9450 5050
+	9450 5550 9450 5450
 Wire Notes Line
-	9450 5150 9400 5100
+	9450 5550 9400 5500
 Wire Notes Line
-	9400 5100 9450 5050
+	9400 5500 9450 5450
 Wire Notes Line
-	9400 5050 9400 5150
+	9400 5450 9400 5550
 Wire Notes Line
-	9400 5100 9300 5100
-Text Notes 9150 5050 0    60   ~ 0
+	9400 5500 9300 5500
+Text Notes 9150 5650 0    60   ~ 0
 STPS2L30AF
 NoConn ~ 4200 3000
 NoConn ~ 4200 3100
 NoConn ~ 5700 3000
+Text Notes 7250 4000 0    60   ~ 0
+GR_PCLK3_0
+Text Notes 2450 5250 0    60   ~ 0
+GR_PCLK7_1
+Text Notes 2450 5150 0    60   ~ 0
+PCLKT7_1
+Text Notes 800  5150 0    60   ~ 0
+PCLKC7_1
+Text Notes 2400 3750 0    60   ~ 0
+PCLKT0_0
+Text Notes 850  3750 0    60   ~ 0
+PCLKC0_0
+Text Notes 2400 3850 0    60   ~ 0
+PCLKT0_1
+Text Notes 850  3850 0    60   ~ 0
+PCLKC0_1
+Text Notes 2400 3950 0    60   ~ 0
+GR_PCLK0_1
+Text Notes 750  3950 0    60   ~ 0
+GR_PCLK0_0
 $EndSCHEMATC
--- a/usb.bak
+++ b/usb.bak
@ -741,7 +741,7 @@ Text GLabel 5000 2800 0    60   Input ~ 0
 FT2V5
 Text GLabel 5600 2500 1    60   Input ~ 0
 USB5V
-Text Notes 7150 2500 0    60   ~ 0
+Text Notes 6700 2500 0    60   ~ 0
 WIFI_GPIO15 v1.7
 Text GLabel 8650 2150 0    60   Input ~ 0
 WIFI_GPIO5
@ -935,4 +935,8 @@ Text Notes 10950 2000 0    60   ~ 0
 NC <v3.0.5
 Text Notes 7350 2200 0    60   ~ 0
 NC v1.7
+Text Notes 7550 2500 0    60   ~ 0
+WIFI_TXD2
+Text Notes 7550 2600 0    60   ~ 0
+WIFI_RXD2
 $EndSCHEMATC