1 files changed, 281 insertions, 204 deletions
diff --git a/control_board/control_board.kicad_sch b/control_board/control_board.kicad_sch
index 3ff893a..cabf0c5 100644
--- a/control_board/control_board.kicad_sch
+++ b/control_board/control_board.kicad_sch
@@ -2761,6 +2761,7 @@
   (junction (at 80.01 162.56) (diameter 1.016) (color 0 0 0 0))
   (junction (at 80.01 173.99) (diameter 1.016) (color 0 0 0 0))
   (junction (at 81.28 83.82) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 82.55 243.84) (diameter 1.016) (color 0 0 0 0))
   (junction (at 83.82 35.56) (diameter 1.016) (color 0 0 0 0))
   (junction (at 83.82 40.64) (diameter 1.016) (color 0 0 0 0))
   (junction (at 83.82 63.5) (diameter 1.016) (color 0 0 0 0))
@@ -2786,6 +2787,7 @@
   (junction (at 123.19 35.56) (diameter 1.016) (color 0 0 0 0))
   (junction (at 132.08 35.56) (diameter 1.016) (color 0 0 0 0))
   (junction (at 132.08 40.64) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 156.21 111.76) (diameter 1.016) (color 0 0 0 0))
   (junction (at 172.72 55.88) (diameter 1.016) (color 0 0 0 0))
   (junction (at 175.26 158.75) (diameter 1.016) (color 0 0 0 0))
   (junction (at 175.26 171.45) (diameter 1.016) (color 0 0 0 0))
@@ -2812,7 +2814,6 @@
   (junction (at 279.4 55.88) (diameter 1.016) (color 0 0 0 0))
   (junction (at 284.48 35.56) (diameter 1.016) (color 0 0 0 0))
   (junction (at 285.75 67.31) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 285.75 137.16) (diameter 1.016) (color 0 0 0 0))
   (junction (at 285.75 175.26) (diameter 1.016) (color 0 0 0 0))
   (junction (at 285.75 198.12) (diameter 1.016) (color 0 0 0 0))
   (junction (at 292.1 205.74) (diameter 1.016) (color 0 0 0 0))
@@ -2887,9 +2888,9 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 19e70116-5ca4-4747-b795-716e5a8b82c7)
   )
-  (wire (pts (xy 35.56 119.38) (xy 101.6 119.38))
+  (wire (pts (xy 35.56 119.38) (xy 68.58 119.38))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 19e70116-5ca4-4747-b795-716e5a8b82c7)
+    (uuid b6191aa0-5402-4782-b629-c92c8b694758)
   )
   (wire (pts (xy 36.83 165.1) (xy 34.29 165.1))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -2971,6 +2972,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 518e00e7-0424-4a05-893e-2d9e7a799681)
   )
+  (wire (pts (xy 45.72 116.84) (xy 68.58 116.84))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d8908a6d-e90e-45be-88e4-55257db99148)
+  )
   (wire (pts (xy 46.99 273.05) (xy 46.99 275.59))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 5746b588-bd5e-45f4-a19e-2df546c3b6dc)
@@ -2999,14 +3004,14 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d427b16d-8889-4b29-9079-e2a8f8a76a95)
   )
-  (wire (pts (xy 55.88 35.56) (xy 55.88 93.98))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid bf8d2aed-bba0-44da-bc77-8655511419d8)
-  )
   (wire (pts (xy 55.88 93.98) (xy 45.72 93.98))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 797983f7-9518-4a72-803e-ee04b53b41e8)
   )
+  (wire (pts (xy 55.88 93.98) (xy 55.88 35.56))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid bf8d2aed-bba0-44da-bc77-8655511419d8)
+  )
   (wire (pts (xy 55.88 93.98) (xy 55.88 96.52))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 797983f7-9518-4a72-803e-ee04b53b41e8)
@@ -3015,9 +3020,9 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 70b854b1-6507-4f64-82fe-b23f6b4f8dfe)
   )
-  (wire (pts (xy 55.88 114.3) (xy 101.6 114.3))
+  (wire (pts (xy 55.88 114.3) (xy 68.58 114.3))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 70b854b1-6507-4f64-82fe-b23f6b4f8dfe)
+    (uuid 0777b9ae-ba12-46fa-8688-b188d758c802)
   )
   (wire (pts (xy 55.88 162.56) (xy 55.88 165.1))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -3071,6 +3076,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c1935ba0-90b0-4f88-ac11-c185b471016d)
   )
