diff --git a/flash.kicad_sch b/flash.kicad_sch
index 9f40cf0..8325d19 100644
--- a/flash.kicad_sch
+++ b/flash.kicad_sch
@@ -684,10 +684,15 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2639a0cd-e932-4b8e-a0c4-8bf3633f71b9)
   )
-  (text "TODO: decide on flash size & package" (at 143.51 72.39 0)
+  (text "TODO: decide on flash package" (at 148.59 73.66 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid db844745-9528-4d80-b626-d68c6a24f5f3)
   )
+  (text "needs to be between\n16 Mib and 128 Mib\n(i.e. MiB and 16 MiB)"
+    (at 166.37 113.03 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid f491e2dd-8744-448e-8e72-9133093a0b97)
+  )
 
   (label "SPI_RP_SD3" (at 199.39 102.87 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -877,7 +882,7 @@
     (uuid 7555ce15-c819-44a7-ad89-f48d70a77d41)
     (property "Reference" "C10" (id 0) (at 120.65 79.2312 90))
     (property "Value" "100nF" (id 1) (at 120.65 81.7681 90))
-    (property "Footprint" "" (id 2) (at 124.46 84.1248 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 124.46 84.1248 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 120.65 85.09 0)
@@ -912,7 +917,7 @@
     (property "Value" "10k" (id 1) (at 109.728 84.2522 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 106.172 82.55 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 106.172 82.55 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 107.95 82.55 0)
@@ -945,7 +950,7 @@
     (uuid fb7fd1b4-d207-4de5-bfe3-443ad90b042c)
     (property "Reference" "C11" (id 0) (at 156.21 79.2312 90))
     (property "Value" "100nF" (id 1) (at 156.21 81.7681 90))
-    (property "Footprint" "" (id 2) (at 160.02 84.1248 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 160.02 84.1248 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 156.21 85.09 0)
diff --git a/iCE2040.pretty/TYPE-C-31-M-12.kicad_mod b/iCE2040.pretty/TYPE-C-31-M-12.kicad_mod
new file mode 100644
index 0000000..3eed785
--- /dev/null
+++ b/iCE2040.pretty/TYPE-C-31-M-12.kicad_mod
@@ -0,0 +1,87 @@
+# originally from https://github.com/jenschr/USB-C-Connectors
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <https://unlicense.org>
+
+
+(footprint "TYPE-C-31-M-12" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 6228878E)
+  (descr "Korean Hroparts Elec, Power only USB connector supporting up to 3A")
+  (attr smd)
+  (fp_text reference "P1" (at 0 -2.15 -180) (layer "F.SilkS")
+    (effects (font (size 0.8 0.8) (thickness 0.1)))
+    (tstamp e837769b-e99a-4387-8749-b27d030a1740)
+  )
+  (fp_text value "USB_C_Plug_USB2.0" (at 0.025 -7.9 -180) (layer "F.Fab")
+    (effects (font (size 0.8 0.8) (thickness 0.1)))
+    (tstamp 9a1f5d84-1efb-4e8d-99e5-5bd82076692c)
+  )
+  (fp_line (start 4.4 2.6) (end -4.4 2.6) (layer "F.SilkS") (width 0.1) (tstamp 05dcc2af-b915-4fda-bf3c-2abd625c5ebe))
+  (fp_line (start -4.4 -4.5) (end -4.4 2.6) (layer "F.SilkS") (width 0.1) (tstamp 45865507-eeb6-46fd-a981-e195ee751741))
+  (fp_line (start 4.2 1.5) (end -4.2 1.5) (layer "F.SilkS") (width 0.1) (tstamp 5ce576ad-4bf7-4cce-ab8c-3df8b19c317d))
+  (fp_line (start -4.4 -4.5) (end 4.4 -4.5) (layer "F.SilkS") (width 0.1) (tstamp 7a165b1a-830b-437f-9c6b-efdf2f32cfcb))
+  (fp_line (start 4.4 -4.5) (end 4.4 2.6) (layer "F.SilkS") (width 0.1) (tstamp af9ecdc4-099c-4c8a-95c7-51116897a35a))
+  (fp_line (start 0 -4.02) (end 0 2.3) (layer "F.SilkS") (width 0.02) (tstamp b43ce565-b85a-4fc8-af51-9649c534db7f))
+  (fp_line (start -2.9 -3.65) (end -2.9 0) (layer "Dwgs.User") (width 0.02) (tstamp 215b499e-5d5a-4629-ab3f-d5db7545410b))
+  (fp_line (start -2.45 -4.37) (end -2.45 0) (layer "Dwgs.User") (width 0.02) (tstamp 2b13ca61-cd81-4e53-adef-335645158a76))
+  (fp_line (start -0.25 -1) (end 0.25 -1) (layer "Dwgs.User") (width 0.02) (tstamp 2bce98c7-dba7-4174-aefa-c839077212fe))
+  (fp_line (start -3.25 -4.37) (end -3.25 0) (layer "Dwgs.User") (width 0.02) (tstamp 5d54e900-3381-46ad-a7ff-d54e007425b9))
+  (fp_line (start -2.45 0) (end 2.45 0) (layer "Dwgs.User") (width 0.02) (tstamp 680fa1ef-276a-4f98-b9d5-2aec165a0256))
+  (fp_line (start 0.25 -4.37) (end 0.25 -1) (layer "Dwgs.User") (width 0.02) (tstamp 730fe6d0-edc8-4b55-97fa-5fe194da2828))
+  (fp_line (start 0.75 -4.37) (end 0.75 -0.5) (layer "Dwgs.User") (width 0.02) (tstamp 8b9ada84-f4b8-453c-891c-47e070b7f661))
+  (fp_line (start -0.25 -4.37) (end -0.25 -1) (layer "Dwgs.User") (width 0.02) (tstamp 910ab49e-02e2-4d10-b87f-f417593a12c9))
+  (fp_line (start 2.9 -3.65) (end 2.9 0) (layer "Dwgs.User") (width 0.02) (tstamp a47b95ec-1e48-4611-a1a2-2b3a95ca108f))
+  (fp_line (start -0.75 -4.37) (end -0.75 -0.5) (layer "Dwgs.User") (width 0.02) (tstamp a902b6d0-8cb4-4048-8d16-ac5da5f3f0e8))
+  (fp_line (start 3.25 -4.37) (end 3.25 0) (layer "Dwgs.User") (width 0.02) (tstamp abc98125-c1a9-4a62-94f7-a0ec40385818))
+  (fp_line (start -0.75 -0.5) (end 0.75 -0.5) (layer "Dwgs.User") (width 0.02) (tstamp b2b2a415-95ec-4fc6-b6d9-e3ce8578cd42))
+  (fp_line (start -2.89 0.5) (end 2.89 0.5) (layer "Dwgs.User") (width 0.02) (tstamp b773a178-dbd9-4e6b-9dbe-948952c8ba24))
+  (fp_line (start -3.25 1) (end 3.25 1) (layer "Dwgs.User") (width 0.02) (tstamp c5a65d82-5735-4b49-b6c1-c4f5209f65c3))
+  (fp_line (start 2.45 -4.37) (end 2.45 0) (layer "Dwgs.User") (width 0.02) (tstamp f1c6d515-2989-4b51-a278-6f0e043d89b4))
+  (pad "" np_thru_hole circle (at 2.9 -3.65) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.01) (solder_paste_margin 0.01) (clearance 0.01) (tstamp 0443571c-3af7-4843-9762-084866f82430))
+  (pad "" np_thru_hole circle (at -2.9 -3.65) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.01) (solder_paste_margin 0.01) (clearance 0.01) (tstamp 792828bd-2e98-493c-9e74-f28cf6a22e59))
+  (pad "A1" smd rect (at -3.375 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 55d86cce-3400-4f7e-aa8e-4ccc51af927f))
+  (pad "A4" smd rect (at -2.575 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 24b1d44b-725f-40df-8c5a-b023c61ecdb3))
+  (pad "A5" smd rect (at -1.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 56371a9a-d97a-4db4-b7ca-b33fc6be6b59))
+  (pad "A6" smd rect (at -0.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3e622644-0184-468f-b878-3bc4033891a1))
+  (pad "A7" smd rect (at 0.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cf2785c9-c1b0-49a9-9e54-62592a5a0284))
+  (pad "A8" smd rect (at 1.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ca3de203-30cb-4399-85b8-2e717a3e7f20))
+  (pad "A9" smd rect (at 2.575 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b87480ed-a248-4cda-be50-787c434d7f07))
+  (pad "A12" smd rect (at 3.375 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ba679b3f-fd39-4985-bed1-bf25a02b962c))
+  (pad "B1" smd rect (at 3.1 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 49e7dc15-83a4-4a9f-8103-3610fcbdbe00))
+  (pad "B4" smd rect (at 2.3 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b4a9abe8-d01f-48ef-b279-b841a1b925e2))
+  (pad "B5" smd rect (at 1.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ad4fd2f6-708c-43d8-8507-affd98103c6b))
+  (pad "B6" smd rect (at 0.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 346b52ac-9f78-4feb-9543-dbe31ced4edf))
+  (pad "B7" smd rect (at -0.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bb795114-6caf-4913-9228-7921113f1c37))
+  (pad "B8" smd rect (at -1.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b6531a55-d123-4039-b7f0-427f26eddda2))
+  (pad "B9" smd rect (at -2.3 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cbbeab6d-2198-4539-9eb9-0108bcbe24b7))
+  (pad "B12" smd rect (at -3.1 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 34947393-533f-4179-b1b3-c869ca56bab8))
+  (pad "S1" thru_hole roundrect (at 4.32 -4.18) (size 1 2.2) (drill oval 0.6 1.7) (layers *.Cu *.Mask) (roundrect_rratio 0.5) (tstamp a24a9516-f930-4ad4-ad0d-b444dabcede2))
+  (pad "S1" thru_hole roundrect (at -4.32 0) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask) (roundrect_rratio 0.5) (tstamp ac263636-46f3-4e09-8331-69689909fc29))
+  (pad "S1" thru_hole roundrect (at -4.32 -4.18) (size 1 2.2) (drill oval 0.6 1.7) (layers *.Cu *.Mask) (roundrect_rratio 0.5) (tstamp b7a77bcc-f968-407f-9126-5ba6d07f95fa))
+  (pad "S1" thru_hole roundrect (at 4.32 0) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask) (roundrect_rratio 0.5) (tstamp c9e0e3a4-0bf9-43d1-8bfe-0e720ecc6cdd))
+)
diff --git a/ice40.kicad_sch b/ice40.kicad_sch
index ff87e1e..ecd9815 100644
--- a/ice40.kicad_sch
+++ b/ice40.kicad_sch
@@ -1598,7 +1598,7 @@
   (symbol (lib_id "Device:C") (at 121.92 97.79 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0bb38aaa-7bd1-4e49-892d-66ba4baeb8e1)
-    (property "Reference" "C?" (id 0) (at 121.92 91.9312 90))
+    (property "Reference" "C21" (id 0) (at 121.92 91.9312 90))
     (property "Value" "100nF" (id 1) (at 121.92 94.4681 90))
     (property "Footprint" "" (id 2) (at 125.73 96.8248 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -1694,7 +1694,7 @@
   (symbol (lib_id "Device:C") (at 175.26 97.79 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 252097d2-1b4e-483e-8632-a7c6b15bb199)
-    (property "Reference" "C?" (id 0) (at 175.26 91.9312 90))
+    (property "Reference" "C22" (id 0) (at 175.26 91.9312 90))
     (property "Value" "100nF" (id 1) (at 175.26 94.4681 90))
     (property "Footprint" "" (id 2) (at 179.07 96.8248 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -1741,19 +1741,19 @@
     (pin "2" (uuid 875d208a-ab6c-4063-85de-6ffe2da74805))
   )
 
-  (symbol (lib_id "FPGA_Lattice:ICE5LP1K-SG48") (at 179.07 48.26 90) (unit 4)
+  (symbol (lib_id "FPGA_Lattice:ICE5LP1K-SG48") (at 179.07 48.26 90) (mirror x) (unit 4)
     (in_bom yes) (on_board yes)
     (uuid 3a3f03c0-22c6-4fb8-9aa2-9b5bc97b6a90)
-    (property "Reference" "U1" (id 0) (at 186.69 57.1469 90)
+    (property "Reference" "U1" (id 0) (at 186.69 39.3731 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "ICE5LP1K-SG48" (id 1) (at 186.69 54.61 90)
+    (property "Value" "ICE5LP1K-SG48" (id 1) (at 186.69 41.91 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm" (id 2) (at 213.36 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.latticesemi.com/Products/FPGAandCPLD/iCE40Ultra" (id 3) (at 153.67 58.42 0)
+    (property "Datasheet" "http://www.latticesemi.com/Products/FPGAandCPLD/iCE40Ultra" (id 3) (at 153.67 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "23" (uuid 8d3e4cb4-a193-4b7e-8fcf-7b93e6e71f92))
@@ -1983,7 +1983,7 @@
   (symbol (lib_id "power:GND") (at 233.68 86.36 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 639ad16b-adec-4581-b7a6-f3d31538bc4b)
-    (property "Reference" "#PWR?" (id 0) (at 240.03 86.36 0)
+    (property "Reference" "#PWR0103" (id 0) (at 240.03 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 235.3838 84.455 0)
@@ -2036,8 +2036,8 @@
   (symbol (lib_id "Device:R") (at 149.86 50.8 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7ab34fd8-ee27-42f5-8fe8-c34e7bf0f526)
-    (property "Reference" "R10" (id 0) (at 149.86 55.5158 90))
-    (property "Value" "100" (id 1) (at 149.86 52.9789 90))
+    (property "Reference" "R11" (id 0) (at 149.86 46.0842 90))
+    (property "Value" "100" (id 1) (at 149.86 48.6211 90))
     (property "Footprint" "" (id 2) (at 149.86 49.022 90)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -2051,7 +2051,7 @@
   (symbol (lib_id "power:GND") (at 128.27 97.79 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 815fe06e-28c9-4496-999c-16f39a656c84)
-    (property "Reference" "#PWR?" (id 0) (at 134.62 97.79 0)
+    (property "Reference" "#PWR0101" (id 0) (at 134.62 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 129.9738 95.885 0)
@@ -2069,7 +2069,7 @@
   (symbol (lib_id "power:GND") (at 181.61 97.79 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 84f5b148-d146-48c9-8ecc-a65cea73934d)
-    (property "Reference" "#PWR?" (id 0) (at 187.96 97.79 0)
+    (property "Reference" "#PWR0102" (id 0) (at 187.96 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 183.3138 95.885 0)
@@ -2204,7 +2204,7 @@
   (symbol (lib_id "Device:C") (at 227.33 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e2d073b2-92aa-4464-821a-aec0b038d2ef)
-    (property "Reference" "C?" (id 0) (at 227.33 80.5012 90))
+    (property "Reference" "C23" (id 0) (at 227.33 80.5012 90))
     (property "Value" "100nF" (id 1) (at 227.33 83.0381 90))
     (property "Footprint" "" (id 2) (at 231.14 85.3948 0)
       (effects (font (size 1.27 1.27)) hide)
diff --git a/ice40lp1k-devboard.kicad_pcb b/ice40lp1k-devboard.kicad_pcb
index 1c9ec7a..8ccab39 100644
--- a/ice40lp1k-devboard.kicad_pcb
+++ b/ice40lp1k-devboard.kicad_pcb
@@ -1,12 +1,14 @@
 (kicad_pcb (version 20211014) (generator pcbnew)
 
   (general
-    (thickness 1.6)
+    (thickness 1.97252)
   )
 
   (paper "A4")
   (layers
     (0 "F.Cu" signal)
+    (1 "In1.Cu" signal)
+    (2 "In2.Cu" signal)
     (31 "B.Cu" signal)
     (32 "B.Adhes" user "B.Adhesive")
     (33 "F.Adhes" user "F.Adhesive")
@@ -38,6 +40,23 @@
   )
 
   (setup
+    (stackup
+      (layer "F.SilkS" (type "Top Silk Screen"))
+      (layer "F.Paste" (type "Top Solder Paste"))
+      (layer "F.Mask" (type "Top Solder Mask") (thickness 0.01))
+      (layer "F.Cu" (type "copper") (thickness 0.04))
+      (layer "dielectric 1" (type "core") (thickness 0.13626) (material "FR4") (epsilon_r 4.5) (loss_tangent 0.02))
+      (layer "In1.Cu" (type "copper") (thickness 0.035))
+      (layer "dielectric 2" (type "prepreg") (thickness 1.53) (material "FR4") (epsilon_r 4.5) (loss_tangent 0.02))
+      (layer "In2.Cu" (type "copper") (thickness 0.035))
+      (layer "dielectric 3" (type "core") (thickness 0.13626) (material "FR4") (epsilon_r 4.5) (loss_tangent 0.02))
+      (layer "B.Cu" (type "copper") (thickness 0.04))
+      (layer "B.Mask" (type "Bottom Solder Mask") (thickness 0.01))
+      (layer "B.Paste" (type "Bottom Solder Paste"))
+      (layer "B.SilkS" (type "Bottom Silk Screen"))
+      (copper_finish "None")
+      (dielectric_constraints no)
+    )
     (pad_to_mask_clearance 0)
     (pcbplotparams
       (layerselection 0x00010fc_ffffffff)
@@ -166,12 +185,18 @@
   (net 89 "/iCE40/ICELVIO11")
   (net 90 "/iCE40/ICERST")
   (net 91 "/Flash/~{CS}")
-  (net 92 "Net-(J1-PadA6)")
-  (net 93 "Net-(J1-PadA7)")
-  (net 94 "Net-(R9-Pad1)")
-  (net 95 "Net-(R8-Pad1)")
-  (net 96 "/Flash/SPI_RP_SD2")
-  (net 97 "/Flash/SPI_RP_SD3")
+  (net 92 "Net-(R9-Pad1)")
+  (net 93 "/Flash/SPI_RP_SD2")
+  (net 94 "/Flash/SPI_RP_SD3")
+  (net 95 "/Power supplies/V33GOOD")
+  (net 96 "/USB connector/D+")
+  (net 97 "/USB connector/D-")
+  (net 98 "/USB connector/VUSB")
+  (net 99 "/USB connector/CC1")
+  (net 100 "unconnected-(J1-PadA8)")
+  (net 101 "/USB connector/CC2")
+  (net 102 "unconnected-(J1-PadB8)")
+  (net 103 "Net-(R10-Pad1)")
 
   (footprint "Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm" (layer "F.Cu")
     (tedit 5DC5F6A5) (tstamp 0169f6a4-cd13-42d1-9f35-1ba9ff3e7223)
@@ -180,7 +205,7 @@
     (tags "QFN NoLead")
     (property "Sheetfile" "ice40.kicad_sch")
     (property "Sheetname" "iCE40")
-    (path "/03814262-2270-49d5-8359-1a1e42921c0f/3a3f03c0-22c6-4fb8-9aa2-9b5bc97b6a90")
+    (path "/03814262-2270-49d5-8359-1a1e42921c0f/d4f51df9-61f2-460b-acf1-fbb595e73296")
     (attr smd)
     (fp_text reference "U1" (at 0 -4.82 45) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
@@ -273,7 +298,7 @@
     (pad "23" smd roundrect (at 2.25 3.4375 45) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 75 "/iCE40/ICELVIO0") (pinfunction "IOT_37a") (pintype "bidirectional") (tstamp b9a3d4d7-08d1-44ab-a34f-8f8144962e00))
     (pad "24" smd roundrect (at 2.75 3.4375 45) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 79 "/iCE40/VCCPLL") (pinfunction "VPP_2V5") (pintype "power_in") (tstamp 695861cc-47cb-41d8-99a4-087a03713131))
+      (net 5 "+2V5") (pinfunction "VPP_2V5") (pintype "power_in") (tstamp 695861cc-47cb-41d8-99a4-087a03713131))
     (pad "25" smd roundrect (at 3.4375 2.75 45) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 73 "/iCE40/ICELVIO1") (pinfunction "IOT_36b") (pintype "bidirectional") (tstamp 957d15a3-1651-4e63-8ed9-054a3a8fa097))
     (pad "26" smd roundrect (at 3.4375 2.25 45) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -283,7 +308,7 @@
     (pad "28" smd roundrect (at 3.4375 1.25 45) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 78 "/iCE40/ICELVIO4") (pinfunction "IOT_41a") (pintype "bidirectional") (tstamp d3d5a792-e3f7-4080-ade1-df7fd43c92a4))
     (pad "29" smd roundrect (at 3.4375 0.75 45) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 5 "+2V5") (pinfunction "VCCPLL") (pintype "power_out") (tstamp f1473389-5e8b-4dab-bbbc-250284252269))
+      (net 79 "/iCE40/VCCPLL") (pinfunction "VCCPLL") (pintype "power_out") (tstamp f1473389-5e8b-4dab-bbbc-250284252269))
     (pad "30" smd roundrect (at 3.4375 0.25 45) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 9 "+1V2") (pinfunction "VCC") (pintype "passive") (tstamp b0dbcefa-fd40-46bb-857c-930676a571e0))
     (pad "31" smd roundrect (at 3.4375 -0.25 45) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -331,6 +356,48 @@
     )
   )
 
+  (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 0e166a6b-f882-455d-bfda-c2d05c5c1fae)
+    (at 167.45 78.08)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/80f36e7c-9e4e-4bc1-8863-d10a240781cd")
+    (attr smd)
+    (fp_text reference "R1" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 5aa14165-931e-4c7f-b36d-759a1fd1dffb)
+    )
+    (fp_text value "47k" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0278621c-e817-4e43-b597-5702e2494a03)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 08271926-a671-4691-89d0-8bccc060dbaf)
+    )
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer "F.SilkS") (width 0.12) (tstamp 21b213d2-0e2e-4efb-b8b4-9e083aae903f))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer "F.SilkS") (width 0.12) (tstamp 83638c17-df63-4434-a237-b910912678c1))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 14e83fd8-7495-4147-a8f1-4fa74dc8af98))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 201adc93-e694-4a7e-a7bc-75e7ce372879))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 9057d643-c9f9-4f4d-8d38-3fe4374660e4))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp b37cbf54-b418-4ca4-905d-17f936798e75))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp 73c8714a-73f4-4c1e-916e-58e6dbaf03c0))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp c0ce6847-2753-44c9-9699-5bda5e5d8218))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp c989382b-5ed7-44b9-b394-072222b9e995))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp d820ee3e-dc58-4135-8025-284e32e7904f))
+    (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 43 "VBUS") (pintype "passive") (tstamp 21d189ff-bb69-4d49-a111-f6319fbc5db5))
+    (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 45 "/Power supplies/~{OC}DET") (pintype "passive") (tstamp b421ac77-8134-4736-a18f-e61f5e3613fd))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Package_TO_SOT_SMD:SOT-23-5" (layer "F.Cu")
     (tedit 5F6F9B37) (tstamp 11b56cf2-15b9-4b6f-9e97-fd8314e9027d)
     (at 120.15 74.1)
