hw1: add in/out caps to 3v3

4 files changed, 296 insertions, 150 deletions

diff --git a/hw1/hw1.kicad_pcb b/hw1/hw1.kicad_pcb
index e619fb2..abb5b61 100644
--- a/hw1/hw1.kicad_pcb
+++ b/hw1/hw1.kicad_pcb
@@ -1,14 +1,14 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.6)
 
   (general
-    (links 66)
-    (no_connects 66)
+    (links 70)
+    (no_connects 70)
     (area 110.922999 72.949999 179.653001 126.440001)
     (thickness 1.6)
     (drawings 27)
     (tracks 0)
     (zones 0)
-    (modules 23)
+    (modules 25)
     (nets 26)
   )
 
@@ -1130,6 +1130,78 @@
     )
   )
 
+  (module Capacitors_SMD:C_0603_HandSoldering (layer F.Cu) (tedit 58AA848B) (tstamp 5A0F6D33)
+    (at 172.085 106.553)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /5A0FC76D)
+    (attr smd)
+    (fp_text reference C7 (at 0 -1.25) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1u (at 0 1.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.8 -0.65) (end 1.8 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 0.65) (end 1.8 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 1 +5V))
+    (pad 2 smd rect (at 0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 2 GND))
+    (model Capacitors_SMD.3dshapes/C_0603.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer F.Cu) (tedit 58AA848B) (tstamp 5A0F6D39)
+    (at 167.513 106.68)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /5A0FC660)
+    (attr smd)
+    (fp_text reference C8 (at 0 -1.25) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1u (at 0 1.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.8 -0.65) (end 1.8 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 0.65) (end 1.8 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 3 +3V3))
+    (pad 2 smd rect (at 0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 2 GND))
+    (model Capacitors_SMD.3dshapes/C_0603.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (gr_text 1 (at 138.938 121.285 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/hw1/hw1.net b/hw1/hw1.net
index e979173..20d44fa 100644
--- a/hw1/hw1.net
+++ b/hw1/hw1.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /home/karlp/src/libopencm3-tests/hw1/hw1.sch)
-    (date "Fri 17 Nov 2017 10:50:30 PM GMT")
+    (date "Fri 17 Nov 2017 11:13:02 PM GMT")
     (tool "Eeschema 4.0.6")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -152,7 +152,19 @@
       (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5A0FB867)))