+  (wire (pts (xy 63.5 252.73) (xy 73.66 252.73))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid cc85134e-cad1-4d30-9638-42328a9ef248)
+  )
   (wire (pts (xy 63.5 255.27) (xy 62.23 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 59010ef3-9500-44a2-aed7-99a343dd025c)
@@ -3147,10 +3156,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid fa7eb2fa-b0aa-41af-b4f0-3074c5e6a39a)
   )
-  (wire (pts (xy 73.66 250.19) (xy 73.66 255.27))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 4fd3cc80-8816-4874-bbc9-bbd769531e3b)
-  )
   (wire (pts (xy 77.47 99.06) (xy 77.47 101.6))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 772b94e0-d385-41f6-8e42-7d254d710d86)
@@ -3215,6 +3220,34 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 7bc4119c-efbc-4d3a-8993-0553a33c2343)
   )
+  (wire (pts (xy 81.28 106.68) (xy 101.6 106.68))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 66bb4bc2-d894-45d4-8087-7034c3da5d5f)
+  )
+  (wire (pts (xy 81.28 119.38) (xy 101.6 119.38))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d7486cea-a570-4c4b-90d3-8eda426b9952)
+  )
+  (wire (pts (xy 82.55 234.95) (xy 62.23 234.95))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 9b8b66ed-5ace-4951-a4db-1a37a829fe9e)
+  )
+  (wire (pts (xy 82.55 237.49) (xy 82.55 234.95))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 9b8b66ed-5ace-4951-a4db-1a37a829fe9e)
+  )
+  (wire (pts (xy 82.55 242.57) (xy 82.55 243.84))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 97ad98c6-438d-49f8-9cc9-41ff71db3394)
+  )
+  (wire (pts (xy 82.55 243.84) (xy 82.55 245.11))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 97ad98c6-438d-49f8-9cc9-41ff71db3394)
+  )
+  (wire (pts (xy 82.55 243.84) (xy 100.33 243.84))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 2003d770-27d8-4869-b465-39b8707b1691)
+  )
   (wire (pts (xy 83.82 35.56) (xy 73.66 35.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 2d37adb4-a728-4cb7-9aa6-86702387703a)
@@ -3287,6 +3320,22 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c2ac0998-29cc-43e2-8384-9a69eb9f770a)
   )
+  (wire (pts (xy 92.71 88.9) (xy 101.6 88.9))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 54b5ca21-3935-45d6-9470-572acf0b5838)
+  )
+  (wire (pts (xy 92.71 91.44) (xy 101.6 91.44))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 44837269-cdef-4cd2-8ee7-20368e386817)
+  )
+  (wire (pts (xy 92.71 93.98) (xy 101.6 93.98))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid f87fe474-84dc-429a-83ed-dfab109ea2db)
+  )
+  (wire (pts (xy 92.71 96.52) (xy 101.6 96.52))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid a95d53db-54d6-4674-a146-901f7a0e3015)
+  )
   (wire (pts (xy 93.98 35.56) (xy 83.82 35.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c9e41d43-f4d8-45c8-a27f-34db15d67d32)
@@ -3315,10 +3364,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c2ac0998-29cc-43e2-8384-9a69eb9f770a)
   )
-  (wire (pts (xy 101.6 116.84) (xy 45.72 116.84))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 518e00e7-0424-4a05-893e-2d9e7a799681)
-  )
   (wire (pts (xy 101.6 162.56) (xy 119.38 162.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid b35e2258-9e40-4ebc-b827-78290a1a0110)
@@ -3371,10 +3416,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 2b9fb1ec-1d4d-455d-8b98-a4afbcfa564a)
   )
-  (wire (pts (xy 114.3 124.46) (xy 119.38 124.46))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid b58505a8-63cb-4bfc-8232-0623ac9beb41)
-  )
   (wire (pts (xy 114.3 130.81) (xy 114.3 124.46))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid b58505a8-63cb-4bfc-8232-0623ac9beb41)
@@ -3387,6 +3428,14 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 6cfbd4d2-e297-40b2-a6d6-1df0a8df4e1a)
   )
+  (wire (pts (xy 116.84 124.46) (xy 114.3 124.46))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 5466b79a-52e1-40f2-93f0-3644c57c87ae)
+  )
+  (wire (pts (xy 116.84 124.46) (xy 119.38 124.46))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 65800c17-079d-4e72-975b-030651a5a632)
+  )
   (wire (pts (xy 118.11 31.75) (xy 118.11 35.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 05876a7c-c8d2-4d20-98e0-f412c51c3f1a)
@@ -3431,6 +3480,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ba50c6c1-48f2-46ff-a1a5-a07e8118a0ba)
   )