@@ -382,6 +449,300 @@
     )
   )
 
+  (footprint "Resistor_SMD:R_0402_1005Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 1298852a-b343-4095-9a3a-fd1b064df743)
+    (at 178.92 59.04)
+    (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/aaba1476-c7a3-4e07-ae69-cceab5140fcb")
+    (attr smd)
+    (fp_text reference "R10" (at 0 -1.17) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp aefd8f11-2ce5-4214-bcb5-a52ba989af77)
+    )
+    (fp_text value "27.4" (at 0 1.17) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 95176a0b-9047-42a6-9851-b83d17445533)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.26 0.26) (thickness 0.04)))
+      (tstamp c57a8fe1-29d8-42aa-8978-879d7a5d5426)
+    )
+    (fp_line (start -0.153641 -0.38) (end 0.153641 -0.38) (layer "F.SilkS") (width 0.12) (tstamp 684ea2a6-0372-4cf9-a3b7-64e80afeb3ad))
+    (fp_line (start -0.153641 0.38) (end 0.153641 0.38) (layer "F.SilkS") (width 0.12) (tstamp d8340806-38ff-4a79-b447-eda39af50c3d))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer "F.CrtYd") (width 0.05) (tstamp 2a7acbb6-9bab-40b8-b8e4-a8416305590b))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer "F.CrtYd") (width 0.05) (tstamp 6cb422ae-cc53-4c9d-ae53-4ab90a5e2769))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer "F.CrtYd") (width 0.05) (tstamp e2ea65ae-bdb8-497d-a925-2d91604bca68))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer "F.CrtYd") (width 0.05) (tstamp f819b4db-ed29-46ae-afcf-fd1d18b80304))
+    (fp_line (start 0.525 -0.27) (end 0.525 0.27) (layer "F.Fab") (width 0.1) (tstamp 1b693061-f7a1-4e10-9f91-030a40a2a4f5))
+    (fp_line (start -0.525 -0.27) (end 0.525 -0.27) (layer "F.Fab") (width 0.1) (tstamp 961a2750-4a21-45b3-831e-704d1971f145))
+    (fp_line (start 0.525 0.27) (end -0.525 0.27) (layer "F.Fab") (width 0.1) (tstamp aa903c58-d686-474d-bc1f-198b7e4b5c36))
+    (fp_line (start -0.525 0.27) (end -0.525 -0.27) (layer "F.Fab") (width 0.1) (tstamp cca9c6e1-c10d-4ee1-b480-89a9806d8b04))
+    (pad "1" smd roundrect (at -0.51 0) (size 0.54 0.64) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 103 "Net-(R10-Pad1)") (pintype "passive") (tstamp 305b3884-73be-4c97-8d70-cea970526622))
+    (pad "2" smd roundrect (at 0.51 0) (size 0.54 0.64) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 28 "/RP2040/DP") (pintype "passive") (tstamp 146633bd-da00-4773-b998-c83e94dbb5e0))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 13c129d8-21ec-426d-8b18-d9f2ce7b4464)
+    (at 159.09 81.63)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/388eadbc-890a-49df-b55d-ad7db24edb73")
+    (attr smd)
+    (fp_text reference "C4" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 27fe8503-2af6-495c-b805-700ebe645c4f)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 7ccf3e56-75a8-4f06-a811-c3c41e22b927)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 70083373-1dc6-46a0-bda8-efa22f77c710)
+    )
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 827a614d-0d4e-4494-90a0-1037678712c2))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp f057cf4d-0197-4de1-b8e3-8a78a60e4710))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 05efd82b-36e9-4478-b21d-a1d420bcd1ba))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 40057bca-89f8-4482-b167-5a96bf3570de))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 7bcdf799-fd46-4433-a1de-2defc580e243))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp f33e8213-f4e2-4168-8bf0-9013a87cbf7d))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 114ebe2e-6eda-4d27-a3b8-f58bbe4f5354))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 8ceb081f-0042-4749-9b78-119bda1f2c2c))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 93ec66f8-4d68-4816-bca5-f5a886a8bf0d))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp b3d57447-bf34-4f04-a569-334cac572ba0))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 46 "/Power supplies/3V3PROTO") (pintype "passive") (tstamp 4263592d-9aa9-4951-86e3-36afcc2d9198))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 1db4d836-f85d-4575-a0d9-6249e06c6bdf))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 26e86c17-70d9-46d8-99c6-f401d8eda2db)
+    (at 163.1 85.61)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/e224f627-1052-4b7c-a8d5-1ef6213b887b")
+    (attr smd)
+    (fp_text reference "R2" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp f62805a1-427c-48e1-8bae-f8687463862d)
+    )
+    (fp_text value "10k" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 22ea5419-9b9e-4120-b9d3-3afc0d9ce398)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp b3575ce7-4253-4101-abd0-8391722a3dfa)
+    )
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer "F.SilkS") (width 0.12) (tstamp 56e05528-692d-46ca-9518-a7788600f2dd))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer "F.SilkS") (width 0.12) (tstamp ef2fa137-12fa-4dbf-aa40-9d2d427b019e))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 1f2ee1ad-2a75-49eb-9043-0ff811887736))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 2fe84239-30d1-4872-b7de-768505c16f20))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 4a62108b-2e42-45ef-ad29-a6e4a2e98e07))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp ea40b3e6-9359-4e8e-8123-e698bf8ef283))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp 494277db-c13c-4664-aa56-bc012f7f8474))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp 5e1e52a8-5210-4c25-8773-81f94388547b))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp 8acd61c9-6569-449e-8957-7c7dc6beb5f1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp f2b64e04-81e7-4c73-8f5c-8c372fcbf403))
+    (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 1 "+3V3") (pintype "passive") (tstamp b93ab8ad-f24c-4db4-9476-dc87fcf2f9cb))
+    (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 95 "/Power supplies/V33GOOD") (pintype "passive") (tstamp 2f448cf9-92e8-4e24-a331-84a5ea8833db))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 304b010f-ce43-4f35-8038-704df48855a4)
+    (at 159.43 78.08)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/18e3be4b-4614-4415-8c25-b33cccfa5efc")
+    (attr smd)
+    (fp_text reference "C3" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 55d03884-4307-4b2d-9983-3818fe8606f9)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 3375b38f-1776-428c-8584-58e44da7eef4)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp f12b94d6-ceb0-4b20-90fc-70c72b12ded8)
+    )
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 21bf4f25-ad6c-4a6a-84e1-702d99096f8e))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 44938042-2051-4f41-9036-1a40464643ce))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 26fea4ac-63a7-477f-b3da-622093ef4ecd))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 2874c71e-7132-4a72-a35c-e307b5c19b42))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp d2e2770f-65fa-4b9f-9657-fa5f1e4f401e))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp e60f6dc6-1e5f-481f-9825-4855d8959609))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 1dc96e85-ebdc-409d-9359-13ea92fc8f64))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 35e60eb3-a750-48d8-9e57-4e09546f1bd8))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 90e610d9-615a-4e7f-9d0c-1c7ec8290752))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp d3dcebc7-8e16-40e1-9e87-10782f00732a))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 46 "/Power supplies/3V3PROTO") (pintype "passive") (tstamp 534e8cb6-959f-4529-a1c7-2392bbb64b7f))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp f825cd28-17c3-40cf-8fdc-4c319efaf5d5))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 3313a61e-ca4a-490d-969b-1980d25bac87)
+    (at 155.08 72.57)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/04baed00-19b8-4331-b8f9-f68656cbbcbc")
+    (attr smd)
+    (fp_text reference "R7" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp af867e60-b396-46fd-aa43-d232e7925f4a)
+    )
+    (fp_text value "5.1k" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 4eb71614-0b9a-4895-9630-e2834e53abc0)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 66496a38-b830-45c0-877d-83b15408f287)
+    )
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer "F.SilkS") (width 0.12) (tstamp 0259ad67-2670-4223-be71-62637865369f))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer "F.SilkS") (width 0.12) (tstamp 650b2051-cb99-4aef-a3bf-1295f51a8005))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 7d2a3ce8-576a-4d64-b4f2-3b4cd6e14850))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp c0297207-0f71-41a4-9e88-e525cf164791))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp dab546e7-8f8f-456e-8765-a59e88d544e6))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp f8826e7d-55db-4c1d-970f-a3297fb98aaa))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp c4285137-7c16-4206-aa6b-511e3b0454d7))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp c9fcd8b9-0c10-40f0-9bf7-24fa0acb87aa))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp d8ba1866-cbd5-4670-bd90-1057ddea4d02))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp e4cc2a86-7626-4289-bf14-a9c629aa7fd5))
+    (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 99 "/USB connector/CC1") (pintype "passive") (tstamp 456532b3-5d9a-45c5-865b-4095d780393c))
+    (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 488f7c66-2207-4b7b-9f4a-b579ccf732e3))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 3539c2e2-1a5f-4b37-bfe8-1aa6883cbeb5)
+    (at 155.08 81.63)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/1284f862-d0b4-4221-b851-0c795b259c24")
+    (attr smd)
+    (fp_text reference "C6" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 3c7df376-50a1-4767-af7e-47fe48bdff1a)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 53000907-de5f-412d-99f2-9b0d3c8f59a1)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp e049e522-dfd1-4951-9044-b3ddc13ac318)
+    )
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 6e08c648-e941-478e-a381-01d592bf35bb))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 9e26c190-b892-4c55-9809-96bc9d8db501))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 3bf2c4cc-539a-449a-ae56-caa5a21fd8f9))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 64f9f0ab-7c38-469b-9a7f-008d84ce3994))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 6aa76cb9-505a-4b5f-a576-3d871695bdd1))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 72320944-3b74-4dbd-ac62-3652de8bc8d2))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 400b02b1-7489-4517-8b67-8d166f612764))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 4eda1992-2373-4f12-81d1-a5e91f434f7f))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 7f6c8c0a-ce9f-4992-8734-a72a93c12e05))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 8078df9f-1e1b-4dae-8ef7-af93d0191e49))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 5 "+2V5") (pintype "passive") (tstamp 5b435f53-6a7d-4856-9372-8bbc253ee74a))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 4e2dd3d4-f70c-420f-b91b-897723abc9d8))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0402_1005Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 425be85a-3c70-4c39-8e44-fbb5de76ea46)
+    (at 158.54 72.31)
+    (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/143096a5-2079-4e17-927f-f5bbdcf55581")
+    (attr smd)
+    (fp_text reference "R9" (at 0 -1.17) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 61d734c0-fe9d-4754-9653-fc7df0b97198)
+    )
+    (fp_text value "27.4" (at 0 1.17) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 47b2707d-e784-4ff4-91d7-e409a72efc8c)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.26 0.26) (thickness 0.04)))
+      (tstamp 7daeb718-43d6-46db-b094-61fc154f30ca)
+    )
+    (fp_line (start -0.153641 -0.38) (end 0.153641 -0.38) (layer "F.SilkS") (width 0.12) (tstamp 71ab1f85-dca3-45ab-a7c7-e41fb5f09937))
+    (fp_line (start -0.153641 0.38) (end 0.153641 0.38) (layer "F.SilkS") (width 0.12) (tstamp a655e355-63ef-49bf-8b9a-5cad1d6ad7d8))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer "F.CrtYd") (width 0.05) (tstamp 68ef271d-7394-4820-914f-3450375349b9))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer "F.CrtYd") (width 0.05) (tstamp 80e9ad6d-fb7c-4fbc-9968-b42a118c85e5))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer "F.CrtYd") (width 0.05) (tstamp 9e3f2b1e-9ea6-4fe7-88f1-31d8f426fc29))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer "F.CrtYd") (width 0.05) (tstamp ab963d12-0fa4-4db5-945e-8454302bc777))
+    (fp_line (start -0.525 -0.27) (end 0.525 -0.27) (layer "F.Fab") (width 0.1) (tstamp 389c94e5-6f26-4b76-b762-9d1f8396539f))
+    (fp_line (start -0.525 0.27) (end -0.525 -0.27) (layer "F.Fab") (width 0.1) (tstamp 59d2222f-55f3-44a5-a982-23f9e92d9b3b))
+    (fp_line (start 0.525 -0.27) (end 0.525 0.27) (layer "F.Fab") (width 0.1) (tstamp d7156634-9921-4628-a3a5-c88b1e7e42c8))
+    (fp_line (start 0.525 0.27) (end -0.525 0.27) (layer "F.Fab") (width 0.1) (tstamp efbcde6f-a6d5-4425-ac04-75b7c14f1a5d))
+    (pad "1" smd roundrect (at -0.51 0) (size 0.54 0.64) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 92 "Net-(R9-Pad1)") (pintype "passive") (tstamp b0e653da-30c4-440d-af83-0dc3a48075c0))
+    (pad "2" smd roundrect (at 0.51 0) (size 0.54 0.64) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 29 "/RP2040/DM") (pintype "passive") (tstamp 50428e5c-0da8-40a2-89c3-e60db0d2ba1b))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Package_TO_SOT_SMD:SOT-353_SC-70-5" (layer "F.Cu")
     (tedit 5A02FF57) (tstamp 5c96952f-f415-4ab4-a3ec-ca4dbc811c03)
     (at 130 69.35)
