More routing, start moving silkscreen

1 files changed, 290 insertions, 486 deletions

diff --git a/kicad-dart-70/kicad-dart-70.kicad_sch b/kicad-dart-70/kicad-dart-70.kicad_sch
index b685d78..27f5fd1 100644
--- a/kicad-dart-70/kicad-dart-70.kicad_sch
+++ b/kicad-dart-70/kicad-dart-70.kicad_sch
@@ -2176,6 +2176,58 @@
         )
       )
     )
+    (symbol "power:+3V3" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "+3V3" (id 1) (at 0 3.556 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" "global power" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Power symbol creates a global label with name \"+3V3\"" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "+3V3_0_1"
+        (polyline
+          (pts
+            (xy -0.762 1.27)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy 0.762 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "+3V3_1_1"
+        (pin power_in line (at 0 0 90) (length 0) hide
+          (name "+3V3" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -2270,7 +2322,7 @@
   (junction (at 259.08 148.59) (diameter 0) (color 0 0 0 0)
     (uuid 11ea7b85-b26d-4a7d-aaed-956352284452)
   )
-  (junction (at 109.22 19.05) (diameter 0) (color 0 0 0 0)
+  (junction (at 46.99 19.05) (diameter 0) (color 0 0 0 0)
     (uuid 130d74aa-cfde-4c45-8bfe-183aacd4590f)
   )
   (junction (at 266.7 44.45) (diameter 0) (color 0 0 0 0)
@@ -2279,7 +2331,7 @@
   (junction (at 210.82 24.13) (diameter 0) (color 0 0 0 0)
     (uuid 13b9a948-b29a-4475-8f42-f20ed3ed1c6a)
   )
-  (junction (at 200.66 121.92) (diameter 0) (color 0 0 0 0)
+  (junction (at 125.73 24.13) (diameter 0) (color 0 0 0 0)
     (uuid 1c29ab88-8089-4a9f-b0ec-e0493fb70d1a)
   )
   (junction (at 30.48 29.21) (diameter 0) (color 0 0 0 0)
@@ -2300,13 +2352,13 @@
   (junction (at 231.14 21.59) (diameter 0) (color 0 0 0 0)
     (uuid 4750ee37-26c3-426a-a03a-0a50ee4de791)
   )
-  (junction (at 105.41 19.05) (diameter 0) (color 0 0 0 0)
+  (junction (at 43.18 19.05) (diameter 0) (color 0 0 0 0)
     (uuid 48d3528f-d200-4dbf-87c6-2835721afb0e)
   )
   (junction (at 26.67 158.75) (diameter 0) (color 0 0 0 0)
     (uuid 4909e963-8ed8-4cc7-a752-cf9a746ceb8a)
   )
-  (junction (at 175.26 121.92) (diameter 0) (color 0 0 0 0)
+  (junction (at 100.33 24.13) (diameter 0) (color 0 0 0 0)
     (uuid 547281cc-eb15-43de-9560-1b10e39a19ed)
   )
   (junction (at 238.76 31.75) (diameter 0) (color 0 0 0 0)
@@ -2327,6 +2379,9 @@
   (junction (at 140.97 24.13) (diameter 0) (color 0 0 0 0)
     (uuid 91bb5e66-90e9-4aff-b233-5b8d53e4ad1c)
   )
+  (junction (at 124.46 24.13) (diameter 0) (color 0 0 0 0)
+    (uuid 94eb2c38-e244-489c-ba32-44729ff54deb)
+  )
   (junction (at 26.67 166.37) (diameter 0) (color 0 0 0 0)
     (uuid 9fb2ca3c-8612-4c01-a40b-6e7e5895a1a0)
   )
@@ -2336,13 +2391,10 @@
   (junction (at 200.66 40.64) (diameter 0) (color 0 0 0 0)
     (uuid a13e5fb2-5800-4421-9e39-63277f01a71d)
   )
-  (junction (at 203.2 121.92) (diameter 0) (color 0 0 0 0)
-    (uuid a99cd17b-9938-46df-92bb-88378a42ecd6)
-  )
   (junction (at 274.32 148.59) (diameter 0) (color 0 0 0 0)
     (uuid a9fed849-c0d2-45ff-802c-7da3e4c52c0a)
   )
-  (junction (at 189.23 129.54) (diameter 0) (color 0 0 0 0)
+  (junction (at 114.3 31.75) (diameter 0) (color 0 0 0 0)
     (uuid b0c265f7-c716-45d5-8397-630db4d2cf65)
   )
   (junction (at 218.44 21.59) (diameter 0) (color 0 0 0 0)
@@ -2351,7 +2403,7 @@
   (junction (at 234.95 44.45) (diameter 0) (color 0 0 0 0)
     (uuid d26d0a63-c69d-4774-9fba-12ed686b99f6)
   )
-  (junction (at 113.03 19.05) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 19.05) (diameter 0) (color 0 0 0 0)
     (uuid d4b4dbc7-e763-47b2-a6cb-b5c021db8bcc)
   )
   (junction (at 55.88 137.16) (diameter 0) (color 0 0 0 0)
@@ -2405,9 +2457,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0116339a-5f0d-4745-a575-44652fb7d9b0)
   )
-  (wire (pts (xy 76.2 76.2) (xy 92.71 76.2))
+  (wire (pts (xy 83.82 71.12) (xy 83.82 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0444269c-f636-4979-a74f-a6f628f157d3)
+    (uuid 04508b78-b957-4886-b3fa-3d951fb6452d)
   )
   (wire (pts (xy 246.38 143.51) (xy 245.11 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2425,7 +2477,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0a3a19af-7bfa-4df3-9b73-b98420c4a518)
   )
-  (wire (pts (xy 105.41 19.05) (xy 109.22 19.05))
+  (wire (pts (xy 43.18 19.05) (xy 46.99 19.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0aad0e8d-0747-412b-85ac-039bbac4ff5e)
   )
@@ -2441,11 +2493,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0dd7a947-881a-4477-b1f8-b88536ca8809)
   )
-  (wire (pts (xy 48.26 76.2) (xy 59.69 76.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 11114267-0a22-4468-9ba9-2433a5bea9a9)
-  )
-  (wire (pts (xy 175.26 121.92) (xy 175.26 123.19))
+  (wire (pts (xy 100.33 24.13) (xy 100.33 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11b5652b-07d3-428f-98d5-c354cf3693b1)
   )
@@ -2453,14 +2501,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 160e3a4c-588b-4e79-ac75-f98bf80b7e0b)
   )
-  (wire (pts (xy 85.09 50.8) (xy 76.2 50.8))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 16f4aa89-10b3-4c19-aee2-b110182c6854)
-  )
-  (wire (pts (xy 200.66 121.92) (xy 203.2 121.92))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 17ba5b19-2b5b-474e-9c14-1c7d35991587)
-  )
   (wire (pts (xy 210.82 31.75) (xy 210.82 33.02))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 17fc291b-23f9-4de7-9168-978b13dcd03c)
@@ -2477,14 +2517,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1bcf4a11-4c4f-42b8-9e84-ad79d97ffe8f)
   )
-  (wire (pts (xy 48.26 88.9) (xy 59.69 88.9))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1de35109-2490-47e3-8be5-ab22f13c6848)
-  )
-  (wire (pts (xy 48.26 50.8) (xy 59.69 50.8))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1ef50cec-8701-41c9-a796-aac175c3bcb1)
-  )
   (wire (pts (xy 193.04 24.13) (xy 189.23 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2199bdfc-0462-4363-af5e-16d8e19d600a)
@@ -2498,7 +2530,7 @@
     (uuid 246d8c70-0329-4f4d-9351-49df120458af)
   )
 
-  (wire (pts (xy 175.26 121.92) (xy 181.61 121.92))
+  (wire (pts (xy 100.33 24.13) (xy 106.68 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 28eca374-9b5c-4480-a1a6-52ddcbb57db2)
   )
@@ -2506,11 +2538,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2a86319a-5a94-4745-ad80-6b5c02f72e82)
   )
-  (polyline (pts (xy 67.31 41.91) (xy 67.31 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2df6f517-3da3-4761-bd39-ad71c01eb424)
-  )
-
   (wire (pts (xy 158.75 24.13) (xy 161.29 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ea38bc3-7d3b-428e-a271-404ee98e752b)
@@ -2519,10 +2546,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2f9b686c-0a8f-432b-9e90-c788e62691c6)
   )
-  (wire (pts (xy 76.2 88.9) (xy 92.71 88.9))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 311d4ef9-a0ea-4e8e-b65b-70e91af2608e)
-  )
   (wire (pts (xy 200.66 40.64) (xy 210.82 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 33f01d9a-6abc-40a9-9b6b-d34bddbf731f)
@@ -2543,18 +2566,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3ee41aac-558c-43a3-a816-e31001ae8352)
   )
-  (wire (pts (xy 48.26 53.34) (xy 59.69 53.34))
+  (wire (pts (xy 48.26 76.2) (xy 92.71 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3f726201-a2b0-494c-bb67-0bed26cc560f)
+    (uuid 3eeccf02-360d-4377-89f3-2458946d5853)
   )
   (wire (pts (xy 34.29 158.75) (xy 26.67 158.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4112aabb-0408-4a3a-9841-f57862637df1)
   )
-  (wire (pts (xy 203.2 121.92) (xy 232.41 121.92))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4352329b-0bea-46d5-b530-75bbd8a0b1ef)
-  )
   (wire (pts (xy 158.75 31.75) (xy 151.13 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 443127ca-ab31-4ac0-90cc-723625487807)
@@ -2563,10 +2582,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4435e8ff-b63e-4b32-81db-49caa0dd6c5f)
   )
-  (wire (pts (xy 48.26 55.88) (xy 59.69 55.88))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 475d7116-2e26-4a72-942e-766ab472ca0d)
-  )
   (polyline (pts (xy 41.91 116.84) (xy 41.91 196.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4b105a5f-5ed5-49ae-8bb9-f1d8c5566b50)
@@ -2604,11 +2619,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 568b5dd5-7629-4c3d-9388-eaa54c2762b1)
   )
-  (wire (pts (xy 48.26 78.74) (xy 59.69 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 56cb3f92-2c0e-42ee-84b9-de64810b5c8d)
-  )
-  (wire (pts (xy 97.79 19.05) (xy 105.41 19.05))
+  (wire (pts (xy 35.56 19.05) (xy 43.18 19.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 579d81c4-8fa6-40d5-b99a-d160787b45b9)
   )
@@ -2636,10 +2647,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5c0d735a-ca1c-4202-8faf-02e515d1181f)
   )
-  (wire (pts (xy 76.2 78.74) (xy 92.71 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5cd8bda4-22ef-4084-8249-44fe15f1fc0e)
-  )
   (wire (pts (xy 259.08 21.59) (xy 231.14 21.59))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5ea05504-bb96-4847-90cf-26cb1afd4244)
@@ -2657,6 +2664,10 @@
     (uuid 6188cf07-9c8d-498a-9db9-9718888dfe39)
   )
 
+  (wire (pts (xy 124.46 24.13) (xy 125.73 24.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 63da3512-bd51-489d-833d-20bce6d76019)
+  )
   (wire (pts (xy 251.46 140.97) (xy 246.38 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 64e90390-0f4c-4cc1-bafa-363ce23516e9)
@@ -2685,10 +2696,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6b09c60c-c53b-47dd-b8b8-94f682cd2086)
   )
-  (wire (pts (xy 48.26 81.28) (xy 59.69 81.28))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c2583d2-6254-4856-a6b8-160d5f6a3f99)
-  )
   (wire (pts (xy 50.8 151.13) (xy 52.07 151.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6cc72bfd-2651-4e90-af42-5d6cec3950c1)
@@ -2697,6 +2704,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7019dafb-64b4-4e22-837e-9f37341a0157)
   )
+  (wire (pts (xy 48.26 78.74) (xy 92.71 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 73062404-be1b-4744-bd1e-9e3d624b8fb3)
+  )
   (wire (pts (xy 55.88 137.16) (xy 58.42 137.16))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 735e33ba-0601-4acb-983d-1656020ec14e)
@@ -2754,15 +2765,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 816e41e9-8ef8-4e70-a70f-02175bdc97c4)
   )
-  (polyline (pts (xy 13.97 41.91) (xy 13.97 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 834eed63-98bc-4692-be8a-6868d5c838d4)
-  )
-
-  (wire (pts (xy 48.26 66.04) (xy 59.69 66.04))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 836458d9-8a3b-4d53-aaf1-9cc6ec2305f2)
-  )
   (wire (pts (xy 234.95 44.45) (xy 231.14 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 86c60f4b-4421-4865-beff-ed93adca8ac2)
@@ -2775,14 +2777,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8b36f37f-a068-4636-8967-22103b343d70)
   )
-  (wire (pts (xy 76.2 81.28) (xy 92.71 81.28))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8b38ff0f-fed5-4ee4-8847-6ec4f4b389a9)
-  )
-  (wire (pts (xy 48.26 86.36) (xy 59.69 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8c8438c2-dfb5-4131-857c-1ad8997220ea)
-  )
   (wire (pts (xy 247.65 161.29) (xy 246.38 161.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e0abe23-8e7e-48a9-af11-f26197bd8fbf)
@@ -2819,7 +2813,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 98ea83ac-41c6-4b7d-be63-41372bbd6e24)
   )
-  (wire (pts (xy 175.26 128.27) (xy 175.26 129.54))
+  (wire (pts (xy 100.33 30.48) (xy 100.33 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 99f8394d-1325-4f0e-9ed0-19dceab6e1f9)
   )
@@ -2843,15 +2837,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a057c374-c462-4764-bd16-2c00eef92afa)
   )
-  (wire (pts (xy 31.75 105.41) (xy 38.1 105.41))
+  (wire (pts (xy 48.26 81.28) (xy 92.71 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a1abde39-78d5-402d-bb1c-75243c61d29b)
+    (uuid a1864b64-1865-4240-b098-5056fb759def)
   )
-  (wire (pts (xy 48.26 58.42) (xy 59.69 58.42))
+  (wire (pts (xy 31.75 105.41) (xy 38.1 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a2c10dec-c0b0-471a-b75e-c1a8452900c1)
+    (uuid a1abde39-78d5-402d-bb1c-75243c61d29b)
   )
-  (wire (pts (xy 232.41 121.92) (xy 232.41 127))
+  (wire (pts (xy 232.41 124.46) (xy 232.41 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a39008b0-0dd6-44dc-b176-ab03b6874ae7)
   )
@@ -2863,7 +2857,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a5f4f26e-4b82-496f-b7bb-4ed4211f8100)
   )
-  (wire (pts (xy 175.26 129.54) (xy 189.23 129.54))
+  (wire (pts (xy 100.33 31.75) (xy 114.3 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a69bb6f5-978b-49bb-9446-4ec9cfe4501e)
   )
@@ -2883,10 +2877,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a99a526a-0727-4d5d-b793-47c299fd72ba)
   )
-  (wire (pts (xy 48.26 83.82) (xy 59.69 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ac0ae1b6-d482-4675-aec8-4c2f8c7318db)
-  )
   (wire (pts (xy 138.43 66.04) (xy 138.43 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ad195d4d-ed76-4a26-ac30-01da417bd64b)
@@ -2911,23 +2901,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b32653e4-7801-40ea-b61b-f0311c01d3b4)
   )
-  (polyline (pts (xy 13.97 41.91) (xy 67.31 41.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b3f67849-c79e-4262-b803-d461d1887604)
-  )
-  (polyline (pts (xy 67.31 95.25) (xy 13.97 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b415a656-e3e5-4629-aa6c-6a23a847c576)
-  )
-
   (wire (pts (xy 266.7 44.45) (xy 259.08 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b5cbe891-dcdf-4951-8f0a-b2c28e4293cd)
   )
-  (wire (pts (xy 48.26 63.5) (xy 59.69 63.5))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bb13b6c6-7b88-4971-969d-518c0a6e43cc)
-  )
   (wire (pts (xy 231.14 24.13) (xy 233.68 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bb78f99c-6783-4afe-a661-68817d4180ab)
@@ -2940,7 +2917,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bda7a16e-b931-4d51-b769-ff5809beef5f)
   )
-  (wire (pts (xy 48.26 60.96) (xy 59.69 60.96))
+  (wire (pts (xy 48.26 60.96) (xy 83.82 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bfce1213-d511-4811-bc9d-beb994b8b9fe)
   )
@@ -2968,10 +2945,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c64a6907-65ea-4d9f-8271-b12257b06b60)
   )
-  (wire (pts (xy 76.2 73.66) (xy 92.71 73.66))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cb987807-5979-49b5-8522-334a69d0b59b)
-  )
   (wire (pts (xy 261.62 148.59) (xy 259.08 148.59))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cbbfb5e5-7e85-4367-b6a7-9b21fc6d9e17)
@@ -2984,7 +2957,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc89f37d-2221-4ee8-a763-21432c733f93)
   )
-  (wire (pts (xy 196.85 121.92) (xy 200.66 121.92))
+  (wire (pts (xy 121.92 24.13) (xy 124.46 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cdc3b2bb-9f60-476c-ac94-bf550b6e7b5e)
   )
@@ -3016,15 +2989,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3a84e57-57ed-4e86-bbef-110f27537e2d)
   )
-  (wire (pts (xy 85.09 60.96) (xy 76.2 60.96))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d4dea28c-2f1d-4f2b-9141-90634cbd9401)
-  )
   (wire (pts (xy 219.71 139.7) (xy 219.71 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d51dda35-7a1a-4d41-817a-7bb1f7f6ffd4)
   )
-  (wire (pts (xy 109.22 19.05) (xy 113.03 19.05))
+  (wire (pts (xy 125.73 24.13) (xy 130.81 24.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d525e71e-c2ed-4851-a87b-7438f67fb580)
+  )
+  (wire (pts (xy 46.99 19.05) (xy 50.8 19.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d5d26400-826e-40a5-a7b1-6a9ebbaedfb4)
   )
@@ -3032,10 +3005,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d6359d4b-1c12-4663-b116-45be3135a185)
   )
-  (wire (pts (xy 48.26 73.66) (xy 59.69 73.66))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dc5747ab-76be-4b9c-9c8e-2d26c29683ce)
-  )
   (wire (pts (xy 241.3 81.28) (xy 261.62 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dd34928a-03c5-4a5d-a033-92155af70ac7)
@@ -3044,11 +3013,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dd927172-6a9a-406f-a951-4e7f78cebb7b)
   )
-  (wire (pts (xy 85.09 71.12) (xy 85.09 60.96))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid de3779df-679b-4989-96e3-142247b3a611)
-  )
-  (wire (pts (xy 113.03 19.05) (xy 120.65 19.05))
+  (wire (pts (xy 50.8 19.05) (xy 58.42 19.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dfd58d9e-0c03-4a20-9983-0d32c26093d8)
   )
@@ -3072,7 +3037,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e176270a-9085-4242-b7c7-9ea9ab078583)
   )
-  (wire (pts (xy 189.23 129.54) (xy 200.66 129.54))
+  (wire (pts (xy 48.26 88.9) (xy 92.71 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e1e720db-7dfc-41da-9ad4-b3768ff49c06)
+  )
+  (wire (pts (xy 114.3 31.75) (xy 125.73 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e264f0d9-6386-4838-a810-81df8032f681)
   )
@@ -3084,6 +3053,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e7ac32f0-5e71-4c65-ac6f-730f4731f5f7)
   )
+  (wire (pts (xy 48.26 73.66) (xy 92.71 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e7fda734-bc52-4f7b-a47b-c1ec6d307d8f)
+  )
   (wire (pts (xy 274.32 148.59) (xy 269.24 148.59))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ea6f4611-7eac-4b21-b232-fff65a738b95)
@@ -3108,7 +3081,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f142e195-1e8c-4d80-b290-cc6d513aa04c)
   )
-  (wire (pts (xy 92.71 71.12) (xy 85.09 71.12))
+  (wire (pts (xy 83.82 71.12) (xy 92.71 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f22441fb-3978-4762-b6a3-6def4069e413)
   )
@@ -3128,7 +3101,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f9dc3b30-27fd-49c2-8e51-0eedd4fc4f72)
   )
-  (wire (pts (xy 200.66 128.27) (xy 200.66 129.54))
+  (wire (pts (xy 125.73 30.48) (xy 125.73 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc244ca3-4412-44ac-b1f3-44d00d15b5ac)
   )
@@ -3140,7 +3113,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fe8a3f3f-3126-421d-b59c-37217ed6f49c)
   )
-  (wire (pts (xy 200.66 121.92) (xy 200.66 123.19))
+  (wire (pts (xy 125.73 24.13) (xy 125.73 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ffb99ea8-48c3-486c-94d4-7034e45d57f7)
   )
@@ -3149,10 +3122,6 @@
     (uuid ffbbcbe6-15b0-480e-b792-9f7693fff52a)
   )
 
-  (text "Cable 15134-0803" (at 69.85 88.9 90)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 0929caf6-d906-41f2-ac17-e9ad4d47086b)
-  )
   (text "+5V for SPKR and LCD" (at 139.7 15.24 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 239d5a08-bfc0-4925-8e7a-6431dab8181d)
@@ -3176,9 +3145,9 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid cc99dfff-7e1c-41c9-90b0-50846ceea0a1)
   )
-  (text "Cable 15134-0803" (at 69.85 66.04 90)
+  (text "+3V3 for CLK, STM32 and mic amp" (at 95.25 15.24 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid f8c7090b-f4e5-4157-b560-7282b4d81d8e)
+    (uuid fe3f7dc5-df73-4ed5-9e26-595b8cfa5333)
   )
 
   (label "TX_to_PA" (at 207.01 76.2 0)
@@ -3189,7 +3158,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 37559495-9dfc-4a54-80ee-fad84f20dc2a)
   )
-  (label "SCL" (at 76.2 86.36 0)
+  (label "SCL" (at 48.26 86.36 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 38bd102f-633a-4953-97ad-13bc577149af)
   )
@@ -3197,7 +3166,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3e13cb83-601f-443a-a951-e96035da31e7)
   )
-  (label "EN_VRX" (at 76.2 53.34 0)
+  (label "EN_VRX" (at 48.26 53.34 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 618621f8-a3f4-49c8-9ea3-607c2df3756e)
   )
@@ -3209,15 +3178,15 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7906f11d-49c0-4b99-b74d-443c82e1ec6a)
   )
-  (label "EN_VTX" (at 76.2 55.88 0)
+  (label "EN_VTX" (at 48.26 55.88 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 79771a5b-bbc0-45e2-b3e2-33121a4ba792)
   )
-  (label "CW_RING" (at 76.2 66.04 0)
+  (label "CW_RING" (at 48.26 66.04 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 85e987f3-11f0-4e85-9be0-8c79e37e02ec)
   )
-  (label "SDA" (at 76.2 83.82 0)
+  (label "SDA" (at 48.26 83.82 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 861fa728-ad72-4a0e-81c5-e00ac8e2afd5)
   )
@@ -3225,11 +3194,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 999a6700-22eb-4836-86fc-2c4c3f94e081)
   )
-  (label "MIC_PTTn" (at 76.2 58.42 0)
+  (label "MIC_PTTn" (at 48.26 58.42 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 9a533855-32f3-454c-b9eb-791fa757c655)
   )
-  (label "CW_TIP" (at 76.2 63.5 0)
+  (label "CW_TIP" (at 48.26 63.5 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 9d366296-47c6-47a8-b170-ad51354d17b9)
   )
@@ -3237,11 +3206,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid a60b880d-79d5-4af9-b917-73bba79e19a9)
   )
-  (label "+3V3_CLK" (at 209.55 121.92 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid abb341f2-96b5-40b7-8b3d-c1ba0b3ea395)
-  )
-  (label "S_METER" (at 76.2 88.9 0)
+  (label "S_METER" (at 48.26 88.9 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid ae9e6037-71e8-40b8-9d18-52132b11e130)
   )
@@ -3249,7 +3214,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b1685444-7ed2-49f0-840b-5ade5d456940)
   )
-  (label "MUTE_MICn" (at 76.2 81.28 0)
+  (label "MUTE_MICn" (at 48.26 81.28 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid cb0bacd7-3cb4-4f05-90bb-6eac18befcbf)
   )
@@ -3288,13 +3253,6 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "+5VA" (shape input) (at 85.09 50.8 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 89d395fa-51a2-4d7d-b809-bdf3654e525b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 92.4621 50.8794 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "+VRX" (shape output) (at 243.84 24.13 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 8e3e968b-49f3-4efb-92bd-f40737515307)
@@ -3567,24 +3525,6 @@
     (pin "1" (uuid a068742f-7f54-4cb0-baeb-1f106dbc7114))
   )
 
-  (symbol (lib_id "power:GND") (at 76.2 48.26 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 19fdf020-4327-47c0-8e0b-59e6d14a1af7)
-    (property "Reference" "#PWR019" (id 0) (at 82.55 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 77.47 52.07 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 76.2 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 76.2 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 3e3ee519-ef8f-4164-b161-61dd58a55935))
-  )
-
   (symbol (lib_id "Connector_Generic:Conn_01x08") (at 45.72 156.21 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1a279761-775d-41bf-87c4-f29c57f2fe7b)
@@ -4260,28 +4200,28 @@
     (pin "2" (uuid 6c26ca2b-b655-4209-99a5-3299a114027b))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 200.66 125.73 0) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 125.73 27.94 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 4f85864b-dffa-48c5-a3ea-03c083def1f8)
-    (property "Reference" "C4" (id 0) (at 203.581 124.5616 0)
+    (property "Reference" "C4" (id 0) (at 128.651 26.7716 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "6.8uF" (id 1) (at 203.581 126.873 0)
+    (property "Value" "6.8uF" (id 1) (at 128.651 29.083 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 200.66 125.73 0)
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 125.73 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 200.66 125.73 0)
+    (property "Datasheet" "~" (id 3) (at 125.73 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "stash tantalum" (id 4) (at 200.66 125.73 0)
+    (property "MPN" "stash tantalum" (id 4) (at 125.73 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 200.66 125.73 0)
+    (property "Need_order" "0" (id 5) (at 125.73 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "OriginalValue" "" (id 6) (at 200.66 125.73 0)
+    (property "OriginalValue" "" (id 6) (at 125.73 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0e42e104-dcdc-406d-98c2-e11733a0f186))
@@ -4309,17 +4249,17 @@
     (pin "1" (uuid 7fbd4638-6be9-415d-b9aa-188ba6ee9be2))
   )
 
-  (symbol (lib_id "power:+12V") (at 175.26 121.92 0) (unit 1)
+  (symbol (lib_id "power:+12V") (at 100.33 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 52dd1893-fe73-4d56-8822-e6824ecc2078)
-    (property "Reference" "#PWR0220" (id 0) (at 175.26 125.73 0)
+    (property "Reference" "#PWR0220" (id 0) (at 100.33 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+12V" (id 1) (at 175.641 117.5258 0))
-    (property "Footprint" "" (id 2) (at 175.26 121.92 0)
+    (property "Value" "+12V" (id 1) (at 100.711 19.7358 0))
+    (property "Footprint" "" (id 2) (at 100.33 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 175.26 121.92 0)
+    (property "Datasheet" "" (id 3) (at 100.33 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8e6a633a-9741-493a-818a-9799d3f5a3dc))
@@ -4343,38 +4283,6 @@
     (pin "1" (uuid 764e0525-fb7c-4d5c-8a88-096d23a6a532))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 71.12 78.74 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 562719a2-e94e-47e7-aa40-00085d98e234)
-    (property "Reference" "J12" (id 0) (at 71.12 92.71 0))
-    (property "Value" "CTRL2" (id 1) (at 74.93 92.71 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal" (id 2) (at 71.12 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 71.12 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "53261-0871" (id 4) (at 71.12 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Manufacturer" "Molex" (id 5) (at 71.12 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "0" (id 6) (at 71.12 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2d504c86-2543-49a6-8e5d-df2c173b3aa5))
-    (pin "2" (uuid ffb76104-362c-475e-91fd-11988fc3dd0f))
-    (pin "3" (uuid 26d8cee4-0250-4a0a-ad55-a6d78f5fc2a8))
-    (pin "4" (uuid e693bce4-f6fd-49ae-8742-dde3ecbe1df8))
-    (pin "5" (uuid e0582099-2f8a-46e1-ae30-38fe74f70e7e))
-    (pin "6" (uuid 8009fc17-5d7b-450c-8a5b-5da8619b0842))
-    (pin "7" (uuid ecbcee3c-b30c-4b07-a464-0d4ea19ddf80))
-    (pin "8" (uuid 7346a0d9-dbd7-4696-980d-22f9f35e3f74))
-  )
-
   (symbol (lib_id "Mechanical:MountingHole_Pad") (at 147.32 57.15 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 58195224-74f8-4977-badd-a8521f4180ab)
@@ -4396,24 +4304,6 @@
     (pin "1" (uuid acaa76b4-6083-429c-a010-de8178716930))
   )
 
-  (symbol (lib_id "power:GND") (at 59.69 71.12 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 585018f4-b0c4-401e-9a6e-fbe35984326a)
-    (property "Reference" "#PWR014" (id 0) (at 53.34 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 58.42 67.31 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 59.69 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 59.69 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 36712104-c5b9-4cba-a695-b2298a1a2846))
-  )
-
   (symbol (lib_id "Device:C_Polarized_Small") (at 200.66 35.56 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 59979c30-d1bb-4c9e-80d0-5b3f64ce4c68)
@@ -4666,6 +4556,22 @@
     (pin "8" (uuid a4fb8748-e3d4-47d2-b11c-9b688a14089b))
   )
 
+  (symbol (lib_id "power:+3V3") (at 124.46 24.13 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 6f575a28-5620-4a86-a3df-865673e2a17e)
+    (property "Reference" "#PWR0213" (id 0) (at 124.46 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 124.46 19.05 0))
+    (property "Footprint" "" (id 2) (at 124.46 24.13 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 124.46 24.13 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bb64f95c-c3b8-43b4-83ac-2393cd404710))
+  )
+
   (symbol (lib_id "power:GND") (at 190.5 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6f6ed46a-adf2-4443-8800-0a73436647d8)
@@ -4706,22 +4612,22 @@
     (pin "2" (uuid 76d028f3-8977-4d27-960b-2586ee067e99))
   )
 
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 105.41 16.51 0) (unit 1)
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 43.18 16.51 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 71003c18-5d5c-4ce0-88a2-0c81653b4460)
-    (property "Reference" "H6" (id 0) (at 107.95 15.2654 0)
+    (property "Reference" "H6" (id 0) (at 45.72 15.2654 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 107.95 17.5768 0)
+    (property "Value" "M3" (id 1) (at 45.72 17.5768 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 105.41 16.51 0)
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 43.18 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 105.41 16.51 0)
+    (property "Datasheet" "~" (id 3) (at 43.18 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 105.41 16.51 0)
+    (property "Need_order" "0" (id 4) (at 43.18 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 16d3bd01-5c27-4905-a005-6f6746ae074f))
@@ -4785,21 +4691,21 @@
     (pin "1" (uuid 0409915f-f266-4d0e-9197-2cc7d11cd375))
   )
 
-  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 189.23 121.92 0) (unit 1)
+  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 114.3 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7a8d8b49-894e-4df2-a14e-077959df16ce)
-    (property "Reference" "U1" (id 0) (at 189.23 115.7732 0))
-    (property "Value" "LD1117S33" (id 1) (at 189.23 118.0846 0))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 189.23 116.84 0)
+    (property "Reference" "U1" (id 0) (at 114.3 17.9832 0))
+    (property "Value" "LD1117S33" (id 1) (at 114.3 20.2946 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 114.3 19.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 191.77 128.27 0)
+    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 116.84 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 189.23 121.92 0)
+    (property "Need_order" "0" (id 4) (at 114.3 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LD1117S33CTR" (id 5) (at 189.23 121.92 0)
+    (property "MPN" "LD1117S33CTR" (id 5) (at 114.3 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 12b58730-fcab-4370-ae5a-aaf7b0fb6ffd))
@@ -4864,22 +4770,22 @@
     (pin "2" (uuid 1fbcaa1b-5109-43ec-8137-3073e233bcda))
   )
 
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 120.65 16.51 0) (unit 1)
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 58.42 16.51 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 814e092d-48ba-4594-9a6d-b86aae820d87)
-    (property "Reference" "H8" (id 0) (at 123.19 15.2654 0)
+    (property "Reference" "H8" (id 0) (at 60.96 15.2654 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 123.19 17.5768 0)
+    (property "Value" "M3" (id 1) (at 60.96 17.5768 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 120.65 16.51 0)
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 58.42 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 120.65 16.51 0)
+    (property "Datasheet" "~" (id 3) (at 58.42 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 120.65 16.51 0)
+    (property "Need_order" "0" (id 4) (at 58.42 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 08e7201d-53b6-44f7-9887-83a635f92973))
@@ -4921,22 +4827,22 @@
     (pin "1" (uuid 2bf2d5f7-c157-41dd-ad66-1dd7d227483f))
   )
 
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 97.79 16.51 0) (unit 1)
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 35.56 16.51 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8638b2f9-a14a-4b9e-8701-16b540abe4b5)
-    (property "Reference" "H5" (id 0) (at 100.33 15.2654 0)
+    (property "Reference" "H5" (id 0) (at 38.1 15.2654 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 100.33 17.5768 0)
+    (property "Value" "M3" (id 1) (at 38.1 17.5768 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 97.79 16.51 0)
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 35.56 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 97.79 16.51 0)
+    (property "Datasheet" "~" (id 3) (at 35.56 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 97.79 16.51 0)
+    (property "Need_order" "0" (id 4) (at 35.56 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e1486343-e8ac-4231-b1fa-fab98e01343a))
@@ -5162,44 +5068,44 @@
     (pin "1" (uuid b86d38ee-93ee-4bb8-bb53-100c80329378))
   )
 
-  (symbol (lib_id "power:GND") (at 109.22 19.05 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 46.99 19.05 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9529f5d8-41ef-44d8-8498-7d0df52ee4d7)
-    (property "Reference" "#PWR023" (id 0) (at 109.22 25.4 0)
+    (property "Reference" "#PWR023" (id 0) (at 46.99 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 109.347 23.4442 0))
-    (property "Footprint" "" (id 2) (at 109.22 19.05 0)
+    (property "Value" "GND" (id 1) (at 47.117 23.4442 0))
+    (property "Footprint" "" (id 2) (at 46.99 19.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 109.22 19.05 0)
+    (property "Datasheet" "" (id 3) (at 46.99 19.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2f45af53-9734-4ad6-81dd-25058dc8b713))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 175.26 125.73 0) (mirror y) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 100.33 27.94 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9aafdc7e-7c4c-4dd3-a761-35d7224b5c29)
-    (property "Reference" "C1" (id 0) (at 172.72 123.9138 0)
+    (property "Reference" "C1" (id 0) (at 97.79 26.1238 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10uF" (id 1) (at 172.72 126.4538 0)
+    (property "Value" "10uF" (id 1) (at 97.79 28.6638 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 175.26 125.73 0)
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 100.33 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 175.26 125.73 0)
+    (property "Datasheet" "~" (id 3) (at 100.33 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "TAJA106K016RNJ" (id 4) (at 175.26 125.73 0)
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 100.33 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 175.26 125.73 0)
+    (property "Need_order" "0" (id 5) (at 100.33 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "OriginalValue" "" (id 6) (at 175.26 125.73 0)
+    (property "OriginalValue" "" (id 6) (at 100.33 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c1880c67-928c-4c29-84b2-8365b725c870))
@@ -5265,24 +5171,6 @@
     (pin "1" (uuid 088e1825-f372-46ef-96ca-3fdda7ddee1b))
   )
 
-  (symbol (lib_id "power:GND") (at 59.69 48.26 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a5113f4f-18bb-4c94-ad55-97d55602bcee)
-    (property "Reference" "#PWR013" (id 0) (at 53.34 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 58.42 44.45 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 59.69 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 59.69 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 3779b915-f683-4514-b6ac-8f05541578e8))
-  )
-
   (symbol (lib_id "power:GND") (at 234.95 44.45 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a71b6e57-f070-4a0d-b554-ffc7809e061b)
@@ -5347,38 +5235,6 @@
     (pin "2" (uuid 4c5a3ce7-1187-4ace-818f-d294ee626e41))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 64.77 81.28 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid ae14c89d-0cd0-4cde-98ef-a7f5710677a2)
-    (property "Reference" "J9" (id 0) (at 64.77 92.71 0))
-    (property "Value" "CTRL2" (id 1) (at 60.96 67.31 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal" (id 2) (at 64.77 81.28 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 64.77 81.28 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "53261-0871" (id 4) (at 64.77 81.28 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Manufacturer" "Molex" (id 5) (at 64.77 81.28 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "0" (id 6) (at 64.77 81.28 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0a90b130-85b9-4cfa-87ed-fbeb358049fe))
-    (pin "2" (uuid 895d361d-d42f-4573-894d-a939e2d8b4c7))
-    (pin "3" (uuid 55975256-5399-4b0f-bc44-222cde0d1480))
-    (pin "4" (uuid 6465ab01-2257-4abf-9ad7-595bc0277775))
-    (pin "5" (uuid 069c6711-ecef-4332-bc15-58e2a4f71e20))
-    (pin "6" (uuid 042aeb54-c6c1-4c70-bc10-6a216d718cf5))
-    (pin "7" (uuid 86960845-07e5-4207-9504-e03fe22a3998))
-    (pin "8" (uuid 7d60fbb2-6b84-4a66-9bbf-60f53992c104))
-  )
-
   (symbol (lib_id "power:GND") (at 144.78 83.82 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ae5b72fa-341b-4007-b800-85a0c3c5236d)
@@ -5433,24 +5289,6 @@
     (pin "1" (uuid b3839b32-cbb8-4573-826a-1cb61ffd4c00))
   )
 
-  (symbol (lib_id "power:GND") (at 76.2 71.12 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b445676f-5350-4a4d-a92c-976e8ed0f7b4)
-    (property "Reference" "#PWR020" (id 0) (at 82.55 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 77.47 74.93 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 76.2 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 76.2 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1c16ee81-db35-47b0-9761-5a753192aca3))
-  )
-
   (symbol (lib_id "Device:C") (at 80.01 153.67 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b4af19b1-aa60-45c2-a43e-31f296b977cf)
@@ -5479,6 +5317,22 @@
     (pin "2" (uuid 6be41946-8f35-4e43-a8d8-03474da6c263))
   )
 
+  (symbol (lib_id "power:+3V3") (at 232.41 124.46 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b66cbcc3-ee79-4731-b632-a79b99645352)
+    (property "Reference" "#PWR0230" (id 0) (at 232.41 128.27 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 232.41 119.38 0))
+    (property "Footprint" "" (id 2) (at 232.41 124.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 232.41 124.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8f1544d1-ece4-4c24-afb8-9279a934a47c))
+  )
+
   (symbol (lib_id "power:GND") (at 26.67 158.75 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ba8af9ae-3bc6-49c5-b14a-e9c04a469969)
@@ -5573,17 +5427,17 @@
     (pin "1" (uuid e9c0466a-1ca3-40d5-9353-90ab37c9e20d))
   )
 
-  (symbol (lib_id "power:GND") (at 189.23 129.54 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 114.3 31.75 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c12281a8-14ce-49d6-bfc7-51cbd063becb)
-    (property "Reference" "#PWR016" (id 0) (at 189.23 135.89 0)
+    (property "Reference" "#PWR016" (id 0) (at 114.3 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 189.357 133.9342 0))
-    (property "Footprint" "" (id 2) (at 189.23 129.54 0)
+    (property "Value" "GND" (id 1) (at 114.427 36.1442 0))
+    (property "Footprint" "" (id 2) (at 114.3 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 189.23 129.54 0)
+    (property "Datasheet" "" (id 3) (at 114.3 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4ce1a304-4a4b-4870-8e34-dd6d20d9af8b))
@@ -5610,38 +5464,6 @@
     (pin "2" (uuid fc5299d7-61c3-42b8-a5ae-2e8de242a46e))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 64.77 58.42 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c61bd3d1-d29d-47bb-88a2-7a020460fa49)
-    (property "Reference" "J8" (id 0) (at 64.77 44.45 0))
-    (property "Value" "CTRL1" (id 1) (at 60.96 44.45 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal" (id 2) (at 64.77 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 64.77 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "53261-0871" (id 4) (at 64.77 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Manufacturer" "Molex" (id 5) (at 64.77 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "0" (id 6) (at 64.77 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7a1e5a2d-ea76-41f4-a13c-11ec84d659f5))
-    (pin "2" (uuid f651ad38-e619-4e5a-a93e-65adaba98385))
-    (pin "3" (uuid 270fb99e-54ac-43da-817a-095bf3d0b9a2))
-    (pin "4" (uuid 64892533-7885-4731-97b6-dcb4ce142b14))
-    (pin "5" (uuid 70ed81d1-ff6f-41d3-8ff6-4fdc1f9522c3))
-    (pin "6" (uuid 0c674c4a-7066-4b08-a0f5-acba81e9bb99))
-    (pin "7" (uuid 0afb00cb-47b1-409b-9556-4258c71c05d5))
-    (pin "8" (uuid 09627c22-f33b-4063-bc9a-111544013822))
-  )
-
   (symbol (lib_id "power:GND") (at 218.44 143.51 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c82311de-0446-4287-9808-7e17692d8e78)
@@ -5660,22 +5482,22 @@
     (pin "1" (uuid a0888a06-7421-4ab0-bc9e-2d9ec1459a8c))
   )
 
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 113.03 16.51 0) (unit 1)
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 50.8 16.51 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c838603b-fd38-4712-b1d7-5c58340cb034)
-    (property "Reference" "H7" (id 0) (at 115.57 15.2654 0)
+    (property "Reference" "H7" (id 0) (at 53.34 15.2654 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 115.57 17.5768 0)
+    (property "Value" "M3" (id 1) (at 53.34 17.5768 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 113.03 16.51 0)
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 50.8 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 113.03 16.51 0)
+    (property "Datasheet" "~" (id 3) (at 50.8 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 113.03 16.51 0)
+    (property "Need_order" "0" (id 4) (at 50.8 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 532ef6c0-2571-41a4-9345-4e12a2a6cbea))
@@ -5963,18 +5785,18 @@
     (pin "1" (uuid 4fcb867f-1cb5-4595-b809-94d8ede5c5cd))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 203.2 121.92 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 130.81 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e34ebb9f-d06c-41e9-bb37-b5ac2dd6aa42)
-    (property "Reference" "TP1" (id 0) (at 203.2 113.665 0))
-    (property "Value" "+3V3" (id 1) (at 203.2 115.9764 0))
-    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 208.28 121.92 0)
+    (property "Reference" "TP1" (id 0) (at 130.81 15.875 0))
+    (property "Value" "+3V3" (id 1) (at 130.81 18.1864 0))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 135.89 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 208.28 121.92 0)
+    (property "Datasheet" "~" (id 3) (at 135.89 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 203.2 121.92 0)
+    (property "Need_order" "0" (id 4) (at 130.81 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 23a8ca08-4382-4a42-b4d1-41b691a96d0c))
@@ -6249,38 +6071,6 @@
     (pin "2" (uuid dcaaf65b-3339-4df2-96b2-ab319d5a49d8))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 71.12 55.88 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid ffa1d09b-1089-40c9-8970-0aea1809cb6b)
-    (property "Reference" "J11" (id 0) (at 71.12 44.45 0))
-    (property "Value" "CTRL1" (id 1) (at 74.93 69.85 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal" (id 2) (at 71.12 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 71.12 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "53261-0871" (id 4) (at 71.12 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Manufacturer" "Molex" (id 5) (at 71.12 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "0" (id 6) (at 71.12 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 4f795bd6-df32-418b-ac99-4d95422818de))
-    (pin "2" (uuid 4d88b900-0829-419d-88cd-1384747c7a56))
-    (pin "3" (uuid 5b5f89f3-a2de-447f-8757-bcec0b2eaa55))
-    (pin "4" (uuid d1d4649b-c6b1-4535-8d37-f22bcc8ae889))
-    (pin "5" (uuid a980edbb-1dd6-4986-b14e-12e9f75258fa))
-    (pin "6" (uuid f005f449-ad7b-4f62-8fd4-84786040c03c))
-    (pin "7" (uuid 0cf199a0-7555-44f0-b094-7fa1a0b1f703))
-    (pin "8" (uuid 402818bb-c4a2-4f84-a5ee-7eacaefe00c4))
-  )
-
   (sheet (at 16.51 45.72) (size 31.75 45.72) (fields_autoplaced)
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
@@ -6339,10 +6129,6 @@
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 5ec1f833-06c1-428e-9dbd-7caef7561f0d)
     )
-    (pin "5V" input (at 48.26 50.8 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-      (uuid 37e4202b-9ff6-4182-ac64-c951c1fbd3d3)
-    )
     (pin "GPIO_PA4" bidirectional (at 48.26 76.2 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid b448150e-5f42-43d8-8621-f46fbdb87d2b)
@@ -6549,12 +6335,6 @@
     (path "/312886f4-8712-40d4-a676-f837f4792ffc"
       (reference "#PWR012") (unit 1) (value "GND") (footprint "")
     )
-    (path "/a5113f4f-18bb-4c94-ad55-97d55602bcee"
-      (reference "#PWR013") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/585018f4-b0c4-401e-9a6e-fbe35984326a"
-      (reference "#PWR014") (unit 1) (value "GND") (footprint "")
-    )
     (path "/ece76d6c-11c3-411a-8561-d37d39adeea3"
       (reference "#PWR015") (unit 1) (value "GND") (footprint "")
     )
@@ -6567,12 +6347,6 @@
     (path "/90c2c88c-bcbc-4f82-8b19-ba4d739befe6"
       (reference "#PWR018") (unit 1) (value "GND") (footprint "")
     )
-    (path "/19fdf020-4327-47c0-8e0b-59e6d14a1af7"
-      (reference "#PWR019") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/b445676f-5350-4a4d-a92c-976e8ed0f7b4"
-      (reference "#PWR020") (unit 1) (value "GND") (footprint "")
-    )
     (path "/0eddf3a3-680e-4189-b645-0f685f620bff"
       (reference "#PWR021") (unit 1) (value "GND") (footprint "")
     )
@@ -6738,15 +6512,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e723526"
       (reference "#PWR075") (unit 1) (value "GND") (footprint "")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/58ba88e3-2644-409b-bf93-a97d876b43f5"
-      (reference "#PWR076") (unit 1) (value "+12V") (footprint "")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/9a63a65c-7772-4730-947b-826752f8f968"
       (reference "#PWR077") (unit 1) (value "GND") (footprint "")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/876b2743-4d0f-4dbc-9633-63f78538646b"
-      (reference "#PWR078") (unit 1) (value "GND") (footprint "")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e7ee5b3"
       (reference "#PWR079") (unit 1) (value "GND") (footprint "")
     )
@@ -6765,9 +6533,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f35243ea-70a8-4861-b1e5-87022345fc08"
       (reference "#PWR084") (unit 1) (value "GND") (footprint "")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e6f1a2c"
-      (reference "#PWR085") (unit 1) (value "GND") (footprint "")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e8a5cfd"
       (reference "#PWR086") (unit 1) (value "GND") (footprint "")
     )
@@ -7149,6 +6914,9 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/089dcddd-a013-499d-91ab-3fd26b703eb2"
       (reference "#PWR0212") (unit 1) (value "GND") (footprint "")
     )
+    (path "/6f575a28-5620-4a86-a3df-865673e2a17e"
+      (reference "#PWR0213") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/85444b88-8b95-493e-b685-624b3cab185d"
       (reference "#PWR0214") (unit 1) (value "GND") (footprint "")
     )
@@ -7197,8 +6965,8 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/492d915d-6a7d-4709-8d26-2ade2f336559"
       (reference "#PWR0229") (unit 1) (value "GND") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/643da255-4107-470d-83bc-ec93c598e306"
-      (reference "#PWR0230") (unit 1) (value "GND") (footprint "")
+    (path "/b66cbcc3-ee79-4731-b632-a79b99645352"
+      (reference "#PWR0230") (unit 1) (value "+3V3") (footprint "")
     )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e9e1af6"
       (reference "#PWR0231") (unit 1) (value "GND") (footprint "")
@@ -7212,6 +6980,9 @@
     (path "/bd7a31f0-822c-40e8-af44-9a84654c86ff"
       (reference "#PWR0234") (unit 1) (value "GND") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/81123d21-10ec-4e6a-8e5d-4a79505941bd"
+      (reference "#PWR0235") (unit 1) (value "GND") (footprint "")
+    )
     (path "/8cbb5345-c7a6-41b7-8a2a-794c3d5f0f34/86dcb5ca-1389-4ae7-85d1-6790b1f6968c"
       (reference "#PWR0236") (unit 1) (value "GND") (footprint "")
     )
@@ -7221,12 +6992,66 @@
     (path "/e1fddc32-7966-4344-9d74-6bfb68a58876"
       (reference "#PWR0238") (unit 1) (value "GND") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/7428d9d6-2f33-4aeb-8480-41d58e13f4e9"
+      (reference "#PWR0239") (unit 1) (value "GND") (footprint "")
+    )
     (path "/23aa8159-9333-44cf-9b92-8391bbc9e6c1"
       (reference "#PWR0240") (unit 1) (value "GND") (footprint "")
     )
     (path "/f5953f75-4b48-4b4f-8eb7-dca86201f1bf/dbf81ee2-3b44-4bc9-846b-ca65e631fb17"
       (reference "#PWR0241") (unit 1) (value "GND") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/0f3582b8-116d-402e-be56-48ea1f5bd30c"
+      (reference "#PWR0242") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/ccac1ed5-30bd-4d64-afde-17b59d1e7c29"
+      (reference "#PWR0243") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/7077bfcd-4a03-4253-aa48-1774e5e8e4a9"
+      (reference "#PWR0244") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/7d8d9469-58f4-402d-9b4c-e0f71ca2e960"
+      (reference "#PWR0245") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/4db29d9d-fdde-4092-9965-8df16edf0cf3"
+      (reference "#PWR0246") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/b8d59f35-1d13-4957-a637-206969024286"
+      (reference "#PWR0247") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/8b74a43b-a613-4ec6-8bcd-c0ef509be423"
+      (reference "#PWR0248") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/89570779-33b8-47c3-b049-4d5d99ab9eef"
+      (reference "#PWR0249") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/dd5bde9e-494c-48fd-97d9-c9b5e8d871fb"
+      (reference "#PWR0250") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/fba5ffa7-6eb9-4140-844a-7249fb173e65"
+      (reference "#PWR0251") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/d9611d63-70d7-41e4-b28c-64031a5d1206"
+      (reference "#PWR0252") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/7b5e7040-fee5-4d5b-863c-c02650ac8c7d"
+      (reference "#PWR0253") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/bf1fd3d9-cfc8-4cfa-b4f2-597343504ad8"
+      (reference "#PWR0254") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/f7c562c0-e29a-4543-a0db-2bbec467f18f"
+      (reference "#PWR0255") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/0dee90fc-7e2c-46e6-bc5b-fb254ccad02f"
+      (reference "#PWR0256") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/fbd5540d-e8ac-4ab3-be6d-131fcfb9a61c"
+      (reference "#PWR0257") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/a9423071-d04a-4d24-8fd5-62dfbb110b5a"
+      (reference "#PWR0258") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/9aafdc7e-7c4c-4dd3-a761-35d7224b5c29"
       (reference "C1") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder")
     )
@@ -7314,15 +7139,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e716b0d"
       (reference "C29") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/623947b0-76f8-478f-8077-454a3c3d3059"
-      (reference "C30") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e7e0c6c"
       (reference "C31") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e483f01"
-      (reference "C32") (unit 1) (value "10uF") (footprint "Capacitor_SMD:CP_Elec_4x5.3")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e518d0f"
       (reference "C33") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
     )
@@ -7752,12 +7571,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/c6708737-1979-4061-9eb1-fed1a80ccf62"
       (reference "C176") (unit 1) (value "DNF") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/67e97af9-c8ad-4fb5-b14c-c53150dd6546"
-      (reference "C177") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/8d1e0b9e-0a17-470c-8a44-d5a4d7fffe77"
-      (reference "C178") (unit 1) (value "6.8uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder")
-    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e9edab8"
       (reference "C179") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder")
     )
@@ -7974,20 +7787,20 @@
     (path "/1a279761-775d-41bf-87c4-f29c57f2fe7b"
       (reference "J7") (unit 1) (value "CTRL2") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
     )
-    (path "/c61bd3d1-d29d-47bb-88a2-7a020460fa49"
-      (reference "J8") (unit 1) (value "CTRL1") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/ce4d5ec6-a6d4-4f4a-8064-f3a8ae44c97d"
+      (reference "J8") (unit 1) (value "CTRL2") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
     )
-    (path "/ae14c89d-0cd0-4cde-98ef-a7f5710677a2"
-      (reference "J9") (unit 1) (value "CTRL2") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/a1964925-47fa-4709-86c3-01cb782b51a7"
+      (reference "J9") (unit 1) (value "CTRL1") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
     )
     (path "/cec9ebe3-4538-4c9d-957b-42d32e2e6557"
       (reference "J10") (unit 1) (value "MICSPK") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical")
     )
-    (path "/ffa1d09b-1089-40c9-8970-0aea1809cb6b"
-      (reference "J11") (unit 1) (value "CTRL1") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/978306e3-ca6f-4a8f-9967-e903d311e475"
+      (reference "J11") (unit 1) (value "CTRL2") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
     )
-    (path "/562719a2-e94e-47e7-aa40-00085d98e234"
-      (reference "J12") (unit 1) (value "CTRL2") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/f6b08f82-e50d-4f78-9d60-e71fbd3ea21a"
+      (reference "J12") (unit 1) (value "CTRL1") (footprint "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal")
     )
     (path "/cd155ecd-6883-49da-a8ed-4170c2f7c167"
       (reference "J13") (unit 1) (value "Base to FE RX") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x08_P2.54mm_Vertical")
@@ -8041,7 +7854,7 @@
       (reference "J31") (unit 1) (value "PC1314") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
     )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005eb61aec"
-      (reference "J33") (unit 1) (value "UART") (footprint "Connector_PinHeader_2.54mm:PinHeader_2x04_P2.54mm_Vertical_SMD")
+      (reference "J33") (unit 1) (value "UART") (footprint "Connector_PinHeader_1.27mm:PinHeader_2x04_P1.27mm_Vertical_SMD")
     )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e9d7021"
       (reference "J34") (unit 1) (value "USB") (footprint "Connector_USB:USB_Micro-B_Molex-105017-0001")
@@ -8944,19 +8757,16 @@
       (reference "TP6") (unit 1) (value "VG") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
     )
     (path "/8cbb5345-c7a6-41b7-8a2a-794c3d5f0f34/372d6ab7-ede5-4d1e-bafa-d98ad2f7f3ef"
-      (reference "TP7") (unit 1) (value "VG") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
+      (reference "TP7") (unit 1) (value "V_{G1}") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
     )
     (path "/8cbb5345-c7a6-41b7-8a2a-794c3d5f0f34/0ce8e0e0-7a57-4962-bade-dc820b780503"
-      (reference "TP8") (unit 1) (value "VG") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
+      (reference "TP8") (unit 1) (value "V_{S}") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
     )
     (path "/8cbb5345-c7a6-41b7-8a2a-794c3d5f0f34/1f2e9bf8-210d-4b3e-9d38-09a9e00f4432"
-      (reference "TP9") (unit 1) (value "VG") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
+      (reference "TP9") (unit 1) (value "V_{G}") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
     )
     (path "/8cbb5345-c7a6-41b7-8a2a-794c3d5f0f34/271bf5fb-c4e3-40b0-bc1d-9d0c466fc900"
-      (reference "TP10") (unit 1) (value "VG") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/3285e67d-e4d8-4140-b839-2c744988ef1f"
-      (reference "TP11") (unit 1) (value "+3V3") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
+      (reference "TP10") (unit 1) (value "V_{E}") (footprint "TestPoint:TestPoint_Pad_D2.0mm")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/a348b283-ea0c-4872-8666-47d6a9dae010"
       (reference "TR1") (unit 1) (value "PT61017PEL") (footprint "Transformer_SMD:Transformer_Ethernet_Bourns_PT61017PEL")
@@ -8982,9 +8792,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b99aa9f1-875f-4993-801a-fec7085b6709"
       (reference "U6") (unit 1) (value "LM4865") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/62e9ed49-1c7c-4949-ac10-4469b493ace4"
-      (reference "U7") (unit 1) (value "LD1117S33") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
-    )
     (path "/f5953f75-4b48-4b4f-8eb7-dca86201f1bf/00000000-0000-0000-0000-000060629fa1"
       (reference "U9") (unit 1) (value "LM350_TO220") (footprint "mpb:TO-220-3_Vertical_SMD")
     )
@@ -8994,9 +8801,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e8e9efd"
       (reference "U11") (unit 1) (value "STM32F103C8Tx") (footprint "Package_QFP:LQFP-48_7x7mm_P0.5mm")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/0a2de5c3-a0fc-4b42-8047-93224ef7ac22"
-      (reference "U12") (unit 1) (value "LD1117S33") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
-    )
     (path "/f0504e2a-4a3f-4fb6-89b3-8abe7feae68f"
       (reference "Y1") (unit 1) (value "CX3225SB25000D0FLJCC") (footprint "mpb:CX3225SB")
     )