aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Eoin Meadows2013-08-19 14:26:39 +0100
committerRichard Eoin Meadows2013-08-19 14:26:39 +0100
commit2480162c07b516f3a396caf87fcf59932ef1f7b2 (patch)
treebe4a06fbf53660672b5ad182b0003a3b46442083
parent80c215627d36d7650eaa7912ecce464c803f8f70 (diff)
Changed text on the end of the board to "ARM Cortex Debug"
-rw-r--r--hardware/contrib/richardeoin/blackmagic_richardeoin.brd79
-rw-r--r--hardware/contrib/richardeoin/blackmagic_richardeoin.sch72
2 files changed, 82 insertions, 69 deletions
diff --git a/hardware/contrib/richardeoin/blackmagic_richardeoin.brd b/hardware/contrib/richardeoin/blackmagic_richardeoin.brd
index 57b0ce6..f8a574e 100644
--- a/hardware/contrib/richardeoin/blackmagic_richardeoin.brd
+++ b/hardware/contrib/richardeoin/blackmagic_richardeoin.brd
@@ -6,7 +6,7 @@
<setting alwaysvectorfont="no"/>
<setting verticaltext="up"/>
</settings>
-<grid distance="0.125" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="0.5" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
<layers>
<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -144,6 +144,14 @@
<text x="15.875" y="7.625" size="1" layer="29" font="vector" ratio="15">STM32F
103CB</text>
<text x="29.375" y="4.875" size="1" layer="29" font="vector" ratio="15" rot="R90">TXS0108</text>
+<text x="33" y="14.5" size="1" layer="16" font="vector" ratio="15" rot="MR0">Blackmagic Debug Probe</text>
+<text x="38.5" y="15" size="1" layer="30" font="vector" ratio="15" rot="SMR270">ARM Cortex Debug</text>
+<text x="2.5" y="7" size="1" layer="16" font="vector" ratio="15" rot="MR270">USB</text>
+<text x="17" y="2.5" size="1" layer="16" font="vector" ratio="15" rot="MR0">Tx/Rx</text>
+<text x="17" y="2.5" size="1" layer="30" font="vector" ratio="15" rot="MR0">Tx/Rx</text>
+<text x="2.5" y="7" size="1" layer="30" font="vector" ratio="15" rot="MR270">USB</text>
+<text x="38.5" y="15" size="1" layer="16" font="vector" ratio="15" rot="SMR270">ARM Cortex Debug</text>
+<text x="33" y="14.5" size="1" layer="30" font="vector" ratio="15" rot="MR0">Blackmagic Debug Probe</text>
</plain>
<libraries>
<library name="stm32f">
@@ -843,22 +851,22 @@ Covered vias can be set in Masks (Limit).
<element name="CN1" library="microbuilder_v3" package="USB-MINIB" value="" x="4.5" y="5.5" rot="R270"/>
<element name="R1" library="microbuilder" package="0603-MINI" value="22Ω" x="11.5" y="4.5" rot="R180"/>
<element name="R2" library="microbuilder" package="0603-MINI" value="22Ω" x="11.5" y="5.75" rot="R180"/>
-<element name="R3" library="microbuilder" package="0603-MINI" value="4K7" x="11.5" y="8.25" rot="R180"/>
-<element name="R5" library="microbuilder" package="0603-MINI" value="1K5" x="11.5" y="7" rot="R180"/>
+<element name="R7" library="microbuilder" package="0603-MINI" value="4K7" x="11.5" y="8.25" rot="R180"/>
+<element name="R3" library="microbuilder" package="0603-MINI" value="1K5" x="11.5" y="7" rot="R180"/>
<element name="BTN1" library="omron" package="B3U-1000P(M)-B" value="SPST.B3U-1000P(M)-B" x="11.5" y="14" rot="R180"/>
-<element name="R6" library="microbuilder" package="0603-MINI" value="10K" x="15" y="14"/>
+<element name="R5" library="microbuilder" package="0603-MINI" value="10K" x="15" y="14"/>
<element name="IC2" library="dan-translate" package="TSSOP20" value="TXS0108" x="28.75" y="8" rot="R90"/>
-<element name="R7" library="microbuilder" package="0603-MINI" value="10K" x="26" y="14" rot="R90"/>
+<element name="R6" library="microbuilder" package="0603-MINI" value="10K" x="26" y="14" rot="R90"/>
<element name="R8" library="microbuilder" package="0603-MINI" value="4K7" x="27.5" y="14" rot="R270"/>
-<element name="C12" library="resistor" package="C0603K" value="100nF" x="24.5" y="14" rot="R270"/>
+<element name="C6" library="resistor" package="C0603K" value="100nF" x="24.5" y="14" rot="R270"/>
<element name="Y1" library="SparkFun" package="CRYSTAL-SMD-5X3" value="8MHz" x="26" y="1.875" rot="R180"/>
-<element name="C10" library="resistor" package="C0603K" value="18pF" x="21.5" y="0.625"/>
-<element name="C11" library="resistor" package="C0603K" value="18pF" x="29.75" y="2" rot="R90"/>
+<element name="C7" library="resistor" package="C0603K" value="18pF" x="21.5" y="0.625"/>
+<element name="C8" library="resistor" package="C0603K" value="18pF" x="29.75" y="2" rot="R90"/>
<element name="JP1" library="SparkFun" package="1X04_LOCK" value="" x="18.5" y="1.25" rot="R180"/>
<element name="D2" library="led" package="CHIPLED_0603" value="RED" x="1.5" y="13.25" rot="R90"/>
-<element name="R9" library="microbuilder" package="0603-MINI" value="390Ω" x="5.25" y="12.75" rot="R180"/>
+<element name="R10" library="microbuilder" package="0603-MINI" value="390Ω" x="5.25" y="12.75" rot="R180"/>
<element name="D1" library="led" package="CHIPLED_0603" value="GREEN" x="1.5" y="12.25" rot="R90"/>
-<element name="R10" library="microbuilder" package="0603-MINI" value="390Ω" x="5.25" y="11.5" rot="R180"/>
+<element name="R9" library="microbuilder" package="0603-MINI" value="390Ω" x="5.25" y="11.5" rot="R180"/>
<element name="D3" library="led" package="CHIPLED_0603" value="YELLOW" x="1.5" y="14.25" rot="R90"/>
<element name="R11" library="microbuilder" package="0603-MINI" value="390Ω" x="5.25" y="14" rot="R180"/>
<element name="D4" library="led" package="CHIPLED_0603" value="YELLOW" x="1.5" y="15.25" rot="R90"/>
@@ -897,14 +905,14 @@ Covered vias can be set in Masks (Limit).
<contactref element="CN1" pad="GND"/>
<contactref element="R4" pad="1"/>
<contactref element="BTN1" pad="2"/>
-<contactref element="C12" pad="2"/>
-<contactref element="R7" pad="1"/>
+<contactref element="C6" pad="2"/>
+<contactref element="R6" pad="1"/>
<contactref element="IC2" pad="11"/>
<contactref element="IC2" pad="12"/>
<contactref element="IC2" pad="18"/>
<contactref element="IC2" pad="20"/>
-<contactref element="C10" pad="1"/>
-<contactref element="C11" pad="1"/>
+<contactref element="C7" pad="1"/>
+<contactref element="C8" pad="1"/>
<contactref element="JP1" pad="4"/>
<contactref element="D1" pad="C"/>
<contactref element="D4" pad="C"/>
@@ -942,10 +950,12 @@ Covered vias can be set in Masks (Limit).
<wire x1="11" y1="9.625" x2="11.5" y2="10.125" width="0.2" layer="1"/>
<wire x1="11.5" y1="10.125" x2="11.5" y2="10.75" width="0.2" layer="1"/>
<wire x1="11.5" y1="10.75" x2="12.375" y2="10.75" width="0.2" layer="1"/>
+<via x="39.5" y="4.5" extent="1-16" drill="0.3"/>
+<via x="39.5" y="11.5" extent="1-16" drill="0.3"/>
</signal>
<signal name="OSC_IN">
<contactref element="IC1" pad="5"/>
-<contactref element="C10" pad="2"/>
+<contactref element="C7" pad="2"/>
<contactref element="Y1" pad="3"/>
<wire x1="24.15" y1="0.725" x2="24.6" y2="0.85" width="0.15" layer="1"/>
<wire x1="24.6" y1="0.85" x2="25.5" y2="1.75" width="0.15" layer="1"/>
@@ -959,7 +969,7 @@ Covered vias can be set in Masks (Limit).
</signal>
<signal name="USB_ENUMERATE">
<contactref element="IC1" pad="29"/>
-<contactref element="R5" pad="1"/>
+<contactref element="R3" pad="1"/>
<wire x1="14.25" y1="8.5" x2="13.25" y2="8.5" width="0.15" layer="1"/>
<wire x1="13.25" y1="8.5" x2="13" y2="8.25" width="0.15" layer="1"/>
<wire x1="13" y1="8.25" x2="13" y2="7.75" width="0.15" layer="1"/>
@@ -981,7 +991,7 @@ Covered vias can be set in Masks (Limit).
</signal>
<signal name="LED2">
<contactref element="IC1" pad="22"/>
-<contactref element="R9" pad="1"/>
+<contactref element="R10" pad="1"/>
<wire x1="6" y1="12.75" x2="6.875" y2="13.625" width="0.15" layer="1"/>
<wire x1="6.875" y1="13.625" x2="6.875" y2="14.375" width="0.15" layer="1"/>
<wire x1="6.875" y1="14.375" x2="7.625" y2="15.125" width="0.15" layer="1"/>
@@ -1070,9 +1080,9 @@ Covered vias can be set in Masks (Limit).
<contactref element="IC1" pad="19"/>
<contactref element="Q1" pad="1"/>
<wire x1="18.25" y1="12" x2="18.25" y2="15.25" width="0.15" layer="1"/>
-<wire x1="18.25" y1="15.25" x2="18.75" y2="15.75" width="0.15" layer="1"/>
-<wire x1="18.75" y1="15.75" x2="28.5" y2="15.75" width="0.15" layer="1"/>
-<wire x1="28.5" y1="15.75" x2="29" y2="15.25" width="0.15" layer="1"/>
+<wire x1="18.25" y1="15.25" x2="18.875" y2="15.875" width="0.15" layer="1"/>
+<wire x1="18.875" y1="15.875" x2="28.375" y2="15.875" width="0.15" layer="1"/>
+<wire x1="28.375" y1="15.875" x2="29" y2="15.25" width="0.15" layer="1"/>
<wire x1="29" y1="15.25" x2="29.1" y2="15.25" width="0.15" layer="1"/>
<wire x1="29.1" y1="15.25" x2="29.4" y2="14.95" width="0.15" layer="1"/>
</signal>
@@ -1129,13 +1139,13 @@ Covered vias can be set in Masks (Limit).
<contactref element="IC1" pad="36"/>
<contactref element="IC1" pad="48"/>
<contactref element="IC1" pad="9"/>
-<contactref element="R6" pad="2"/>
+<contactref element="R5" pad="2"/>
<contactref element="IC1" pad="41"/>
<contactref element="IC1" pad="40"/>
<contactref element="IC2" pad="19"/>
<contactref element="Q1" pad="2"/>
<contactref element="JP1" pad="1"/>
-<contactref element="R10" pad="1"/>
+<contactref element="R9" pad="1"/>
<contactref element="IC3" pad="5"/>
<contactref element="C2" pad="1"/>
<contactref element="C3" pad="1"/>
@@ -1198,7 +1208,7 @@ Covered vias can be set in Masks (Limit).
<signal name="D+">
<contactref element="CN1" pad="D+"/>
<contactref element="R1" pad="2"/>
-<contactref element="R5" pad="2"/>
+<contactref element="R3" pad="2"/>
<wire x1="8.564" y1="5.5" x2="9.75" y2="5.5" width="0.15" layer="1"/>
<wire x1="9.75" y1="5.5" x2="10.75" y2="4.5" width="0.15" layer="1"/>
<wire x1="10.75" y1="7" x2="11.5" y2="6.25" width="0.15" layer="1"/>
@@ -1214,7 +1224,7 @@ Covered vias can be set in Masks (Limit).
</signal>
<signal name="5.0V">
<contactref element="CN1" pad="VBUS"/>
-<contactref element="R3" pad="2"/>
+<contactref element="R7" pad="2"/>
<contactref element="C1" pad="1"/>
<contactref element="IC3" pad="1"/>
<contactref element="IC3" pad="3"/>
@@ -1236,7 +1246,7 @@ Covered vias can be set in Masks (Limit).
<signal name="VBUS">
<contactref element="IC1" pad="26"/>
<contactref element="R4" pad="2"/>
-<contactref element="R3" pad="1"/>
+<contactref element="R7" pad="1"/>
<wire x1="12.25" y1="8.25" x2="12.25" y2="9.5" width="0.4" layer="1"/>
<wire x1="14.25" y1="10" x2="13.25" y2="10" width="0.15" layer="1"/>
<wire x1="13.25" y1="10" x2="13" y2="9.75" width="0.15" layer="1"/>
@@ -1246,15 +1256,15 @@ Covered vias can be set in Masks (Limit).
<signal name="FORCE_BOOTLOADER">
<contactref element="IC1" pad="25"/>
<contactref element="BTN1" pad="1"/>
-<contactref element="R6" pad="1"/>
+<contactref element="R5" pad="1"/>
<wire x1="14.25" y1="14" x2="13.25" y2="14" width="0.4" layer="1"/>
<wire x1="14.25" y1="10.5" x2="14.25" y2="14" width="0.15" layer="1"/>
</signal>
<signal name="TARGET_POWER_ADC">
<contactref element="IC1" pad="18"/>
<contactref element="R8" pad="1"/>
-<contactref element="C12" pad="1"/>
-<contactref element="R7" pad="2"/>
+<contactref element="C6" pad="1"/>
+<contactref element="R6" pad="2"/>
<wire x1="18.75" y1="12" x2="18.75" y2="14" width="0.2" layer="1"/>
<wire x1="18.75" y1="14" x2="19.625" y2="14.875" width="0.2" layer="1"/>
<wire x1="19.625" y1="14.875" x2="24.5" y2="14.875" width="0.2" layer="1"/>
@@ -1299,13 +1309,13 @@ Covered vias can be set in Masks (Limit).
<contactref element="JTAG1" pad="10"/>
<contactref element="IC2" pad="8"/>
<wire x1="31.55" y1="9.625" x2="32.625" y2="9.625" width="0.15" layer="1"/>
-<wire x1="32.625" y1="9.625" x2="33.75" y2="10.5" width="0.15" layer="1"/>
-<wire x1="33.75" y1="10.5" x2="34.61" y2="10.5" width="0.15" layer="1"/>
+<wire x1="32.625" y1="9.625" x2="33.5" y2="10.5" width="0.15" layer="1"/>
+<wire x1="33.5" y1="10.5" x2="34.61" y2="10.5" width="0.15" layer="1"/>
<wire x1="34.61" y1="10.5" x2="34.4" y2="10.54" width="0.15" layer="1"/>
</signal>
<signal name="LPC_XTAL2">
<contactref element="Y1" pad="1"/>
-<contactref element="C11" pad="2"/>
+<contactref element="C8" pad="2"/>
<contactref element="IC1" pad="6"/>
<wire x1="22.75" y1="7.5" x2="23.5" y2="7.5" width="0.15" layer="1"/>
<wire x1="23.5" y1="7.5" x2="24.125" y2="6.875" width="0.15" layer="1"/>
@@ -1319,14 +1329,14 @@ Covered vias can be set in Masks (Limit).
</signal>
<signal name="N$2">
<contactref element="D2" pad="A"/>
-<contactref element="R9" pad="2"/>
+<contactref element="R10" pad="2"/>
<wire x1="4.5" y1="12.75" x2="4.25" y2="12.75" width="0.2" layer="1"/>
<wire x1="4.25" y1="12.75" x2="3.75" y2="13.25" width="0.2" layer="1"/>
<wire x1="3.75" y1="13.25" x2="2.25" y2="13.25" width="0.2" layer="1"/>
</signal>
<signal name="N$4">
<contactref element="D1" pad="A"/>
-<contactref element="R10" pad="2"/>
+<contactref element="R9" pad="2"/>
<wire x1="4.5" y1="11.5" x2="4.25" y2="11.5" width="0.2" layer="1"/>
<wire x1="4.25" y1="11.5" x2="3.5" y2="12.25" width="0.2" layer="1"/>
<wire x1="3.5" y1="12.25" x2="2.25" y2="12.25" width="0.2" layer="1"/>
@@ -1342,6 +1352,9 @@ Covered vias can be set in Masks (Limit).
<contactref element="R12" pad="2"/>
<wire x1="4.5" y1="15.25" x2="2.25" y2="15.25" width="0.2" layer="1"/>
</signal>
+<signal name="KEY">
+<wire x1="39.75" y1="9" x2="39.75" y2="7" width="0.2" layer="1"/>
+</signal>
</signals>
<errors>
<approved hash="18,29,f7895cbe0abaa18d"/>
diff --git a/hardware/contrib/richardeoin/blackmagic_richardeoin.sch b/hardware/contrib/richardeoin/blackmagic_richardeoin.sch
index 4a67d30..6d68d2c 100644
--- a/hardware/contrib/richardeoin/blackmagic_richardeoin.sch
+++ b/hardware/contrib/richardeoin/blackmagic_richardeoin.sch
@@ -6464,35 +6464,35 @@ package type OT</description>
<part name="R2" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="22Ω"/>
<part name="U$1" library="microbuilder_v3" deviceset="5.0V" device=""/>
<part name="U$5" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R3" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="4K7"/>
+<part name="R7" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="4K7"/>
<part name="U$7" library="microbuilder_v3" deviceset="GND" device=""/>
<part name="U$8" library="microbuilder_v3" deviceset="5.0V" device=""/>
-<part name="R5" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="1K5"/>
+<part name="R3" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="1K5"/>
<part name="BTN1" library="omron" deviceset="SPST" device=".B3U-1000P(M)-B"/>
-<part name="R6" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="10K"/>
+<part name="R5" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="10K"/>
<part name="U$9" library="microbuilder_v3" deviceset="GND" device=""/>
<part name="U$10" library="microbuilder_v3" deviceset="3.3V" device=""/>
<part name="U$11" library="microbuilder_v3" deviceset="3.3V" device=""/>
<part name="IC2" library="dan-translate" deviceset="TX0108" device="PWR" value="TXS0108"/>
<part name="U$61" library="microbuilder" deviceset="GND" device=""/>
-<part name="R7" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="10K"/>
+<part name="R6" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="10K"/>
<part name="R8" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="4K7"/>
-<part name="C12" library="resistor" deviceset="C-EU" device="C0603K" value="100nF"/>
+<part name="C6" library="resistor" deviceset="C-EU" device="C0603K" value="100nF"/>
<part name="U$12" library="microbuilder_v3" deviceset="GND" device=""/>
<part name="U$13" library="microbuilder_v3" deviceset="GND" device=""/>
<part name="U$14" library="microbuilder_v3" deviceset="3.3V" device=""/>
<part name="U$15" library="microbuilder_v3" deviceset="3.3V" device=""/>
<part name="Y1" library="SparkFun" deviceset="CRYSTAL" device="5X3" value="8MHz"/>
-<part name="C10" library="resistor" deviceset="C-EU" device="C0603K" value="18pF"/>
-<part name="C11" library="resistor" deviceset="C-EU" device="C0603K" value="18pF"/>
+<part name="C7" library="resistor" deviceset="C-EU" device="C0603K" value="18pF"/>
+<part name="C8" library="resistor" deviceset="C-EU" device="C0603K" value="18pF"/>
<part name="U$16" library="microbuilder_v3" deviceset="GND" device=""/>
<part name="JP1" library="SparkFun" deviceset="M04" device="LOCK"/>
<part name="U$17" library="microbuilder_v3" deviceset="3.3V" device=""/>
<part name="U$18" library="microbuilder_v3" deviceset="GND" device=""/>
<part name="D2" library="led" deviceset="LED" device="CHIPLED_0603" value="RED"/>
-<part name="R9" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="390Ω"/>
-<part name="D1" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
<part name="R10" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="390Ω"/>
+<part name="D1" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
+<part name="R9" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="390Ω"/>
<part name="D3" library="led" deviceset="LED" device="CHIPLED_0603" value="YELLOW"/>
<part name="R11" library="microbuilder" deviceset="RESISTOR" device="0603MINI" value="390Ω"/>
<part name="D4" library="led" deviceset="LED" device="CHIPLED_0603" value="YELLOW"/>
@@ -6540,35 +6540,35 @@ package type OT</description>
<instance part="R2" gate="G$1" x="170.18" y="101.6"/>
<instance part="U$1" gate="G$1" x="182.88" y="114.3"/>
<instance part="U$5" gate="G$1" x="182.88" y="88.9"/>
-<instance part="R3" gate="G$1" x="101.6" y="68.58" rot="R90"/>
+<instance part="R7" gate="G$1" x="101.6" y="68.58" rot="R90"/>
<instance part="U$7" gate="G$1" x="101.6" y="38.1"/>
<instance part="U$8" gate="G$1" x="101.6" y="78.74"/>
-<instance part="R5" gate="G$1" x="170.18" y="111.76"/>
+<instance part="R3" gate="G$1" x="170.18" y="111.76"/>
<instance part="BTN1" gate="G$1" x="116.84" y="58.42"/>
-<instance part="R6" gate="G$1" x="109.22" y="66.04" rot="R90"/>
+<instance part="R5" gate="G$1" x="109.22" y="66.04" rot="R90"/>
<instance part="U$9" gate="G$1" x="121.92" y="38.1"/>
<instance part="U$10" gate="G$1" x="109.22" y="76.2"/>
<instance part="U$11" gate="G$1" x="96.52" y="86.36"/>
<instance part="IC2" gate="G$1" x="175.26" y="149.86" rot="MR0"/>
<instance part="U$61" gate="G$1" x="157.48" y="132.08"/>
-<instance part="R7" gate="G$1" x="119.38" y="81.28" rot="R90"/>
+<instance part="R6" gate="G$1" x="119.38" y="81.28" rot="R90"/>
<instance part="R8" gate="G$1" x="137.16" y="88.9"/>
-<instance part="C12" gate="G$1" x="127" y="83.82"/>
+<instance part="C6" gate="G$1" x="127" y="83.82"/>
<instance part="U$12" gate="G$1" x="119.38" y="71.12"/>
<instance part="U$13" gate="G$1" x="127" y="71.12"/>
<instance part="U$14" gate="G$1" x="154.94" y="177.8"/>
<instance part="U$15" gate="G$1" x="213.36" y="177.8"/>
<instance part="Y1" gate="G$1" x="20.32" y="96.52" rot="R90"/>
-<instance part="C10" gate="G$1" x="10.16" y="99.06" rot="R90"/>
-<instance part="C11" gate="G$1" x="10.16" y="93.98" rot="R90"/>
+<instance part="C7" gate="G$1" x="10.16" y="99.06" rot="R90"/>
+<instance part="C8" gate="G$1" x="10.16" y="93.98" rot="R90"/>
<instance part="U$16" gate="G$1" x="5.08" y="78.74"/>
<instance part="JP1" gate="G$1" x="129.54" y="129.54" rot="R180"/>
<instance part="U$17" gate="G$1" x="121.92" y="139.7"/>
<instance part="U$18" gate="G$1" x="121.92" y="116.84"/>
<instance part="D2" gate="G$1" x="220.98" y="73.66" rot="R90"/>
-<instance part="R9" gate="G$1" x="210.82" y="73.66"/>
+<instance part="R10" gate="G$1" x="210.82" y="73.66"/>
<instance part="D1" gate="G$1" x="220.98" y="83.82" rot="R90"/>
-<instance part="R10" gate="G$1" x="210.82" y="83.82"/>
+<instance part="R9" gate="G$1" x="210.82" y="83.82"/>
<instance part="D3" gate="G$1" x="220.98" y="63.5" rot="R90"/>
<instance part="R11" gate="G$1" x="210.82" y="63.5"/>
<instance part="D4" gate="G$1" x="220.98" y="53.34" rot="R90"/>
@@ -6653,12 +6653,12 @@ package type OT</description>
<wire x1="121.92" y1="58.42" x2="121.92" y2="40.64" width="0.1524" layer="91"/>
</segment>
<segment>
-<pinref part="C12" gate="G$1" pin="2"/>
+<pinref part="C6" gate="G$1" pin="2"/>
<pinref part="U$13" gate="G$1" pin="GND"/>
<wire x1="127" y1="73.66" x2="127" y2="78.74" width="0.1524" layer="91"/>
</segment>
<segment>
-<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="R6" gate="G$1" pin="1"/>
<pinref part="U$12" gate="G$1" pin="GND"/>
<wire x1="119.38" y1="73.66" x2="119.38" y2="76.2" width="0.1524" layer="91"/>
</segment>
@@ -6686,8 +6686,8 @@ package type OT</description>
<wire x1="5.08" y1="81.28" x2="5.08" y2="93.98" width="0.1524" layer="91"/>
<wire x1="5.08" y1="93.98" x2="7.62" y2="93.98" width="0.1524" layer="91"/>
<junction x="5.08" y="93.98"/>
-<pinref part="C10" gate="G$1" pin="1"/>
-<pinref part="C11" gate="G$1" pin="1"/>
+<pinref part="C7" gate="G$1" pin="1"/>
+<pinref part="C8" gate="G$1" pin="1"/>
<pinref part="U$16" gate="G$1" pin="GND"/>
</segment>
<segment>
@@ -6748,7 +6748,7 @@ package type OT</description>
<net name="OSC_IN" class="0">
<segment>
<pinref part="IC1" gate="G$1" pin="PD0/OSC_IN"/>
-<pinref part="C10" gate="G$1" pin="2"/>
+<pinref part="C7" gate="G$1" pin="2"/>
<wire x1="33.02" y1="99.06" x2="20.32" y2="99.06" width="0.1524" layer="91"/>
<pinref part="Y1" gate="G$1" pin="2"/>
<wire x1="20.32" y1="99.06" x2="15.24" y2="99.06" width="0.1524" layer="91"/>
@@ -6760,7 +6760,7 @@ package type OT</description>
<pinref part="IC1" gate="G$1" pin="PA8"/>
<wire x1="165.1" y1="111.76" x2="78.74" y2="111.76" width="0.1524" layer="91"/>
<label x="81.28" y="111.76" size="1.778" layer="95"/>
-<pinref part="R5" gate="G$1" pin="1"/>
+<pinref part="R3" gate="G$1" pin="1"/>
</segment>
</net>
<net name="USB_DM" class="0">
@@ -6790,7 +6790,7 @@ package type OT</description>
<label x="81.28" y="60.96" size="1.778" layer="95"/>
</segment>
<segment>
-<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="R10" gate="G$1" pin="1"/>
<wire x1="205.74" y1="73.66" x2="190.5" y2="73.66" width="0.1524" layer="91"/>
<label x="193.04" y="73.66" size="1.778" layer="95"/>
</segment>
@@ -6969,7 +6969,7 @@ package type OT</description>
<pinref part="U$3" gate="G$1" pin="3.3V"/>
</segment>
<segment>
-<pinref part="R6" gate="G$1" pin="2"/>
+<pinref part="R5" gate="G$1" pin="2"/>
<pinref part="U$10" gate="G$1" pin="3.3V"/>
<wire x1="109.22" y1="71.12" x2="109.22" y2="73.66" width="0.1524" layer="91"/>
</segment>
@@ -7001,7 +7001,7 @@ package type OT</description>
<wire x1="121.92" y1="132.08" x2="121.92" y2="137.16" width="0.1524" layer="91"/>
</segment>
<segment>
-<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="R9" gate="G$1" pin="1"/>
<pinref part="U$20" gate="G$1" pin="3.3V"/>
<wire x1="205.74" y1="83.82" x2="200.66" y2="83.82" width="0.1524" layer="91"/>
<wire x1="200.66" y1="83.82" x2="200.66" y2="86.36" width="0.1524" layer="91"/>
@@ -7033,7 +7033,7 @@ package type OT</description>
<pinref part="CN1" gate="G$1" pin="D+"/>
<pinref part="R1" gate="G$1" pin="2"/>
<wire x1="187.96" y1="104.14" x2="177.8" y2="104.14" width="0.1524" layer="91"/>
-<pinref part="R5" gate="G$1" pin="2"/>
+<pinref part="R3" gate="G$1" pin="2"/>
<wire x1="177.8" y1="104.14" x2="175.26" y2="104.14" width="0.1524" layer="91"/>
<wire x1="175.26" y1="111.76" x2="177.8" y2="111.76" width="0.1524" layer="91"/>
<wire x1="177.8" y1="111.76" x2="177.8" y2="104.14" width="0.1524" layer="91"/>
@@ -7056,7 +7056,7 @@ package type OT</description>
</segment>
<segment>
<pinref part="U$8" gate="G$1" pin="5.0V"/>
-<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R7" gate="G$1" pin="2"/>
<wire x1="101.6" y1="76.2" x2="101.6" y2="73.66" width="0.1524" layer="91"/>
</segment>
<segment>
@@ -7080,7 +7080,7 @@ package type OT</description>
<pinref part="R4" gate="G$1" pin="2"/>
<wire x1="78.74" y1="55.88" x2="101.6" y2="55.88" width="0.1524" layer="91"/>
<wire x1="101.6" y1="55.88" x2="101.6" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="R7" gate="G$1" pin="1"/>
<wire x1="101.6" y1="63.5" x2="101.6" y2="55.88" width="0.1524" layer="91"/>
<junction x="101.6" y="55.88"/>
<label x="81.28" y="55.88" size="1.778" layer="95"/>
@@ -7091,7 +7091,7 @@ package type OT</description>
<pinref part="IC1" gate="G$1" pin="PB12"/>
<wire x1="78.74" y1="58.42" x2="109.22" y2="58.42" width="0.1524" layer="91"/>
<pinref part="BTN1" gate="G$1" pin="1"/>
-<pinref part="R6" gate="G$1" pin="1"/>
+<pinref part="R5" gate="G$1" pin="1"/>
<wire x1="109.22" y1="58.42" x2="114.3" y2="58.42" width="0.1524" layer="91"/>
<wire x1="109.22" y1="60.96" x2="109.22" y2="58.42" width="0.1524" layer="91"/>
<junction x="109.22" y="58.42"/>
@@ -7103,11 +7103,11 @@ package type OT</description>
<pinref part="IC1" gate="G$1" pin="PB0"/>
<wire x1="78.74" y1="88.9" x2="119.38" y2="88.9" width="0.1524" layer="91"/>
<pinref part="R8" gate="G$1" pin="1"/>
-<pinref part="C12" gate="G$1" pin="1"/>
+<pinref part="C6" gate="G$1" pin="1"/>
<wire x1="119.38" y1="88.9" x2="127" y2="88.9" width="0.1524" layer="91"/>
<wire x1="127" y1="88.9" x2="132.08" y2="88.9" width="0.1524" layer="91"/>
<wire x1="127" y1="86.36" x2="127" y2="88.9" width="0.1524" layer="91"/>
-<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="R6" gate="G$1" pin="2"/>
<wire x1="119.38" y1="86.36" x2="119.38" y2="88.9" width="0.1524" layer="91"/>
<junction x="119.38" y="88.9"/>
<junction x="127" y="88.9"/>
@@ -7160,21 +7160,21 @@ package type OT</description>
<wire x1="20.32" y1="93.98" x2="33.02" y2="93.98" width="0.1524" layer="91"/>
<junction x="20.32" y="93.98"/>
<pinref part="Y1" gate="G$1" pin="1"/>
-<pinref part="C11" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="2"/>
<pinref part="IC1" gate="G$1" pin="PD1/OSC_OUT"/>
</segment>
</net>
<net name="N$2" class="0">
<segment>
<pinref part="D2" gate="G$1" pin="A"/>
-<pinref part="R9" gate="G$1" pin="2"/>
+<pinref part="R10" gate="G$1" pin="2"/>
<wire x1="218.44" y1="73.66" x2="215.9" y2="73.66" width="0.1524" layer="91"/>
</segment>
</net>
<net name="N$4" class="0">
<segment>
<pinref part="D1" gate="G$1" pin="A"/>
-<pinref part="R10" gate="G$1" pin="2"/>
+<pinref part="R9" gate="G$1" pin="2"/>
<wire x1="218.44" y1="83.82" x2="215.9" y2="83.82" width="0.1524" layer="91"/>
</segment>
</net>