@@ -431,6 +792,48 @@
     )
   )
 
+  (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 5fcf5baa-c51d-4212-a475-7f442ae48bef)
+    (at 186.13 61.81)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "flash.kicad_sch")
+    (property "Sheetname" "Flash")
+    (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/e2cbb072-17a3-4911-84f4-b240cb3e4dda")
+    (attr smd)
+    (fp_text reference "R3" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2c1c4228-3c5c-4279-ae85-a29191254dd9)
+    )
+    (fp_text value "10k" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d6df53d6-75e2-4f5f-93ba-bd886055ff0b)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 898a0578-7c02-4c13-be81-6127f6d04820)
+    )
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer "F.SilkS") (width 0.12) (tstamp 3877868e-be21-4d7b-8995-42316d43daa1))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer "F.SilkS") (width 0.12) (tstamp c1d0f791-66cf-4ff6-9f3e-4e0de64eb88d))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 0fe91d81-7e0a-475f-be5d-1cf5d7c7cfd9))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 30a29d3f-f118-4efd-a0ff-9bd337d2b936))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 39bd5485-ee70-4286-85ec-d827f52b9845))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp bb9b63cd-861e-421a-844f-3afd99b396df))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp 1d5c2293-9763-44c8-aaa1-c9ce0d85ea43))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp 1db55c0b-d72b-4cd9-8991-7ab118b9a7ac))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp 5d2bebb7-9632-4d40-a14f-3b065a43ad35))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp eab630d5-9507-4c87-b8a9-430c86b7e52e))
+    (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 1 "+3V3") (pintype "passive") (tstamp 5ab3d8b9-84c9-4358-a3bb-a714e5563a92))
+    (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 13 "/Flash/SPI_~{CS}_ICE") (pintype "passive") (tstamp 59ef2de3-bba7-41b6-b31b-622280aa5356))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Package_TO_SOT_SMD:TSOT-23-5" (layer "F.Cu")
     (tedit 5F6F97DB) (tstamp 601c07da-fe4e-425e-8a3f-16aa608b91ca)
     (at 125.3 74.1)
@@ -564,17 +967,17 @@
     (fp_line (start -0.65 -0.53) (end -0.33 -0.85) (layer "F.Fab") (width 0.1) (tstamp b377c8b7-085f-4dd0-a182-1c798efb2e43))
     (fp_line (start -0.65 -0.53) (end -0.65 0.85) (layer "F.Fab") (width 0.1) (tstamp b6d96ae2-1d3d-431e-916e-f9fc61e7a94b))
     (pad "1" smd rect (at -0.85 -0.5375) (size 0.5 0.375) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 92 "Net-(J1-PadA6)") (pinfunction "I/O1") (pintype "passive") (tstamp 81f74954-47a2-4f9c-a01a-4e4f74471e60))
+      (net 96 "/USB connector/D+") (pinfunction "I/O1") (pintype "passive") (tstamp 81f74954-47a2-4f9c-a01a-4e4f74471e60))
     (pad "2" smd rect (at -0.925 0) (size 0.65 0.3) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 56f2ba7f-4ec0-4e07-a68b-60147959a4af))
     (pad "3" smd rect (at -0.85 0.5375) (size 0.5 0.375) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 93 "Net-(J1-PadA7)") (pinfunction "I/O2") (pintype "passive") (tstamp fbfcc375-5a24-4a81-8dd7-30f2fcd57734))
+      (net 97 "/USB connector/D-") (pinfunction "I/O2") (pintype "passive") (tstamp fbfcc375-5a24-4a81-8dd7-30f2fcd57734))
     (pad "4" smd rect (at 0.85 0.5375) (size 0.5 0.375) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 94 "Net-(R9-Pad1)") (pinfunction "I/O2") (pintype "passive") (tstamp 296e1c26-4622-47e0-bf68-7268f1bdeff2))
+      (net 92 "Net-(R9-Pad1)") (pinfunction "I/O2") (pintype "passive") (tstamp 296e1c26-4622-47e0-bf68-7268f1bdeff2))
     (pad "5" smd rect (at 0.925 0) (size 0.65 0.3) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 43 "VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 31bfff8c-1cb9-4447-8310-2162c455b1e9))
     (pad "6" smd rect (at 0.85 -0.5375) (size 0.5 0.375) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 95 "Net-(R8-Pad1)") (pinfunction "I/O1") (pintype "passive") (tstamp 9771cf2b-6be2-47aa-b9c2-0cfb53699eb1))