+  (wire (pts (xy 124.46 46.99) (xy 124.46 48.26))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 9fd7c481-51fb-400d-99c5-02e963efa9bc)
+  )
   (wire (pts (xy 132.08 35.56) (xy 123.19 35.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ba50c6c1-48f2-46ff-a1a5-a07e8118a0ba)
@@ -3487,7 +3540,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 46b052cd-8d0c-4426-a9d5-74920f61121b)
   )
-  (wire (pts (xy 134.62 111.76) (xy 152.4 111.76))
+  (wire (pts (xy 134.62 111.76) (xy 156.21 111.76))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ee8977d4-759d-4aa3-8946-a7e763b86436)
   )
@@ -3503,14 +3556,30 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 18d73d6d-712e-4305-a908-224665ca7cd5)
   )
+  (wire (pts (xy 135.89 46.99) (xy 124.46 46.99))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 9fd7c481-51fb-400d-99c5-02e963efa9bc)
+  )
   (wire (pts (xy 142.24 35.56) (xy 132.08 35.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ba50c6c1-48f2-46ff-a1a5-a07e8118a0ba)
   )
+  (wire (pts (xy 156.21 111.76) (xy 181.61 111.76))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 87154d88-891a-4e5f-8b79-f380317e9010)
+  )
+  (wire (pts (xy 156.21 115.57) (xy 156.21 111.76))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 3087e9a2-29df-4769-94db-d502b55cb35e)
+  )
   (wire (pts (xy 157.48 101.6) (xy 167.64 101.6))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 16845b23-b5c2-4713-8012-b8decb2de394)
   )
+  (wire (pts (xy 157.48 115.57) (xy 156.21 115.57))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 3087e9a2-29df-4769-94db-d502b55cb35e)
+  )
   (wire (pts (xy 158.75 158.75) (xy 166.37 158.75))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 79fe0aad-ea98-4c5c-929a-35037c7a351f)
@@ -3519,6 +3588,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 89201f82-390b-4a92-bc6d-f0cdb0cdf61b)
   )
+  (wire (pts (xy 162.56 115.57) (xy 181.61 115.57))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid e5d9825b-2848-4ae2-ba2c-841707d25e2d)
+  )
   (wire (pts (xy 171.45 158.75) (xy 175.26 158.75))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 0e9d954b-33b9-4c9c-9e43-b34c9c50ab28)
@@ -4059,10 +4132,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 2e57e75a-72ab-46ca-9311-4da4b25c9a82)
   )
-  (wire (pts (xy 285.75 175.26) (xy 299.72 175.26))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 56f1d553-c94b-47fa-a1cc-3939394d2323)
-  )
   (wire (pts (xy 285.75 203.2) (xy 285.75 208.28))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 10ac3cec-a917-4ca5-aa64-d43d6bb32d36)
@@ -4167,6 +4236,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 5771a696-88c5-4324-b749-e27b23c40605)
   )
+  (wire (pts (xy 299.72 175.26) (xy 285.75 175.26))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 56f1d553-c94b-47fa-a1cc-3939394d2323)
+  )
   (wire (pts (xy 299.72 175.26) (xy 299.72 179.07))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 34ef2721-54f5-434e-8a03-d392aee3b0e0)
@@ -4307,14 +4380,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c4af7b07-aa78-4596-a3e8-98443466e919)
   )
-  (wire (pts (xy 316.23 147.32) (xy 327.66 147.32))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 7da99c4d-c5ee-472b-97b6-5f6934ab2e70)
-  )
-  (wire (pts (xy 316.23 149.86) (xy 327.66 149.86))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid c729e8f7-42aa-42a8-a593-fe1515801be9)
-  )
   (wire (pts (xy 316.23 190.5) (xy 316.23 226.06))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 65783e6b-6b1f-456c-8db0-0151e68353c7)
@@ -4419,26 +4484,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 7b4a6ca6-7b01-49f7-b155-d424e9758605)
   )
-  (wire (pts (xy 325.12 137.16) (xy 285.75 137.16))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 1c66ce09-994a-4f0b-8b2e-ee065cafc437)
-  )
-  (wire (pts (xy 325.12 144.78) (xy 325.12 137.16))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 1c66ce09-994a-4f0b-8b2e-ee065cafc437)
-  )
-  (wire (pts (xy 325.12 152.4) (xy 327.66 152.4))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 840579fb-e6f2-4341-afe1-3f9c3c2b8c53)
-  )
-  (wire (pts (xy 325.12 154.94) (xy 325.12 152.4))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 840579fb-e6f2-4341-afe1-3f9c3c2b8c53)
-  )
-  (wire (pts (xy 327.66 144.78) (xy 325.12 144.78))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 1c66ce09-994a-4f0b-8b2e-ee065cafc437)
-  )
   (wire (pts (xy 331.47 55.88) (xy 279.4 55.88))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid fff0347e-4ea6-4426-b574-191c3bbf62e0)
