diff --git a/analog.bak b/analog.bak index 115fc1e..eb8acbb 100644 --- a/analog.bak +++ b/analog.bak @@ -7,7 +7,7 @@ encoding utf-8 Sheet 9 11 Title "ULX3S" Date "" -Rev "1.0.0" +Rev "1.0.1" Comp "EMARD" Comment1 "Analog audio and video" Comment2 "" @@ -95,7 +95,7 @@ F 6 "311-1.20KHRCT-ND" V 3750 1900 50 0001 C CNN "Digikey" 0 1 1 0 $EndComp Wire Wire Line - 3400 2350 3500 2350 + 2950 2350 3500 2350 Wire Wire Line 3500 2200 3600 2200 Wire Wire Line @@ -171,7 +171,7 @@ Wire Wire Line 3500 2700 3600 2700 Connection ~ 3500 2850 Wire Wire Line - 3400 2550 3500 2550 + 2950 2550 3500 2550 Connection ~ 3500 2700 Text GLabel 3900 2550 2 60 Input ~ 0 AUDIO_R0 @@ -460,21 +460,21 @@ Wire Wire Line 3500 1400 3500 1550 NoConn ~ 1900 1900 Wire Wire Line - 2050 1900 2050 1850 + 2050 1900 2050 1450 Text Label 2000 2800 3 60 ~ 0 AUDIO_V Wire Wire Line 2000 2750 2000 3200 Wire Wire Line - 2300 2750 2300 2800 + 2300 2750 2300 3200 Wire Wire Line 2950 1700 3500 1700 -Text GLabel 3400 2350 0 60 Input ~ 0 +Text Label 2300 2800 3 60 ~ 0 AUDIO_L -Text GLabel 3400 2550 0 60 Input ~ 0 +Text Label 2050 1850 1 60 ~ 0 AUDIO_R -Text GLabel 2050 1850 1 60 Input ~ 0 -AUDIO_R -Text GLabel 2300 2800 3 60 Input ~ 0 +Text Label 3000 2350 0 60 ~ 0 AUDIO_L +Text Label 3000 2550 0 60 ~ 0 +AUDIO_R $EndSCHEMATC diff --git a/analog.sch b/analog.sch index 115fc1e..eb8acbb 100644 --- a/analog.sch +++ b/analog.sch @@ -7,7 +7,7 @@ encoding utf-8 Sheet 9 11 Title "ULX3S" Date "" -Rev "1.0.0" +Rev "1.0.1" Comp "EMARD" Comment1 "Analog audio and video" Comment2 "" @@ -95,7 +95,7 @@ F 6 "311-1.20KHRCT-ND" V 3750 1900 50 0001 C CNN "Digikey" 0 1 1 0 $EndComp Wire Wire Line - 3400 2350 3500 2350 + 2950 2350 3500 2350 Wire Wire Line 3500 2200 3600 2200 Wire Wire Line @@ -171,7 +171,7 @@ Wire Wire Line 3500 2700 3600 2700 Connection ~ 3500 2850 Wire Wire Line - 3400 2550 3500 2550 + 2950 2550 3500 2550 Connection ~ 3500 2700 Text GLabel 3900 2550 2 60 Input ~ 0 AUDIO_R0 @@ -460,21 +460,21 @@ Wire Wire Line 3500 1400 3500 1550 NoConn ~ 1900 1900 Wire Wire Line - 2050 1900 2050 1850 + 2050 1900 2050 1450 Text Label 2000 2800 3 60 ~ 0 AUDIO_V Wire Wire Line 2000 2750 2000 3200 Wire Wire Line - 2300 2750 2300 2800 + 2300 2750 2300 3200 Wire Wire Line 2950 1700 3500 1700 -Text GLabel 3400 2350 0 60 Input ~ 0 +Text Label 2300 2800 3 60 ~ 0 AUDIO_L -Text GLabel 3400 2550 0 60 Input ~ 0 +Text Label 2050 1850 1 60 ~ 0 AUDIO_R -Text GLabel 2050 1850 1 60 Input ~ 0 -AUDIO_R -Text GLabel 2300 2800 3 60 Input ~ 0 +Text Label 3000 2350 0 60 ~ 0 AUDIO_L +Text Label 3000 2550 0 60 ~ 0 +AUDIO_R $EndSCHEMATC diff --git a/footprints/audio-jack/jack_trs_6pins_apple.lib b/footprints/audio-jack/jack_trs_6pins_apple.lib index a373573..79adb1d 100644 --- a/footprints/audio-jack/jack_trs_6pins_apple.lib +++ b/footprints/audio-jack/jack_trs_6pins_apple.lib @@ -20,12 +20,12 @@ P 5 0 1 16 -150 -100 -150 150 -250 150 -250 -100 -150 -100 f P 6 0 1 16 -600 200 -600 350 250 350 250 -300 -600 -300 -600 -150 N P 9 0 1 16 -450 -100 -450 150 -650 150 -650 250 -750 250 -750 -200 -650 -200 -650 -100 -450 -100 f P 11 0 1 16 -100 -100 -100 150 0 150 0 100 100 150 150 100 150 -50 100 -100 0 -50 0 -100 -100 -100 f -X S 1 -450 -400 100 U 50 50 1 1 P -X T 2 0 -400 100 U 50 50 1 1 P +X GND 1 -450 -400 100 U 50 50 1 1 P +X L 2 0 -400 100 U 50 50 1 1 P X R 3 -250 450 100 D 50 50 1 1 P -X SN 4 -300 -400 100 U 50 50 1 1 P -X TN 5 350 -200 100 L 50 50 1 1 P -X RN 6 -400 450 100 D 50 50 1 1 P +X V 4 -300 -400 100 U 50 50 1 1 P +X LSW 5 350 -200 100 L 50 50 1 1 P +X RSW 6 -400 450 100 D 50 50 1 1 P ENDDRAW ENDDEF # diff --git a/power.bak b/power.bak index 9c00823..24a2219 100644 --- a/power.bak +++ b/power.bak @@ -7,7 +7,7 @@ encoding utf-8 Sheet 3 11 Title "ULX3S" Date "" -Rev "1.0.0" +Rev "1.0.1" Comp "EMARD" Comment1 "Power" Comment2 "" @@ -752,9 +752,10 @@ F 7 "www.diodes.com" H 3100 5600 50 0001 C CNN "MNF2_URL" F 8 "Diodes inc." H 3100 5600 50 0001 C CNN "MFG2" F 9 "BAT54WSQ-7-F " H 3100 5600 50 0001 C CNN "MPN2" F 10 "www.mouser.com" H 3100 5600 50 0001 C CNN "Mouser_URL" -F 11 "863-NSR0530HT1G " H 3100 5600 50 0001 C CNN "Mouser" -F 12 "621-BAT54WSQ-7-F " H 3100 5600 50 0001 C CNN "Mouser2" +F 11 "863-NSR0530HT1G " H 3100 5600 50 0001 C CNN "Mouser2" +F 12 "621-BAT54WSQ-7-F " H 3100 5600 50 0001 C CNN "Mouser3" F 13 "NSR0530HT1GOSCT-ND" H 3100 5600 50 0001 C CNN "Digikey" +F 14 "755-RSX051VYM30FHTR" H 3100 5600 50 0001 C CNN "Mouser" 1 3100 5600 -1 0 0 1 $EndComp diff --git a/power.sch b/power.sch index 9c00823..24a2219 100644 --- a/power.sch +++ b/power.sch @@ -7,7 +7,7 @@ encoding utf-8 Sheet 3 11 Title "ULX3S" Date "" -Rev "1.0.0" +Rev "1.0.1" Comp "EMARD" Comment1 "Power" Comment2 "" @@ -752,9 +752,10 @@ F 7 "www.diodes.com" H 3100 5600 50 0001 C CNN "MNF2_URL" F 8 "Diodes inc." H 3100 5600 50 0001 C CNN "MFG2" F 9 "BAT54WSQ-7-F " H 3100 5600 50 0001 C CNN "MPN2" F 10 "www.mouser.com" H 3100 5600 50 0001 C CNN "Mouser_URL" -F 11 "863-NSR0530HT1G " H 3100 5600 50 0001 C CNN "Mouser" -F 12 "621-BAT54WSQ-7-F " H 3100 5600 50 0001 C CNN "Mouser2" +F 11 "863-NSR0530HT1G " H 3100 5600 50 0001 C CNN "Mouser2" +F 12 "621-BAT54WSQ-7-F " H 3100 5600 50 0001 C CNN "Mouser3" F 13 "NSR0530HT1GOSCT-ND" H 3100 5600 50 0001 C CNN "Digikey" +F 14 "755-RSX051VYM30FHTR" H 3100 5600 50 0001 C CNN "Mouser" 1 3100 5600 -1 0 0 1 $EndComp diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib index d9484ad..33d75f7 100644 --- a/ulx3s-cache.lib +++ b/ulx3s-cache.lib @@ -798,12 +798,12 @@ P 5 0 1 16 -150 -100 -150 150 -250 150 -250 -100 -150 -100 f P 6 0 1 16 -600 200 -600 350 250 350 250 -300 -600 -300 -600 -150 N P 9 0 1 16 -450 -100 -450 150 -650 150 -650 250 -750 250 -750 -200 -650 -200 -650 -100 -450 -100 f P 11 0 1 16 -100 -100 -100 150 0 150 0 100 100 150 150 100 150 -50 100 -100 0 -50 0 -100 -100 -100 f -X S 1 -450 -400 100 U 50 50 1 1 P -X T 2 0 -400 100 U 50 50 1 1 P +X GND 1 -450 -400 100 U 50 50 1 1 P +X L 2 0 -400 100 U 50 50 1 1 P X R 3 -250 450 100 D 50 50 1 1 P -X SN 4 -300 -400 100 U 50 50 1 1 P -X TN 5 350 -200 100 L 50 50 1 1 P -X RN 6 -400 450 100 D 50 50 1 1 P +X V 4 -300 -400 100 U 50 50 1 1 P +X LSW 5 350 -200 100 L 50 50 1 1 P +X RSW 6 -400 450 100 D 50 50 1 1 P ENDDRAW ENDDEF # diff --git a/ulx3s.pro b/ulx3s.pro index a0be5b5..9d70876 100644 --- a/ulx3s.pro +++ b/ulx3s.pro @@ -1,4 +1,4 @@ -update=subota, 09. lipnja 2018. 19:42:57 CEST +update=nedjelja, 10. lipnja 2018. 11:27:29 CEST version=1 last_client=kicad [pcbnew] diff --git a/ulx3s.sch b/ulx3s.sch index 9b1eff3..86c35e9 100644 --- a/ulx3s.sch +++ b/ulx3s.sch @@ -7,7 +7,7 @@ encoding utf-8 Sheet 1 11 Title "ULX3S" Date "" -Rev "1.8.11" +Rev "1.8.12" Comp "EMARD" Comment1 "Root sheet" Comment2 "" diff --git a/usb.bak b/usb.bak index e255d19..60d0267 100644 --- a/usb.bak +++ b/usb.bak @@ -233,9 +233,9 @@ Wire Wire Line Wire Wire Line 1800 1900 2150 1900 Wire Wire Line - 1800 2750 2100 2750 + 1800 2750 2150 2750 Wire Wire Line - 1800 2850 2100 2850 + 1800 2850 2150 2850 Wire Wire Line 1800 2000 1850 2000 Wire Wire Line @@ -474,37 +474,37 @@ USB_FPGA connected to\nBANK1 on "gpdi" sheet and\nBANK2 on "ram" sheet $Comp L Device:R R52 U 1 1 59C0F7B0 -P 2250 2750 +P 2300 2750 AR Path="/59C0F7B0" Ref="R52" Part="1" AR Path="/58D6BF46/59C0F7B0" Ref="R52" Part="1" -F 0 "R52" V 2200 2950 50 0000 C CNN -F 1 "27" V 2250 2750 50 0000 C CNN -F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 2750 50 0001 C CNN -F 3 "" H 2250 2750 50 0000 C CNN -F 4 "www.yageo.com" V 2250 2750 50 0001 C CNN "MNF1_URL" -F 5 "AC0603JR-0727RL" V 2250 2750 50 0001 C CNN "MPN" - 1 2250 2750 +F 0 "R52" V 2250 2950 50 0000 C CNN +F 1 "27" V 2300 2750 50 0000 C CNN +F 2 "Resistor_SMD:R_0603_1608Metric" V 2230 2750 50 0001 C CNN +F 3 "" H 2300 2750 50 0000 C CNN +F 4 "www.yageo.com" V 2300 2750 50 0001 C CNN "MNF1_URL" +F 5 "AC0603JR-0727RL" V 2300 2750 50 0001 C CNN "MPN" + 1 2300 2750 0 1 1 0 $EndComp $Comp L Device:R R53 U 1 1 59C0F7B6 -P 2250 2850 +P 2300 2850 AR Path="/59C0F7B6" Ref="R53" Part="1" AR Path="/58D6BF46/59C0F7B6" Ref="R53" Part="1" -F 0 "R53" V 2200 3050 50 0000 C CNN -F 1 "27" V 2250 2850 50 0000 C CNN -F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 2850 50 0001 C CNN -F 3 "" H 2250 2850 50 0000 C CNN -F 4 "www.yageo.com" V 2250 2850 50 0001 C CNN "MNF1_URL" -F 5 "AC0603JR-0727RL" V 2250 2850 50 0001 C CNN "MPN" - 1 2250 2850 +F 0 "R53" V 2250 3050 50 0000 C CNN +F 1 "27" V 2300 2850 50 0000 C CNN +F 2 "Resistor_SMD:R_0603_1608Metric" V 2230 2850 50 0001 C CNN +F 3 "" H 2300 2850 50 0000 C CNN +F 4 "www.yageo.com" V 2300 2850 50 0001 C CNN "MNF1_URL" +F 5 "AC0603JR-0727RL" V 2300 2850 50 0001 C CNN "MPN" + 1 2300 2850 0 1 1 0 $EndComp Wire Wire Line - 2400 2750 2700 2750 + 2450 2750 2700 2750 Wire Wire Line - 2400 2850 2600 2850 + 2450 2850 2600 2850 Text Label 1850 2750 0 60 ~ 0 FPD- Text Label 1850 2850 0 60 ~ 0 @@ -903,5 +903,5 @@ STPS2L30AF Text GLabel 1800 2950 2 60 Input ~ 0 US2_ID Text Notes 1600 3350 0 60 ~ 0 -US2_ID to RTC\non "powr" sheet +US2_ID to RTC\non "power" sheet $EndSCHEMATC diff --git a/usb.sch b/usb.sch index e255d19..60d0267 100644 --- a/usb.sch +++ b/usb.sch @@ -233,9 +233,9 @@ Wire Wire Line Wire Wire Line 1800 1900 2150 1900 Wire Wire Line - 1800 2750 2100 2750 + 1800 2750 2150 2750 Wire Wire Line - 1800 2850 2100 2850 + 1800 2850 2150 2850 Wire Wire Line 1800 2000 1850 2000 Wire Wire Line @@ -474,37 +474,37 @@ USB_FPGA connected to\nBANK1 on "gpdi" sheet and\nBANK2 on "ram" sheet $Comp L Device:R R52 U 1 1 59C0F7B0 -P 2250 2750 +P 2300 2750 AR Path="/59C0F7B0" Ref="R52" Part="1" AR Path="/58D6BF46/59C0F7B0" Ref="R52" Part="1" -F 0 "R52" V 2200 2950 50 0000 C CNN -F 1 "27" V 2250 2750 50 0000 C CNN -F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 2750 50 0001 C CNN -F 3 "" H 2250 2750 50 0000 C CNN -F 4 "www.yageo.com" V 2250 2750 50 0001 C CNN "MNF1_URL" -F 5 "AC0603JR-0727RL" V 2250 2750 50 0001 C CNN "MPN" - 1 2250 2750 +F 0 "R52" V 2250 2950 50 0000 C CNN +F 1 "27" V 2300 2750 50 0000 C CNN +F 2 "Resistor_SMD:R_0603_1608Metric" V 2230 2750 50 0001 C CNN +F 3 "" H 2300 2750 50 0000 C CNN +F 4 "www.yageo.com" V 2300 2750 50 0001 C CNN "MNF1_URL" +F 5 "AC0603JR-0727RL" V 2300 2750 50 0001 C CNN "MPN" + 1 2300 2750 0 1 1 0 $EndComp $Comp L Device:R R53 U 1 1 59C0F7B6 -P 2250 2850 +P 2300 2850 AR Path="/59C0F7B6" Ref="R53" Part="1" AR Path="/58D6BF46/59C0F7B6" Ref="R53" Part="1" -F 0 "R53" V 2200 3050 50 0000 C CNN -F 1 "27" V 2250 2850 50 0000 C CNN -F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 2850 50 0001 C CNN -F 3 "" H 2250 2850 50 0000 C CNN -F 4 "www.yageo.com" V 2250 2850 50 0001 C CNN "MNF1_URL" -F 5 "AC0603JR-0727RL" V 2250 2850 50 0001 C CNN "MPN" - 1 2250 2850 +F 0 "R53" V 2250 3050 50 0000 C CNN +F 1 "27" V 2300 2850 50 0000 C CNN +F 2 "Resistor_SMD:R_0603_1608Metric" V 2230 2850 50 0001 C CNN +F 3 "" H 2300 2850 50 0000 C CNN +F 4 "www.yageo.com" V 2300 2850 50 0001 C CNN "MNF1_URL" +F 5 "AC0603JR-0727RL" V 2300 2850 50 0001 C CNN "MPN" + 1 2300 2850 0 1 1 0 $EndComp Wire Wire Line - 2400 2750 2700 2750 + 2450 2750 2700 2750 Wire Wire Line - 2400 2850 2600 2850 + 2450 2850 2600 2850 Text Label 1850 2750 0 60 ~ 0 FPD- Text Label 1850 2850 0 60 ~ 0 @@ -903,5 +903,5 @@ STPS2L30AF Text GLabel 1800 2950 2 60 Input ~ 0 US2_ID Text Notes 1600 3350 0 60 ~ 0 -US2_ID to RTC\non "powr" sheet +US2_ID to RTC\non "power" sheet $EndSCHEMATC diff --git a/wifi.bak b/wifi.bak index 35e2e94..71382aa 100644 --- a/wifi.bak +++ b/wifi.bak @@ -203,9 +203,9 @@ GP12 Text GLabel 5700 3550 0 60 Input ~ 0 GN12 Text GLabel 5700 3650 0 60 Input ~ 0 -AUDIO_R +GP11 Text GLabel 5700 3750 0 60 Input ~ 0 -AUDIO_L +GN11 Text GLabel 7550 3900 2 60 Input ~ 0 WIFI_GPIO16 $Comp