From e29c7d417070ad1510983439cb95a69b1982ea97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?King=20K=C3=A9vin?= Date: Mon, 30 Dec 2019 17:02:05 +0100 Subject: [PATCH] switch SWDIO and SWCLK for easier DFU force --- hardware/usb_cable_tester.lht | 176 ++++++++++++++++------------------ hardware/usb_cable_tester.sch | 38 ++++---- 2 files changed, 102 insertions(+), 112 deletions(-) diff --git a/hardware/usb_cable_tester.lht b/hardware/usb_cable_tester.lht index c4f6fa0..95e1102 100644 --- a/hardware/usb_cable_tester.lht +++ b/hardware/usb_cable_tester.lht @@ -41431,48 +41431,6 @@ ha:pcb-rnd-board-v6 { clearline=1 } } - ha:line.133085 { - x1=69.9mm; y1=26.64mm; x2=68.86mm; y2=26.64mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } - ha:line.133088 { - x1=68.86mm; y1=26.64mm; x2=68.0mm; y2=27.5mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } - ha:line.133091 { - x1=68.0mm; y1=27.5mm; x2=68.0mm; y2=29.8mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } - ha:line.133094 { - x1=68.0mm; y1=29.8mm; x2=67.1mm; y2=30.7mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } - ha:line.133121 { - x1=69.9mm; y1=29.18mm; x2=71.58mm; y2=29.18mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } - ha:line.133124 { - x1=71.58mm; y1=29.18mm; x2=72.0mm; y2=29.6mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } - ha:line.133127 { - x1=72.0mm; y1=29.6mm; x2=72.0mm; y2=33.7mm; thickness=0.2mm; clearance=0.39mm; - ha:flags { - clearline=1 - } - } ha:line.133130 { x1=72.0mm; y1=33.7mm; x2=71.4mm; y2=1.3503937in; thickness=0.2mm; clearance=0.39mm; ha:flags { @@ -41773,6 +41731,36 @@ ha:pcb-rnd-board-v6 { clearline=1 } } + ha:line.190455 { + x1=69.9mm; y1=26.64mm; x2=71.34mm; y2=26.64mm; thickness=0.2mm; clearance=0.39mm; + ha:flags { + clearline=1 + } + } + ha:line.190458 { + x1=71.34mm; y1=26.64mm; x2=72.0mm; y2=27.3mm; thickness=0.2mm; clearance=0.39mm; + ha:flags { + clearline=1 + } + } + ha:line.190461 { + x1=72.0mm; y1=33.7mm; x2=72.0mm; y2=27.3mm; thickness=0.2mm; clearance=0.39mm; + ha:flags { + clearline=1 + } + } + ha:line.190464 { + x1=69.9mm; y1=29.18mm; x2=68.62mm; y2=29.18mm; thickness=0.2mm; clearance=0.39mm; + ha:flags { + clearline=1 + } + } + ha:line.190467 { + x1=67.1mm; y1=30.7mm; x2=68.62mm; y2=29.18mm; thickness=0.2mm; clearance=0.39mm; + ha:flags { + clearline=1 + } + } } color = {#3a5fcd} } @@ -42140,14 +42128,6 @@ ha:pcb-rnd-board-v6 { thickness = 0.25mm rot = 0.000000 } - ha:text.19095 { - string=SWCLK; x=61.8mm; y=28.0mm; scale=150; fid=0; - ha:flags { - clearline=1 - } - thickness = 0.25mm - rot = 0.000000 - } ha:text.19096 { string=GND; x=64.3mm; y=30.5mm; scale=150; fid=0; ha:flags { @@ -42205,7 +42185,7 @@ ha:pcb-rnd-board-v6 { rot = 0.000000 } ha:text.131926 { - string=SWDIO; x=62.0mm; y=25.6mm; scale=150; fid=0; + string=SWDIO; x=62.0mm; y=28.1mm; scale=150; fid=0; ha:flags { clearline=1 } @@ -42220,6 +42200,14 @@ ha:pcb-rnd-board-v6 { thickness = 0.17mm rot = 0.000000 } + ha:text.190451 { + string=SWCLK; x=61.8mm; y=25.5mm; scale=150; fid=0; + ha:flags { + clearline=1 + } + thickness = 0.25mm + rot = 0.000000 + } } color = {#000000} } @@ -45296,12 +45284,12 @@ ha:pcb-rnd-board-v6 { ha:LIGHTNING_DEVICE_GND { li:conn { J11-1; U2-22; } } + ha:USB-C_HOST_SSTXN1 { + li:conn { J2-3; U2-90; } + } ha:USB-C_HOST_SSTXN2 { li:conn { J2-22; U2-118; } } - ha:USB-C_HOST_SSTXN1 { - li:conn { J2-3; U2-90; } - } ha:Vcc { li:conn { C3-2; S1-2; U3-3; } } @@ -45392,15 +45380,15 @@ ha:pcb-rnd-board-v6 { ha:unnamed_net1 { li:conn { D2-2; U4-6; } } + ha:unnamed_net2 { + li:conn { D3-2; U4-7; } + } ha:unnamed_net3 { li:conn { R8-2; U4-2; } } ha:unnamed_net4 { li:conn { D2-1; D3-1; R7-1; } } - ha:unnamed_net2 { - li:conn { D3-2; U4-7; } - } ha:unnamed_net5 { li:conn { R8-1; R9-2; } } @@ -45438,7 +45426,7 @@ ha:pcb-rnd-board-v6 { li:conn { J7-3; U2-5; } } ha:SWCLK { - li:conn { J4-3; U2-109; } + li:conn { J4-2; U2-109; } } ha:USB-B_DEVICE_SSTXM { li:conn { J6-5; U2-36; } @@ -45456,7 +45444,7 @@ ha:pcb-rnd-board-v6 { li:conn { J1-7; U2-93; } } ha:SWDIO { - li:conn { J4-2; U2-105; } + li:conn { J4-3; U2-105; } } ha:USB-C_DEVICE_GND1 { li:conn { J10-1; U2-53; } @@ -45521,69 +45509,69 @@ ha:pcb-rnd-board-v6 { ha:+3.3V { li:conn { C4-2; C9-2; C10-2; C11-2; C12-2; C13-2; C14-2; C15-2; C16-2; C17-2; C18-2; C19-2; C20-2; C21-2; J4-1; Q1-2; R4-2; R5-2; U2-6; U2-17; U2-32; U2-33; U2-39; U2-52; U2-62; U2-72; U2-84; U2-95; U2-108; U2-121; U2-131; U2-144; U3-2; } } + ha:unnamed_net12 { + li:conn { J9-4; U6-13; } + } ha:unnamed_net13 { li:conn { J9-5; U6-12; } } ha:unnamed_net14 { li:conn { J9-6; U6-11; } } - ha:unnamed_net12 { - li:conn { J9-4; U6-13; } - } - ha:unnamed_net15 { - li:conn { J9-7; U6-10; } - } - ha:unnamed_net17 { - li:conn { J9-9; U6-8; } + ha:unnamed_net15 { + li:conn { J9-7; U6-10; } } + ha:unnamed_net16 { + li:conn { J9-8; U6-9; } + } + ha:unnamed_net17 { + li:conn { J9-9; U6-8; } + } + ha:unnamed_net18 { + li:conn { J9-10; U6-7; } + } + ha:unnamed_net19 { + li:conn { J9-11; U6-6; } + } + ha:unnamed_net20 { + li:conn { J9-12; U6-5; } + } + ha:unnamed_net21 { + li:conn { J9-13; U6-4; } + } ha:unnamed_net22 { li:conn { J9-14; U6-3; } } - ha:unnamed_net16 { - li:conn { J9-8; U6-9; } - } - ha:unnamed_net19 { - li:conn { J9-11; U6-6; } - } + ha:USB-C_HOST_SSRXN1 { + li:conn { J2-15; U2-125; } + } + ha:USB-C_HOST_SSRXN2 { + li:conn { J2-10; U2-101; } + } ha:unnamed_net25 { li:conn { J9-16; U6-1; } } ha:unnamed_net26 { li:conn { J9-2; U6-15; } } - ha:USB-C_HOST_SSRXN1 { - li:conn { J2-15; U2-125; } - } + ha:unnamed_net23 { + li:conn { J9-3; U6-14; } + } ha:unnamed_net24 { li:conn { J9-15; U6-2; } } - ha:USB-C_HOST_SSRXN2 { - li:conn { J2-10; U2-101; } - } - ha:unnamed_net18 { - li:conn { J9-10; U6-7; } - } - ha:unnamed_net20 { - li:conn { J9-12; U6-5; } - } ha:USB-MINIB_DEVICE_VBUS { li:conn { J7-1; U2-3; } } - ha:unnamed_net23 { - li:conn { J9-3; U6-14; } - } ha:USB-B_DEVICE_VBUS { li:conn { J6-1; U2-29; } } - ha:USB-C_HOST_SSRXP1 { - li:conn { J2-14; U2-129; } - } + ha:USB-C_HOST_SSRXP1 { + li:conn { J2-14; U2-129; } + } ha:USB-C_HOST_SSRXP2 { li:conn { J2-11; U2-99; } } - ha:unnamed_net21 { - li:conn { J9-13; U6-4; } - } ha:LIGHTNING_DEVICE_PWR { li:conn { J11-5; U2-15; } } diff --git a/hardware/usb_cable_tester.sch b/hardware/usb_cable_tester.sch index 9746914..491e6f3 100644 --- a/hardware/usb_cable_tester.sch +++ b/hardware/usb_cable_tester.sch @@ -1661,26 +1661,10 @@ T 3900 16700 5 10 0 0 0 0 1 category=connector T 3900 16700 5 10 0 0 0 0 1 description=1x4 pin header, 0.1 in. +T 3900 16700 5 10 0 0 0 0 1 +note=short SWDIO to nearby GND to force DFU bootloader } C 5600 16400 1 0 0 ground.sym -C 5800 17400 1 0 0 io-1.sym -{ -T 6700 17600 5 10 0 0 0 0 1 -net=SWDIO:1 -T 6000 18000 5 10 0 0 0 0 1 -device=none -T 6700 17500 5 10 1 1 0 1 1 -value=SWDIO -} -C 5800 17100 1 0 0 output-2.sym -{ -T 6700 17300 5 10 0 0 0 0 1 -net=SWCLK:1 -T 6000 17800 5 10 0 0 0 0 1 -device=none -T 6700 17200 5 10 1 1 0 1 1 -value=SWCLK -} N 5600 17800 5800 17800 4 N 5800 17800 5800 18000 4 N 5600 17500 5800 17500 4 @@ -3484,3 +3468,21 @@ C 5400 20900 1 0 0 generic-power.sym T 5600 21150 5 10 1 1 0 3 1 net=VDISPLAY:1 } +C 5800 17400 1 0 0 output-2.sym +{ +T 6700 17600 5 10 0 0 0 0 1 +net=SWCLK:1 +T 6000 18100 5 10 0 0 0 0 1 +device=none +T 6700 17500 5 10 1 1 0 1 1 +value=SWCLK +} +C 5800 17100 1 0 0 io-1.sym +{ +T 6700 17300 5 10 0 0 0 0 1 +net=SWDIO:1 +T 6000 17700 5 10 0 0 0 0 1 +device=none +T 6700 17200 5 10 1 1 0 1 1 +value=SWDIO +}