@@ -4592,6 +4637,22 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8a3daafc-f255-4ac3-9df4-af6692f72d32)
   )
+  (label "STM_DM" (at 73.66 250.19 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid a303594e-d109-4eb4-b4fe-6e327895ed64)
+  )
+  (label "STM_DP" (at 73.66 252.73 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 88761e0c-ea62-4608-a899-d68e746edc21)
+  )
+  (label "ADS_NRST" (at 81.28 106.68 0)
+    (effects (font (size 1.524 1.524)) (justify left bottom))
+    (uuid bc284b69-c5da-46f8-9bdc-bebefc95747f)
+  )
+  (label "STM_USB_PULLUP" (at 81.28 119.38 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 76d2f005-405a-4faa-bec7-d245c14a0c8f)
+  )
   (label "ADS_START" (at 88.9 81.28 0)
     (effects (font (size 1.524 1.524)) (justify left bottom))
     (uuid 680d81bb-de7e-4c2d-977d-2df9a581f1a2)
@@ -4612,6 +4673,22 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3be9d6c9-8562-44f1-afe5-2954cec409f4)
   )
+  (label "LED3" (at 92.71 88.9 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid dfdda3c4-57d0-4a0e-8cfd-e1ed641aafca)
+  )
+  (label "LED2" (at 92.71 91.44 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 758674ee-8453-4986-94a8-2a17537e7ade)
+  )
+  (label "LED1" (at 92.71 93.98 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 33c54a18-955e-4b47-9d0d-48296e467c6b)
+  )
+  (label "~ESP_PWR" (at 92.71 96.52 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid b7b12984-46ab-46a9-b496-d72a01049b35)
+  )
   (label "~RST" (at 93.98 53.34 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 423d6735-7266-485b-88b2-24c6d0b60bca)
@@ -4624,10 +4701,18 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3751f4ae-730b-4038-b33f-3690afa240df)
   )
+  (label "STM_VUSB" (at 100.33 243.84 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 2da4e194-f16e-486f-8795-b09ee4d82d7b)
+  )
   (label "AVDD_STM" (at 127 35.56 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8fb662e5-1108-4ef7-93f0-479a41692e9c)
   )
+  (label "STM_VUSB" (at 135.89 46.99 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 3440d6cf-9957-4d45-91d6-fbdf4d7da116)
+  )
   (label "ADS_NDRDY" (at 152.4 83.82 180)
     (effects (font (size 1.524 1.524)) (justify right bottom))
     (uuid 09dd8ec9-97ee-4461-bcf7-0ee1bc47feab)
@@ -4664,13 +4749,9 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 61815940-b104-465d-a163-760b17723549)
   )