+      (net 103 "Net-(R10-Pad1)") (pinfunction "I/O1") (pintype "passive") (tstamp 9771cf2b-6be2-47aa-b9c2-0cfb53699eb1))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-666.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -582,6 +985,307 @@
     )
   )
 
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 7c335c29-8ed5-4461-8442-0d9333c74e59)
+    (at 159.09 84.14)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/7098eef9-b906-4263-8a5f-deaeec7dec60")
+    (attr smd)
+    (fp_text reference "C8" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e684b63e-a174-40a5-9332-240e6ab124b8)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 87975508-0548-4e61-be17-81ea87bbf6b8)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 6a58e2f0-6059-423e-9c26-71e5e3664536)
+    )
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 07fac89b-a30a-4d55-8290-613666c4f4bb))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 47a39e03-0656-4a3c-bc86-7975e797e6f5))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 3affdf73-4691-4347-a1a9-116f021334cd))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 5b9998b9-e010-4f38-88ee-cb8f8feccd13))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 7649df4f-c237-4e14-a858-b1ec83a14aaf))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp e91f2117-c924-4ddc-bbf3-e9f8257ea944))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 121456fd-6260-4c9b-8ff4-50363d8d6a85))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 2e539ef2-0282-4496-9eda-5238c5e84910))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 36a1c802-31d3-4b74-86be-c7def0a2d104))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp f5406c18-39ec-4090-87c4-e9a23954f540))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 9 "+1V2") (pintype "passive") (tstamp 1d6e9026-58f5-457d-9b6c-7120b2ab9f29))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp bc8fe1ce-4f58-4a37-b096-1776866dc9da))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Fuse:Fuse_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEF1) (tstamp 7f42b767-4ffa-4073-a4db-ae9c1b21f313)
+    (at 168.1125 69)
+    (descr "Fuse SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "fuse")
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/4562c012-dae0-44b0-9d83-a6687d1171f6")
+    (attr smd)
+    (fp_text reference "F1" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp cc9c0948-77cd-43a3-a251-610bcda641c5)
+    )
+    (fp_text value "1~1.5A" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 424b7143-4a81-42d1-ae4a-5bb384d1480f)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 3b33823d-d118-4028-b88e-c00c06eaffe7)
+    )
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 14770f29-3334-4b80-bc70-19e4bdf7b9bd))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer "F.SilkS") (width 0.12) (tstamp 40bb0d3c-1cbe-4be2-b669-2927bab4cfa0))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 052a6442-504e-4f6d-88cd-466afaceee35))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 5d7d49fa-294d-4a92-aa4e-88a081d4cd8f))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 9da7edc3-eaa3-4dd0-a797-0aca458aa290))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp c5fc3a90-0dc8-47a2-a8d1-18b8eccb2874))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 703a7cbc-f42c-4be6-ad43-a0d8ea620dc0))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 8c1be597-9859-4f57-a264-67e15af2eb99))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 90935a32-6b34-41ab-9589-f6cc968181ad))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp b99224c9-a229-44e0-a4a4-dc5deb654bbf))
+    (pad "1" smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 98 "/USB connector/VUSB") (pintype "passive") (tstamp 19c8ca41-accc-4fd6-8fbb-7e8f55822d5c))
+    (pad "2" smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 43 "VBUS") (pintype "passive") (tstamp cdd7b216-0ed4-4bc0-b4c7-730b33510ce3))
+    (model "${KICAD6_3DMODEL_DIR}/Fuse.3dshapes/Fuse_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 945ff9b0-374e-4573-8811-becfa14830fa)
+    (at 163.44 78.08)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/3f552ef1-a7a7-418f-8e31-6d6e7c7bd956")
+    (attr smd)
+    (fp_text reference "C7" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp f14b67d3-987e-4179-bfac-a452962d8578)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 61b9c6d3-eb0e-45ce-9d71-329223f4a823)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 02d790ae-36a1-423d-9825-d435ae13e631)
+    )
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 19d80137-9a9d-48ff-85b9-bc7ad9e1b981))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp d546a188-c11f-4e08-bcec-a47ef39a1e25))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 20f03ebd-cc2a-47cb-be02-be9dd59fd3a7))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp dd5816c5-b9ec-48ea-958f-188427f31d89))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp e5462593-ad7b-4a9c-87ac-14f52e3778ee))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp f3d83f9b-2a84-42ea-b288-6ef2fa90a1f8))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 1270c804-5676-422b-bf9f-54f6a04701b6))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 38ca7823-0637-4e02-8930-6ff2559e403f))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 9c679d51-18f8-4dc6-b4f8-577a341a84a6))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp a6c72dfb-3316-44d2-be1e-76e9ea71a27e))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 7 "+1V8") (pintype "passive") (tstamp d14eaec8-2764-46c5-9798-8fd752479905))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 0e0fc692-b533-4075-acf6-1af137b06d60))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 98bb170c-290b-41ad-80f7-9a9dc440f9c3)
+    (at 190.14 59.3)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "flash.kicad_sch")
+    (property "Sheetname" "Flash")
+    (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/fb7fd1b4-d207-4de5-bfe3-443ad90b042c")
+    (attr smd)
+    (fp_text reference "C11" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 61ff47c4-017f-4b3f-8776-673634348a7d)
+    )
+    (fp_text value "100nF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b48c7b4f-5216-4289-880e-f029fce583e8)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp e10d209a-fd3e-4103-b1f9-5b3a097235d9)
+    )
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 024c95c5-36fd-47f2-bb91-740a0df425a4))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 1568397d-bd8e-4a7a-bef4-019061900d16))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 1801ca18-f49e-4bbd-bf99-97f252a8c8c2))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 6e39a3fe-2c5d-4a27-9961-3fa5935d561c))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp ce422113-8cdf-4773-bc91-c9902ed4760a))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp ec3d969c-710f-44c5-9527-0900bdc303ca))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 27d5f6e2-ce3f-42ae-8464-b6600bd2764b))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 55b0f868-a9d7-4dec-862d-f3ec22194f12))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 93c2c398-066e-4fd9-beee-4f84b949d63b))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp ed79b106-92c0-426d-888b-7ff981be0412))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 2c232a22-1393-45ab-a92f-d00a9d1e73f8))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 1 "+3V3") (pintype "passive") (tstamp ec6810c0-b168-4e1a-855b-0d66960938c9))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 9cc64dcb-0ef7-4dae-bdc5-9c17a9f3ba97)
+    (at 186.13 59.3)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "flash.kicad_sch")
+    (property "Sheetname" "Flash")
+    (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/7555ce15-c819-44a7-ad89-f48d70a77d41")
+    (attr smd)
+    (fp_text reference "C10" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b0356376-8075-40a0-9895-23f9cfaf59c5)
+    )
+    (fp_text value "100nF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp a239ea3d-4651-4768-9b8a-f5afda30fb51)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp c160c59e-6b1a-4bf1-9ed4-d456ffc636ce)
+    )
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 00d20f8d-9b66-4d16-9907-c8b051b235ae))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp cf8ee21e-e48a-4341-9231-1018877b5979))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 3222d6ae-7036-482d-a26d-b6947f7069c0))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 69f8c79a-d0a2-4d3f-8dc3-a38b57429969))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 72c76a77-9d08-47ed-8435-6fad11225888))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp e5c5014c-8ff5-4986-8fbc-edbd674e5bcd))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 4c85e611-00d3-42a6-bee6-1651880b2321))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 93a09806-727a-4711-98a0-9c58207fa3bf))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp ae27600f-d8e8-48b8-b085-1742e295f199))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp b870f825-e19c-4b74-9da8-667384948b01))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 531b3218-5541-4663-9f9e-97b9cc145714))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 1 "+3V3") (pintype "passive") (tstamp 4a12ead1-7fab-4aed-8262-06ddc5240200))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp 9fc65baf-14e5-4f0f-b246-40e4345d2df8)
+    (at 167.11 80.59)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/a9f9846d-30d6-4036-8909-7ba0c56f281b")
+    (attr smd)
+    (fp_text reference "C5" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 67734fe0-c929-4b73-b290-d63ee0fd4422)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 21bac3cf-bc10-4b2d-ad48-ababe2c9493d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp ad8fe7a8-aed1-4303-8ff8-f72b44b991ef)
+    )
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 83f5b5fa-edfd-4dff-a3f6-f58273f95d5a))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp bd6cd858-3613-4aa2-aeac-6a516a0e3f80))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 268f22b2-a7ed-4f95-a276-fe982142e58f))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp bb719564-357c-4e5f-906a-2360d3ff199f))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp e6c6a8dd-f168-4cee-89ec-ac5765acfb2f))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp f2647035-8350-4f67-92c4-368fc9332d04))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 28aedc3e-74e8-4881-b85f-4176e2e6d18b))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 68aacba7-2230-4e60-b003-089fd8c7078c))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp cd30ded3-2a75-4d7c-a168-0883faad7ee4))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp f800da34-bb67-4fb5-9b76-bd8f00d36dbf))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 46 "/Power supplies/3V3PROTO") (pintype "passive") (tstamp 05c99415-32b4-43e3-ad5f-6c0cfdb371f4))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 594155b9-2437-489c-9e73-fd7e2a113fe6))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "iCE2040:CONN-USB-A-PCB-TRACES" (layer "F.Cu")
+    (tedit 585ED739) (tstamp a5b902fd-8c24-4e76-b629-1da007790f3f)
+    (at 159.59532 70.56532)
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (property "exclude_from_bom" "")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/db8c2adc-7eb5-426c-824d-53c00f8b3078")
+    (attr exclude_from_pos_files exclude_from_bom)
+    (fp_text reference "J2" (at 0.13 -7.85) (layer "F.SilkS") hide
+      (effects (font (size 1.5 1.5) (thickness 0.15)))
+      (tstamp 2977217e-1ed5-4d7f-8ac2-9a21f1872674)
+    )
+    (fp_text value "USB_A" (at 0.29 -10.13) (layer "F.Fab") hide
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+      (tstamp cb7e73f1-26ea-4366-ba0e-d44f72d8fc06)
+    )
+    (fp_text user "${REFERENCE}" (at 4.75 -13) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 33873909-578f-4091-8e11-01f18f1b236b)
+    )
+    (fp_text user "${REFERENCE}" (at 0 -6.25) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp f56451d0-5e6a-4f23-ba0f-c06c03390c27)
+    )
+    (fp_line (start -6 -12) (end -5 -12) (layer "F.Fab") (width 0.04064) (tstamp 0ad5afa5-a90d-441d-adb3-89476398e719))
+    (fp_line (start -4.5 -12) (end -4 -12) (layer "F.Fab") (width 0.04064) (tstamp 20d79d2e-a963-44e8-8bf0-52ef9cdcfbbb))
+    (fp_line (start 4.5 -12) (end 5 -12) (layer "F.Fab") (width 0.04064) (tstamp 241e4975-c6e1-4d39-b79b-ff8790c6b695))
+    (fp_line (start 6 -12) (end 6 0) (layer "F.Fab") (width 0.04064) (tstamp 3ba4476a-eba9-4525-b5b8-5ca68221d77b))
+    (fp_line (start 2.5 -12) (end 3 -12) (layer "F.Fab") (width 0.04064) (tstamp 40aa9a5a-5d91-4614-bd83-22226697433b))
+    (fp_line (start 6 0) (end -6 0) (layer "F.Fab") (width 0.04064) (tstamp 5434bc1b-cc3d-44f7-96ce-4f8ca2d9b9d8))
+    (fp_line (start 5.5 -12) (end 6 -12) (layer "F.Fab") (width 0.04064) (tstamp 5bcf9d2c-6258-4c6e-9fdf-4e52203e07f9))
+    (fp_line (start -6 0) (end -6 -12) (layer "F.Fab") (width 0.04064) (tstamp 609588b3-3ec9-4911-a4e4-1b93f631cced))
+    (fp_line (start 1.5 -12) (end 2 -12) (layer "F.Fab") (width 0.04064) (tstamp 809d9760-1679-49aa-8cd7-9276ceb7f887))
+    (fp_line (start 3.5 -12) (end 4 -12) (layer "F.Fab") (width 0.04064) (tstamp 86f59085-0c75-4adb-8171-29f463654536))
+    (fp_line (start -0.5 -12) (end 0 -12) (layer "F.Fab") (width 0.04064) (tstamp b5ec0da5-fbc1-4ca6-ba4c-232fd6b70495))
+    (fp_line (start -2.5 -12) (end -2 -12) (layer "F.Fab") (width 0.04064) (tstamp bc9e68cb-14fd-49a3-b6bf-7fb3285ccf3b))
+    (fp_line (start -3.5 -12) (end -3 -12) (layer "F.Fab") (width 0.04064) (tstamp cb996090-ba88-462c-8399-e3430de05268))
+    (fp_line (start -1.5 -12) (end -1 -12) (layer "F.Fab") (width 0.04064) (tstamp ce14233a-96cb-4711-8f65-855f70f270d8))
+    (fp_line (start 0.5 -12) (end 1 -12) (layer "F.Fab") (width 0.04064) (tstamp e5e52520-a2b3-4fbe-87bf-8038ffc7d1b0))
+    (pad "1" connect rect locked (at 3.81 -4.9) (size 1.9 8) (layers "F.Cu" "F.Mask")
+      (net 98 "/USB connector/VUSB") (pinfunction "VBUS") (pintype "power_in") (tstamp 92703ec5-3dfc-455f-b12e-64f14735a50c))
+    (pad "2" connect rect locked (at 1.3 -5.15) (size 2 7.5) (layers "F.Cu" "F.Mask")
+      (net 97 "/USB connector/D-") (pinfunction "D-") (pintype "bidirectional") (tstamp a5390844-0d58-4b5e-9e4f-be83462f5b72))
+    (pad "3" connect rect locked (at -1.3 -5.15) (size 2 7.5) (layers "F.Cu" "F.Mask")
+      (net 96 "/USB connector/D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 7a78a7c2-4712-4eb9-bdbf-e093dab0dd3f))
+    (pad "4" connect rect locked (at -3.81 -4.9) (size 1.9 8) (layers "F.Cu" "F.Mask")
+      (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp bab74189-0802-4f51-ac1b-f29d10a9afed))
+  )
+
   (footprint "Package_SON:WSON-8-1EP_6x5mm_P1.27mm_EP3.4x4.3mm" (layer "F.Cu")
     (tedit 5DC5FB10) (tstamp ac5963eb-b810-44a0-af12-1c7b4318f1f7)
     (at 127.4 106.3 90)
@@ -623,7 +1327,7 @@
     (pad "2" smd roundrect (at -2.7 -0.635 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 11 "/Flash/SPI_ICE_SD1") (pinfunction "DO(IO1)") (pintype "bidirectional") (tstamp 80eee943-5707-4e9b-9c4b-1c7426aff443))
     (pad "3" smd roundrect (at -2.7 0.635 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 96 "/Flash/SPI_RP_SD2") (pinfunction "IO2") (pintype "bidirectional") (tstamp 63077a98-4ad3-4140-a4fe-5bda33ffad89))
+      (net 93 "/Flash/SPI_RP_SD2") (pinfunction "IO2") (pintype "bidirectional") (tstamp 63077a98-4ad3-4140-a4fe-5bda33ffad89))
     (pad "4" smd roundrect (at -2.7 1.905 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp fd714867-5417-478f-ba1c-9ed25c8df858))
     (pad "5" smd roundrect (at 2.7 1.905 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -631,7 +1335,7 @@
     (pad "6" smd roundrect (at 2.7 0.635 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 12 "/Flash/SPI_CLK_ICE") (pinfunction "CLK") (pintype "input") (tstamp dd18475f-7e0a-4a34-b115-e27e8173073c))
     (pad "7" smd roundrect (at 2.7 -0.635 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 97 "/Flash/SPI_RP_SD3") (pinfunction "IO3") (pintype "bidirectional") (tstamp 2b03db0e-6d00-4122-8e01-e42f8914f5d3))
+      (net 94 "/Flash/SPI_RP_SD3") (pinfunction "IO3") (pintype "bidirectional") (tstamp 2b03db0e-6d00-4122-8e01-e42f8914f5d3))
     (pad "8" smd roundrect (at 2.7 -1.905 90) (size 0.75 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 1 "+3V3") (pinfunction "VCC") (pintype "power_in") (tstamp 522d2f19-e78e-47d6-9a67-742d185f2d7f))
     (pad "9" smd rect (at 0 0 90) (size 3.4 4.3) (layers "F.Cu" "F.Mask")
@@ -643,6 +1347,90 @@
     )
   )
 
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp b032c6f6-0f7b-4d23-ab64-32c3e708467f)
+    (at 155.08 84.14)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/340e6a21-0a15-40a6-8e7c-2fde4ad0b6b7")
+    (attr smd)
+    (fp_text reference "C9" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp dfcf23dc-2d94-4bfc-a639-0f68c4485d28)
+    )
+    (fp_text value "1u" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 875bc656-7d01-4fb8-9f00-5eb769113d4b)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp cccae7b5-1b8d-43a5-bcf6-8051475a06f8)
+    )
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp dd01a38a-8200-4ee8-9143-0e2cae790016))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp e26d443c-67fc-4dca-87eb-72a4dc985315))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 37eb8425-c453-4063-bf55-08cd4bea8ffb))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 6fde2a1f-c4d6-4978-8453-e98002c444a8))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 86b00a69-3fde-44d9-82bb-74a06b992354))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp e49ce151-25cd-4951-8cf2-33ea39937aef))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 22e23734-0bdf-4b0c-87a2-9d84c5b58e81))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 4b7f49ef-5f09-4267-8a02-386fefa3b4e4))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp d3be2a5d-7e77-4a8d-ad44-c83d80728b91))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp fb72e615-7ff6-420e-81af-d60367895c4e))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 95 "/Power supplies/V33GOOD") (pintype "passive") (tstamp a0fbe4f8-d61f-4bf9-81cb-472d77e9d52b))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp 5de50541-2a3e-419b-805c-7b460d6380c3))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp b32c73ae-6abb-4690-a28a-d4cbc17be081)
+    (at 179.425 55.9175)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor")
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/8cf2c0bd-7fd6-4a5d-8a4f-33e3fe13e5ea")
+    (attr smd)
+    (fp_text reference "R8" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 46090f34-7388-47aa-b18a-ef94efce368a)
+    )
+    (fp_text value "5.1k" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 3d50fd70-2480-4f7c-872f-f6d82f25a601)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp aa01b68c-ffbe-4d61-ba86-9aabc7d73eba)
+    )
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer "F.SilkS") (width 0.12) (tstamp e63def0b-8fc8-4621-ae78-843774aa0a4f))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer "F.SilkS") (width 0.12) (tstamp e79bf2db-002e-46f5-98d2-d2e58026aa4c))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 331afd9b-ed1d-413f-b9f5-51b9bbe7abaf))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 5d94db85-a325-4d6c-83a8-b802e1159db5))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 9091de3c-c131-47a4-bd09-d93a1a261ab7))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp bcd98001-4a10-4301-9cbe-0d2234f8ca7d))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp 576a6a49-6394-4b7d-9feb-d17bc5061f23))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp 7caf952f-2a17-4443-b048-64d173f3dcb9))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp 8c24a2be-5110-4e0d-b119-39148bc66b1c))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp de5c324e-2957-4345-8803-dda84160f1e7))
+    (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 101 "/USB connector/CC2") (pintype "passive") (tstamp 3b804ab2-2659-4fc0-bcd7-a4607655ac93))
+    (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp a6078358-acb6-4b55-a012-1ed5ed394e52))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "MCU_RaspberryPi_and_Boards:RP2040-QFN-56" (layer "F.Cu")
     (tedit 5EF32B43) (tstamp cab6c21e-9cab-4808-bbbf-bed033e20b25)
     (at 115 94.3 45)
@@ -785,13 +1573,13 @@
     (pad "50" smd roundrect locked (at -0.2 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 58 "/RP2040/DVDD") (pinfunction "DVDD") (pintype "power_in") (tstamp f4219293-6352-44af-beba-6f1c20db6529))
     (pad "51" smd roundrect locked (at -0.6 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 97 "/Flash/SPI_RP_SD3") (pinfunction "QSPI_SD3") (pintype "bidirectional") (tstamp f6791e5d-6c6f-4164-a0f2-41888a6224cd))
+      (net 94 "/Flash/SPI_RP_SD3") (pinfunction "QSPI_SD3") (pintype "bidirectional") (tstamp f6791e5d-6c6f-4164-a0f2-41888a6224cd))
     (pad "52" smd roundrect locked (at -1 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 12 "/Flash/SPI_CLK_ICE") (pinfunction "QSPI_SCLK") (pintype "output") (tstamp f7dbc0e1-9ed8-458d-8206-a2f513446c1d))
     (pad "53" smd roundrect locked (at -1.4 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 14 "/Flash/SPI_ICE_SD0") (pinfunction "QSPI_SD0") (pintype "bidirectional") (tstamp dbc4557c-71c3-4567-aba9-5a2f063fcf27))
     (pad "54" smd roundrect locked (at -1.8 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 96 "/Flash/SPI_RP_SD2") (pinfunction "QSPI_SD2") (pintype "bidirectional") (tstamp b4e0a1cc-fb17-4179-9d24-9403775b4e1d))
+      (net 93 "/Flash/SPI_RP_SD2") (pinfunction "QSPI_SD2") (pintype "bidirectional") (tstamp b4e0a1cc-fb17-4179-9d24-9403775b4e1d))
     (pad "55" smd roundrect locked (at -2.2 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 11 "/Flash/SPI_ICE_SD1") (pinfunction "QSPI_SD1") (pintype "bidirectional") (tstamp 134866ac-b20f-48e3-937c-8ee70d02c457))
     (pad "56" smd roundrect locked (at -2.6 -3.4375 45) (size 0.2 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -823,6 +1611,230 @@
     )
   )
 