+      (tstamp 5A0FB867))
+    (comp (ref C8)
+      (value 1u)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5A0FC660))
+    (comp (ref C7)
+      (value 1u)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5A0FC76D)))
   (libparts
     (libpart (lib device) (part C)
       (description "Unpolarized capacitor")
@@ -373,165 +385,169 @@
     (library (logical karlp-klibs)
       (uri /home/karlp/src/libopencm3-tests/hw1/karlp-klibs.lib)))
   (nets
-    (net (code 1) (name "Net-(U1-Pad3)")
-      (node (ref U1) (pin 3)))
-    (net (code 2) (name GND)
-      (node (ref J1) (pin 3))
-      (node (ref U2) (pin 2))
-      (node (ref P3) (pin 7))
-      (node (ref P1) (pin 6))
-      (node (ref C3) (pin 2))
-      (node (ref P1) (pin 7))
-      (node (ref C4) (pin 2))
-      (node (ref C5) (pin 2))
+    (net (code 1) (name /SWO)
+      (node (ref J1) (pin 6))
+      (node (ref U1) (pin 39)))
+    (net (code 2) (name +3V3)
+      (node (ref U1) (pin 9))
+      (node (ref C5) (pin 1))
+      (node (ref P1) (pin 4))
+      (node (ref C8) (pin 1))
+      (node (ref J1) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref U2) (pin 5))
+      (node (ref U1) (pin 24))
+      (node (ref C4) (pin 1))
+      (node (ref U1) (pin 36))
+      (node (ref U1) (pin 48))
+      (node (ref C3) (pin 1)))
+    (net (code 3) (name GND)
       (node (ref C2) (pin 2))
-      (node (ref U1) (pin 35))
+      (node (ref C3) (pin 2))
+      (node (ref P9) (pin 10))
       (node (ref P10) (pin 5))
+      (node (ref C8) (pin 2))
+      (node (ref C6) (pin 2))
+      (node (ref C7) (pin 2))
+      (node (ref J1) (pin 3))
       (node (ref C1) (pin 2))
+      (node (ref P3) (pin 7))
       (node (ref U1) (pin 23))
       (node (ref U1) (pin 47))
       (node (ref U1) (pin 8))
-      (node (ref C6) (pin 2))
-      (node (ref P9) (pin 10)))
-    (net (code 3) (name /NRST)
+      (node (ref U1) (pin 35))
+      (node (ref U2) (pin 2))
+      (node (ref C4) (pin 2))
+      (node (ref C5) (pin 2))
+      (node (ref P1) (pin 7))
+      (node (ref P1) (pin 6)))
+    (net (code 4) (name /NRST)
       (node (ref J1) (pin 5))
-      (node (ref C1) (pin 1))
-      (node (ref U1) (pin 7)))
-    (net (code 4) (name /SWCLK)
+      (node (ref U1) (pin 7))
+      (node (ref C1) (pin 1)))
+    (net (code 5) (name /SWCLK)
       (node (ref J1) (pin 2))
       (node (ref U1) (pin 37)))
-    (net (code 5) (name /SWDIO)
-      (node (ref U1) (pin 34))
-      (node (ref J1) (pin 4)))
-    (net (code 6) (name /SWO)
-      (node (ref J1) (pin 6))
-      (node (ref U1) (pin 39)))
+    (net (code 6) (name /SWDIO)
+      (node (ref J1) (pin 4))
+      (node (ref U1) (pin 34)))
     (net (code 7) (name "Net-(U1-Pad40)")
       (node (ref U1) (pin 40)))
     (net (code 8) (name "Net-(U1-Pad2)")
       (node (ref U1) (pin 2)))
-    (net (code 9) (name "Net-(U1-Pad4)")
+    (net (code 9) (name "Net-(U1-Pad3)")
+      (node (ref U1) (pin 3)))
+    (net (code 10) (name "Net-(U1-Pad4)")
       (node (ref U1) (pin 4)))
-    (net (code 10) (name "Net-(U1-Pad19)")
+    (net (code 11) (name "Net-(U1-Pad19)")
       (node (ref U1) (pin 19)))
-    (net (code 11) (name "Net-(U1-Pad18)")
+    (net (code 12) (name "Net-(U1-Pad18)")
       (node (ref U1) (pin 18)))
-    (net (code 12) (name /SPI_CS)
-      (node (ref U1) (pin 25))
-      (node (ref P3) (pin 3))
-      (node (ref P9) (pin 6)))
-    (net (code 13) (name /ADC_IN2)
-      (node (ref U1) (pin 17)))
-    (net (code 14) (name /ADC_IN1)
-      (node (ref P2) (pin 3))
-      (node (ref U1) (pin 16)))
-    (net (code 15) (name /SPI_MOSI)
-      (node (ref P9) (pin 5))
+    (net (code 13) (name /SPI_MOSI)
       (node (ref U1) (pin 28))
-      (node (ref P3) (pin 4)))
-    (net (code 16) (name /SPI_MISO)
+      (node (ref P3) (pin 4))
+      (node (ref P9) (pin 5)))
+    (net (code 14) (name "Net-(U2-Pad4)")
+      (node (ref U2) (pin 4)))
+    (net (code 15) (name /ADC_IN2)
+      (node (ref U1) (pin 17)))
+    (net (code 16) (name /ADC_IN1)
+      (node (ref U1) (pin 16))
+      (node (ref P2) (pin 3)))
+    (net (code 17) (name /SPI_MISO)
       (node (ref P3) (pin 5))
       (node (ref U1) (pin 27))
       (node (ref P9) (pin 4)))
-    (net (code 17) (name /SPI_SCK)
-      (node (ref P3) (pin 6))
+    (net (code 18) (name /SPI_SCK)
       (node (ref P9) (pin 3))
+      (node (ref P3) (pin 6))
       (node (ref U1) (pin 26)))
-    (net (code 18) (name /UART_RX_OUT)
+    (net (code 19) (name /SPI_CS)
+      (node (ref P9) (pin 6))
+      (node (ref P3) (pin 3))
+      (node (ref U1) (pin 25)))
+    (net (code 20) (name /UART_RX_OUT)
       (node (ref P4) (pin 2))
       (node (ref P9) (pin 7))
       (node (ref U1) (pin 13)))
-    (net (code 19) (name /UART_TX_OUT)
-      (node (ref P9) (pin 8))
+    (net (code 21) (name /UART_TX_OUT)
+      (node (ref P4) (pin 1))
       (node (ref U1) (pin 12))
-      (node (ref P4) (pin 1)))
-    (net (code 20) (name "Net-(P9-Pad9)")
+      (node (ref P9) (pin 8)))
+    (net (code 22) (name "Net-(P9-Pad9)")
       (node (ref P9) (pin 9)))
-    (net (code 21) (name +3V3)
-      (node (ref J1) (pin 1))
-      (node (ref U1) (pin 9))
-      (node (ref P1) (pin 4))
-      (node (ref C3) (pin 1))
-      (node (ref C4) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref U2) (pin 5))
-      (node (ref U1) (pin 36))
-      (node (ref U1) (pin 48))
-      (node (ref U1) (pin 24)))
-    (net (code 22) (name /I2C_SDA)
-      (node (ref JP1) (pin 1))
-      (node (ref P2) (pin 5))
-      (node (ref U1) (pin 46))
-      (node (ref P3) (pin 9))
-      (node (ref P9) (pin 2)))
-    (net (code 23) (name /USB_DP)
-      (node (ref U1) (pin 33))
-      (node (ref P10) (pin 3)))
-    (net (code 24) (name /USB_DM)
-      (node (ref P10) (pin 2))
-      (node (ref U1) (pin 32)))
-    (net (code 25) (name /I2C_SCL)
+    (net (code 23) (name /USB_DM)
+      (node (ref U1) (pin 32))
+      (node (ref P10) (pin 2)))
+    (net (code 24) (name /I2C_SCL)
       (node (ref P2) (pin 6))
+      (node (ref JP2) (pin 1))
       (node (ref P9) (pin 1))
-      (node (ref U1) (pin 45))
       (node (ref P3) (pin 10))
-      (node (ref JP2) (pin 1)))
-    (net (code 26) (name "Net-(R1-Pad1)")
-      (node (ref R1) (pin 1))
-      (node (ref R2) (pin 1)))
-    (net (code 27) (name "Net-(JP1-Pad2)")
-      (node (ref R1) (pin 2))
-      (node (ref JP1) (pin 2)))
-    (net (code 28) (name "Net-(JP2-Pad2)")
+      (node (ref U1) (pin 45)))
+    (net (code 25) (name /I2C_SDA)
+      (node (ref U1) (pin 46))
+      (node (ref P2) (pin 5))
+      (node (ref JP1) (pin 1))
+      (node (ref P9) (pin 2))
+      (node (ref P3) (pin 9)))
+    (net (code 26) (name /USB_DP)
+      (node (ref P10) (pin 3))
+      (node (ref U1) (pin 33)))
+    (net (code 27) (name "Net-(JP2-Pad2)")
       (node (ref JP2) (pin 2))
       (node (ref R2) (pin 2)))
-    (net (code 29) (name "Net-(U1-Pad41)")
+    (net (code 28) (name "Net-(JP1-Pad2)")
+      (node (ref JP1) (pin 2))
+      (node (ref R1) (pin 2)))
+    (net (code 29) (name "Net-(R1-Pad1)")
+      (node (ref R1) (pin 1))
+      (node (ref R2) (pin 1)))
+    (net (code 30) (name "Net-(U1-Pad41)")
       (node (ref U1) (pin 41)))
-    (net (code 30) (name "Net-(U1-Pad42)")
+    (net (code 31) (name "Net-(C6-Pad1)")
+      (node (ref C6) (pin 1))
+      (node (ref U1) (pin 1)))
+    (net (code 32) (name "Net-(U1-Pad42)")
       (node (ref U1) (pin 42)))
-    (net (code 31) (name "Net-(U1-Pad43)")
+    (net (code 33) (name "Net-(U1-Pad44)")
+      (node (ref U1) (pin 44)))
+    (net (code 34) (name "Net-(U1-Pad20)")
+      (node (ref U1) (pin 20)))
+    (net (code 35) (name /Vin)
+      (node (ref P1) (pin 8)))
+    (net (code 36) (name "Net-(P10-Pad6)")
+      (node (ref P10) (pin 6)))
+    (net (code 37) (name "Net-(P10-Pad4)")
+      (node (ref P10) (pin 4)))
+    (net (code 38) (name "Net-(U1-Pad6)")
+      (node (ref U1) (pin 6)))
+    (net (code 39) (name "Net-(U1-Pad5)")
+      (node (ref U1) (pin 5)))
+    (net (code 40) (name +5V)
+      (node (ref C7) (pin 1))
+      (node (ref U2) (pin 1))
+      (node (ref U2) (pin 3))
+      (node (ref P10) (pin 1))
+      (node (ref P1) (pin 5)))
+    (net (code 41) (name "Net-(U1-Pad43)")
       (node (ref U1) (pin 43)))
-    (net (code 32) (name "Net-(U1-Pad21)")
+    (net (code 42) (name "Net-(U1-Pad21)")
       (node (ref U1) (pin 21)))
-    (net (code 33) (name "Net-(U1-Pad22)")
+    (net (code 43) (name "Net-(U1-Pad22)")
       (node (ref U1) (pin 22)))
-    (net (code 34) (name "Net-(U1-Pad38)")
+    (net (code 44) (name "Net-(U1-Pad38)")
       (node (ref U1) (pin 38)))
-    (net (code 35) (name "Net-(U1-Pad31)")
+    (net (code 45) (name "Net-(U1-Pad31)")
       (node (ref U1) (pin 31)))
-    (net (code 36) (name "Net-(U1-Pad30)")
+    (net (code 46) (name "Net-(U1-Pad30)")
       (node (ref U1) (pin 30)))
-    (net (code 37) (name "Net-(U1-Pad29)")
+    (net (code 47) (name "Net-(U1-Pad29)")
       (node (ref U1) (pin 29)))
-    (net (code 38) (name /Vin)
-      (node (ref P1) (pin 8)))
-    (net (code 39) (name "Net-(C6-Pad1)")
-      (node (ref U1) (pin 1))
-      (node (ref C6) (pin 1)))
-    (net (code 40) (name "Net-(U1-Pad44)")
-      (node (ref U1) (pin 44)))
-    (net (code 41) (name "Net-(U1-Pad20)")
-      (node (ref U1) (pin 20)))
-    (net (code 42) (name "Net-(U1-Pad11)")
+    (net (code 48) (name "Net-(U1-Pad11)")
       (node (ref U1) (pin 11)))
-    (net (code 43) (name "Net-(U1-Pad6)")
-      (node (ref U1) (pin 6)))
-    (net (code 44) (name "Net-(U1-Pad5)")
-      (node (ref U1) (pin 5)))
-    (net (code 45) (name "Net-(P10-Pad4)")
-      (node (ref P10) (pin 4)))
-    (net (code 46) (name "Net-(U2-Pad4)")
-      (node (ref U2) (pin 4)))
-    (net (code 47) (name "Net-(U1-Pad10)")
+    (net (code 49) (name "Net-(U1-Pad10)")
       (node (ref U1) (pin 10)))
-    (net (code 48) (name +5V)
-      (node (ref U2) (pin 1))
-      (node (ref P10) (pin 1))
-      (node (ref U2) (pin 3))
-      (node (ref P1) (pin 5)))
-    (net (code 49) (name "Net-(P10-Pad6)")
-      (node (ref P10) (pin 6)))
     (net (code 50) (name /AREF)
       (node (ref P3) (pin 8)))
     (net (code 51) (name "Net-(P8-Pad1)")
@@ -563,11 +579,11 @@
     (net (code 64) (name /A3)
       (node (ref P2) (pin 4)))
     (net (code 65) (name /DAC2_OUT)
-      (node (ref U1) (pin 15))
-      (node (ref P2) (pin 2)))
+      (node (ref P2) (pin 2))
+      (node (ref U1) (pin 15)))
     (net (code 66) (name /DAC1_OUT)
-      (node (ref U1) (pin 14))
-      (node (ref P2) (pin 1)))
+      (node (ref P2) (pin 1))
+      (node (ref U1) (pin 14)))
     (net (code 67) (name /RESET_OUT)
       (node (ref P1) (pin 3)))
     (net (code 68) (name /IOREF)
diff --git a/hw1/hw1.pdf b/hw1/hw1.pdf
index 93a6d5f..1e4f3a3 100644
--- a/hw1/hw1.pdf
+++ b/hw1/hw1.pdf
diff --git a/hw1/hw1.sch b/hw1/hw1.sch
index e581bcd..fb7808b 100644
--- a/hw1/hw1.sch
+++ b/hw1/hw1.sch
@@ -361,7 +361,9 @@ Wire Wire Line
 Wire Wire Line
 	9400 2000 8600 2000
 Wire Wire Line
-	8850 2100 9400 2100
+	8850 2100 9300 2100
+Wire Wire Line
+	9300 2100 9400 2100
 Connection ~ 9300 2100
 Wire Wire Line
 	8600 2000 8600 1450
@@ -428,7 +430,13 @@ Wire Notes Line
 Wire Wire Line
 	4500 2450 4500 2350
 Wire Wire Line
-	4350 2450 4650 2450
+	4350 2450 4450 2450
+Wire Wire Line
+	4450 2450 4500 2450
+Wire Wire Line
+	4500 2450 4550 2450
+Wire Wire Line
+	4550 2450 4650 2450
 Wire Wire Line
 	4350 2450 4350 2550
 Wire Wire Line
@@ -443,9 +451,15 @@ Connection ~ 4550 2450
 Wire Wire Line
 	4350 6150 4350 6250
 Wire Wire Line
-	4350 6250 4650 6250
+	4350 6250 4450 6250
+Wire Wire Line
+	4450 6250 4550 6250
+Wire Wire Line
+	4550 6250 4650 6250
+Wire Wire Line
+	4450 6150 4450 6250
 Wire Wire Line
-	4450 6150 4450 6300
+	4450 6250 4450 6300
 Connection ~ 4450 6250
 Wire Wire Line
 	4550 6250 4550 6150
@@ -542,12 +556,24 @@ $EndComp
 Wire Wire Line
 	2050 6850 2050 6650
 Wire Wire Line
-	1500 6850 2600 6850
+	1500 6850 1850 6850
+Wire Wire Line
+	1850 6850 2050 6850
+Wire Wire Line
+	2050 6850 2250 6850
+Wire Wire Line
+	2250 6850 2600 6850
 Connection ~ 1850 6850
 Connection ~ 2050 6850
 Connection ~ 2250 6850
 Wire Wire Line
-	1500 7150 2600 7150
+	1500 7150 1850 7150
+Wire Wire Line
+	1850 7150 2050 7150
+Wire Wire Line
+	2050 7150 2250 7150
+Wire Wire Line
+	2250 7150 2600 7150
 Connection ~ 2250 7150
 Connection ~ 1850 7150
 Wire Wire Line
@@ -709,41 +735,45 @@ $EndComp
 $Comp
 L +3V3 #PWR014
 U 1 1 59F7B6BD
-P 6150 6800
-F 0 "#PWR014" H 6150 6650 50  0001 C CNN
-F 1 "+3V3" H 6150 6940 50  0000 C CNN
-F 2 "" H 6150 6800 50  0000 C CNN
-F 3 "" H 6150 6800 50  0000 C CNN
-	1    6150 6800
+P 6150 7000
+F 0 "#PWR014" H 6150 6850 50  0001 C CNN
+F 1 "+3V3" H 6150 7140 50  0000 C CNN
+F 2 "" H 6150 7000 50  0000 C CNN
+F 3 "" H 6150 7000 50  0000 C CNN
+	1    6150 7000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR015
 U 1 1 59F7B70C
-P 5400 7500
-F 0 "#PWR015" H 5400 7250 50  0001 C CNN
-F 1 "GND" H 5400 7350 50  0000 C CNN
-F 2 "" H 5400 7500 50  0000 C CNN
-F 3 "" H 5400 7500 50  0000 C CNN
-	1    5400 7500
+P 5400 7550
+F 0 "#PWR015" H 5400 7300 50  0001 C CNN
+F 1 "GND" H 5400 7400 50  0000 C CNN
+F 2 "" H 5400 7550 50  0000 C CNN
+F 3 "" H 5400 7550 50  0000 C CNN
+	1    5400 7550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5800 7000 6150 7000
+	5800 7000 6100 7000
 Wire Wire Line
-	6150 7000 6150 6800
+	6100 7000 6100 7000
 Wire Wire Line
-	4850 7000 5000 7000
+	6100 7000 6150 7000
+Wire Wire Line
+	4850 7000 4900 7000
+Wire Wire Line
+	4900 7000 5000 7000
 Wire Wire Line
 	3150 1600 3450 1600
 Wire Wire Line
 	3450 1600 3450 1550
 Wire Wire Line
 	3150 1600 3150 1550
-Text Label 4900 7000 0    60   ~ 0
-VBUS
 Wire Wire Line
 	5400 7400 5400 7500
+Wire Wire Line
+	5400 7500 5400 7550
 $Comp
 L +5V #PWR016
 U 1 1 59F7C40C
@@ -755,8 +785,6 @@ F 3 "" H 3150 1550 50  0001 C CNN
 	1    3150 1550
 	1    0    0    -1  
 $EndComp
-Text Label 3150 1550 0    60   ~ 0
-VBUS
 $Comp
 L +5V #PWR017
 U 1 1 59F7C819
@@ -972,4 +1000,34 @@ Text Notes -500 3850 0    60   ~ 0
 Don't place this\nI dont' think we need it
 Text Notes 9000 3300 0    60   ~ 0
 TODO\n[ ] Route all spare pins to _something_?
+$Comp
+L C C?
+U 1 1 5A0FC660
+P 6100 7350
+F 0 "C?" H 6125 7450 50  0000 L CNN
+F 1 "1u" H 6125 7250 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 6138 7200 50  0000 C CNN
+F 3 "" H 6100 7350 50  0000 C CNN
+	1    6100 7350
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 5A0FC76D
+P 4900 7350
+F 0 "C?" H 4925 7450 50  0000 L CNN
+F 1 "1u" H 4925 7250 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4938 7200 50  0000 C CNN
+F 3 "" H 4900 7350 50  0000 C CNN
+	1    4900 7350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4900 7500 5400 7500
+Wire Wire Line
+	5400 7500 6100 7500
+Connection ~ 5400 7500
+Wire Wire Line
+	6100 7200 6100 7000
+Connection ~ 6100 7000
 $EndSCHEMATC