-  (label "ADS_NRST" (at 152.4 109.22 180)
-    (effects (font (size 1.524 1.524)) (justify right bottom))
-    (uuid bc284b69-c5da-46f8-9bdc-bebefc95747f)
-  )
-  (label "~ESP_PWR" (at 152.4 111.76 180)
+  (label "STM_DM" (at 152.4 109.22 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid b7b12984-46ab-46a9-b496-d72a01049b35)
+    (uuid 3092c194-e2ac-481a-880d-e1a3b1a801a8)
   )
   (label "SWDIO" (at 152.4 114.3 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
@@ -4724,6 +4805,14 @@
     (effects (font (size 1.524 1.524)) (justify left bottom))
     (uuid 06d8e6cd-3fa7-4633-8e72-1145f73f1c4e)
   )
+  (label "STM_DP" (at 181.61 111.76 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 725a2128-6c27-4f23-a544-f6cb34be9616)
+  )
+  (label "STM_USB_PULLUP" (at 181.61 115.57 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 09491bfb-7647-4adc-9ab2-555f0c50010f)
+  )
   (label "ESP_EN_POST" (at 181.61 158.75 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 13e23734-ff19-4488-9c57-26f8ed243cf5)
@@ -4912,14 +5001,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e74c1860-b2b8-40b0-a870-2bf4f068282e)
   )
-  (label "ESP_RX0" (at 316.23 147.32 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid b192280b-564e-47e2-9faf-b18af3f88125)
-  )
-  (label "ESP_TX0" (at 316.23 149.86 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 6e565d57-fb82-4a5c-b768-e60e4d9a4e69)
-  )
   (label "SD_DAT2" (at 316.23 226.06 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4aebaecd-ebc4-4bdf-8095-0fa5273cdd01)
@@ -5031,130 +5112,94 @@
     (pin "1" (uuid 88ad69e9-d319-49c2-b91c-8d37f4b28019))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 88.9 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 5e4207aa-66a1-4158-a42f-7c22ff08f0a2)
-    (property "Reference" "TP4" (id 0) (at 96.0691 88.7729 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "PB3" (id 1) (at 97.098 88.773 90)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 101.6 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 79ac1d97-50ac-4e17-8965-73a625ba8d4b))
-  )
-
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 91.44 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 101.6 109.22 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid f10d5314-1eed-43a3-95f8-9f52300a7ae7)
-    (property "Reference" "TP5" (id 0) (at 96.0691 91.3129 90)
+    (uuid c2ea7021-e1ae-4c0a-b6b5-6ff7d95156ec)
+    (property "Reference" "TP7" (id 0) (at 96.0691 109.0929 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PB4" (id 1) (at 97.098 91.313 90)
+    (property "Value" "PB11" (id 1) (at 97.098 109.093 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 86.36 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 86.36 0)
+    (property "Datasheet" "~" (id 3) (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid cc18034d-5853-444a-8fb2-2d5d5efa13af))
+    (pin "1" (uuid aa7f524e-8643-4c59-83c7-a3dc9facd90c))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 93.98 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 101.6 111.76 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2f09e129-514c-414c-b5b9-5544082d71d1)
-    (property "Reference" "TP6" (id 0) (at 96.0691 93.8529 90)
+    (property "Reference" "TP6" (id 0) (at 96.0691 111.6329 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PB5" (id 1) (at 97.098 93.853 90)
+    (property "Value" "PB12" (id 1) (at 97.098 111.633 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 88.9 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 88.9 0)
+    (property "Datasheet" "~" (id 3) (at 101.6 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2cf9d625-1dd2-4689-ba35-44de01425418))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 96.52 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid c2ea7021-e1ae-4c0a-b6b5-6ff7d95156ec)
-    (property "Reference" "TP7" (id 0) (at 96.0691 96.3929 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "PB6" (id 1) (at 97.098 96.393 90)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 101.6 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid aa7f524e-8643-4c59-83c7-a3dc9facd90c))
-  )
-
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 106.68 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 101.6 114.3 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid c8f0c915-fe22-4a2d-b653-be638622d408)
-    (property "Reference" "TP8" (id 0) (at 96.0691 106.5529 90)
+    (uuid 5e4207aa-66a1-4158-a42f-7c22ff08f0a2)
+    (property "Reference" "TP4" (id 0) (at 96.0691 114.1729 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PB10" (id 1) (at 97.098 106.553 90)
+    (property "Value" "PB13" (id 1) (at 97.098 114.173 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 101.6 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 101.6 0)
+    (property "Datasheet" "~" (id 3) (at 101.6 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid c25c1ce6-1dff-4380-8cd6-e9d4284ae9e6))
+    (pin "1" (uuid 79ac1d97-50ac-4e17-8965-73a625ba8d4b))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 109.22 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 101.6 116.84 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 440e870e-b4ab-4995-aac6-b02be450c297)
-    (property "Reference" "TP9" (id 0) (at 96.0691 109.0929 90)
+    (uuid f10d5314-1eed-43a3-95f8-9f52300a7ae7)
+    (property "Reference" "TP5" (id 0) (at 96.0691 116.7129 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PB11" (id 1) (at 97.098 109.093 90)
+    (property "Value" "PB14" (id 1) (at 97.098 116.713 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 104.14 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 104.14 0)
+    (property "Datasheet" "~" (id 3) (at 101.6 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 96c22034-0dcb-4ede-9559-5bdd90453820))
+    (pin "1" (uuid cc18034d-5853-444a-8fb2-2d5d5efa13af))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 101.6 111.76 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 134.62 81.28 270) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid e73d6560-3aaa-4d94-b51e-c0b99b43c295)
-    (property "Reference" "TP10" (id 0) (at 96.0691 111.6329 90)
+    (uuid 8a3d9fac-edcf-4911-960e-cd8f6ad6f064)
+    (property "Reference" "TP8" (id 0) (at 140.1509 81.4071 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PB12" (id 1) (at 97.098 111.633 90)
+    (property "Value" "PA0" (id 1) (at 139.122 81.407 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 101.6 106.68 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_1.5x1.5mm" (id 2) (at 134.62 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 106.68 0)
+    (property "Datasheet" "~" (id 3) (at 134.62 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 55dce810-2ce5-4708-ae23-9fd2b097dabd))
+    (pin "1" (uuid 6a8a3e18-b9c2-4889-a155-6dee6852881f))
   )
 
   (symbol (lib_id "Connector:TestPoint") (at 300.99 82.55 90) (unit 1)
@@ -5608,7 +5653,7 @@
   (symbol (lib_id "power:GND") (at 52.07 27.94 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7342aafa-40a9-4872-b0ee-d3f007a3372d)
-    (property "Reference" "#PWR?" (id 0) (at 52.07 34.29 0)
+    (property "Reference" "#PWR0120" (id 0) (at 52.07 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 52.1843 32.2644 0))
@@ -5685,6 +5730,22 @@
     (pin "1" (uuid 6f95b87d-f87f-4c3e-bff4-6d907a9e3e4d))
   )
 
+  (symbol (lib_id "power:GND") (at 82.55 250.19 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 97ead892-37d9-4112-8dd7-617726e94232)
+    (property "Reference" "#PWR0122" (id 0) (at 82.55 256.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 82.6643 254.5144 0))
+    (property "Footprint" "" (id 2) (at 82.55 250.19 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 82.55 250.19 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e12a632b-d9b3-47a4-b976-8216a82bcdc9))
+  )
+
   (symbol (lib_id "power:GND") (at 109.22 45.72 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8c2bcfe2-39f6-485c-b88a-0756555b6faa)
@@ -6007,22 +6068,6 @@
     (pin "1" (uuid 0fdb427e-889c-4d96-96b2-ccc1ae9fd9a8))
   )
 
-  (symbol (lib_id "power:GND") (at 325.12 154.94 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e02c6a39-2c24-4f2c-a940-4eeeae8de692)
-    (property "Reference" "#PWR0126" (id 0) (at 325.12 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 325.2343 159.2644 0))
-    (property "Footprint" "" (id 2) (at 325.12 154.94 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 325.12 154.94 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f5176b39-b729-491c-968c-7c91ea044a5e))
-  )
-
   (symbol (lib_id "power:GND") (at 345.44 227.33 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 02b6a033-d485-4099-97a7-9e691e337a36)
@@ -6207,6 +6252,44 @@
     (pin "2" (uuid 161f4e9f-0bf3-4873-9a6c-1001514352ed))
   )
 
+  (symbol (lib_id "Device:R_Small") (at 82.55 240.03 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid aa05f398-6be8-4e95-a325-beecf8806ad1)
+    (property "Reference" "R35" (id 0) (at 84.0487 238.8806 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 84.049 241.179 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 82.55 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 82.55 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7e14c164-9969-4f50-ba24-61c4637de616))
+    (pin "2" (uuid 1f6dc1e9-d93f-4b18-9939-e7346f438ac8))
+  )
+
+  (symbol (lib_id "Device:R_Small") (at 82.55 247.65 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid ff03e2b9-3bf7-4014-bd4e-904b97f0e74f)
+    (property "Reference" "R36" (id 0) (at 84.0487 246.5006 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 84.049 248.799 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 82.55 247.65 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 82.55 247.65 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 093d474e-a8e0-4548-bd7b-8d7748a9412f))
+    (pin "2" (uuid 9427f91b-80de-4535-a18e-7f90f4561c16))
+  )
+
   (symbol (lib_id "Device:R_Small") (at 85.09 96.52 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ae542bfc-e251-413c-9c96-49ec9743adf4)
@@ -6260,6 +6343,21 @@
     (pin "2" (uuid d89c86aa-6eaa-4545-a8e9-bb90fa5001fa))
   )
 
+  (symbol (lib_id "Device:R_Small") (at 160.02 115.57 270) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c0c05ce4-f81d-44c7-b9c9-e2bc3fe93e41)
+    (property "Reference" "R37" (id 0) (at 159.9438 113.1508 90))
+    (property "Value" "1k5" (id 1) (at 160.02 118.218 90))
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 160.02 115.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 160.02 115.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7aa8926f-d99a-442e-8c1b-fc50b8e0614e))
+    (pin "2" (uuid 7df2fcd7-b25f-4f37-a2cb-ba802aac12d2))
+  )
+
   (symbol (lib_id "Device:R_Small") (at 168.91 158.75 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9a5d3577-9898-44f0-bfb3-890f55a0cde5)
@@ -6763,10 +6861,10 @@
     (property "Reference" "Y2" (id 0) (at 68.9609 72.5106 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "32k" (id 1) (at 68.961 74.809 90)
+    (property "Value" "32.768k" (id 1) (at 68.961 74.809 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 71.12 73.66 0)
+    (property "Footprint" "Crystal:Crystal_SMD_3215-2Pin_3.2x1.5mm" (id 2) (at 71.12 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 71.12 73.66 0)
@@ -7393,7 +7491,7 @@
     (property "Value" "8M w/ 12p load" (id 1) (at 51.816 67.189 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 71.12 66.04 0)
+    (property "Footprint" "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm" (id 2) (at 71.12 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 71.12 66.04 0)
@@ -7483,10 +7581,10 @@
   (symbol (lib_id "Connector_Generic:Conn_01x04") (at 59.69 22.86 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cf7d5a77-0838-4807-afbc-2c8f610d5d31)
-    (property "Reference" "J?" (id 0) (at 61.7221 22.6886 0)
+    (property "Reference" "J8" (id 0) (at 61.7221 22.6886 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "ESP_UART" (id 1) (at 61.722 20.39 0)
+    (property "Value" "STM_SWD" (id 1) (at 61.722 20.39 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Connector_JST:JST_XH_S4B-XH-A_1x04_P2.50mm_Horizontal" (id 2) (at 59.69 22.86 0)
@@ -7501,27 +7599,6 @@
     (pin "4" (uuid 3f8c0488-2ce5-44ee-86d4-00c3ac1a1aad))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x04") (at 332.74 147.32 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid c9ed2319-f4f4-479b-8f0c-c947fc9c2ae7)
-    (property "Reference" "J5" (id 0) (at 334.7721 147.4914 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ESP_UART" (id 1) (at 334.772 149.79 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_JST:JST_XH_S4B-XH-A_1x04_P2.50mm_Horizontal" (id 2) (at 332.74 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 332.74 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2da4453e-f281-49f3-b2a9-e226787f220a))
-    (pin "2" (uuid ad40534f-5905-452e-975d-af581efc0c7a))
-    (pin "3" (uuid 5f542e79-aea4-4fb8-8f41-c241c3be5e47))
-    (pin "4" (uuid b919f5fc-8cb9-4daa-a217-28391d739107))
-  )
-
   (symbol (lib_id "Switch:SW_DPDT_x2") (at 48.26 162.56 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 66dadf08-9b19-4a66-a937-42707c88c289)
@@ -8102,9 +8179,15 @@
     (path "/ca17c7f2-b24d-405f-8e11-cbea9f860617"
       (reference "#PWR0119") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/7342aafa-40a9-4872-b0ee-d3f007a3372d"
+      (reference "#PWR0120") (unit 1) (value "GND") (footprint "")
+    )
     (path "/8baf17d7-a794-42cf-948f-2db6ee0e1736"
       (reference "#PWR0121") (unit 1) (value "GND") (footprint "")
     )
+    (path "/97ead892-37d9-4112-8dd7-617726e94232"
+      (reference "#PWR0122") (unit 1) (value "GND") (footprint "")
+    )
     (path "/9fc61c82-34c2-4de3-923f-842bbdf303a8"
       (reference "#PWR0123") (unit 1) (value "GND") (footprint "")
     )
@@ -8114,9 +8197,6 @@
     (path "/b5e43be1-9d47-4891-b7e1-c1592b9f74a7"
       (reference "#PWR0125") (unit 1) (value "GND") (footprint "")
     )
-    (path "/e02c6a39-2c24-4f2c-a940-4eeeae8de692"
-      (reference "#PWR0126") (unit 1) (value "GND") (footprint "")
-    )
     (path "/02b6a033-d485-4099-97a7-9e691e337a36"
       (reference "#PWR0127") (unit 1) (value "GND") (footprint "")
     )
@@ -8150,9 +8230,6 @@
     (path "/1c846aea-1ccd-4b1f-9621-ec36543c7265"
       (reference "#PWR0137") (unit 1) (value "GND") (footprint "")
     )
-    (path "/7342aafa-40a9-4872-b0ee-d3f007a3372d"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/fdae8ac0-ef2a-4be7-a53f-b161bbfde3a7"
       (reference "C1") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
@@ -8264,9 +8341,6 @@
     (path "/a4ba0ca6-5ef9-4df9-8b16-2209bbdec38b"
       (reference "J4") (unit 1) (value "ESP_JTAG") (footprint "Connector_JST:JST_XH_S6B-XH-A_1x06_P2.50mm_Horizontal")
     )
-    (path "/c9ed2319-f4f4-479b-8f0c-c947fc9c2ae7"
-      (reference "J5") (unit 1) (value "ESP_UART") (footprint "Connector_JST:JST_XH_S4B-XH-A_1x04_P2.50mm_Horizontal")
-    )
     (path "/ac662f51-b1e4-4e6d-9fe3-cdf462557ce2"
       (reference "J6") (unit 1) (value "Micro_SD_Card_Det") (footprint "footprints:GCT_MEM2061-01-188-00-A_REVA")
     )
@@ -8274,7 +8348,7 @@
       (reference "J7") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "Connector_USB:USB_C_Receptacle_Amphenol_12401610E4-2A")
     )
     (path "/cf7d5a77-0838-4807-afbc-2c8f610d5d31"
-      (reference "J?") (unit 1) (value "ESP_UART") (footprint "Connector_JST:JST_XH_S4B-XH-A_1x04_P2.50mm_Horizontal")
+      (reference "J8") (unit 1) (value "STM_SWD") (footprint "Connector_JST:JST_XH_S4B-XH-A_1x04_P2.50mm_Horizontal")
     )
     (path "/a3d33833-f98a-4448-bd9b-2f9b9ae34dab"
       (reference "L1") (unit 1) (value "L_Core_Ferrite_Small") (footprint "Inductor_SMD:L_0402_1005Metric")
@@ -8459,6 +8533,15 @@
     (path "/df107261-5848-4d17-bb19-ff17b3abc06b"
       (reference "R34") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
+    (path "/aa05f398-6be8-4e95-a325-beecf8806ad1"
+      (reference "R35") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
+    (path "/ff03e2b9-3bf7-4014-bd4e-904b97f0e74f"
+      (reference "R36") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
+    (path "/c0c05ce4-f81d-44c7-b9c9-e2bc3fe93e41"
+      (reference "R37") (unit 1) (value "1k5") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
     (path "/8e9ffaa0-3390-419c-8fb4-694bbc6fe469"
       (reference "SW1") (unit 1) (value "STM_RST") (footprint "")
     )
@@ -8484,25 +8567,19 @@
       (reference "TP3") (unit 1) (value "PB2") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
     )
     (path "/5e4207aa-66a1-4158-a42f-7c22ff08f0a2"
-      (reference "TP4") (unit 1) (value "PB3") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
+      (reference "TP4") (unit 1) (value "PB13") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
     )
     (path "/f10d5314-1eed-43a3-95f8-9f52300a7ae7"
-      (reference "TP5") (unit 1) (value "PB4") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
+      (reference "TP5") (unit 1) (value "PB14") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
     )
     (path "/2f09e129-514c-414c-b5b9-5544082d71d1"
-      (reference "TP6") (unit 1) (value "PB5") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
+      (reference "TP6") (unit 1) (value "PB12") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
     )
     (path "/c2ea7021-e1ae-4c0a-b6b5-6ff7d95156ec"
-      (reference "TP7") (unit 1) (value "PB6") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
-    )
-    (path "/c8f0c915-fe22-4a2d-b653-be638622d408"
-      (reference "TP8") (unit 1) (value "PB10") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
-    )
-    (path "/440e870e-b4ab-4995-aac6-b02be450c297"
-      (reference "TP9") (unit 1) (value "PB11") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
+      (reference "TP7") (unit 1) (value "PB11") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
     )
-    (path "/e73d6560-3aaa-4d94-b51e-c0b99b43c295"
-      (reference "TP10") (unit 1) (value "PB12") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
+    (path "/8a3d9fac-edcf-4911-960e-cd8f6ad6f064"
+      (reference "TP8") (unit 1) (value "PA0") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
     )
     (path "/98d7feae-cf6a-40a7-a170-6f8d1efbf8ea"
       (reference "TP22") (unit 1) (value "TNOW") (footprint "TestPoint:TestPoint_Pad_1.5x1.5mm")
@@ -8529,10 +8606,10 @@
       (reference "U5") (unit 1) (value "AMS1117-3.3") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
     )
     (path "/22fae4c8-e3f1-4370-9929-a09e30fe4456"
-      (reference "Y1") (unit 1) (value "8M w/ 12p load") (footprint "")
+      (reference "Y1") (unit 1) (value "8M w/ 12p load") (footprint "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm")
     )
     (path "/39a07fea-6ffc-4d52-b509-9b133e014bbb"
-      (reference "Y2") (unit 1) (value "32k") (footprint "")
+      (reference "Y2") (unit 1) (value "32.768k") (footprint "Crystal:Crystal_SMD_3215-2Pin_3.2x1.5mm")
     )
   )
 )