+  (footprint "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (layer "F.Cu")
+    (tedit 5B391E66) (tstamp d25f27be-6785-4ce7-91e6-9638c924b566)
+    (at 155.25 78.6)
+    (descr "SMD Solder Jumper, 1x1.5mm, rounded Pads, 0.3mm gap, open")
+    (tags "solder jumper open")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/2c766f7e-432d-4286-9852-ddb2dcf89f08")
+    (attr exclude_from_pos_files)
+    (fp_text reference "JP1" (at 0 -1.8) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0546e4bd-a827-4f21-b255-8fd00531a8cf)
+    )
+    (fp_text value "SolderJumper_2_Open" (at 0 1.9) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 4f6b5622-4b86-45c8-a091-3f537d17ca8a)
+    )
+    (fp_line (start -1.4 0.3) (end -1.4 -0.3) (layer "F.SilkS") (width 0.12) (tstamp 06d569bb-22c3-40ff-87ad-fd53e8906dd5))
+    (fp_line (start 0.7 1) (end -0.7 1) (layer "F.SilkS") (width 0.12) (tstamp 47427045-a003-4b68-93fc-3484c24e5d3a))
+    (fp_line (start 1.4 -0.3) (end 1.4 0.3) (layer "F.SilkS") (width 0.12) (tstamp 57002fff-36fc-4c83-bdb8-a0bd871d0110))
+    (fp_line (start -0.7 -1) (end 0.7 -1) (layer "F.SilkS") (width 0.12) (tstamp 7dd1b621-bf6b-4899-a915-5a87b3dbeb88))
+    (fp_arc (start -0.7 1) (mid -1.194975 0.794975) (end -1.4 0.3) (layer "F.SilkS") (width 0.12) (tstamp 2965c5c6-5723-4cb7-b93c-277886839830))
+    (fp_arc (start -1.4 -0.3) (mid -1.194975 -0.794975) (end -0.7 -1) (layer "F.SilkS") (width 0.12) (tstamp 75a5a3b2-7ad3-4087-a050-320a39bbfaca))
+    (fp_arc (start 1.4 0.3) (mid 1.194975 0.794975) (end 0.7 1) (layer "F.SilkS") (width 0.12) (tstamp 7869467d-fe0e-438f-8b70-f8f5d61c85bb))
+    (fp_arc (start 0.7 -1) (mid 1.194975 -0.794975) (end 1.4 -0.3) (layer "F.SilkS") (width 0.12) (tstamp b8baa11c-d1e2-4cdd-a1b0-d741ee17c041))
+    (fp_line (start 1.65 1.25) (end -1.65 1.25) (layer "F.CrtYd") (width 0.05) (tstamp 73352381-348d-42f7-ac31-3dba9fb4aaa0))
+    (fp_line (start 1.65 1.25) (end 1.65 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 82c827ff-00f0-4697-8104-259fc508ddd9))
+    (fp_line (start -1.65 -1.25) (end -1.65 1.25) (layer "F.CrtYd") (width 0.05) (tstamp bfeef5db-0354-4a4f-ad69-5e40004e582b))
+    (fp_line (start -1.65 -1.25) (end 1.65 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp d711a4fa-7c4b-444c-bf57-e4fddcde1497))
+    (pad "1" smd custom (at -0.65 0) (size 1 0.5) (layers "F.Cu" "F.Mask")
+      (net 46 "/Power supplies/3V3PROTO") (pinfunction "A") (pintype "passive") (zone_connect 2)
+      (options (clearance outline) (anchor rect))
+      (primitives
+        (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0) (fill yes))
+        (gr_circle (center 0 -0.25) (end 0.5 -0.25) (width 0) (fill yes))
+        (gr_poly (pts
+            (xy 0.5 0.75)
+            (xy 0 0.75)
+            (xy 0 -0.75)
+            (xy 0.5 -0.75)
+          ) (width 0) (fill yes))
+      ) (tstamp 9302c6a6-b26a-40ac-a41d-ac68fbae5d36))
+    (pad "2" smd custom (at 0.65 0) (size 1 0.5) (layers "F.Cu" "F.Mask")
+      (net 5 "+2V5") (pinfunction "B") (pintype "passive") (zone_connect 2)
+      (options (clearance outline) (anchor rect))
+      (primitives
+        (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0) (fill yes))
+        (gr_circle (center 0 -0.25) (end 0.5 -0.25) (width 0) (fill yes))
+        (gr_poly (pts
+            (xy 0 0.75)
+            (xy -0.5 0.75)
+            (xy -0.5 -0.75)
+            (xy 0 -0.75)
+          ) (width 0) (fill yes))
+      ) (tstamp 6b876131-7514-434e-91bc-c69d80d6e0ca))
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp d7435114-6ba4-4251-a3dc-48f4b3b796f3)
+    (at 163.1 83.1)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/85f7defa-fdc3-410b-b0e9-8a6708953006")
+    (attr smd)
+    (fp_text reference "C1" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 361ef3a5-d4a8-4e84-8b7f-a0b57a7d1857)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b38080d3-3229-4e0f-a01b-7aaf3fcd287c)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 22183572-9c3f-48fc-ad6d-448144a08e2c)
+    )
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp 1ccc6683-8198-473c-8176-d0d0297bc85c))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 92bddb6b-3495-418d-abed-cbb0aa064695))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp 7fea73b9-f744-4475-9400-5fb94329070d))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 9dddb2b5-5f65-4870-aa8a-e43588c50ac1))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp c8556768-a241-45d0-9d15-c924f33b1295))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp db08d784-1ace-4eef-a319-c999a10a6184))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 9c49c55d-b103-48aa-b828-3a855c434669))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 9c714278-461d-4bbb-86b4-99f6454394d3))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp be91ed9e-5ef4-4a5a-93a4-8e8f197cf378))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp fbd0fa53-59cf-4925-87cb-5ad0ed34ea84))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 43 "VBUS") (pintype "passive") (tstamp a90328fb-a101-48ed-98bc-5187d4e73989))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp db237861-6508-40a9-95c6-26aa1588f72a))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "iCE2040:TYPE-C-31-M-12" (layer "F.Cu")
+    (tedit 6228878E) (tstamp d94bd9ca-982e-404d-8e4c-05ad25e7a272)
+    (at 172.1 60.9875)
+    (descr "Korean Hroparts Elec, Power only USB connector supporting up to 3A")
+    (property "Sheetfile" "usbconn.kicad_sch")
+    (property "Sheetname" "USB connector")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/e73745fe-0a73-4277-b362-d81fe5c7482d")
+    (attr smd)
+    (fp_text reference "J1" (at 0 -2.15 -180) (layer "F.SilkS")
+      (effects (font (size 0.8 0.8) (thickness 0.1)))
+      (tstamp cb0c4b11-3985-4c61-aeaa-7134f3f06e01)
+    )
+    (fp_text value "USB_C_Receptacle_USB2.0" (at 0.025 -7.9 -180) (layer "F.Fab")
+      (effects (font (size 0.8 0.8) (thickness 0.1)))
+      (tstamp a526da42-2198-406b-b71e-c1a760fd88c6)
+    )
+    (fp_line (start 4.2 1.5) (end -4.2 1.5) (layer "F.SilkS") (width 0.1) (tstamp 926674a4-3ad5-43b2-80df-5c750b1d1fe9))
+    (fp_line (start 4.4 2.6) (end -4.4 2.6) (layer "F.SilkS") (width 0.1) (tstamp 972bb22b-fac8-45f4-9446-5109f91e0126))
+    (fp_line (start 0 -4.02) (end 0 2.3) (layer "F.SilkS") (width 0.02) (tstamp 98b5b922-8f25-44a9-8c85-c5b06a86066c))
+    (fp_line (start -4.4 -4.5) (end 4.4 -4.5) (layer "F.SilkS") (width 0.1) (tstamp bddd3237-0261-41f3-8f68-8063db9242eb))
+    (fp_line (start -4.4 -4.5) (end -4.4 2.6) (layer "F.SilkS") (width 0.1) (tstamp c29c3e9d-fa5f-4674-8a7a-4536129f8149))
+    (fp_line (start 4.4 -4.5) (end 4.4 2.6) (layer "F.SilkS") (width 0.1) (tstamp d94c5e50-52fd-4d0d-af1c-42db07b37e8d))
+    (fp_line (start 2.9 -3.65) (end 2.9 0) (layer "Dwgs.User") (width 0.02) (tstamp 13376b3f-a349-4b3a-a6a4-01377fc39f0c))
+    (fp_line (start -3.25 -4.37) (end -3.25 0) (layer "Dwgs.User") (width 0.02) (tstamp 26d383f5-46f1-4714-bb08-175faaf9ac29))
+    (fp_line (start 2.45 -4.37) (end 2.45 0) (layer "Dwgs.User") (width 0.02) (tstamp 4ef5f0b9-1ff6-45bb-bd09-318a18cb83e1))
+    (fp_line (start 0.25 -4.37) (end 0.25 -1) (layer "Dwgs.User") (width 0.02) (tstamp 57c1276c-c88b-4abf-bc5c-ed3d70d7eef3))
+    (fp_line (start -2.45 -4.37) (end -2.45 0) (layer "Dwgs.User") (width 0.02) (tstamp 597e3e7d-1f73-48b5-adb9-1d6512276055))
+    (fp_line (start -0.75 -0.5) (end 0.75 -0.5) (layer "Dwgs.User") (width 0.02) (tstamp 5ab2aa29-1ded-40f5-9db7-e38457f80d1a))
+    (fp_line (start 3.25 -4.37) (end 3.25 0) (layer "Dwgs.User") (width 0.02) (tstamp 5c993c30-9e1e-449b-934e-b21941d01ea2))
+    (fp_line (start -2.45 0) (end 2.45 0) (layer "Dwgs.User") (width 0.02) (tstamp 6776aea4-d974-4a31-8d5d-374cd37dfcbc))
+    (fp_line (start -3.25 1) (end 3.25 1) (layer "Dwgs.User") (width 0.02) (tstamp 73a8ec2f-6545-4034-a5ab-6f2db8f31fb0))
+    (fp_line (start -2.9 -3.65) (end -2.9 0) (layer "Dwgs.User") (width 0.02) (tstamp a0823cdb-bfbd-41d7-9c11-a085e99fcbef))
+    (fp_line (start -0.75 -4.37) (end -0.75 -0.5) (layer "Dwgs.User") (width 0.02) (tstamp a8a04ce2-fcee-42ac-9d68-78602a087a0e))
+    (fp_line (start -0.25 -1) (end 0.25 -1) (layer "Dwgs.User") (width 0.02) (tstamp ada66973-f1d5-40ca-90d5-740f4805a04a))
+    (fp_line (start 0.75 -4.37) (end 0.75 -0.5) (layer "Dwgs.User") (width 0.02) (tstamp b4623a32-6466-499f-a3ed-ae18605db87b))
+    (fp_line (start -2.89 0.5) (end 2.89 0.5) (layer "Dwgs.User") (width 0.02) (tstamp d10d1cd6-dd1c-43d8-b4d1-2c2d437773b1))
+    (fp_line (start -0.25 -4.37) (end -0.25 -1) (layer "Dwgs.User") (width 0.02) (tstamp db08e5c4-27eb-44c7-811c-51650a754e84))
+    (pad "" np_thru_hole circle (at 2.9 -3.65) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask)
+      (solder_mask_margin 0.01) (solder_paste_margin 0.01) (clearance 0.01) (tstamp 268d11ab-fb2a-4b4c-b32e-f82f0ece0656))
+    (pad "" np_thru_hole circle (at -2.9 -3.65) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask)
+      (solder_mask_margin 0.01) (solder_paste_margin 0.01) (clearance 0.01) (tstamp ab100447-5fc7-4292-93c4-763a93676a45))
+    (pad "A1" smd rect (at -3.375 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 67d7c589-1a0f-49f7-8dea-8d5e93bcf8b8))
+    (pad "A4" smd rect (at -2.575 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 98 "/USB connector/VUSB") (pinfunction "VBUS") (pintype "passive") (tstamp b4557c7e-28b6-46c3-9cd1-07dd424cb628))
+    (pad "A5" smd rect (at -1.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 99 "/USB connector/CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp f764fdba-25ac-47fc-acfd-915ba68c6084))
+    (pad "A6" smd rect (at -0.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 96 "/USB connector/D+") (pinfunction "D+") (pintype "bidirectional") (tstamp c78476eb-d846-4637-a802-9095ee80e9c8))
+    (pad "A7" smd rect (at 0.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 97 "/USB connector/D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 0407273d-fd4f-4eac-978f-89f2e516b593))
+    (pad "A8" smd rect (at 1.25 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 100 "unconnected-(J1-PadA8)") (pinfunction "SBU1") (pintype "bidirectional") (tstamp 3a8962cf-e233-4fc6-a026-3780411255ce))
+    (pad "A9" smd rect (at 2.575 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 98 "/USB connector/VUSB") (pinfunction "VBUS") (pintype "passive") (tstamp be518963-670b-4170-ac1e-64af5f3b9039))
+    (pad "A12" smd rect (at 3.375 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp adaf565b-0756-4a91-9155-e2eef4831f05))
+    (pad "B1" smd rect (at 3.1 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 47bbfce0-7100-422f-9743-732242e6219b))
+    (pad "B4" smd rect (at 2.3 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 98 "/USB connector/VUSB") (pinfunction "VBUS") (pintype "passive") (tstamp 8379bb46-2db9-46ce-be9e-9003b567aa52))
+    (pad "B5" smd rect (at 1.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 101 "/USB connector/CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp c4942ee2-cc46-4713-b334-f92ccdb3e0c0))
+    (pad "B6" smd rect (at 0.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 96 "/USB connector/D+") (pinfunction "D+") (pintype "bidirectional") (tstamp df01c118-8658-450d-a5f3-bbfad1e2a4b1))
+    (pad "B7" smd rect (at -0.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 97 "/USB connector/D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 6ad46b35-0d60-46ee-a6ba-26c720054f2d))
+    (pad "B8" smd rect (at -1.75 -5.1) (size 0.25 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 102 "unconnected-(J1-PadB8)") (pinfunction "SBU2") (pintype "bidirectional") (tstamp b1f9ce3a-88a8-42fd-be37-5f84d2db0d20))
+    (pad "B9" smd rect (at -2.3 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 98 "/USB connector/VUSB") (pinfunction "VBUS") (pintype "passive") (tstamp 01af31fb-8031-49a7-967c-01e73454a130))
+    (pad "B12" smd rect (at -3.1 -5.1) (size 0.3 1.45) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 01966c41-da05-4873-8e3f-f1aae57fc232))
+    (pad "S1" thru_hole roundrect (at -4.32 -4.18) (size 1 2.2) (drill oval 0.6 1.7) (layers *.Cu *.Mask) (roundrect_rratio 0.5)
+      (net 2 "GND") (pinfunction "SHIELD") (pintype "passive") (tstamp 19705ef4-8b74-4db9-824d-8d3056429a86))
+    (pad "S1" thru_hole roundrect (at 4.32 0) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask) (roundrect_rratio 0.5)
+      (net 2 "GND") (pinfunction "SHIELD") (pintype "passive") (tstamp 53b5fad5-7cb2-4868-b35b-1092ccfecc33))
+    (pad "S1" thru_hole roundrect (at -4.32 0) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask) (roundrect_rratio 0.5)
+      (net 2 "GND") (pinfunction "SHIELD") (pintype "passive") (tstamp d0596ebe-34c1-4b0a-a81e-c78a8a3734e5))
+    (pad "S1" thru_hole roundrect (at 4.32 -4.18) (size 1 2.2) (drill oval 0.6 1.7) (layers *.Cu *.Mask) (roundrect_rratio 0.5)
+      (net 2 "GND") (pinfunction "SHIELD") (pintype "passive") (tstamp f92e1da6-9e0a-483a-8688-b91e9b47760b))
+  )
+
+  (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu")
+    (tedit 5F68FEEE) (tstamp e2e56b7f-44a2-486f-915f-f691d9528629)
+    (at 163.1 80.59)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor")
+    (property "Sheetfile" "psu.kicad_sch")
+    (property "Sheetname" "Power supplies")
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/752c1fc3-d745-4e29-90e8-baeb2406ca8a")
+    (attr smd)
+    (fp_text reference "C2" (at 0 -1.43) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6bbbb40a-23d5-49a9-bfe4-9063e0d22042)
+    )
+    (fp_text value "1uF" (at 0 1.43) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 628575ab-f538-4445-9377-129d225e5cc1)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp 7f9046f2-c57c-4564-aeda-1f2399cfc850)
+    )
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer "F.SilkS") (width 0.12) (tstamp 8dff93ee-0386-4e49-aaaa-8de13f6253a6))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer "F.SilkS") (width 0.12) (tstamp d11045e4-9603-49f2-81b4-c681bde889c7))
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp 66f5f1a4-230d-4785-a30f-452757d5b174))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp a127224e-137a-43e9-a3c8-e9c9d34a3b8e))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer "F.CrtYd") (width 0.05) (tstamp ae37a1c6-d36b-41a1-b47c-c682a44d4526))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer "F.CrtYd") (width 0.05) (tstamp ee5b826a-cc5f-4015-85ed-9eebabf28bbb))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 0fc88eee-f33d-482f-b80a-616e72e233f8))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 11d00b33-4141-4f87-80b7-c04d94e243b6))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer "F.Fab") (width 0.1) (tstamp 826ad1ca-c3f2-4516-8d18-1400b1f9046a))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer "F.Fab") (width 0.1) (tstamp 9c75040c-6643-4a6e-b2fa-cf000144cece))
+    (pad "1" smd roundrect (at -0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 46 "/Power supplies/3V3PROTO") (pintype "passive") (tstamp 596d569b-78f9-4b24-9353-4862bf24033a))
+    (pad "2" smd roundrect (at 0.775 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "GND") (pintype "passive") (tstamp f36687aa-6120-4859-be44-996e2b06c45c))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Package_TO_SOT_SMD:TSOT-23-5" (layer "F.Cu")
     (tedit 5F6F97DB) (tstamp f944bf84-80fc-4e56-b43a-7ebf0ebf88a2)
     (at 125.3 69.65)
diff --git a/ice40lp1k-devboard.kicad_pro b/ice40lp1k-devboard.kicad_pro
index 6b59c42..f26dbde 100644
--- a/ice40lp1k-devboard.kicad_pro
+++ b/ice40lp1k-devboard.kicad_pro
@@ -2,26 +2,133 @@
   "board": {
     "design_settings": {
       "defaults": {
-        "board_outline_line_width": 0.1,
-        "copper_line_width": 0.2,
+        "board_outline_line_width": 0.09999999999999999,
+        "copper_line_width": 0.19999999999999998,
+        "copper_text_italic": false,
         "copper_text_size_h": 1.5,
         "copper_text_size_v": 1.5,
         "copper_text_thickness": 0.3,
+        "copper_text_upright": false,
+        "courtyard_line_width": 0.049999999999999996,
+        "dimension_precision": 4,
+        "dimension_units": 3,
+        "dimensions": {
+          "arrow_length": 1270000,
+          "extension_offset": 500000,
+          "keep_text_aligned": true,
+          "suppress_zeroes": false,
+          "text_position": 0,
+          "units_format": 1
+        },
+        "fab_line_width": 0.09999999999999999,
+        "fab_text_italic": false,
+        "fab_text_size_h": 1.0,
+        "fab_text_size_v": 1.0,
+        "fab_text_thickness": 0.15,
+        "fab_text_upright": false,
         "other_line_width": 0.15,
+        "other_text_italic": false,
+        "other_text_size_h": 1.0,
+        "other_text_size_v": 1.0,
+        "other_text_thickness": 0.15,
+        "other_text_upright": false,
+        "pads": {
+          "drill": 0.762,
+          "height": 1.524,
+          "width": 1.524
+        },
         "silk_line_width": 0.15,
+        "silk_text_italic": false,
         "silk_text_size_h": 1.0,
         "silk_text_size_v": 1.0,
-        "silk_text_thickness": 0.15
+        "silk_text_thickness": 0.15,
+        "silk_text_upright": false,
+        "zones": {
+          "45_degree_only": false,
+          "min_clearance": 0.508
+        }
       },
-      "diff_pair_dimensions": [],
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.0,
+          "via_gap": 0.0,
+          "width": 0.0
+        }
+      ],
       "drc_exclusions": [],
-      "rules": {
-        "min_copper_edge_clearance": 0.0,
-        "solder_mask_clearance": 0.0,
-        "solder_mask_min_width": 0.0
+      "meta": {
+        "version": 2
       },
-      "track_widths": [],
-      "via_dimensions": []
+      "rule_severities": {
+        "annular_width": "error",
+        "clearance": "error",
+        "copper_edge_clearance": "error",
+        "courtyards_overlap": "error",
+        "diff_pair_gap_out_of_range": "error",
+        "diff_pair_uncoupled_length_too_long": "error",
+        "drill_out_of_range": "error",
+        "duplicate_footprints": "warning",
+        "extra_footprint": "warning",
+        "footprint_type_mismatch": "error",
+        "hole_clearance": "error",
+        "hole_near_hole": "error",
+        "invalid_outline": "error",
+        "item_on_disabled_layer": "error",
+        "items_not_allowed": "error",
+        "length_out_of_range": "error",
+        "malformed_courtyard": "error",
+        "microvia_drill_out_of_range": "error",
+        "missing_courtyard": "ignore",
+        "missing_footprint": "warning",
+        "net_conflict": "warning",
+        "npth_inside_courtyard": "ignore",
+        "padstack": "error",
+        "pth_inside_courtyard": "ignore",
+        "shorting_items": "error",
+        "silk_over_copper": "warning",
+        "silk_overlap": "warning",
+        "skew_out_of_range": "error",
+        "through_hole_pad_without_hole": "error",
+        "too_many_vias": "error",
+        "track_dangling": "warning",
+        "track_width": "error",
+        "tracks_crossing": "error",
+        "unconnected_items": "error",
+        "unresolved_variable": "error",
+        "via_dangling": "warning",
+        "zone_has_empty_net": "error",
+        "zones_intersect": "error"
+      },
+      "rules": {
+        "allow_blind_buried_vias": false,
+        "allow_microvias": false,
+        "max_error": 0.005,
+        "min_clearance": 0.0,
+        "min_copper_edge_clearance": 0.0,
+        "min_hole_clearance": 0.25,
+        "min_hole_to_hole": 0.25,
+        "min_microvia_diameter": 0.19999999999999998,
+        "min_microvia_drill": 0.09999999999999999,
+        "min_silk_clearance": 0.0,
+        "min_through_hole_diameter": 0.3,
+        "min_track_width": 0.19999999999999998,
+        "min_via_annular_width": 0.049999999999999996,
+        "min_via_diameter": 0.39999999999999997,
+        "solder_mask_clearance": 0.0,
+        "solder_mask_min_width": 0.0,
+        "use_height_for_length_calcs": true
+      },
+      "track_widths": [
+        0.0
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        }
+      ],
+      "zones_allow_external_fillets": false,
+      "zones_use_no_outline": true
     },
     "layer_presets": []
   },
diff --git a/ice40lp1k-devboard.kicad_sch b/ice40lp1k-devboard.kicad_sch
index c2368ea..0552c29 100644
--- a/ice40lp1k-devboard.kicad_sch
+++ b/ice40lp1k-devboard.kicad_sch
@@ -763,47 +763,47 @@
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/cee563d0-e92b-4488-96c7-43c586a2105f"
       (reference "#PWR038") (unit 1) (value "+3V3") (footprint "")
     )
-    (path "/03814262-2270-49d5-8359-1a1e42921c0f/639ad16b-adec-4581-b7a6-f3d31538bc4b"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/815fe06e-28c9-4496-999c-16f39a656c84"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+      (reference "#PWR0101") (unit 1) (value "GND") (footprint "")
     )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/84f5b148-d146-48c9-8ecc-a65cea73934d"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+      (reference "#PWR0102") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/03814262-2270-49d5-8359-1a1e42921c0f/639ad16b-adec-4581-b7a6-f3d31538bc4b"
+      (reference "#PWR0103") (unit 1) (value "GND") (footprint "")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/85f7defa-fdc3-410b-b0e9-8a6708953006"
-      (reference "C1") (unit 1) (value "1uF") (footprint "")
+      (reference "C1") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/752c1fc3-d745-4e29-90e8-baeb2406ca8a"
-      (reference "C2") (unit 1) (value "1uF") (footprint "")
+      (reference "C2") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/18e3be4b-4614-4415-8c25-b33cccfa5efc"
-      (reference "C3") (unit 1) (value "1uF") (footprint "")
+      (reference "C3") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/388eadbc-890a-49df-b55d-ad7db24edb73"
-      (reference "C4") (unit 1) (value "1uF") (footprint "")
+      (reference "C4") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/a9f9846d-30d6-4036-8909-7ba0c56f281b"
-      (reference "C5") (unit 1) (value "1uF") (footprint "")
+      (reference "C5") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/1284f862-d0b4-4221-b851-0c795b259c24"
-      (reference "C6") (unit 1) (value "1uF") (footprint "")
+      (reference "C6") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/3f552ef1-a7a7-418f-8e31-6d6e7c7bd956"
-      (reference "C7") (unit 1) (value "1uF") (footprint "")
+      (reference "C7") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/7098eef9-b906-4263-8a5f-deaeec7dec60"
-      (reference "C8") (unit 1) (value "1uF") (footprint "")
+      (reference "C8") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/340e6a21-0a15-40a6-8e7c-2fde4ad0b6b7"
-      (reference "C9") (unit 1) (value "1u") (footprint "")
+      (reference "C9") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/7555ce15-c819-44a7-ad89-f48d70a77d41"
-      (reference "C10") (unit 1) (value "100nF") (footprint "")
+      (reference "C10") (unit 1) (value "100nF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/fb7fd1b4-d207-4de5-bfe3-443ad90b042c"
-      (reference "C11") (unit 1) (value "100nF") (footprint "")
+      (reference "C11") (unit 1) (value "100nF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/324936c3-f932-46da-a731-576c6f55a633"
       (reference "C12") (unit 1) (value "10nF") (footprint "")
@@ -833,31 +833,34 @@
       (reference "C20") (unit 1) (value "10uF") (footprint "")
     )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/0bb38aaa-7bd1-4e49-892d-66ba4baeb8e1"
-      (reference "C?") (unit 1) (value "100nF") (footprint "")
+      (reference "C21") (unit 1) (value "100nF") (footprint "")
     )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/252097d2-1b4e-483e-8632-a7c6b15bb199"
-      (reference "C?") (unit 1) (value "100nF") (footprint "")
+      (reference "C22") (unit 1) (value "100nF") (footprint "")
     )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/e2d073b2-92aa-4464-821a-aec0b038d2ef"
-      (reference "C?") (unit 1) (value "100nF") (footprint "")
+      (reference "C23") (unit 1) (value "100nF") (footprint "")
     )
     (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/4562c012-dae0-44b0-9d83-a6687d1171f6"
-      (reference "F1") (unit 1) (value "1~1.5A") (footprint "")
+      (reference "F1") (unit 1) (value "1~1.5A") (footprint "Fuse:Fuse_0603_1608Metric")
     )
-    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/2528bd34-f9c6-45fe-8fba-1749d6b92b05"
-      (reference "J1") (unit 1) (value "USB_C_Plug_USB2.0") (footprint "")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/e73745fe-0a73-4277-b362-d81fe5c7482d"
+      (reference "J1") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "iCE2040:TYPE-C-31-M-12")
     )
-    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/1fe01d0f-cdff-4707-9372-734f12bdf3c8"
-      (reference "J2") (unit 1) (value "USB_B_Micro") (footprint "")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/621ea217-bb4e-4ad7-a50e-0da2144a00e2"
+      (reference "J2") (unit 1) (value "1010411[01]-0001LF") (footprint "Connector_USB:USB_Micro-B_Amphenol_10104110_Horizontal")
+    )
+    (path "/2d44100a-d992-41b4-9844-07fb6385f2db/2c766f7e-432d-4286-9852-ddb2dcf89f08"
+      (reference "JP1") (unit 1) (value "SolderJumper_2_Open") (footprint "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/80f36e7c-9e4e-4bc1-8863-d10a240781cd"
-      (reference "R1") (unit 1) (value "47k") (footprint "")
+      (reference "R1") (unit 1) (value "47k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/2d44100a-d992-41b4-9844-07fb6385f2db/e224f627-1052-4b7c-a8d5-1ef6213b887b"
-      (reference "R2") (unit 1) (value "10k") (footprint "")
+      (reference "R2") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/e2cbb072-17a3-4911-84f4-b240cb3e4dda"
-      (reference "R3") (unit 1) (value "10k") (footprint "")
+      (reference "R3") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/411b60fc-77d3-4913-bbd9-f2a927a11662/58aa138d-9529-4adf-b163-5593749cecf6"
       (reference "R4") (unit 1) (value "10k") (footprint "")
@@ -869,16 +872,19 @@
       (reference "R6") (unit 1) (value "1k") (footprint "")
     )
     (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/04baed00-19b8-4331-b8f9-f68656cbbcbc"
-      (reference "R7") (unit 1) (value "5.1k") (footprint "")
+      (reference "R7") (unit 1) (value "5.1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/aaba1476-c7a3-4e07-ae69-cceab5140fcb"
-      (reference "R8") (unit 1) (value "27.4") (footprint "")
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/8cf2c0bd-7fd6-4a5d-8a4f-33e3fe13e5ea"
+      (reference "R8") (unit 1) (value "5.1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/143096a5-2079-4e17-927f-f5bbdcf55581"
-      (reference "R9") (unit 1) (value "27.4") (footprint "")
+      (reference "R9") (unit 1) (value "27.4") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
+    (path "/45606faf-9f92-4e54-b8f3-ca6d1cbc2f70/aaba1476-c7a3-4e07-ae69-cceab5140fcb"
+      (reference "R10") (unit 1) (value "27.4") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/03814262-2270-49d5-8359-1a1e42921c0f/7ab34fd8-ee27-42f5-8fe8-c34e7bf0f526"
-      (reference "R10") (unit 1) (value "100") (footprint "")
+      (reference "R11") (unit 1) (value "100") (footprint "")
     )
     (path "/d680877e-993b-4add-aab8-8316b76a8800/71ea0a0b-0939-409f-88a3-dd8a41291f53"
       (reference "SW1") (unit 1) (value "SW_Push") (footprint "")
diff --git a/psu.kicad_sch b/psu.kicad_sch
index b664d55..ed2424b 100644
--- a/psu.kicad_sch
+++ b/psu.kicad_sch
@@ -95,6 +95,73 @@
         )
       )
     )
+    (symbol "Jumper:SolderJumper_2_Open" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "JP" (id 0) (at 0 2.032 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "SolderJumper_2_Open" (id 1) (at 0 -2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "solder jumper SPST" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Solder Jumper, 2-pole, open" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SolderJumper*Open*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SolderJumper_2_Open_0_1"
+        (arc (start -0.254 1.016) (mid -1.27 0) (end -0.254 -1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start -0.254 1.016) (mid -1.27 0) (end -0.254 -1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (polyline
+          (pts
+            (xy -0.254 1.016)
+            (xy -0.254 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.254 1.016)
+            (xy 0.254 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0.254 -1.016) (mid 1.27 0) (end 0.254 1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0.254 -1.016) (mid 1.27 0) (end 0.254 1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+      )
+      (symbol "SolderJumper_2_Open_1_1"
+        (pin passive line (at -3.81 0 0) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 3.81 0 180) (length 2.54)
+          (name "B" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Power_Management:AP2171W" (in_bom yes) (on_board yes)
       (property "Reference" "U" (id 0) (at -7.62 -6.35 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -604,6 +671,9 @@
   (junction (at 148.59 72.39) (diameter 0) (color 0 0 0 0)
     (uuid 1274bd27-8f48-4452-9745-7b6c6840c1ef)
   )
+  (junction (at 134.62 92.71) (diameter 0) (color 0 0 0 0)
+    (uuid 205bfb71-5624-4edb-9711-c77e2c6bfe68)
+  )
   (junction (at 171.45 100.33) (diameter 0) (color 0 0 0 0)
     (uuid 24cf8e14-73f1-4f97-bd31-6e549f499634)
   )
@@ -628,6 +698,9 @@
   (junction (at 172.72 41.91) (diameter 0) (color 0 0 0 0)
     (uuid 660a90c2-cc0a-4aed-b5b1-8065df6d5375)
   )
+  (junction (at 171.45 92.71) (diameter 0) (color 0 0 0 0)
+    (uuid 663a693a-8f9c-40fd-b944-aaeb0076ebca)
+  )
   (junction (at 158.75 113.03) (diameter 0) (color 0 0 0 0)
     (uuid 6c9fef46-eff2-4d8b-9689-9355486f523e)
   )
@@ -727,6 +800,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 271d81d7-378e-46a4-979b-f82be661672d)
   )
+  (wire (pts (xy 134.62 92.71) (xy 142.24 92.71))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2cec391f-9c54-4088-ae4d-2e7cc3e4c43c)
+  )
   (wire (pts (xy 134.62 41.91) (xy 134.62 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 38c5bbe7-5c35-4784-9ec8-fa466678d01a)
@@ -779,10 +856,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 664e9956-eabb-4466-a0e1-9714518da8c9)
   )
+  (wire (pts (xy 149.86 92.71) (xy 171.45 92.71))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6b4c2ca1-db37-4a9b-a7a5-db7ef8b768e8)
+  )
   (wire (pts (xy 143.51 105.41) (xy 143.51 102.87))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6e0cada8-5132-44bd-adaa-4e710e6e9953)
   )
+  (wire (pts (xy 134.62 92.71) (xy 134.62 100.33))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 72b72aa3-8f32-4da4-a957-06b135514468)
+  )
   (wire (pts (xy 134.62 100.33) (xy 134.62 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 737ea8b9-ab23-4396-bc9a-dd496fb1fd71)
@@ -867,7 +952,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid abea0143-9213-4732-b3b2-bfa2ad9e71f2)
   )
-  (wire (pts (xy 171.45 97.79) (xy 171.45 100.33))
+  (wire (pts (xy 171.45 90.17) (xy 171.45 92.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aca46f38-3a5d-4d02-99bd-b93f4fe6d2d2)
   )
@@ -883,6 +968,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b87a7771-3492-4cfb-837e-0315a61bd59b)
   )
+  (wire (pts (xy 171.45 92.71) (xy 171.45 100.33))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c337f577-b153-4df8-836f-df07247c7a13)
+  )
   (wire (pts (xy 203.2 41.91) (xy 203.2 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c59dc390-202e-4672-bf12-c2f34865442d)
@@ -939,7 +1028,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc0f8858-f36e-4d7e-b14b-49cf024731ed)
   )
-  (wire (pts (xy 134.62 72.39) (xy 134.62 100.33))
+  (wire (pts (xy 134.62 72.39) (xy 134.62 92.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dce1ebb8-ccad-40e6-9edf-ca51fa818b83)
   )
@@ -1015,11 +1104,21 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 622d2116-5135-4bcf-96e8-5b4fbbe74ea1)
   )
+  (text "TODO: ~{OC}DET going\ndown will just restart\nthe system, mightn't\nbe desirable (how fix?)"
+    (at 73.66 82.55 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 62c0c6aa-72b9-47af-ae8d-5587e2271ff6)
+  )
   (text "use multi-stage LDOs\nto avoid too large\npower waste due to\nstep-down sizes"
     (at 102.87 57.15 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 90e9ab6d-da34-4194-861c-ebd143e90b5f)
   )
+  (text "U4 max Vin = 6.5V!\nguaranteed by ESD/TVS prot\n+ Vbus fuse"
+    (at 72.39 66.04 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid b395d6ee-cddf-4435-bf48-46bf63ade6ce)
+  )
   (text "150mA" (at 160.02 124.46 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bfee9797-e797-4b55-8924-6cc5ee5e588e)
@@ -1036,6 +1135,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e9c774a1-f644-47a1-ad2c-ce183938a2b0)
   )
+  (text "iCE40 needs 2V5 for NVCM writing, but\nit's fine to supply 2V5 if not needed\nso this bridge can be used when not\nusing a 2V5 regulator & have it work"
+    (at 173.99 96.52 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid f80460d4-2266-45d8-96e6-0397fed19319)
+  )
   (text "not 100% matching\nsymbol, pin4=PGOOD" (at 161.29 67.31 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fe43edef-5b22-4298-beac-43a40501c776)
@@ -1100,7 +1204,7 @@
     (property "Value" "1uF" (id 1) (at 174.371 108.3822 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 172.4152 110.49 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 172.4152 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 171.45 106.68 0)
@@ -1119,7 +1223,7 @@
     (property "Value" "1uF" (id 1) (at 140.081 108.3822 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 138.1252 110.49 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 138.1252 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 137.16 106.68 0)
@@ -1129,17 +1233,17 @@
     (pin "2" (uuid d11ce2da-817c-47f6-ad03-986797c2a167))
   )
 
-  (symbol (lib_id "power:+2V5") (at 171.45 97.79 0) (unit 1)
+  (symbol (lib_id "power:+2V5") (at 171.45 90.17 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1b5c9be8-b47c-4006-80af-fad345bc78a1)
-    (property "Reference" "#PWR08" (id 0) (at 171.45 101.6 0)
+    (property "Reference" "#PWR08" (id 0) (at 171.45 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+2V5" (id 1) (at 171.45 94.2142 0))
-    (property "Footprint" "" (id 2) (at 171.45 97.79 0)
+    (property "Value" "+2V5" (id 1) (at 171.45 86.5942 0))
+    (property "Footprint" "" (id 2) (at 171.45 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 171.45 97.79 0)
+    (property "Datasheet" "" (id 3) (at 171.45 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f357b5d9-5c9c-4cec-b6dc-d3898a1e7ffa))
@@ -1163,6 +1267,21 @@
     (pin "5" (uuid 6f39ce1a-8c73-4990-8050-7cf9661a6cc1))
   )
 
+  (symbol (lib_id "Jumper:SolderJumper_2_Open") (at 146.05 92.71 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 2c766f7e-432d-4286-9852-ddb2dcf89f08)
+    (property "Reference" "JP1" (id 0) (at 146.05 88.1212 0))
+    (property "Value" "SolderJumper_2_Open" (id 1) (at 146.05 90.6581 0))
+    (property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (id 2) (at 146.05 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 146.05 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8b1cfcca-068c-4132-a122-359df763d56a))
+    (pin "2" (uuid 72b4ab93-c62e-452d-8165-330a5ab3619b))
+  )
+
   (symbol (lib_id "Regulator_Linear:MIC5365-3.3YC5") (at 158.75 132.08 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 338b45ae-0a42-4c5d-ab0b-d2f7d8b0e159)
@@ -1190,7 +1309,7 @@
     (property "Value" "1u" (id 1) (at 206.121 49.9622 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 204.1652 52.07 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 204.1652 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 203.2 48.26 0)
@@ -1225,7 +1344,7 @@
     (property "Value" "1uF" (id 1) (at 142.621 80.4422 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 140.6652 82.55 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 140.6652 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 139.7 78.74 0)
@@ -1260,7 +1379,7 @@
     (property "Value" "1uF" (id 1) (at 174.371 137.5922 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 172.4152 139.7 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 172.4152 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 171.45 135.89 0)
@@ -1345,7 +1464,7 @@
     (property "Value" "1uF" (id 1) (at 181.991 80.4422 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 180.0352 82.55 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 180.0352 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 179.07 78.74 0)
@@ -1364,7 +1483,7 @@
     (property "Value" "1uF" (id 1) (at 126.111 80.4422 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 124.1552 82.55 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 124.1552 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 123.19 78.74 0)
@@ -1415,7 +1534,7 @@
     (property "Value" "47k" (id 1) (at 184.658 43.6122 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 181.102 41.91 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 181.102 41.91 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 182.88 41.91 0)
@@ -1434,7 +1553,7 @@
     (property "Value" "1uF" (id 1) (at 100.711 80.4422 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 98.7552 82.55 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 98.7552 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 97.79 78.74 0)
@@ -1519,7 +1638,7 @@
     (property "Value" "1uF" (id 1) (at 142.621 137.5922 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 140.6652 139.7 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 140.6652 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 139.7 135.89 0)
@@ -1568,7 +1687,7 @@
     (uuid e224f627-1052-4b7c-a8d5-1ef6213b887b)
     (property "Reference" "R2" (id 0) (at 196.85 37.1942 90))
     (property "Value" "10k" (id 1) (at 196.85 39.7311 90))
-    (property "Footprint" "" (id 2) (at 196.85 43.688 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 196.85 43.688 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 196.85 41.91 0)
diff --git a/usbconn.kicad_sch b/usbconn.kicad_sch
index 028560a..8a98a8f 100644
--- a/usbconn.kicad_sch
+++ b/usbconn.kicad_sch
@@ -156,11 +156,11 @@
         )
       )
     )
-    (symbol "Connector:USB_C_Plug_USB2.0" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "P" (id 0) (at -10.16 19.05 0)
+    (symbol "Connector:USB_C_Receptacle_USB2.0" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at -10.16 19.05 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "USB_C_Plug_USB2.0" (id 1) (at 12.7 19.05 0)
+      (property "Value" "USB_C_Receptacle_USB2.0" (id 1) (at 19.05 19.05 0)
         (effects (font (size 1.27 1.27)) (justify right))
       )
       (property "Footprint" "" (id 2) (at 3.81 0 0)
@@ -172,21 +172,37 @@
       (property "ki_keywords" "usb universal serial bus type-C USB2.0" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "USB 2.0-only Type-C Plug connector" (id 5) (at 0 0 0)
+      (property "ki_description" "USB 2.0-only Type-C Receptacle connector" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "USB*C*Plug*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "USB*C*Receptacle*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "USB_C_Plug_USB2.0_0_0"
+      (symbol "USB_C_Receptacle_USB2.0_0_0"
         (rectangle (start -0.254 -17.78) (end 0.254 -16.764)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
+        (rectangle (start 10.16 -14.986) (end 9.144 -15.494)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start 10.16 -12.446) (end 9.144 -12.954)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start 10.16 -4.826) (end 9.144 -5.334)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
         (rectangle (start 10.16 -2.286) (end 9.144 -2.794)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
+        (rectangle (start 10.16 0.254) (end 9.144 -0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
         (rectangle (start 10.16 2.794) (end 9.144 2.286)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
@@ -204,7 +220,7 @@
           (fill (type none))
         )
       )
-      (symbol "USB_C_Plug_USB2.0_0_1"
+      (symbol "USB_C_Receptacle_USB2.0_0_1"
         (rectangle (start -10.16 17.78) (end 10.16 -17.78)
           (stroke (width 0.254) (type default) (color 0 0 0 0))
           (fill (type background))
@@ -302,7 +318,7 @@
           (fill (type outline))
         )
       )
-      (symbol "USB_C_Plug_USB2.0_1_1"
+      (symbol "USB_C_Receptacle_USB2.0_1_1"
         (pin passive line (at 0 -22.86 90) (length 5.08)
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "A1" (effects (font (size 1.27 1.27))))
@@ -316,7 +332,7 @@
           (number "A4" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 15.24 10.16 180) (length 5.08)
-          (name "CC" (effects (font (size 1.27 1.27))))
+          (name "CC1" (effects (font (size 1.27 1.27))))
           (number "A5" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 15.24 -2.54 180) (length 5.08)
@@ -327,6 +343,10 @@
           (name "D-" (effects (font (size 1.27 1.27))))
           (number "A7" (effects (font (size 1.27 1.27))))
         )
+        (pin bidirectional line (at 15.24 -12.7 180) (length 5.08)
+          (name "SBU1" (effects (font (size 1.27 1.27))))
+          (number "A8" (effects (font (size 1.27 1.27))))
+        )
         (pin passive line (at 15.24 15.24 180) (length 5.08) hide
           (name "VBUS" (effects (font (size 1.27 1.27))))
           (number "A9" (effects (font (size 1.27 1.27))))
@@ -344,9 +364,21 @@
           (number "B4" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at 15.24 7.62 180) (length 5.08)
-          (name "VCONN" (effects (font (size 1.27 1.27))))
+          (name "CC2" (effects (font (size 1.27 1.27))))
           (number "B5" (effects (font (size 1.27 1.27))))
         )
+        (pin bidirectional line (at 15.24 -5.08 180) (length 5.08)
+          (name "D+" (effects (font (size 1.27 1.27))))
+          (number "B6" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 15.24 0 180) (length 5.08)
+          (name "D-" (effects (font (size 1.27 1.27))))
+          (number "B7" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 15.24 -15.24 180) (length 5.08)
+          (name "SBU2" (effects (font (size 1.27 1.27))))
+          (number "B8" (effects (font (size 1.27 1.27))))
+        )
         (pin passive line (at 15.24 15.24 180) (length 5.08) hide
           (name "VBUS" (effects (font (size 1.27 1.27))))
           (number "B9" (effects (font (size 1.27 1.27))))
@@ -810,12 +842,21 @@
     )
   )
 
+  (junction (at 167.64 95.25) (diameter 0) (color 0 0 0 0)
+    (uuid 0e9dff35-250d-48bc-9f38-212cec2d3178)
+  )
   (junction (at 134.62 128.27) (diameter 0) (color 0 0 0 0)
     (uuid 1f5f5594-f09d-4a59-9f1c-c921fa42d5f3)
   )
   (junction (at 179.07 60.96) (diameter 0) (color 0 0 0 0)
     (uuid 5b2b5322-1be5-4ac9-872a-89960c9dafe6)
   )
+  (junction (at 176.53 101.6) (diameter 0) (color 0 0 0 0)
+    (uuid 9a04a5fe-c7e0-426c-8986-78c4a807c403)
+  )
+  (junction (at 179.07 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 9a453021-edf5-4fe5-9550-2560a8d4b92f)
+  )
   (junction (at 156.21 55.88) (diameter 0) (color 0 0 0 0)
     (uuid a8f97a81-9717-40fd-b0e2-221ee1fcaf66)
   )
@@ -826,7 +867,8 @@
     (uuid c5cb5918-abe4-4659-bdd6-fed27ef37ddc)
   )
 
-  (no_connect (at 153.67 96.52) (uuid 8a4db672-8026-41d2-8d23-56249c3317c7))
+  (no_connect (at 153.67 116.84) (uuid 99a241cd-72e5-4050-9f2b-fcae924d662e))
+  (no_connect (at 153.67 119.38) (uuid 99a241cd-72e5-4050-9f2b-fcae924d662f))
 
   (wire (pts (xy 223.52 72.39) (xy 226.06 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -836,10 +878,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0deeca3a-9693-4c1b-bb6f-742514409b15)
   )
+  (wire (pts (xy 157.48 93.98) (xy 157.48 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 18775eb4-a9e9-4184-9fdb-1ae717fc8b50)
+  )
   (wire (pts (xy 153.67 106.68) (xy 179.07 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1cce9bfb-464c-4071-a45c-48a914d31ad1)
   )
+  (wire (pts (xy 152.4 73.66) (xy 143.51 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1da1c550-8919-467d-9584-769b09b737c5)
+  )
   (wire (pts (xy 134.62 128.27) (xy 134.62 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 264c5b3b-6a23-48f3-949e-5e07ecc9c997)
@@ -852,14 +902,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2bf290b0-9c7f-414e-8d0d-c3086e060a4e)
   )
-  (wire (pts (xy 143.51 73.66) (xy 152.4 73.66))
+  (wire (pts (xy 167.64 91.44) (xy 167.64 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2cd71b60-2503-43e1-b5ae-b7955d8e4353)
+    (uuid 3b299833-613c-433e-9559-61a0ddfe7992)
   )
   (wire (pts (xy 207.01 52.07) (xy 215.9 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3c236466-e0e7-4522-bbe0-f0c0f93f8ba2)
   )
+  (wire (pts (xy 153.67 93.98) (xy 157.48 93.98))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3fff6616-a27c-4ee2-a2df-1d1a28dab9fa)
+  )
   (wire (pts (xy 143.51 73.66) (xy 143.51 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 496302d5-7686-481d-87ea-6fe14299e63d)
@@ -884,6 +938,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4fa33f93-ea0b-484b-a391-dd3779ebb4a6)
   )
+  (wire (pts (xy 152.4 66.04) (xy 152.4 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 53a6b8fb-5cbe-4139-8c9a-74b604114687)
+  )
+  (wire (pts (xy 158.75 99.06) (xy 157.48 99.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5421f9c2-21df-43e4-b622-60c577b40c82)
+  )
+  (wire (pts (xy 157.48 99.06) (xy 157.48 96.52))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 552b6a0c-f9e7-499f-8ef3-a9bcc0ad8bb4)
+  )
   (wire (pts (xy 179.07 60.96) (xy 186.69 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 571c7df7-9bcf-40d1-9570-f06992b321dc)
@@ -892,18 +958,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5df0db71-dae6-4cbd-af6d-f4d1a6b4e8bf)
   )
-  (wire (pts (xy 152.4 66.04) (xy 152.4 73.66))
+  (wire (pts (xy 153.67 104.14) (xy 176.53 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5eb03990-08c6-4fd7-bf9f-3b086f2a99dd)
+    (uuid 61acddbf-a60b-4c70-89df-86504fc0268b)
+  )
+  (wire (pts (xy 168.91 95.25) (xy 167.64 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 630c81f7-846e-4b87-8a06-bd675cef411b)
   )
   (wire (pts (xy 156.21 88.9) (xy 156.21 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6ccf6903-ad9d-4e73-800a-824831c21516)
   )
-  (wire (pts (xy 153.67 93.98) (xy 156.21 93.98))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6edc74c8-730a-418a-bb50-bd2250a02689)
-  )
   (wire (pts (xy 168.91 53.34) (xy 168.91 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f0d510e-a3ef-42b8-b174-2ebd124c7326)
@@ -912,11 +978,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 72311d21-520e-424e-9e21-6e6bce89b2e6)
   )
+  (wire (pts (xy 153.67 96.52) (xy 157.48 96.52))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 77b240a8-1177-4126-b125-ef22a3ab54f7)
+  )
   (wire (pts (xy 140.97 73.66) (xy 143.51 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 792f6171-4f69-4721-af44-93cdc9773255)
   )
-  (wire (pts (xy 163.83 93.98) (xy 166.37 93.98))
+  (wire (pts (xy 166.37 91.44) (xy 167.64 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 81d11b43-811d-4cc8-8278-49dce3b7f41b)
   )
@@ -924,6 +994,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 851951cf-02c2-47c3-87ab-a019836111c2)
   )
+  (wire (pts (xy 151.13 66.04) (xy 152.4 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9634c3a7-1276-4adf-b767-67de38eb1757)
+  )
   (wire (pts (xy 153.67 101.6) (xy 176.53 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 96a86f59-34fd-4166-8ccc-40f2662f34c7)
@@ -932,6 +1006,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 99b541b5-05fe-4369-bdcd-018bbd8b9bdc)
   )
+  (wire (pts (xy 157.48 91.44) (xy 158.75 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a8d8c0a2-e34d-45f9-a67d-542d3fea59b6)
+  )
+  (wire (pts (xy 179.07 109.22) (xy 179.07 106.68))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b3d94db3-0f7e-49b3-a75f-dd88a8c95dc8)
+  )
+  (wire (pts (xy 166.37 99.06) (xy 167.64 99.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b509c9cb-8e78-40d9-8b16-59ad8e338b5a)
+  )
   (wire (pts (xy 186.69 60.96) (xy 186.69 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b53461fb-f61e-47c5-a249-d128f5211cf3)
@@ -944,10 +1030,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b9d31376-b5c6-4d56-8a23-27783bb5df62)
   )
+  (wire (pts (xy 167.64 95.25) (xy 167.64 99.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid baa426bd-fa8c-4817-9c8c-76c87bd1cf1c)
+  )
   (wire (pts (xy 130.81 127) (xy 130.81 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bd976d6b-6b6d-4c4c-a4b6-376d8124315e)
   )
+  (wire (pts (xy 176.53 104.14) (xy 176.53 101.6))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c67b0a9f-c653-426e-8db1-480d6e5edf19)
+  )
   (wire (pts (xy 151.13 63.5) (xy 176.53 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c7ea4c90-3740-480a-befd-13c3d8c58dc4)
@@ -956,10 +1050,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cb0a021d-e87f-4e8e-bb6a-9b4015f2aeea)
   )
-  (wire (pts (xy 151.13 66.04) (xy 152.4 66.04))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d8ee2b95-9c8b-4744-9da0-746bc396e060)
-  )
   (wire (pts (xy 189.23 62.23) (xy 194.31 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d90f0c3b-9dba-433f-9e62-eaed354b867a)
@@ -980,14 +1070,49 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f1081a15-dad1-4bcd-bd07-640fd164d7c5)
   )
+  (wire (pts (xy 153.67 109.22) (xy 179.07 109.22))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f4b12f6d-0b4f-4977-997e-8d98d8002342)
+  )
   (wire (pts (xy 143.51 73.66) (xy 143.51 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f5e94a18-e801-466f-a686-e15ec5d6333e)
   )
 
-  (text "TODO: which\nUSB connector?" (at 119.38 80.01 0)
+  (text "compatible parts:\n\nType-C-31-M-12 from Korean Hroparts Elec @ LCSC\nUSB4105-GF-A from GCT @ Digikey\nCU3216SASDLR010-NH from Civlux @ Digikey\n\n"
+    (at 142.24 134.62 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 3848ea06-2898-4832-a6bc-646e23386763)
+    (uuid 3b79f60c-3688-4a9a-a2a7-389732f7a2d0)
+  )
+  (text "USB series are line-terminating,\nso perfer smaller footprints"
+    (at 222.25 49.53 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 6fe5d668-138d-4689-aa68-af22003ddd79)
+  )
+  (text "NOTE: footprint\nmight be too small?" (at 194.31 77.47 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 8b3e6ca6-78bf-4eee-80e4-e8222037428a)
+  )
+
+  (label "D+" (at 151.13 60.96 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 08fa2f62-4b7a-4cb4-b04d-99129195b087)
+  )
+  (label "CC2" (at 154.94 96.52 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 0b49c9b1-dd44-45c6-a733-a7d11a05fbe7)
+  )
+  (label "VUSB" (at 151.13 55.88 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 2935743b-af66-497c-a7bc-d4529952f042)
+  )
+  (label "CC1" (at 153.67 93.98 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 8c8c096f-76ce-4000-87aa-042ca9dd94cd)
+  )
+  (label "D-" (at 151.13 63.5 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid b2bc3076-66f9-44e2-ad6c-2993edfc3df3)
   )
 
   (hierarchical_label "DM" (shape output) (at 226.06 72.39 0)
@@ -1003,15 +1128,15 @@
     (uuid ab077813-650f-4d86-b435-07028b6d5afd)
   )
 
-  (symbol (lib_id "Device:R") (at 160.02 93.98 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 162.56 91.44 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 04baed00-19b8-4331-b8f9-f68656cbbcbc)
-    (property "Reference" "R7" (id 0) (at 160.02 89.2642 90))
-    (property "Value" "5.1k" (id 1) (at 160.02 91.8011 90))
-    (property "Footprint" "" (id 2) (at 160.02 95.758 90)
+    (property "Reference" "R7" (id 0) (at 162.56 86.7242 90))
+    (property "Value" "5.1k" (id 1) (at 162.56 89.2611 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 162.56 93.218 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 160.02 93.98 0)
+    (property "Datasheet" "~" (id 3) (at 162.56 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ce2d9deb-8ee8-47aa-9107-bf18547b985c))
@@ -1023,7 +1148,7 @@
     (uuid 143096a5-2079-4e17-927f-f5bbdcf55581)
     (property "Reference" "R9" (id 0) (at 219.71 67.6742 90))
     (property "Value" "27.4" (id 1) (at 219.71 70.2111 90))
-    (property "Footprint" "" (id 2) (at 219.71 74.168 90)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 219.71 74.168 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 219.71 72.39 0)
@@ -1033,51 +1158,6 @@
     (pin "2" (uuid 391203e6-8a57-43d2-948f-165bf222b526))
   )
 
-  (symbol (lib_id "Connector:USB_B_Micro") (at 143.51 60.96 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 1fe01d0f-cdff-4707-9372-734f12bdf3c8)
-    (property "Reference" "J2" (id 0) (at 143.51 49.6402 0))
-    (property "Value" "USB_B_Micro" (id 1) (at 143.51 52.1771 0))
-    (property "Footprint" "" (id 2) (at 147.32 62.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 147.32 62.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 13543914-279b-4402-ad8b-e7f874f87b77))
-    (pin "2" (uuid fc07b1d2-881b-4dd9-a5a0-448646fb6915))
-    (pin "3" (uuid cd2815fd-f72d-4d74-8190-568093e38049))
-    (pin "4" (uuid 3823c95a-3e48-46ba-9b8a-be018b3514e2))
-    (pin "5" (uuid 5a9361e5-3119-47f0-9c16-b9e9e77399b8))
-    (pin "6" (uuid 3dbbe218-2340-47db-b915-8b2e560969dc))
-  )
-
-  (symbol (lib_id "Connector:USB_C_Plug_USB2.0") (at 138.43 104.14 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 2528bd34-f9c6-45fe-8fba-1749d6b92b05)
-    (property "Reference" "J1" (id 0) (at 138.43 82.6602 0))
-    (property "Value" "USB_C_Plug_USB2.0" (id 1) (at 138.43 85.1971 0))
-    (property "Footprint" "" (id 2) (at 142.24 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 142.24 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "A1" (uuid 68813d12-5e45-4b28-afe9-b9c1d2367cdd))
-    (pin "A12" (uuid f5e7c680-6163-43ba-8d6e-2039f6a2b5fb))
-    (pin "A4" (uuid 66d64b42-483a-4b27-b7a8-7a363533a913))
-    (pin "A5" (uuid 4a0d6d79-8704-42b4-9061-192df03015ba))
-    (pin "A6" (uuid 83e464bc-27e8-4661-9a85-6ce43a282741))
-    (pin "A7" (uuid 36d9edca-48b0-4cff-b9f4-b2c4f6bac63c))
-    (pin "A9" (uuid 06702264-de66-4bba-a90c-65efce8883b2))
-    (pin "B1" (uuid 93b9f55b-7c3c-4578-b44d-6660bf162ade))
-    (pin "B12" (uuid 7069d573-996f-4319-8b33-1821425cce69))
-    (pin "B4" (uuid 12cdfe4e-b81c-4a10-8e34-438206b760b3))
-    (pin "B5" (uuid dfda8020-40ce-40a2-a0aa-8237cdf9539a))
-    (pin "B9" (uuid 079f56ed-617d-420a-8cc3-3984aa005e21))
-    (pin "S1" (uuid 6f1823e1-2f47-4cbc-8b05-ccddd3d1aa39))
-  )
-
   (symbol (lib_id "Power_Protection:USBLC6-2P6") (at 204.47 62.23 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 27f29206-c1c1-4dec-ba4d-edb31e711bd2)
@@ -1120,7 +1200,7 @@
     (uuid 4562c012-dae0-44b0-9d83-a6687d1171f6)
     (property "Reference" "F1" (id 0) (at 162.56 51.4182 90))
     (property "Value" "1~1.5A" (id 1) (at 162.56 53.9551 90))
-    (property "Footprint" "" (id 2) (at 162.56 57.658 90)
+    (property "Footprint" "Fuse:Fuse_0603_1608Metric" (id 2) (at 162.56 57.658 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 162.56 55.88 0)
@@ -1148,6 +1228,40 @@
     (pin "1" (uuid 011e01cb-44b4-4d49-957a-44095e7089c7))
   )
 
+  (symbol (lib_id "Connector:USB_B_Micro") (at 143.51 60.96 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 621ea217-bb4e-4ad7-a50e-0da2144a00e2)
+    (property "Reference" "J2" (id 0) (at 143.51 49.6402 0))
+    (property "Value" "1010411[01]-0001LF" (id 1) (at 143.51 52.1771 0))
+    (property "Footprint" "Connector_USB:USB_Micro-B_Amphenol_10104110_Horizontal" (id 2) (at 147.32 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 147.32 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid eea7ca12-2936-4617-a788-47cef5fa48da))
+    (pin "2" (uuid 80de0087-1216-4b9b-a21b-8cdfdde95237))
+    (pin "3" (uuid f6c83799-1ede-4181-860a-9be2491374d7))
+    (pin "4" (uuid b67cf678-6488-4398-833b-a266af3697dd))
+    (pin "5" (uuid 0f5c0d8e-5d5a-436d-8b92-aacee0333986))
+    (pin "6" (uuid bf5eec32-6a30-438d-9360-44f4632a2589))
+  )
+
+  (symbol (lib_id "Device:R") (at 162.56 99.06 90) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 8cf2c0bd-7fd6-4a5d-8a4f-33e3fe13e5ea)
+    (property "Reference" "R8" (id 0) (at 162.56 93.9831 90))
+    (property "Value" "5.1k" (id 1) (at 162.56 96.52 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 162.56 97.282 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 162.56 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 51a1b0fc-bb4c-45d1-bc7b-8b91ecd2f6c9))
+    (pin "2" (uuid d52786da-c87f-417c-98a0-627a703f8ea3))
+  )
+
   (symbol (lib_id "power:VBUS") (at 168.91 53.34 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a3cc0cf9-ff17-4977-9de1-70f7d43e7e7c)
@@ -1167,9 +1281,9 @@
   (symbol (lib_id "Device:R") (at 219.71 52.07 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aaba1476-c7a3-4e07-ae69-cceab5140fcb)
-    (property "Reference" "R8" (id 0) (at 219.71 47.3542 90))
+    (property "Reference" "R10" (id 0) (at 219.71 47.3542 90))
     (property "Value" "27.4" (id 1) (at 219.71 49.8911 90))
-    (property "Footprint" "" (id 2) (at 219.71 53.848 90)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 219.71 53.848 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 219.71 52.07 0)
@@ -1213,24 +1327,54 @@
     (pin "1" (uuid b035fc9d-0279-4e23-b387-c9e97a087cf6))
   )
 
-  (symbol (lib_id "power:GND") (at 166.37 93.98 90) (unit 1)
+  (symbol (lib_id "power:GND") (at 168.91 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cf56ab81-0318-4fc8-911e-17796e506d1b)
-    (property "Reference" "#PWR024" (id 0) (at 172.72 93.98 0)
+    (property "Reference" "#PWR024" (id 0) (at 175.26 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 169.545 94.4138 90)
+    (property "Value" "GND" (id 1) (at 172.085 95.6838 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 166.37 93.98 0)
+    (property "Footprint" "" (id 2) (at 168.91 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 166.37 93.98 0)
+    (property "Datasheet" "" (id 3) (at 168.91 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5affb18c-986e-48dd-991f-f19065de63d0))
   )
 
+  (symbol (lib_id "Connector:USB_C_Receptacle_USB2.0") (at 138.43 104.14 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e73745fe-0a73-4277-b362-d81fe5c7482d)
+    (property "Reference" "J1" (id 0) (at 138.43 82.6602 0))
+    (property "Value" "USB_C_Receptacle_USB2.0" (id 1) (at 138.43 85.1971 0))
+    (property "Footprint" "iCE2040:TYPE-C-31-M-12" (id 2) (at 142.24 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 142.24 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "A1" (uuid e77a7557-7131-4ff2-ac44-5caeb0fc4dd0))
+    (pin "A12" (uuid addedf14-93cb-40d4-a6af-41844cbe5161))
+    (pin "A4" (uuid a71f093c-c734-4733-a667-a6e898792bda))
+    (pin "A5" (uuid 901f0f45-8d46-4851-9431-30eccb4d211f))
+    (pin "A6" (uuid 0e42bdfc-0a9d-42a8-8ed7-0157278efcca))
+    (pin "A7" (uuid 56d524f9-fc92-4681-8fe4-f5580441dc63))
+    (pin "A8" (uuid c2b561ea-f915-482a-9dd2-a62c372ea784))
+    (pin "A9" (uuid 42e6025d-48a3-40d9-a035-36d850588232))
+    (pin "B1" (uuid fe04d3a9-c04c-4644-95a5-da30c7ab65e1))
+    (pin "B12" (uuid d952fbb4-9304-43a9-b12b-06338e728858))
+    (pin "B4" (uuid 997aea20-d556-46d5-bd1f-f02b66af2e84))
+    (pin "B5" (uuid 1157416f-bc3e-4b18-b822-a66cca70d0bf))
+    (pin "B6" (uuid 2a3d625c-fee8-436c-a717-c354bf8ab63a))
+    (pin "B7" (uuid fdbb19de-8724-4ca8-849d-1c575778a2c6))
+    (pin "B8" (uuid 1948c4f6-3489-4d04-9fbd-f5ac7d532e4c))
+    (pin "B9" (uuid 1901f95c-c18f-4569-8165-6e7c197b5ad0))
+    (pin "S1" (uuid ab926a7b-ab0c-4b18-b53b-3f006b306f4b))
+  )
+
   (symbol (lib_id "power:GND") (at 143.51 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ec63e092-edb4-42d0-8e72-1254f9546bce)