From 9449e3c10b05679bf8843de139b87508e556667c Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 12 Feb 2023 22:37:47 +0100
Subject: More routing, start moving silkscreen

---
 kicad-dart-70/control.kicad_sch | 2249 +++++++++++++++++++++++----------------
 1 file changed, 1354 insertions(+), 895 deletions(-)

(limited to 'kicad-dart-70/control.kicad_sch')

diff --git a/kicad-dart-70/control.kicad_sch b/kicad-dart-70/control.kicad_sch
index 43ca822..d20f69c 100644
--- a/kicad-dart-70/control.kicad_sch
+++ b/kicad-dart-70/control.kicad_sch
@@ -14,41 +14,6 @@
   )
 
   (lib_symbols
-    (symbol "Connector:TestPoint" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "TP" (id 0) (at 0 6.858 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "TestPoint" (id 1) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "test point" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "TestPoint_0_1"
-        (circle (center 0 3.302) (radius 0.762)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "TestPoint_1_1"
-        (pin passive line (at 0 0 90) (length 2.54)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector:USB_B_Micro" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at -5.08 11.43 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -314,6 +279,99 @@
         )
       )
     )
+    (symbol "Connector_Generic:Conn_01x08" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at 0 10.16 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "Conn_01x08" (id 1) (at 0 -12.7 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" "connector" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Generic connector, single row, 01x08, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "Conn_01x08_1_1"
+        (rectangle (start -1.27 -10.033) (end 0 -10.287)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 -7.493) (end 0 -7.747)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 -4.953) (end 0 -5.207)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 -2.413) (end 0 -2.667)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 0.127) (end 0 -0.127)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 2.667) (end 0 2.413)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 5.207) (end 0 4.953)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 7.747) (end 0 7.493)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 8.89) (end 1.27 -11.43)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+        (pin passive line (at -5.08 7.62 0) (length 3.81)
+          (name "Pin_1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 5.08 0) (length 3.81)
+          (name "Pin_2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 2.54 0) (length 3.81)
+          (name "Pin_3" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 0 0) (length 3.81)
+          (name "Pin_4" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -2.54 0) (length 3.81)
+          (name "Pin_5" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -5.08 0) (length 3.81)
+          (name "Pin_6" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -7.62 0) (length 3.81)
+          (name "Pin_7" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -10.16 0) (length 3.81)
+          (name "Pin_8" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Connector_Generic:Conn_02x04_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at 1.27 5.08 0)
         (effects (font (size 1.27 1.27)))
@@ -1349,49 +1407,6 @@
         )
       )
     )
-    (symbol "Regulator_Linear:LD1117S33TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "LD1117S33TR_SOT223" (id 1) (at 0 3.175 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 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 2.54 -6.35 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "REGULATOR LDO 3.3V" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT-223" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "LD1117S33TR_SOT223_0_1"
-        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-      )
-      (symbol "LD1117S33TR_SOT223_1_1"
-        (pin power_in line (at 0 -7.62 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_out line (at 7.62 0 180) (length 2.54)
-          (name "VO" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -7.62 0 0) (length 2.54)
-          (name "VI" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Switch:SW_Push" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "SW" (id 0) (at 1.27 2.54 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1671,6 +1686,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)
@@ -1716,41 +1783,50 @@
   (junction (at 247.65 52.07) (diameter 0) (color 0 0 0 0)
     (uuid 0866ee23-d486-4d3a-a64d-98814c5ef163)
   )
+  (junction (at 259.08 48.26) (diameter 0) (color 0 0 0 0)
+    (uuid 0a368386-18d2-4ef6-8165-200b72a998f5)
+  )
+  (junction (at 31.75 153.67) (diameter 0) (color 0 0 0 0)
+    (uuid 0f80f31f-72b7-4a12-98d4-1ab91816cb66)
+  )
   (junction (at 34.29 85.09) (diameter 0) (color 0 0 0 0)
     (uuid 1276659c-ff14-4940-b214-e27c5bbbd628)
   )
-  (junction (at 207.01 90.17) (diameter 0) (color 0 0 0 0)
-    (uuid 13669500-5baf-474d-9795-5cd07ed31711)
+  (junction (at 31.75 123.19) (diameter 0) (color 0 0 0 0)
+    (uuid 1b4d93c0-b76c-47a2-869f-90d3a6551a1b)
   )
-  (junction (at 125.73 24.13) (diameter 0) (color 0 0 0 0)
-    (uuid 18eb06be-4daf-4e03-af66-101a20520115)
+  (junction (at 26.67 90.17) (diameter 0) (color 0 0 0 0)
+    (uuid 1d8e009c-7943-40d7-8021-ed1bc658a4c2)
   )
-  (junction (at 223.52 133.35) (diameter 0) (color 0 0 0 0)
+  (junction (at 223.52 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 2a891096-042c-4004-b161-8bd2c0b59fd7)
   )
-  (junction (at 200.66 24.13) (diameter 0) (color 0 0 0 0)
-    (uuid 365db125-0d05-4a3b-80f5-776f84224f16)
+  (junction (at 266.7 20.32) (diameter 0) (color 0 0 0 0)
+    (uuid 3a3e423a-0c3f-40d0-bc24-f2fd6c41cc34)
   )
-  (junction (at 149.86 69.85) (diameter 0) (color 0 0 0 0)
+  (junction (at 149.86 55.88) (diameter 0) (color 0 0 0 0)
     (uuid 3b398e0a-4c10-4dcc-aa1f-5dcd51a576d9)
   )
   (junction (at 20.32 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 3e97b4b6-51fe-4831-8963-04e554d396f4)
   )
-  (junction (at 243.84 123.19) (diameter 0) (color 0 0 0 0)
+  (junction (at 243.84 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 3f43b8cc-e232-4de4-a8bc-56a1a1c0a87a)
   )
-  (junction (at 124.46 87.63) (diameter 0) (color 0 0 0 0)
+  (junction (at 124.46 73.66) (diameter 0) (color 0 0 0 0)
     (uuid 418a0e9c-c95f-4d4a-a88f-ec13faf3303c)
   )
-  (junction (at 191.77 24.13) (diameter 0) (color 0 0 0 0)
-    (uuid 44749f55-d122-4aa6-85e2-ad52f442bc2e)
+  (junction (at 31.75 133.35) (diameter 0) (color 0 0 0 0)
+    (uuid 43b68646-b8ec-4be3-a413-276bb49b62bd)
   )
-  (junction (at 130.81 49.53) (diameter 0) (color 0 0 0 0)
+  (junction (at 130.81 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 463e71c6-e035-4ed0-9a41-c3c9633f2c78)
   )
-  (junction (at 22.86 85.09) (diameter 0) (color 0 0 0 0)
-    (uuid 50eddd67-6aa3-43d4-a67d-b80202184bf7)
+  (junction (at 90.17 72.39) (diameter 0) (color 0 0 0 0)
+    (uuid 4aeb06a7-de87-4606-9e7f-a948ca11c315)
+  )
+  (junction (at 74.93 17.78) (diameter 0) (color 0 0 0 0)
+    (uuid 506b584a-7a0c-4748-9a0a-fd2df4f10b53)
   )
   (junction (at 31.75 191.77) (diameter 0) (color 0 0 0 0)
     (uuid 59cde6dd-9dca-42cc-926a-90d90b278d0e)
@@ -1761,43 +1837,43 @@
   (junction (at 256.54 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 6d4ae51e-8ca2-4932-9759-eaa3b5ce6b35)
   )
-  (junction (at 149.86 146.05) (diameter 0) (color 0 0 0 0)
+  (junction (at 149.86 132.08) (diameter 0) (color 0 0 0 0)
     (uuid 70b621b6-45b5-43cb-9683-d589118723d7)
   )
-  (junction (at 147.32 146.05) (diameter 0) (color 0 0 0 0)
+  (junction (at 147.32 132.08) (diameter 0) (color 0 0 0 0)
     (uuid 73e2a101-0bc0-414b-9aa7-7eeb8a3caef1)
   )
-  (junction (at 120.65 49.53) (diameter 0) (color 0 0 0 0)
+  (junction (at 120.65 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 752fa345-d8be-4e99-aad1-e88671f99643)
   )
-  (junction (at 160.02 49.53) (diameter 0) (color 0 0 0 0)
+  (junction (at 160.02 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 77b09fa1-fbbb-49ab-94c4-069660b694ff)
   )
-  (junction (at 148.59 186.69) (diameter 0) (color 0 0 0 0)
+  (junction (at 73.66 187.96) (diameter 0) (color 0 0 0 0)
     (uuid 782b86fa-ef9f-4c16-a991-b44a80f0f0c3)
   )
-  (junction (at 138.43 180.34) (diameter 0) (color 0 0 0 0)
+  (junction (at 110.49 35.56) (diameter 0) (color 0 0 0 0)
+    (uuid 7a569be9-30d3-40a6-bcfb-48572e4d943e)
+  )
+  (junction (at 63.5 181.61) (diameter 0) (color 0 0 0 0)
     (uuid 7efaeda2-e767-44b9-adb2-3a0c3f4d2f1d)
   )
-  (junction (at 22.86 90.17) (diameter 0) (color 0 0 0 0)
-    (uuid 85d4e31f-0a9c-44fe-988a-fd9d1c9f0d5f)
+  (junction (at 25.4 85.09) (diameter 0) (color 0 0 0 0)
+    (uuid 862cd780-bf4e-4e2e-bb26-0952d83f334b)
   )
-  (junction (at 158.75 180.34) (diameter 0) (color 0 0 0 0)
+  (junction (at 83.82 181.61) (diameter 0) (color 0 0 0 0)
     (uuid 8847e751-6992-4f80-92c5-c3bef4b5dbf6)
   )
-  (junction (at 116.84 85.09) (diameter 0) (color 0 0 0 0)
+  (junction (at 116.84 71.12) (diameter 0) (color 0 0 0 0)
     (uuid 8c497335-9f19-4d8f-81b9-d3f6e5560190)
   )
-  (junction (at 226.06 24.13) (diameter 0) (color 0 0 0 0)
-    (uuid 950bee3f-9e72-4e30-a26d-44d6909f7316)
-  )
-  (junction (at 241.3 123.19) (diameter 0) (color 0 0 0 0)
+  (junction (at 241.3 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 9801ccc8-5152-40bb-932d-67072f8cd8ad)
   )
   (junction (at 26.67 191.77) (diameter 0) (color 0 0 0 0)
     (uuid 98560b74-a1df-4f18-9056-9d04ee495b97)
   )
-  (junction (at 140.97 49.53) (diameter 0) (color 0 0 0 0)
+  (junction (at 140.97 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 9cb0289b-897f-4a33-9575-6ead0989832a)
   )
   (junction (at 41.91 133.35) (diameter 0) (color 0 0 0 0)
@@ -1806,19 +1882,19 @@
   (junction (at 270.51 52.07) (diameter 0) (color 0 0 0 0)
     (uuid aa21b640-c66c-4373-8449-938440dd5f1c)
   )
-  (junction (at 148.59 180.34) (diameter 0) (color 0 0 0 0)
+  (junction (at 73.66 181.61) (diameter 0) (color 0 0 0 0)
     (uuid b2ecb88a-4c09-46d5-b24a-de38dbb48f75)
   )
   (junction (at 41.91 143.51) (diameter 0) (color 0 0 0 0)
     (uuid b47512f5-ddb1-4f6a-a01f-993a149ffa47)
   )
-  (junction (at 152.4 146.05) (diameter 0) (color 0 0 0 0)
+  (junction (at 152.4 132.08) (diameter 0) (color 0 0 0 0)
     (uuid b7e9cf10-b74e-4e80-a7f1-e33a29fe56de)
   )
   (junction (at 20.32 153.67) (diameter 0) (color 0 0 0 0)
     (uuid be9a62f2-23dd-41df-91a7-1f4ac377faf3)
   )
-  (junction (at 198.12 97.79) (diameter 0) (color 0 0 0 0)
+  (junction (at 81.28 77.47) (diameter 0) (color 0 0 0 0)
     (uuid c21d43cd-6a5c-49e4-8e47-27ce04de320c)
   )
   (junction (at 34.29 90.17) (diameter 0) (color 0 0 0 0)
@@ -1827,26 +1903,26 @@
   (junction (at 21.59 191.77) (diameter 0) (color 0 0 0 0)
     (uuid c700ac3f-55c1-4328-ac50-f1d2cfb94ee9)
   )
-  (junction (at 214.63 31.75) (diameter 0) (color 0 0 0 0)
-    (uuid c919be4d-1323-48ff-9b47-63e806eb379b)
-  )
   (junction (at 41.91 123.19) (diameter 0) (color 0 0 0 0)
     (uuid cc016ca4-b9a4-4d80-91ba-91d6e0df5bcc)
   )
-  (junction (at 170.18 49.53) (diameter 0) (color 0 0 0 0)
+  (junction (at 170.18 35.56) (diameter 0) (color 0 0 0 0)
     (uuid e1640c92-0a7b-4990-ae42-e9436c2a460d)
   )
+  (junction (at 31.75 143.51) (diameter 0) (color 0 0 0 0)
+    (uuid e4389c4e-c952-4182-9a64-3fb2a72a1786)
+  )
   (junction (at 274.32 27.94) (diameter 0) (color 0 0 0 0)
     (uuid ed74c2b7-a3ac-4886-84f5-377b5e1bbbfc)
   )
-  (junction (at 228.6 24.13) (diameter 0) (color 0 0 0 0)
-    (uuid edb71222-40e6-4859-afb6-9f8493972161)
+  (junction (at 113.03 96.52) (diameter 0) (color 0 0 0 0)
+    (uuid ff6d9fdb-84d0-4d1c-a636-19102cb32ce0)
   )
 
   (no_connect (at 19.05 30.48) (uuid 27a098aa-a54a-4603-8a04-fe8def00e684))
   (no_connect (at 19.05 25.4) (uuid 32b8b153-c903-4741-ad0e-f8d9602e50e4))
   (no_connect (at 39.37 33.02) (uuid 342988be-16c5-4d72-82f4-e65b4c5f0a23))
-  (no_connect (at 233.68 138.43) (uuid 487ede9d-e4e2-47c1-b417-084ff862638c))
+  (no_connect (at 233.68 124.46) (uuid 487ede9d-e4e2-47c1-b417-084ff862638c))
   (no_connect (at 19.05 45.72) (uuid 4f2980f5-7c43-4875-a7d2-8b8b265a1e46))
   (no_connect (at 19.05 40.64) (uuid 5187d1a9-67b2-40c1-a07c-4e0e8a38791d))
   (no_connect (at 39.37 35.56) (uuid 54760758-af89-4a41-a60d-e1b689c5006e))
@@ -1857,89 +1933,89 @@
   (no_connect (at 29.21 60.96) (uuid 94d11b9d-6eb0-4385-9ae1-ddcc32221de4))
   (no_connect (at 19.05 48.26) (uuid 98bce542-8d71-44ac-8b06-d20ab5e9152b))
   (no_connect (at 19.05 55.88) (uuid 9a013d10-199f-4d04-bd4c-941faf08d324))
-  (no_connect (at 144.78 69.85) (uuid b1a7eebe-6925-4250-9db7-8e9e0fa6cd98))
+  (no_connect (at 144.78 55.88) (uuid b1a7eebe-6925-4250-9db7-8e9e0fa6cd98))
   (no_connect (at 19.05 27.94) (uuid cbf32607-4f05-4315-90ea-7b1ad43a34e7))
   (no_connect (at 49.53 24.13) (uuid d201603c-e100-4dec-85ec-f4b2f2d1beac))
   (no_connect (at 39.37 25.4) (uuid e52ceaab-2ff4-49eb-abf8-ad8d6eddfba5))
   (no_connect (at 19.05 50.8) (uuid e57a82f1-c1a2-475f-b5ba-dfeed83c5d9b))
 
-  (wire (pts (xy 165.1 133.35) (xy 213.36 133.35))
+  (wire (pts (xy 165.1 119.38) (xy 213.36 119.38))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 006bc43b-d3a8-4a38-a8dc-5a24da3f9b4d)
   )
-  (wire (pts (xy 49.53 26.67) (xy 60.96 26.67))
+  (wire (pts (xy 49.53 26.67) (xy 72.39 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0172fa94-4b7c-4d5e-bde6-27bb171b91e9)
   )
+  (wire (pts (xy 63.5 149.86) (xy 64.77 149.86))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 01bec52d-63c5-49e5-955c-569d1162d97f)
+  )
   (wire (pts (xy 34.29 71.12) (xy 40.64 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0242d9ef-e4f8-46fc-9a77-e91737006838)
   )
-  (wire (pts (xy 34.29 95.25) (xy 34.29 90.17))
+  (wire (pts (xy 60.96 71.12) (xy 60.96 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 035870a0-33fd-4542-9093-58d01a043d61)
+    (uuid 02f4b20d-c9a8-4969-8fae-b3557e58a4d5)
   )
-  (wire (pts (xy 222.25 24.13) (xy 226.06 24.13))
+  (wire (pts (xy 34.29 93.98) (xy 34.29 90.17))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 044e08b9-e685-498e-bd87-b8524296a144)
+    (uuid 035870a0-33fd-4542-9093-58d01a043d61)
   )
-  (wire (pts (xy 119.38 74.93) (xy 132.08 74.93))
+  (wire (pts (xy 119.38 60.96) (xy 132.08 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0454b0ed-4e94-46b1-9058-7210ddee62e4)
   )
-  (wire (pts (xy 200.66 31.75) (xy 214.63 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 049c481d-6ebe-4dd1-9faa-e600aef235d0)
-  )
-  (wire (pts (xy 34.29 102.87) (xy 34.29 111.76))
+  (wire (pts (xy 34.29 101.6) (xy 34.29 102.87))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 075e8b22-aaf4-4757-89b3-6249642534f1)
   )
-  (wire (pts (xy 170.18 140.97) (xy 165.1 140.97))
+  (wire (pts (xy 170.18 127) (xy 165.1 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 092bd70b-48e0-45b7-9940-021b2d382881)
   )
-  (wire (pts (xy 189.23 86.36) (xy 198.12 86.36))
+  (wire (pts (xy 44.45 120.65) (xy 31.75 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0cb31f5d-5577-4529-a561-fc2e8e6c473e)
+    (uuid 09f2736c-9021-4d8c-8548-ee1072a97795)
   )
-  (wire (pts (xy 22.86 91.44) (xy 22.86 90.17))
+  (wire (pts (xy 15.24 91.44) (xy 15.24 90.17))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1021e01a-7480-4604-9b82-a8d70899e83d)
   )
-  (wire (pts (xy 34.29 133.35) (xy 30.48 133.35))
+  (wire (pts (xy 34.29 133.35) (xy 31.75 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 10acd6cf-9aa0-464b-9051-98ec9eb1cee0)
   )
-  (wire (pts (xy 165.1 130.81) (xy 213.36 130.81))
+  (wire (pts (xy 48.26 146.05) (xy 55.88 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 11b49d13-b047-4242-be65-9a9b1c80ec58)
+    (uuid 11719fed-d88d-4530-9c26-831b28b31b78)
   )
-  (wire (pts (xy 207.01 87.63) (xy 207.01 90.17))
+  (wire (pts (xy 64.77 132.08) (xy 45.72 132.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1525aa38-a541-4636-8138-01e3058a1520)
+    (uuid 117ea635-ba04-4738-95f8-db64471b3c10)
   )
-  (wire (pts (xy 251.46 100.33) (xy 260.35 100.33))
+  (wire (pts (xy 165.1 116.84) (xy 213.36 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 15328724-62c0-4c64-8165-7ba7fa235831)
+    (uuid 11b49d13-b047-4242-be65-9a9b1c80ec58)
   )
-  (wire (pts (xy 127 115.57) (xy 132.08 115.57))
+  (wire (pts (xy 127 101.6) (xy 132.08 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1627b889-41c1-4638-81bb-2059620a165d)
   )
-  (wire (pts (xy 127 125.73) (xy 132.08 125.73))
+  (wire (pts (xy 127 111.76) (xy 132.08 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 166aacf9-9169-4bbe-a203-0c1180fa7c79)
   )
-  (wire (pts (xy 191.77 35.56) (xy 191.77 24.13))
+  (wire (pts (xy 266.7 20.32) (xy 274.32 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1758ba3f-65d9-48ce-8dc4-3064f533dbae)
+    (uuid 183d445a-de65-4a66-9059-9ba25be6a94a)
   )
   (wire (pts (xy 21.59 191.77) (xy 26.67 191.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1998e0d6-130d-4ba8-96ae-888a1f6e3081)
   )
-  (wire (pts (xy 110.49 55.88) (xy 110.49 57.15))
+  (wire (pts (xy 110.49 41.91) (xy 110.49 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a795a6f-1bc6-41fb-82d7-5ae528094d84)
   )
@@ -1947,27 +2023,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1aa1dab1-f1aa-419d-8e2b-8cd33b1239aa)
   )
-  (wire (pts (xy 207.01 90.17) (xy 209.55 90.17))
+  (wire (pts (xy 90.17 69.85) (xy 91.44 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d79b872-4247-447b-8107-559d53ddd5a5)
   )
-  (wire (pts (xy 243.84 102.87) (xy 243.84 99.06))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1fcbe337-d147-4e02-846e-7f1ec4528bd0)
-  )
-  (wire (pts (xy 130.81 49.53) (xy 140.97 49.53))
+  (wire (pts (xy 130.81 35.56) (xy 140.97 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2330a65f-a667-4564-b2ea-fd267508069a)
   )
-  (wire (pts (xy 260.35 20.32) (xy 274.32 20.32))
+  (wire (pts (xy 260.35 20.32) (xy 266.7 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23425199-2ac8-404e-b295-8bb0276f526e)
   )
-  (wire (pts (xy 189.23 125.73) (xy 181.61 125.73))
+  (wire (pts (xy 189.23 111.76) (xy 181.61 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 238ce6dc-0557-409a-ab04-93448fccaac4)
   )
-  (wire (pts (xy 160.02 49.53) (xy 154.94 49.53))
+  (wire (pts (xy 160.02 35.56) (xy 154.94 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23d269d6-d694-442a-bf5d-98bf3544fc31)
   )
@@ -1975,56 +2047,73 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2480dd87-1dff-4a50-81a2-52ef161ac45c)
   )
-  (wire (pts (xy 138.43 180.34) (xy 138.43 181.61))
+  (wire (pts (xy 259.08 48.26) (xy 262.89 48.26))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 24884ea9-449f-44bf-b800-4ed7c93ce21e)
+  )
+  (wire (pts (xy 63.5 181.61) (xy 63.5 182.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 251435cb-df17-46ab-aac4-3d24ccac8db0)
   )
-  (wire (pts (xy 223.52 133.35) (xy 233.68 133.35))
+  (wire (pts (xy 109.22 106.68) (xy 132.08 106.68))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 25892d42-97fc-44a1-b3ba-aeb16f99fc18)
+  )
+  (wire (pts (xy 223.52 119.38) (xy 233.68 119.38))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25ada721-670a-4020-ae0b-77410c4e375a)
   )
-  (wire (pts (xy 34.29 123.19) (xy 30.48 123.19))
+  (polyline (pts (xy 12.7 63.5) (xy 12.7 165.1))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2713b852-bf79-44b8-86d7-5e0782348c75)
+  )
+
+  (wire (pts (xy 34.29 123.19) (xy 31.75 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2965eaa9-5c83-4078-a673-05e36103f2d1)
   )
-  (wire (pts (xy 127 123.19) (xy 132.08 123.19))
+  (wire (pts (xy 26.67 104.14) (xy 64.77 104.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2b7ff33a-ec1c-46d5-8b84-ce602b213971)
+  )
+  (wire (pts (xy 127 109.22) (xy 132.08 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2bd08fdd-e559-4112-af36-bdef9848d0a6)
   )
-  (wire (pts (xy 228.6 24.13) (xy 234.95 24.13))
+  (wire (pts (xy 81.28 96.52) (xy 97.79 96.52))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2c6ad630-243d-427a-a5cf-bdab2e7e3ca0)
+  )
+  (wire (pts (xy 64.77 134.62) (xy 46.99 134.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2da947aa-ae17-4b65-af50-1f4c2e060828)
+    (uuid 2e004af1-24c2-4d3f-9cdf-8ffccd65096d)
   )
-  (wire (pts (xy 243.84 91.44) (xy 251.46 91.44))
+  (wire (pts (xy 57.15 82.55) (xy 57.15 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 34d6d782-5641-4526-b346-05de03ea8c0e)
+    (uuid 34bc620a-9d77-48b4-909a-ab4e80c66d2f)
   )
-  (polyline (pts (xy 59.69 15.24) (xy 59.69 63.5))
+  (polyline (pts (xy 59.69 15.24) (xy 59.69 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 36dbbb14-ed77-4633-af35-90660d2143f3)
   )
 
-  (wire (pts (xy 80.01 31.75) (xy 80.01 24.13))
+  (wire (pts (xy 120.65 35.56) (xy 130.81 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3767c9f7-bcd4-45e3-8ce9-5319ea755a8a)
+    (uuid 37e843e9-2538-4a91-9a9b-f536fa0a9e84)
   )
-  (wire (pts (xy 120.65 49.53) (xy 130.81 49.53))
+  (wire (pts (xy 64.77 127) (xy 44.45 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 37e843e9-2538-4a91-9a9b-f536fa0a9e84)
+    (uuid 38d4be64-e2ca-4c77-8402-c0bcde2a8985)
   )
   (wire (pts (xy 247.65 52.07) (xy 247.65 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 39fc171f-22e1-4125-a6fb-074be0f89972)
   )
-  (wire (pts (xy 110.49 49.53) (xy 120.65 49.53))
+  (wire (pts (xy 110.49 35.56) (xy 120.65 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3a013e8f-5b12-499b-8d2d-0ad49966db1a)
   )
-  (wire (pts (xy 200.66 24.13) (xy 200.66 25.4))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3c7ec0d6-65f7-4e0f-bf39-65992df7174f)
-  )
-  (wire (pts (xy 158.75 181.61) (xy 158.75 180.34))
+  (wire (pts (xy 83.82 182.88) (xy 83.82 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3d927ca0-f4ad-42ab-b902-dfef8d84eebb)
   )
@@ -2032,15 +2121,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3ecb97a2-d71c-4514-8aef-66aafaac321d)
   )
-  (wire (pts (xy 66.04 44.45) (xy 73.66 44.45))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3f4ca593-2b3f-4c1d-83fb-6afbc1dc83bd)
-  )
-  (wire (pts (xy 102.87 135.89) (xy 102.87 138.43))
+  (wire (pts (xy 31.75 151.13) (xy 31.75 153.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3f4f4435-0d48-417e-8f86-def0fd108af7)
+    (uuid 3ecfdc85-ccb3-4449-a7de-24b5b9ff8623)
   )
-  (wire (pts (xy 148.59 186.69) (xy 158.75 186.69))
+  (wire (pts (xy 73.66 187.96) (xy 83.82 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3fc3a397-ec3a-4314-aa6a-44925ef4cbbe)
   )
@@ -2049,11 +2134,11 @@
     (uuid 437ebe18-8f4c-4d60-9ade-e76424d17726)
   )
 
-  (wire (pts (xy 158.75 180.34) (xy 160.02 180.34))
+  (wire (pts (xy 83.82 181.61) (xy 85.09 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4736f749-4a0e-4a05-b1aa-d51f1c3fc23d)
   )
-  (wire (pts (xy 160.02 49.53) (xy 170.18 49.53))
+  (wire (pts (xy 160.02 35.56) (xy 170.18 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4829bee0-faa8-43f7-b2d7-8a6e5d1b3050)
   )
@@ -2065,7 +2150,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4ac2ebce-bb4e-40ee-8aab-660b525d546b)
   )
-  (wire (pts (xy 124.46 92.71) (xy 132.08 92.71))
+  (wire (pts (xy 124.46 78.74) (xy 132.08 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4cd135a5-fdd1-4851-864a-dadf7c96d9ff)
   )
@@ -2077,27 +2162,27 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4f69bb40-cbf2-45c5-8c23-3e0667e1f6c1)
   )
-  (wire (pts (xy 165.1 128.27) (xy 181.61 128.27))
+  (wire (pts (xy 165.1 114.3) (xy 181.61 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 500298f6-b9ed-4e53-bde6-024545f1a90a)
   )
-  (wire (pts (xy 201.93 76.2) (xy 201.93 35.56))
+  (wire (pts (xy 44.45 129.54) (xy 44.45 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5072acae-0fdb-4040-acf2-e7c46e26f505)
+    (uuid 5340b604-f44f-4b11-a6bf-532ca4d65b6f)
   )
-  (wire (pts (xy 165.1 113.03) (xy 170.18 113.03))
+  (wire (pts (xy 165.1 99.06) (xy 170.18 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 53b642b8-d876-4cba-97a5-d4c9c528a2c5)
   )
-  (wire (pts (xy 226.06 24.13) (xy 228.6 24.13))
+  (wire (pts (xy 74.93 17.78) (xy 72.39 17.78))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 53ca9047-4473-49bf-9a5c-d4ba6da3881d)
+    (uuid 5650bed6-fa0f-4e0e-bc2c-475445b4cde8)
   )
-  (wire (pts (xy 41.91 111.76) (xy 41.91 123.19))
+  (wire (pts (xy 64.77 101.6) (xy 57.15 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 58a22765-7f2e-4f66-9ea8-f56fcca75dda)
+    (uuid 58839379-e082-4fb4-906e-c6877a462c18)
   )
-  (wire (pts (xy 34.29 143.51) (xy 30.48 143.51))
+  (wire (pts (xy 34.29 143.51) (xy 31.75 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 595e8034-8a59-4a5c-b366-f8604d8aa4da)
   )
@@ -2105,15 +2190,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5af71f61-4c88-4f07-8375-dac3a2ef186d)
   )
-  (wire (pts (xy 200.66 30.48) (xy 200.66 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5c2835f1-d56c-4019-9ef3-09fd3e460220)
-  )
-  (wire (pts (xy 110.49 49.53) (xy 110.49 50.8))
+  (wire (pts (xy 110.49 35.56) (xy 110.49 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5e8f43a4-e869-473e-b093-0ec79ea19580)
   )
-  (wire (pts (xy 226.06 128.27) (xy 233.68 128.27))
+  (wire (pts (xy 226.06 114.3) (xy 233.68 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5f48357f-c353-4808-811f-74ed7ffaa7c6)
   )
@@ -2125,15 +2206,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 61e795c9-5bb5-48b3-b7a0-cb64f04c7adc)
   )
-  (wire (pts (xy 34.29 153.67) (xy 30.48 153.67))
+  (wire (pts (xy 49.53 101.6) (xy 49.53 90.17))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 62bb59d5-9173-4472-8052-d1f9b5eb8ddd)
+  )
+  (wire (pts (xy 48.26 146.05) (xy 48.26 149.86))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 653c064d-2952-4357-b6d2-6994eafa06e3)
+  )
+  (wire (pts (xy 34.29 153.67) (xy 31.75 153.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 66d98295-60ac-4b7d-a181-3284b2b387bc)
   )
-  (wire (pts (xy 124.46 90.17) (xy 124.46 87.63))
+  (wire (pts (xy 124.46 76.2) (xy 124.46 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 677a1070-c11b-49a9-8186-12e0a3e880b1)
   )
-  (wire (pts (xy 66.04 57.15) (xy 66.04 52.07))
+  (wire (pts (xy 77.47 29.21) (xy 77.47 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 679e5b0e-a017-43d8-8845-79a886253d82)
   )
@@ -2141,52 +2230,68 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 67a7995e-8784-42ca-a88d-2917f425f1b7)
   )
-  (wire (pts (xy 215.9 143.51) (xy 223.52 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6be0facb-2aaa-4e96-b9a3-b62386a9a87b)
-  )
-  (polyline (pts (xy 15.24 15.24) (xy 15.24 63.5))
+  (polyline (pts (xy 15.24 15.24) (xy 15.24 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6c1a4ff4-84d5-4723-9271-598658bada11)
   )
 
-  (wire (pts (xy 165.1 125.73) (xy 180.34 125.73))
+  (wire (pts (xy 165.1 111.76) (xy 180.34 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f75ea3e-6135-44f5-9313-1aad839ab6f6)
   )
-  (wire (pts (xy 137.16 180.34) (xy 138.43 180.34))
+  (wire (pts (xy 31.75 153.67) (xy 30.48 153.67))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7015e2a0-a2e3-4f1d-a3b4-6e3232db9600)
+  )
+  (wire (pts (xy 74.93 17.78) (xy 77.47 17.78))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 70fbc14f-75ce-4a72-aeed-887f01f7e9b7)
+  )
+  (wire (pts (xy 62.23 181.61) (xy 63.5 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 742f6656-c86d-41c0-937e-ef6ded3bd482)
   )
-  (wire (pts (xy 243.84 102.87) (xy 260.35 102.87))
+  (wire (pts (xy 82.55 119.38) (xy 81.28 119.38))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 75080b0b-6140-45af-8605-622af6de8bea)
+    (uuid 759cc877-c951-4232-8801-84944e2711e0)
   )
-  (wire (pts (xy 223.52 133.35) (xy 220.98 133.35))
+  (wire (pts (xy 223.52 119.38) (xy 220.98 119.38))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 771145ed-2e00-4172-ac95-37a36c6a35ce)
   )
-  (wire (pts (xy 140.97 49.53) (xy 149.86 49.53))
+  (wire (pts (xy 31.75 143.51) (xy 30.48 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 79e9b764-7934-4c55-bbe2-66da90857ed4)
+  )
+  (wire (pts (xy 140.97 35.56) (xy 149.86 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7c1fd6fc-5c53-4ccb-a456-46fe6fc0bc71)
   )
-  (wire (pts (xy 34.29 111.76) (xy 41.91 111.76))
+  (wire (pts (xy 34.29 102.87) (xy 41.91 102.87))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7d0bbe80-0957-4d01-9233-f16ef102a13b)
   )
-  (wire (pts (xy 157.48 180.34) (xy 158.75 180.34))
+  (wire (pts (xy 82.55 181.61) (xy 83.82 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7d512d14-3ca4-4934-b506-eb07d268c7dc)
   )
-  (wire (pts (xy 255.27 48.26) (xy 262.89 48.26))
+  (wire (pts (xy 255.27 48.26) (xy 259.08 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7dd55760-37b2-4d89-b4f0-9a6e2271c608)
   )
-  (wire (pts (xy 147.32 146.05) (xy 144.78 146.05))
+  (wire (pts (xy 49.53 31.75) (xy 60.96 31.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7dea5b06-9728-4946-ac18-76df3b51d33b)
+  )
+  (wire (pts (xy 147.32 132.08) (xy 144.78 132.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7f2c9904-545b-4337-acd6-8707e0924818)
   )
-  (wire (pts (xy 243.84 123.19) (xy 241.3 123.19))
+  (wire (pts (xy 31.75 120.65) (xy 31.75 123.19))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7f70a162-654d-4a57-bc5d-a31cdfbe16ab)
+  )
+  (wire (pts (xy 243.84 109.22) (xy 241.3 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7fa098fb-b644-4e64-920e-8328b5d12f21)
   )
@@ -2198,83 +2303,115 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83b77b4d-dcc2-4e93-a5f3-1d1480646393)
   )
+  (wire (pts (xy 82.55 118.11) (xy 82.55 119.38))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8531137a-1a8b-4272-8a2a-21ebe15116a8)
+  )
   (wire (pts (xy 255.27 57.15) (xy 256.54 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 875404be-e359-458a-af29-1bd3403dd55f)
   )
-  (wire (pts (xy 170.18 110.49) (xy 165.1 110.49))
+  (wire (pts (xy 170.18 96.52) (xy 165.1 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8916cfb5-5541-43a9-8e0e-951b776d485c)
   )
-  (wire (pts (xy 125.73 21.59) (xy 125.73 24.13))
+  (wire (pts (xy 90.17 69.85) (xy 90.17 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8aacfdd5-15da-46ff-b53e-da8342d51270)
+    (uuid 8c018d47-5ab9-4aea-a37a-71038b398265)
   )
-  (wire (pts (xy 207.01 90.17) (xy 207.01 92.71))
+  (wire (pts (xy 64.77 129.54) (xy 44.45 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8c018d47-5ab9-4aea-a37a-71038b398265)
+    (uuid 8cad3c76-9d14-47b0-af16-b1d45fb7e210)
   )
-  (wire (pts (xy 49.53 31.75) (xy 80.01 31.75))
+  (wire (pts (xy 25.4 85.09) (xy 25.4 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8cf3b989-d323-4aa3-888a-229ee0855e8a)
+    (uuid 8cc76f91-ded4-40ee-b697-880b3a291e2e)
   )
   (wire (pts (xy 20.32 143.51) (xy 20.32 153.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d760ab7-cb5d-426a-b4aa-fb7e0964cb41)
   )
-  (wire (pts (xy 73.66 57.15) (xy 66.04 57.15))
+  (wire (pts (xy 113.03 96.52) (xy 118.11 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8f577817-ea32-42aa-bedc-809b6d0ffec6)
+    (uuid 8eee2ea4-1445-45c5-abf0-47f99f0cf976)
   )
-  (wire (pts (xy 148.59 180.34) (xy 149.86 180.34))
+  (wire (pts (xy 73.66 181.61) (xy 74.93 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9004cee7-358e-4c08-9d64-a05f28a4e7b6)
   )
-  (wire (pts (xy 22.86 85.09) (xy 26.67 85.09))
+  (wire (pts (xy 15.24 85.09) (xy 25.4 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 901dc96c-698d-427d-880a-ee46536a481f)
   )
-  (wire (pts (xy 198.12 97.79) (xy 199.39 97.79))
+  (wire (pts (xy 81.28 77.47) (xy 82.55 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 91b93633-9d4a-4170-b7ca-34e2d5aedb1e)
   )
-  (wire (pts (xy 124.46 87.63) (xy 132.08 87.63))
+  (wire (pts (xy 124.46 73.66) (xy 132.08 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92cf4db4-2dba-4763-9cd8-3c7f8aff8f24)
   )
-  (wire (pts (xy 124.46 90.17) (xy 115.57 90.17))
+  (wire (pts (xy 124.46 76.2) (xy 115.57 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93b580d1-c2df-48c4-9d06-465ca9d3eebc)
   )
-  (wire (pts (xy 102.87 138.43) (xy 132.08 138.43))
+  (wire (pts (xy 31.75 130.81) (xy 31.75 133.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 93da3a85-5fda-48d7-be90-2ac97d347c10)
+  )
+  (wire (pts (xy 31.75 133.35) (xy 30.48 133.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9a54de37-9a36-4361-8f2a-998faf1c0711)
+  )
+  (wire (pts (xy 87.63 124.46) (xy 132.08 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c00f763-4387-4dca-9d2a-687600fcbd31)
   )
-  (wire (pts (xy 220.98 130.81) (xy 233.68 130.81))
+  (wire (pts (xy 220.98 116.84) (xy 233.68 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f7324c5-50a2-442c-8a80-edf04aa2b2ac)
   )
-  (wire (pts (xy 149.86 69.85) (xy 147.32 69.85))
+  (wire (pts (xy 26.67 90.17) (xy 26.67 104.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a17a454c-d5db-41e2-aad7-bb23416d3abb)
+  )
+  (wire (pts (xy 149.86 55.88) (xy 147.32 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a32fe8ab-5810-40f6-8eab-48332c0ee5a0)
   )
-  (wire (pts (xy 198.12 104.14) (xy 198.12 102.87))
+  (wire (pts (xy 81.28 83.82) (xy 81.28 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a6772870-a42e-49f8-bd4d-a35118c5fb87)
   )
-  (wire (pts (xy 124.46 95.25) (xy 132.08 95.25))
+  (wire (pts (xy 31.75 123.19) (xy 30.48 123.19))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a8ec01c3-5395-47fc-8245-52f53884ef0c)
+  )
+  (wire (pts (xy 124.46 81.28) (xy 132.08 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab5db7e5-9de7-449f-b70b-9d0dd610b10b)
   )
-  (wire (pts (xy 116.84 87.63) (xy 116.84 85.09))
+  (wire (pts (xy 116.84 73.66) (xy 116.84 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac5a5c45-797a-4bbe-bfd5-5ce5a8aa3463)
   )
-  (wire (pts (xy 198.12 96.52) (xy 198.12 97.79))
+  (wire (pts (xy 109.22 99.06) (xy 109.22 96.52))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid acc086a0-e4a1-477e-a665-53709bdb472e)
+  )
+  (wire (pts (xy 81.28 76.2) (xy 81.28 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ae0da676-b905-4af3-8d1e-af49105ca29d)
   )
-  (wire (pts (xy 152.4 146.05) (xy 149.86 146.05))
+  (wire (pts (xy 46.99 151.13) (xy 31.75 151.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ae15e328-ecca-4103-8937-cab586d25863)
+  )
+  (wire (pts (xy 187.96 106.68) (xy 187.96 105.41))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b02e051f-3ad1-4d09-a486-11f02dd3200d)
+  )
+  (wire (pts (xy 152.4 132.08) (xy 149.86 132.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b05af61d-3c1d-44cf-aea2-61fd169c9d1a)
   )
@@ -2282,83 +2419,109 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b28ba5b1-54d9-4597-94a4-3b5c7b5bab1e)
   )
-  (wire (pts (xy 149.86 49.53) (xy 149.86 69.85))
+  (wire (pts (xy 149.86 35.56) (xy 149.86 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b3eebb03-af8c-48e8-a7d9-5ec3741206fa)
   )
-  (wire (pts (xy 191.77 24.13) (xy 200.66 24.13))
+  (polyline (pts (xy 72.39 63.5) (xy 72.39 165.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b5764917-bb73-4032-bb79-484b4094badd)
+    (uuid b7352d31-f539-445c-ba3f-fbc1562b3d46)
   )
-  (wire (pts (xy 181.61 125.73) (xy 181.61 128.27))
+
+  (wire (pts (xy 181.61 111.76) (xy 181.61 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b9fce689-53c2-4275-98d8-2c8da9bd740a)
   )
-  (wire (pts (xy 116.84 85.09) (xy 115.57 85.09))
+  (wire (pts (xy 116.84 71.12) (xy 115.57 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ba80136a-34d0-4a97-a9c9-c43ab3f7be6e)
   )
-  (wire (pts (xy 152.4 69.85) (xy 149.86 69.85))
+  (wire (pts (xy 97.79 96.52) (xy 97.79 72.39))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid baa5fb47-0080-48ce-a6eb-0a22f840580d)
+  )
+  (wire (pts (xy 152.4 55.88) (xy 149.86 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bade9875-e59b-4d52-b529-c48d7c265fc4)
   )
-  (wire (pts (xy 49.53 29.21) (xy 60.96 29.21))
+  (wire (pts (xy 81.28 137.16) (xy 87.63 137.16))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bb740424-d759-4423-b2a5-0258d69ff2b8)
+  )
+  (wire (pts (xy 49.53 29.21) (xy 77.47 29.21))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bc913ca4-9065-43d2-9d7f-c7073d14811d)
   )
-  (wire (pts (xy 170.18 115.57) (xy 165.1 115.57))
+  (wire (pts (xy 170.18 101.6) (xy 165.1 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bcb9de97-da39-48c2-ba62-52171a3a19f8)
   )
-  (wire (pts (xy 207.01 104.14) (xy 207.01 102.87))
+  (wire (pts (xy 64.77 93.98) (xy 60.96 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid be3969cd-6eb6-46db-b717-5a91b206baa1)
+    (uuid bcc6231b-fada-4e7b-994f-501a10edaac4)
   )
-  (wire (pts (xy 22.86 85.09) (xy 16.51 85.09))
+  (wire (pts (xy 118.11 104.14) (xy 132.08 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c71a0f1c-e0a1-4cfb-a1c2-249d4b359638)
+    (uuid bd09b87f-3171-467c-9c1b-9b264cb5811f)
   )
-  (wire (pts (xy 180.34 123.19) (xy 189.23 123.19))
+  (wire (pts (xy 45.72 132.08) (xy 45.72 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ca0eab8e-e3fd-464d-bb03-d1603b8a651b)
+    (uuid bdc362f0-8353-4b85-a2e5-77a124b70e3e)
   )
-  (wire (pts (xy 201.93 35.56) (xy 191.77 35.56))
+  (wire (pts (xy 90.17 83.82) (xy 90.17 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cd84c7b2-4536-4fce-8e6f-895da17fdf47)
+    (uuid be3969cd-6eb6-46db-b717-5a91b206baa1)
   )
-  (wire (pts (xy 200.66 24.13) (xy 207.01 24.13))
+  (wire (pts (xy 46.99 134.62) (xy 46.99 151.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cda471cd-ed64-4f58-b827-5f282321cb92)
+    (uuid bff5a479-d653-4ef3-9142-cd1c60af5e4c)
   )
-  (wire (pts (xy 73.66 54.61) (xy 73.66 52.07))
+  (wire (pts (xy 87.63 137.16) (xy 87.63 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cf02db11-2ff8-4f79-b3e9-9802575ab786)
+    (uuid c11bad5b-a36f-48f7-a423-b6938509b64c)
   )
-  (wire (pts (xy 226.06 24.13) (xy 226.06 25.4))
+  (wire (pts (xy 25.4 85.09) (xy 26.67 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d030b1b5-66ea-4dee-aa8b-a368d46b7f2a)
+    (uuid c3bf758f-2f4a-44b5-89bd-399138aded84)
   )
-  (wire (pts (xy 214.63 31.75) (xy 226.06 31.75))
+  (wire (pts (xy 109.22 96.52) (xy 113.03 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d0c49abc-3258-4c00-a10f-f54b5d0253a5)
+    (uuid c4f64510-07d5-4ae3-902b-5d0e59c44376)
   )
-  (wire (pts (xy 154.94 49.53) (xy 154.94 69.85))
+  (wire (pts (xy 180.34 109.22) (xy 189.23 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d1ea7795-8403-4edb-b959-1b29f77ed16f)
+    (uuid ca0eab8e-e3fd-464d-bb03-d1603b8a651b)
   )
-  (wire (pts (xy 26.67 90.17) (xy 22.86 90.17))
+  (wire (pts (xy 72.39 26.67) (xy 72.39 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d4d81f67-fac4-4771-8b7d-f2089683330d)
+    (uuid cf02db11-2ff8-4f79-b3e9-9802575ab786)
   )
-  (wire (pts (xy 148.59 181.61) (xy 148.59 180.34))
+  (polyline (pts (xy 72.39 165.1) (xy 12.7 165.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d8ebdeb0-2bbd-4a1b-a259-f95c97f44cbe)
+    (uuid d1139c2e-c886-424c-a875-a1901610c4d7)
   )
-  (wire (pts (xy 147.32 180.34) (xy 148.59 180.34))
+
+  (wire (pts (xy 154.94 35.56) (xy 154.94 55.88))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d1ea7795-8403-4edb-b959-1b29f77ed16f)
+  )
+  (wire (pts (xy 26.67 90.17) (xy 15.24 90.17))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d4d81f67-fac4-4771-8b7d-f2089683330d)
+  )
+  (wire (pts (xy 73.66 182.88) (xy 73.66 181.61))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d8ebdeb0-2bbd-4a1b-a259-f95c97f44cbe)
+  )
+  (wire (pts (xy 72.39 181.61) (xy 73.66 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dacfc6b2-f197-4446-86ee-d141533404be)
   )
-  (wire (pts (xy 246.38 123.19) (xy 243.84 123.19))
+  (wire (pts (xy 97.79 72.39) (xy 90.17 72.39))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid db2d81f3-23da-41d4-9b62-2e8fe838cf89)
+  )
+  (wire (pts (xy 246.38 109.22) (xy 243.84 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dba4ad5b-8704-4fc8-9247-b9c4709cf1cf)
   )
@@ -2366,68 +2529,81 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc2567a8-f67d-423b-a6b0-f3bf10022eef)
   )
-  (wire (pts (xy 16.51 90.17) (xy 22.86 90.17))
+  (wire (pts (xy 132.08 71.12) (xy 116.84 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dc3924cb-3c6c-488f-b9d5-465b4a917136)
+    (uuid dcbc5a2e-2561-4663-8736-09acc9fe0209)
   )
-  (wire (pts (xy 132.08 85.09) (xy 116.84 85.09))
+  (wire (pts (xy 63.5 187.96) (xy 73.66 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dcbc5a2e-2561-4663-8736-09acc9fe0209)
+    (uuid ddcf9a83-0126-4df6-88fa-3363d508d3a6)
   )
-  (wire (pts (xy 80.01 24.13) (xy 125.73 24.13))
+  (wire (pts (xy 189.23 106.68) (xy 187.96 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dcd3cd29-abce-4f07-aed6-b3bd595ad3c1)
+    (uuid deadb616-b4aa-444c-a56e-5704f773e34d)
   )
-  (wire (pts (xy 138.43 186.69) (xy 148.59 186.69))
+  (wire (pts (xy 45.72 140.97) (xy 31.75 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ddcf9a83-0126-4df6-88fa-3363d508d3a6)
+    (uuid dece3cbd-7376-4a8b-8f30-175b2548ec21)
   )
-  (wire (pts (xy 158.75 146.05) (xy 152.4 146.05))
+  (wire (pts (xy 44.45 130.81) (xy 31.75 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e382fedc-c868-44fd-9740-47cc05b15c1c)
+    (uuid df1810e4-d2b1-4c4a-a469-1d3279013048)
   )
-  (wire (pts (xy 170.18 105.41) (xy 165.1 105.41))
+  (polyline (pts (xy 12.7 63.5) (xy 72.39 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e4a40ea1-de8c-4913-8d95-0a86c0054fcc)
+    (uuid e1153486-162b-4507-b81c-3c8ab418a121)
   )
-  (wire (pts (xy 125.73 24.13) (xy 191.77 24.13))
+
+  (wire (pts (xy 158.75 132.08) (xy 152.4 132.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e56a79a9-61d2-495a-b224-3ba9edb139f1)
+    (uuid e382fedc-c868-44fd-9740-47cc05b15c1c)
   )
-  (wire (pts (xy 226.06 123.19) (xy 226.06 128.27))
+  (wire (pts (xy 170.18 91.44) (xy 165.1 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e4a40ea1-de8c-4913-8d95-0a86c0054fcc)
+  )
+  (wire (pts (xy 226.06 109.22) (xy 226.06 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e584287a-6232-40cf-a082-8dea5986b945)
   )
-  (wire (pts (xy 138.43 180.34) (xy 139.7 180.34))
+  (wire (pts (xy 63.5 181.61) (xy 64.77 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e68fac9b-3de3-4acb-9bb0-3dee3685df22)
   )
-  (wire (pts (xy 180.34 125.73) (xy 180.34 123.19))
+  (wire (pts (xy 180.34 111.76) (xy 180.34 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e7130644-c4ae-4f9d-997d-5b4fa9d09578)
   )
-  (wire (pts (xy 127 110.49) (xy 132.08 110.49))
+  (wire (pts (xy 127 96.52) (xy 132.08 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e719e133-06c8-48a5-8b34-3a33eec285a2)
   )
-  (polyline (pts (xy 59.69 63.5) (xy 15.24 63.5))
+  (polyline (pts (xy 59.69 62.23) (xy 15.24 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e8e850c4-7708-4bbf-84e9-a768c6d278e3)
   )
 
-  (wire (pts (xy 223.52 143.51) (xy 223.52 140.97))
+  (wire (pts (xy 223.52 129.54) (xy 223.52 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e96fb2f4-eacc-40ed-bf61-c56b99b120c0)
   )
-  (wire (pts (xy 198.12 86.36) (xy 198.12 88.9))
+  (wire (pts (xy 44.45 127) (xy 44.45 120.65))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e9b295a5-cdeb-4da6-bdd9-19728b2c98e4)
+  )
+  (wire (pts (xy 90.17 68.58) (xy 81.28 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eaa232ae-0357-4d6f-87b8-c4745ba4beae)
   )
+  (wire (pts (xy 64.77 149.86) (xy 64.77 137.16))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid eb0a63f4-b906-442b-93ec-ffece07fdfe0)
+  )
   (wire (pts (xy 41.91 153.67) (xy 41.91 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb5c3818-51cd-4092-a6a2-1d306912382e)
   )
-  (wire (pts (xy 123.19 80.01) (xy 132.08 80.01))
+  (wire (pts (xy 125.73 66.04) (xy 132.08 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ed265626-f6f5-4029-beb9-f6ad275e86b5)
   )
@@ -2435,30 +2611,30 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ee955228-8cba-41df-9590-142549e57cef)
   )
-  (wire (pts (xy 251.46 100.33) (xy 251.46 99.06))
+  (wire (pts (xy 25.4 106.68) (xy 64.77 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f1353e9e-7eae-44e9-872c-ec11c41e5657)
+    (uuid f0f2fa4c-2880-427e-a24f-022d6c3aded4)
   )
-  (wire (pts (xy 165.1 107.95) (xy 189.23 107.95))
+  (wire (pts (xy 41.91 119.38) (xy 64.77 119.38))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f1ef3bae-8492-482a-bb52-c850c5dd92fa)
+    (uuid f195bef5-4865-4edb-b1c1-1159dcbcf864)
   )
-  (wire (pts (xy 226.06 30.48) (xy 226.06 31.75))
+  (wire (pts (xy 31.75 140.97) (xy 31.75 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f2333ea0-3cdc-40cc-b541-5643d95d4956)
+    (uuid f4034db7-8854-4045-b7b2-1e1c9b9e34c1)
   )
-  (wire (pts (xy 189.23 107.95) (xy 189.23 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f3536d5c-3080-450b-b9d1-9b03a699a225)
-  )
-  (wire (pts (xy 149.86 146.05) (xy 147.32 146.05))
+  (wire (pts (xy 149.86 132.08) (xy 147.32 132.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f46f4b86-daf6-4869-98cb-928039f00f5f)
   )
-  (wire (pts (xy 241.3 123.19) (xy 233.68 123.19))
+  (wire (pts (xy 241.3 109.22) (xy 233.68 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6c96c0d-4cf7-4e5a-ad96-cb52e5fda138)
   )
+  (wire (pts (xy 41.91 119.38) (xy 41.91 123.19))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f7ab66cc-203f-4754-b8dc-ece5fbc39d5d)
+  )
   (wire (pts (xy 20.32 133.35) (xy 20.32 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f928df12-b33b-4d6e-8a51-572bf83802ca)
@@ -2467,12 +2643,12 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid faac2d32-2379-4b8f-8acf-c85798bc06e6)
   )
-  (wire (pts (xy 205.74 80.01) (xy 207.01 80.01))
+  (wire (pts (xy 57.15 96.52) (xy 64.77 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fda99d35-648a-4644-959e-8e11da852ebe)
+    (uuid fea67a82-098b-48c6-940d-5cd9df757cce)
   )
 
-  (text "TODO\n\n\nDone\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020\nAdd cable between main board and control"
+  (text "TODO\n\nDone\nMove STM32 to main board\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020\nAdd cable between main board and control"
     (at 1.27 -15.24 0)
     (effects (font (size 3 3)) (justify left bottom))
     (uuid 1154c567-1e30-4104-a3b9-6b57e1efe0f8)
@@ -2486,41 +2662,48 @@
     (uuid 2a4a455a-d851-42f3-92ae-dce395b66e62)
   )
   (text "After RESET,\nall GPIOs floating,\nexcept\nPA15: JTDI in PU\nPA14: JTCK in PD\nPA13: JTMS in PU\nPB4: NJTRST in PU"
-    (at 163.83 157.48 0)
+    (at 163.83 143.51 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4585c64e-96ad-4886-8cc1-623266bf73bf)
   )
-  (text "TIM1 CH1" (at 173.99 123.19 0)
+  (text "TIM1 CH1" (at 173.99 109.22 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 49389a66-8741-452b-8284-834f65c51e1b)
   )
-  (text "Comment from picardy:\n\nLow pass filter for CW sidetone,\nfinally unused. STATUS LED replaced\nby piezo buzzer instead."
-    (at -53.34 -16.51 0)
+  (text "Cable 15134-0803" (at 74.93 109.22 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 76d9276c-0bff-44cf-81b5-cc0de1c97f12)
+    (uuid 7b631093-e11c-49b0-a46a-633c5ceda110)
   )
-  (text "TIM3 CH1" (at 172.72 118.11 0)
+  (text "TIM3 CH1" (at 172.72 104.14 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7ea15999-0781-4c2e-a266-2adaf5a39946)
   )
+  (text "Front UI board" (at 71.12 163.83 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 8d92f97b-74a7-43f9-9feb-d6e333f8a974)
+  )
   (text "LCD: use a 5V\ncharacter display,\nand Adafruit 292\nbackpack with\n3V3 I2C.\n"
-    (at 58.42 62.23 180)
+    (at 58.42 60.96 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 957effad-d1d8-4a6b-8428-056683589978)
   )
-  (text "TIM3 CH2" (at 172.72 120.65 0)
+  (text "TIM3 CH2" (at 172.72 106.68 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a632aa3e-0113-4f5d-90b5-27bac9ed8392)
   )
-  (text "PC13..15\nlimited current" (at 104.14 100.33 0)
+  (text "PC13..15\nlimited current" (at 104.14 86.36 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d5605fa7-538d-473c-8da8-4e6409672b1d)
   )
+  (text "Cable 15134-0803" (at 74.93 137.16 90)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid dd938c83-7076-4e3c-82e0-49322a91ed68)
+  )
   (text "DISP_DAT" (at 49.53 26.67 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e1ee8c3a-d18b-43d4-92e4-74a5b6e689c1)
   )
-  (text "PA0..7, PB0..1: ADC in" (at 166.37 99.06 0)
+  (text "PA0..7, PB0..1: ADC in" (at 166.37 85.09 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fb6ae0ae-5f09-42f3-a277-43e9524a252b)
   )
@@ -2529,41 +2712,33 @@
     (uuid fd29d2ff-b67b-4b37-95fa-5b64b72e1a7d)
   )
 
-  (label "USB_DP" (at 226.06 133.35 0)
+  (label "USB_DP" (at 226.06 119.38 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0157ed9d-375b-4b39-a7c1-9cb08dcf67bf)
   )
-  (label "USART1_RX" (at 165.1 128.27 0)
+  (label "USART1_RX" (at 165.1 114.3 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0470f6f8-3373-4410-9688-3749de7c241a)
   )
-  (label "3.3V_UI" (at 215.9 143.51 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 07f48ae2-edda-4b4e-8328-4e0ff9651f91)
-  )
-  (label "SDA" (at 132.08 120.65 180)
+  (label "SDA" (at 132.08 106.68 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0886377c-acad-41ba-a045-1d436eadaaab)
   )
-  (label "3.3V_UI" (at 189.23 120.65 90)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 0dc3f608-a471-4302-b437-efcc7facccad)
+  (label "3.3V_UI" (at 41.91 102.87 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 0b2c254c-035e-4b52-9889-bbb048995de9)
   )
-  (label "BTN1" (at 132.08 102.87 180)
+  (label "BTN1" (at 132.08 88.9 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0ece2b87-02c1-4250-9204-efdee0b5a9d0)
   )
-  (label "PB15" (at 201.93 128.27 0)
+  (label "PB15" (at 201.93 114.3 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1c36527b-20ab-4863-8486-3913ee2e57f4)
   )
-  (label "3.3V_UI" (at 245.11 91.44 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 1f82ca6c-aa77-4583-badd-71916c80caea)
-  )
-  (label "I2C2_SDA" (at 73.66 54.61 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 23d0e929-f5a1-4c62-b387-0887d9659f38)
+  (label "3.3V_UI" (at 55.88 146.05 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 1df87102-6570-4cc8-9930-cfb8a8d46ff8)
   )
   (label "3.3V_UI" (at 40.64 71.12 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
@@ -2573,107 +2748,83 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3a41f6b2-d64e-4fc9-9c78-62461e28f42c)
   )
-  (label "3.3V_UI" (at 267.97 20.32 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 3cb649da-5812-48c6-b68c-aac0c5c07ab1)
-  )
-  (label "BTN2" (at 132.08 133.35 180)
+  (label "BTN2" (at 132.08 119.38 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3fcf515a-b2e5-4769-a263-706606d34687)
   )
-  (label "I2C2_SDA" (at 201.93 125.73 0)
+  (label "I2C2_SDA" (at 201.93 111.76 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 474da0bb-a80f-4ce4-b14e-5f26d8f31e91)
   )
-  (label "USB_DM" (at 226.06 130.81 0)
+  (label "USB_DM" (at 226.06 116.84 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 496eb987-d081-4e1e-a63a-28ee1d48f2f8)
   )
-  (label "PB15" (at 132.08 140.97 180)
+  (label "PB15" (at 132.08 127 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 4c756fc2-8fde-4459-8921-e1db5a89f1ba)
   )
-  (label "3.3V_UI" (at 170.18 41.91 0)
+  (label "SWDIO" (at 165.1 121.92 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 4f68bee9-de8e-40b3-9bb6-a76d3a4e2f97)
+    (uuid 502090da-c5a3-4316-9f8a-2de92274b2b8)
   )
-  (label "SWDIO" (at 165.1 135.89 0)
+  (label "MUTE_SPKR" (at 165.1 93.98 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 502090da-c5a3-4316-9f8a-2de92274b2b8)
+    (uuid 57b815ce-1f83-4176-9946-50c52170481e)
   )
-  (label "ENC_BTN" (at 132.08 97.79 180)
+  (label "ENC_BTN" (at 132.08 83.82 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 588d3cbf-6c0a-4102-8f72-574f6ea20133)
   )
-  (label "I2C2_SCL" (at 201.93 123.19 0)
+  (label "I2C2_SCL" (at 201.93 109.22 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 5900b9d3-f54e-4689-953a-e125f5f9fa71)
   )
-  (label "SCL" (at 132.08 118.11 180)
+  (label "SCL" (at 132.08 104.14 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5bd9bd00-e17c-4137-8daf-974f4e7eb479)
   )
-  (label "XTAL2" (at 132.08 87.63 180)
+  (label "XTAL2" (at 132.08 73.66 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5c5b3284-d7e2-4069-8087-eaf4a8346272)
   )
-  (label "ENC_B" (at 16.51 85.09 0)
+  (label "ENC_B" (at 81.28 106.68 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 5e4e2554-e691-40cb-837f-552b7d5bc858)
   )
-  (label "I2C2_SCL" (at 73.66 57.15 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 61d63f1b-dbdf-4e18-9e78-d70eac21ae65)
-  )
-  (label "3.3V_UI" (at 40.64 111.76 0)
+  (label "3.3V_UI" (at 49.53 119.38 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 62ac7083-8caf-45e9-8895-1c0309ab5c83)
   )
-  (label "I2C2_SDA" (at 132.08 130.81 180)
+  (label "I2C2_SDA" (at 132.08 116.84 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 6c1d0ff6-53d9-4a5b-89a8-5313d6ca7d94)
   )
-  (label "SDA" (at 257.81 100.33 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 6db6b2d8-cd53-4924-910c-ce03370c85ba)
-  )
-  (label "3.3V_UI" (at 111.76 74.93 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 702f962b-d7ed-4258-a55c-95b4ef01ab28)
-  )
-  (label "BTN0" (at 132.08 105.41 180)
+  (label "BTN0" (at 132.08 91.44 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 72635b6d-f5d1-44fe-86b5-9bebc2da5d46)
   )
-  (label "SCL" (at 257.81 102.87 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 7288ce3d-ad6e-43f5-96ca-99065d7798d0)
-  )
-  (label "ENC_BTN" (at 57.15 85.09 0)
+  (label "ENC_BTN" (at 81.28 101.6 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 73b08644-febb-4c1e-9b8f-826cf4cd7348)
   )
-  (label "ENC_A" (at 165.1 118.11 0)
+  (label "ENC_A" (at 165.1 104.14 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7803a0ea-b6d3-457b-b195-42c8dc80b579)
   )
-  (label "XTAL1" (at 132.08 85.09 180)
+  (label "XTAL1" (at 132.08 71.12 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 794e55a0-75fe-436a-8b64-c2f248c65f18)
   )
-  (label "ENC_B" (at 165.1 120.65 0)
+  (label "ENC_B" (at 165.1 106.68 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7fd58396-b4e5-46f4-aa37-499fb1457243)
   )
-  (label "3.3V_UI" (at 111.76 49.53 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 81f4e303-316d-4dda-8a12-729c19703c39)
-  )
-  (label "STATUSn" (at 132.08 138.43 180)
+  (label "STATUSn" (at 132.08 124.46 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8233de19-691a-4981-9177-f647c5ab854c)
   )
-  (label "BTN2" (at 30.48 143.51 0)
+  (label "BTN2" (at 81.28 132.08 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8b8cbcc8-2fab-4017-82d7-9e2b0dd87d55)
   )
@@ -2681,15 +2832,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8ce5f070-df4e-4d8d-b78f-3ef1b6a0875c)
   )
-  (label "PWM_CW" (at 165.1 123.19 0)
+  (label "PWM_CW" (at 165.1 109.22 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8d33a8d3-c5cc-40b4-ba71-6923d60927e2)
   )
-  (label "3.3V_UI" (at 255.27 48.26 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 8e9ac0f6-87ec-43af-ad7c-0def570a3fdd)
-  )
-  (label "BOOT0" (at 123.19 80.01 0)
+  (label "BOOT0" (at 125.73 66.04 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 92ba8945-0271-4dc3-a102-541bc7646045)
   )
@@ -2697,15 +2844,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 92f4b848-251e-40e0-b324-8b9b23c0d808)
   )
-  (label "PC14" (at 132.08 95.25 180)
+  (label "PC14" (at 132.08 81.28 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 94b40fef-8e3d-4a32-a137-035c86ca86c8)
   )
-  (label "3.3V_UI" (at 234.95 24.13 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid a45336d6-a379-46af-8e44-28ed055c02ad)
-  )
-  (label "PA0" (at 165.1 102.87 0)
+  (label "PA0" (at 165.1 88.9 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a4813917-c395-4e03-b658-4133a12249cd)
   )
@@ -2713,27 +2856,27 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b4b8fad9-0954-4267-898b-11fce62b39de)
   )
-  (label "PC13" (at 132.08 92.71 180)
+  (label "PC13" (at 132.08 78.74 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid bb592211-9895-49a1-bb6a-47f7a9f85864)
   )
-  (label "SWCLK" (at 165.1 138.43 0)
+  (label "SWCLK" (at 165.1 124.46 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bf046f55-cad5-4e6d-8fc5-1978a2a4f4dc)
   )
-  (label "MUTE_SPKR" (at 198.12 86.36 180)
+  (label "MUTE_SPKR" (at 90.17 68.58 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid bf990ee0-74a2-4da7-8afc-cf8f9fcfdf9c)
   )
-  (label "BTN3" (at 30.48 153.67 0)
+  (label "BTN3" (at 81.28 134.62 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c40d36bb-2efa-4bc3-859b-223faaa66f3e)
   )
-  (label "BTN0" (at 30.48 123.19 0)
+  (label "BTN0" (at 81.28 127 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c435621a-1e7b-4aea-a701-d5d27a54bd0d)
   )
-  (label "BOOT1" (at 132.08 107.95 180)
+  (label "BOOT1" (at 132.08 93.98 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c8ce7d0f-bd8a-416c-9bb9-339f4090a830)
   )
@@ -2741,23 +2884,15 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c90387a3-7222-414a-9f26-d5d7b7d40104)
   )
-  (label "3.3V_UI" (at 102.87 120.65 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid ce7a5488-0263-47e6-94d4-23d4c58d0e13)
-  )
-  (label "PWM_CW" (at 129.54 180.34 180)
+  (label "PWM_CW" (at 54.61 181.61 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid cf672f56-2d68-4c6c-a783-23e23c937b72)
   )
-  (label "3.3V_UI" (at 66.04 44.45 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid d912edd9-914f-4a21-9a39-c25dc4c432d1)
-  )
   (label "SWDIO" (at 260.35 27.94 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e42b8b80-020c-4fee-b000-fd91abf3966d)
   )
-  (label "USART1_TX" (at 165.1 125.73 0)
+  (label "USART1_TX" (at 165.1 111.76 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e721791d-da51-4bae-ab44-002be5ea386c)
   )
@@ -2765,27 +2900,27 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e75faf61-76fe-4e22-b01e-16c228ce55be)
   )
-  (label "RESETn" (at 132.08 74.93 180)
+  (label "RESETn" (at 132.08 60.96 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e9862dd4-26d2-4ddd-91fc-972d848045f5)
   )
-  (label "I2C2_SCL" (at 132.08 128.27 180)
+  (label "I2C2_SCL" (at 132.08 114.3 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ee5ea3d6-1422-40d3-882b-9d8b9c72bbba)
   )
-  (label "PA0" (at 201.93 120.65 0)
+  (label "PA0" (at 201.93 106.68 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f2cb3dc7-19c3-4d39-8479-4368f9d1680c)
   )
-  (label "BTN3" (at 132.08 135.89 180)
+  (label "BTN3" (at 132.08 121.92 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid f686f314-e4c1-4c2d-a83a-58da96d3edf9)
   )
-  (label "ENC_A" (at 16.51 90.17 0)
+  (label "ENC_A" (at 81.28 104.14 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f7a8cf05-b405-47d6-a8ce-eb5ffec4afaa)
   )
-  (label "BTN1" (at 30.48 133.35 0)
+  (label "BTN1" (at 81.28 129.54 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f82b8be3-e209-4493-8527-8e48e4d9c1ce)
   )
@@ -2794,310 +2929,321 @@
     (uuid fd2d066c-2ff9-43c4-ab8e-a65d2b71b5c1)
   )
 
-  (hierarchical_label "SDA" (shape bidirectional) (at 260.35 100.33 0)
+  (global_label "+5VA" (shape input) (at 60.96 31.75 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 0ef1b66f-e76b-4202-84a8-3a5c6b43b54d)
+    (uuid 23c07a9f-1a0f-4174-9bf6-1e9d44a3bbdc)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 68.3321 31.8294 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
+  (global_label "+5VA" (shape input) (at 81.28 93.98 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid b6bf96cd-5d96-481c-b31e-d68390866415)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 88.6521 94.0594 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
   )
-  (hierarchical_label "5V" (shape input) (at 125.73 21.59 180)
+
+  (hierarchical_label "SDA" (shape bidirectional) (at 109.22 106.68 180)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 1482a397-7070-4a7f-87fc-b4a801f5cfa9)
+    (uuid 0ef1b66f-e76b-4202-84a8-3a5c6b43b54d)
   )
-  (hierarchical_label "CW_RING" (shape input) (at 127 125.73 180)
+  (hierarchical_label "CW_RING" (shape input) (at 127 111.76 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 16a9ff70-bfb0-43c0-91e2-031c952ed930)
   )
-  (hierarchical_label "MIC_PTTn" (shape input) (at 170.18 110.49 0)
+  (hierarchical_label "MIC_PTTn" (shape input) (at 170.18 96.52 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 1718dc82-e46c-4c2e-af5a-768580eea712)
   )
-  (hierarchical_label "SPKR_VOL" (shape output) (at 209.55 90.17 0)
+  (hierarchical_label "SPKR_VOL" (shape output) (at 91.44 69.85 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 32993904-ff6f-4989-9ce4-90806124fcff)
   )
-  (hierarchical_label "SCL" (shape bidirectional) (at 260.35 102.87 0)
-    (effects (font (size 1.27 1.27)) (justify left))
+  (hierarchical_label "SCL" (shape bidirectional) (at 118.11 104.14 180)
+    (effects (font (size 1.27 1.27)) (justify right))
     (uuid 474d99d2-54fe-431f-a744-fd4a289e3a63)
   )
-  (hierarchical_label "EN_TX" (shape output) (at 127 115.57 180)
+  (hierarchical_label "EN_TX" (shape output) (at 127 101.6 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4a151dd5-28d8-42af-b70d-d52cf427540e)
   )
-  (hierarchical_label "CW_KEYn" (shape output) (at 170.18 140.97 0)
+  (hierarchical_label "CW_KEYn" (shape output) (at 170.18 127 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 5b1cf420-b469-4a8f-a998-9abdfd8b7687)
   )
-  (hierarchical_label "GPIO_PA4" (shape bidirectional) (at 170.18 113.03 0)
+  (hierarchical_label "GPIO_PA4" (shape bidirectional) (at 170.18 99.06 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 66b37154-37b1-4543-8931-fdcc691edda8)
   )
-  (hierarchical_label "EN_RX" (shape output) (at 127 110.49 180)
+  (hierarchical_label "EN_RX" (shape output) (at 127 96.52 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 92563de1-61c4-4e3f-8603-96474790934f)
   )
-  (hierarchical_label "CW_TIP" (shape input) (at 127 123.19 180)
+  (hierarchical_label "CW_TIP" (shape input) (at 127 109.22 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid a263031f-c5bf-414f-9c78-a88827a06381)
   )
-  (hierarchical_label "S_METER" (shape input) (at 170.18 115.57 0)
+  (hierarchical_label "S_METER" (shape input) (at 170.18 101.6 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d205f026-5c37-4a8f-96d0-c67ab0976f34)
   )
-  (hierarchical_label "CW_TONE" (shape output) (at 165.1 180.34 0)
+  (hierarchical_label "CW_TONE" (shape output) (at 90.17 181.61 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d618158f-4184-4754-aa33-65a98e706342)
   )
-  (hierarchical_label "MUTE_MICn" (shape output) (at 170.18 105.41 0)
+  (hierarchical_label "MUTE_MICn" (shape output) (at 170.18 91.44 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid e721274f-b458-4ab5-8d4d-44bffaffa7c9)
   )
 
-  (symbol (lib_id "Device:R") (at 115.57 74.93 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 115.57 60.96 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3048e7)
-    (property "Reference" "R172" (id 0) (at 115.57 69.6722 90))
-    (property "Value" "10k" (id 1) (at 115.57 71.9836 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 115.57 76.708 90)
+    (property "Reference" "R172" (id 0) (at 115.57 55.7022 90))
+    (property "Value" "10k" (id 1) (at 115.57 58.0136 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 115.57 62.738 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 115.57 74.93 0)
+    (property "Datasheet" "~" (id 3) (at 115.57 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 115.57 74.93 0)
+    (property "Need_order" "0" (id 4) (at 115.57 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f8f190b9-b0db-4303-be1a-5600b63ef7b3))
     (pin "2" (uuid 7e09dacf-e7df-4d1b-ae00-782e58d5681e))
   )
 
-  (symbol (lib_id "Device:FerriteBead") (at 170.18 45.72 180) (unit 1)
+  (symbol (lib_id "Device:FerriteBead") (at 170.18 31.75 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5709c5)
-    (property "Reference" "FB4" (id 0) (at 173.6598 44.5516 0)
+    (property "Reference" "FB4" (id 0) (at 173.6598 30.5816 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 173.6598 46.863 0)
+    (property "Value" "BLM18BB221SN1D" (id 1) (at 173.6598 32.893 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 171.958 45.72 90)
+    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 171.958 31.75 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 170.18 45.72 0)
+    (property "Datasheet" "~" (id 3) (at 170.18 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 170.18 45.72 90)
+    (property "MPN" "BLM18BB221SN1D" (id 4) (at 170.18 31.75 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 170.18 45.72 90)
+    (property "Need_order" "0" (id 5) (at 170.18 31.75 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 91739e86-f39b-4cdc-b575-642e4a50730e))
     (pin "2" (uuid f96e437f-ac96-4e0c-9515-7163a925c871))
   )
 
-  (symbol (lib_id "Device:R") (at 133.35 180.34 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 58.42 181.61 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e58e428)
-    (property "Reference" "R174" (id 0) (at 133.35 175.0822 90))
-    (property "Value" "1k" (id 1) (at 133.35 177.3936 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 133.35 178.562 90)
+    (property "Reference" "R174" (id 0) (at 58.42 176.3522 90))
+    (property "Value" "1k" (id 1) (at 58.42 178.6636 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 58.42 179.832 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 133.35 180.34 0)
+    (property "Datasheet" "~" (id 3) (at 58.42 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 133.35 180.34 0)
+    (property "Need_order" "0" (id 4) (at 58.42 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 281b5eb6-1208-42ae-bb8a-610da179d81d))
     (pin "2" (uuid 5f6ef5a5-fcef-46d6-861e-e8cbd84496dc))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 148.59 184.15 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 73.66 185.42 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5a72b6)
-    (property "Reference" "C171" (id 0) (at 150.9268 182.9816 0)
+    (property "Reference" "C171" (id 0) (at 75.9968 184.2516 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 150.9268 185.293 0)
+    (property "Value" "0.1uF" (id 1) (at 75.9968 186.563 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 148.59 184.15 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 73.66 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 148.59 184.15 0)
+    (property "Datasheet" "~" (id 3) (at 73.66 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 148.59 184.15 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 73.66 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 148.59 184.15 0)
+    (property "Need_order" "0" (id 5) (at 73.66 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b533d202-b04e-42ab-9365-795e730feb44))
     (pin "2" (uuid 8b17d1c2-7934-45ab-8740-3ff19c5f5da5))
   )
 
-  (symbol (lib_id "Device:R") (at 143.51 180.34 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 68.58 181.61 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5a9b8e)
-    (property "Reference" "R175" (id 0) (at 143.51 175.0822 90))
-    (property "Value" "1k" (id 1) (at 143.51 177.3936 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 143.51 178.562 90)
+    (property "Reference" "R175" (id 0) (at 68.58 176.3522 90))
+    (property "Value" "1k" (id 1) (at 68.58 178.6636 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 68.58 179.832 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 143.51 180.34 0)
+    (property "Datasheet" "~" (id 3) (at 68.58 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 143.51 180.34 0)
+    (property "Need_order" "0" (id 4) (at 68.58 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 03f2f483-0f35-4c0f-8c9b-031e53791a92))
     (pin "2" (uuid cd62a01c-3e56-4d97-b8cd-4489859cfde2))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 138.43 184.15 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 63.5 185.42 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5a9b9a)
-    (property "Reference" "C169" (id 0) (at 140.7668 182.9816 0)
+    (property "Reference" "C169" (id 0) (at 65.8368 184.2516 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 140.7668 185.293 0)
+    (property "Value" "0.1uF" (id 1) (at 65.8368 186.563 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 138.43 184.15 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 63.5 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 138.43 184.15 0)
+    (property "Datasheet" "~" (id 3) (at 63.5 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 138.43 184.15 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 63.5 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 138.43 184.15 0)
+    (property "Need_order" "0" (id 5) (at 63.5 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3fcfdd05-38dd-4c86-a67d-03828382e13d))
     (pin "2" (uuid 32253759-c329-4a42-a9cc-9133e1b902a6))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 158.75 184.15 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 83.82 185.42 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5af42d)
-    (property "Reference" "C172" (id 0) (at 161.0868 182.9816 0)
+    (property "Reference" "C172" (id 0) (at 86.1568 184.2516 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 161.0868 185.293 0)
+    (property "Value" "0.1uF" (id 1) (at 86.1568 186.563 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 158.75 184.15 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 83.82 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 158.75 184.15 0)
+    (property "Datasheet" "~" (id 3) (at 83.82 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 158.75 184.15 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 83.82 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 158.75 184.15 0)
+    (property "Need_order" "0" (id 5) (at 83.82 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 83e7466b-e8cc-4ed1-bdf0-1d6c37cb6ca6))
     (pin "2" (uuid f866e63f-9952-4bca-a80c-306e990dea84))
   )
 
-  (symbol (lib_id "Device:R") (at 153.67 180.34 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 78.74 181.61 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5af438)
-    (property "Reference" "R176" (id 0) (at 153.67 175.0822 90))
-    (property "Value" "1k" (id 1) (at 153.67 177.3936 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 153.67 178.562 90)
+    (property "Reference" "R176" (id 0) (at 78.74 176.3522 90))
+    (property "Value" "1k" (id 1) (at 78.74 178.6636 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 78.74 179.832 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 153.67 180.34 0)
+    (property "Datasheet" "~" (id 3) (at 78.74 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 153.67 180.34 0)
+    (property "Need_order" "0" (id 4) (at 78.74 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 48eaabae-50f0-4257-9597-3341a960ee69))
     (pin "2" (uuid a69df032-e066-4e22-a183-8d0fe9852363))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 162.56 180.34 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 87.63 181.61 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5b4333)
-    (property "Reference" "C174" (id 0) (at 162.56 174.5234 90))
-    (property "Value" "0.1uF" (id 1) (at 162.56 176.8348 90))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 162.56 180.34 0)
+    (property "Reference" "C174" (id 0) (at 87.63 175.7934 90))
+    (property "Value" "0.1uF" (id 1) (at 87.63 178.1048 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 87.63 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 162.56 180.34 0)
+    (property "Datasheet" "~" (id 3) (at 87.63 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 162.56 180.34 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 87.63 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 162.56 180.34 0)
+    (property "Need_order" "0" (id 5) (at 87.63 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 35caa2ff-5ac0-414a-9ce1-dd4c07fecc3f))
     (pin "2" (uuid 4923844c-9901-4d77-8334-11fc5594158a))
   )
 
-  (symbol (lib_id "power:GND") (at 148.59 186.69 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 73.66 187.96 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5cebae)
-    (property "Reference" "#PWR0222" (id 0) (at 148.59 193.04 0)
+    (property "Reference" "#PWR0222" (id 0) (at 73.66 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 148.717 191.0842 0))
-    (property "Footprint" "" (id 2) (at 148.59 186.69 0)
+    (property "Value" "GND" (id 1) (at 73.787 192.3542 0))
+    (property "Footprint" "" (id 2) (at 73.66 187.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 148.59 186.69 0)
+    (property "Datasheet" "" (id 3) (at 73.66 187.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 97db9b5d-2037-4cda-aae2-aa1a02947488))
   )
 
-  (symbol (lib_id "Device:R") (at 243.84 95.25 0) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 118.11 100.33 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e60f832)
-    (property "Reference" "R183" (id 0) (at 245.618 94.0816 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Reference" "R183" (id 0) (at 115.57 99.0599 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "4.7k" (id 1) (at 245.618 96.393 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "4.7k" (id 1) (at 115.57 101.5999 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 242.062 95.25 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 116.332 100.33 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 243.84 95.25 0)
+    (property "Datasheet" "~" (id 3) (at 118.11 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 243.84 95.25 0)
+    (property "Need_order" "0" (id 4) (at 118.11 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fe52833b-0978-4f81-9c0d-ae54a439bc4e))
     (pin "2" (uuid ac72b9ff-51d6-42fe-b53b-67a181043497))
   )
 
-  (symbol (lib_id "Device:R") (at 251.46 95.25 0) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 109.22 102.87 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e61059e)
-    (property "Reference" "R185" (id 0) (at 253.238 94.0816 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Reference" "R185" (id 0) (at 106.68 101.5999 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "4.7k" (id 1) (at 253.238 96.393 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "4.7k" (id 1) (at 106.68 104.1399 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 249.682 95.25 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 107.442 102.87 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 251.46 95.25 0)
+    (property "Datasheet" "~" (id 3) (at 109.22 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 251.46 95.25 0)
+    (property "Need_order" "0" (id 4) (at 109.22 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 903452fc-132c-4009-8163-3b8ec53c9b24))
@@ -3123,10 +3269,10 @@
   )
 
   (symbol (lib_id "Device:R") (at 38.1 123.19 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e769b30)
-    (property "Reference" "R164" (id 0) (at 38.1 117.9322 90))
-    (property "Value" "5.1k" (id 1) (at 38.1 120.2436 90))
+    (property "Reference" "R164" (id 0) (at 38.1 127 90))
+    (property "Value" "5.1k" (id 1) (at 38.1 129.54 90))
     (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 38.1 124.968 90)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3140,21 +3286,21 @@
     (pin "2" (uuid 7e7f611f-ef35-4ef0-9156-83776b71dbc4))
   )
 
-  (symbol (lib_id "MCU_ST_STM32F1:STM32F103C8Tx") (at 149.86 107.95 0) (unit 1)
+  (symbol (lib_id "MCU_ST_STM32F1:STM32F103C8Tx") (at 149.86 93.98 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e8e9efd)
-    (property "Reference" "U11" (id 0) (at 148.59 148.3106 0))
-    (property "Value" "STM32F103C8Tx" (id 1) (at 148.59 150.622 0))
-    (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (id 2) (at 134.62 143.51 0)
+    (property "Reference" "U11" (id 0) (at 148.59 134.3406 0))
+    (property "Value" "STM32F103C8Tx" (id 1) (at 148.59 136.652 0))
+    (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (id 2) (at 134.62 129.54 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf" (id 3) (at 149.86 107.95 0)
+    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf" (id 3) (at 149.86 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "STM32F103C8T6" (id 4) (at 149.86 107.95 0)
+    (property "MPN" "STM32F103C8T6" (id 4) (at 149.86 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 149.86 107.95 0)
+    (property "Need_order" "0" (id 5) (at 149.86 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 61d821ee-c7bd-4d2b-b7e9-4e81ee1b8602))
@@ -3225,320 +3371,320 @@
     (pin "2" (uuid 40e096ce-9d6e-482d-b8c4-3ca126a99030))
   )
 
-  (symbol (lib_id "Device:R") (at 217.17 130.81 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 217.17 116.84 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e91af64)
-    (property "Reference" "R179" (id 0) (at 217.17 125.5522 90))
-    (property "Value" "22" (id 1) (at 217.17 127.8636 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 217.17 129.032 90)
+    (property "Reference" "R179" (id 0) (at 217.17 111.5822 90))
+    (property "Value" "22" (id 1) (at 217.17 113.8936 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 217.17 115.062 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 217.17 130.81 0)
+    (property "Datasheet" "~" (id 3) (at 217.17 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 217.17 130.81 0)
+    (property "Need_order" "0" (id 4) (at 217.17 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bec0516f-9815-4d8e-ba32-5bcb5afe996f))
     (pin "2" (uuid 8b899556-d165-4406-b718-b6a4f2e0af04))
   )
 
-  (symbol (lib_id "Device:R") (at 217.17 133.35 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 217.17 119.38 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e91b437)
-    (property "Reference" "R180" (id 0) (at 217.17 136.271 90))
-    (property "Value" "22" (id 1) (at 217.17 138.5824 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 217.17 131.572 90)
+    (property "Reference" "R180" (id 0) (at 217.17 122.301 90))
+    (property "Value" "22" (id 1) (at 217.17 124.6124 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 217.17 117.602 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 217.17 133.35 0)
+    (property "Datasheet" "~" (id 3) (at 217.17 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 217.17 133.35 0)
+    (property "Need_order" "0" (id 4) (at 217.17 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 37f4d6c8-5fb5-469e-8db5-8c1b94f34872))
     (pin "2" (uuid 4881655c-3d50-4246-9f98-f124f40970fb))
   )
 
-  (symbol (lib_id "Device:R") (at 223.52 137.16 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 223.52 123.19 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e92c2be)
-    (property "Reference" "R181" (id 0) (at 225.298 135.9916 0)
+    (property "Reference" "R181" (id 0) (at 225.298 122.0216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "4.7k" (id 1) (at 225.298 138.303 0)
+    (property "Value" "4.7k" (id 1) (at 225.298 124.333 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 225.298 137.16 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 225.298 123.19 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 223.52 137.16 0)
+    (property "Datasheet" "~" (id 3) (at 223.52 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 223.52 137.16 0)
+    (property "Need_order" "0" (id 4) (at 223.52 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9fd3b344-5541-4134-81fc-3b54017cf610))
     (pin "2" (uuid 733f06eb-898c-48f9-901c-9fbd7a7ce01f))
   )
 
-  (symbol (lib_id "power:GND") (at 140.97 57.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 140.97 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e953edc)
-    (property "Reference" "#PWR0221" (id 0) (at 140.97 63.5 0)
+    (property "Reference" "#PWR0221" (id 0) (at 140.97 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 141.097 61.5442 0))
-    (property "Footprint" "" (id 2) (at 140.97 57.15 0)
+    (property "Value" "GND" (id 1) (at 141.097 47.5742 0))
+    (property "Footprint" "" (id 2) (at 140.97 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 140.97 57.15 0)
+    (property "Datasheet" "" (id 3) (at 140.97 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b79ba764-ebea-41ae-9f4f-054fbef3450a))
   )
 
-  (symbol (lib_id "power:GND") (at 130.81 57.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 130.81 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9543a6)
-    (property "Reference" "#PWR0219" (id 0) (at 130.81 63.5 0)
+    (property "Reference" "#PWR0219" (id 0) (at 130.81 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 130.937 61.5442 0))
-    (property "Footprint" "" (id 2) (at 130.81 57.15 0)
+    (property "Value" "GND" (id 1) (at 130.937 47.5742 0))
+    (property "Footprint" "" (id 2) (at 130.81 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 130.81 57.15 0)
+    (property "Datasheet" "" (id 3) (at 130.81 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 22300701-1390-4220-be33-6554f3b61f6d))
   )
 
-  (symbol (lib_id "power:GND") (at 120.65 57.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 120.65 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e954536)
-    (property "Reference" "#PWR0218" (id 0) (at 120.65 63.5 0)
+    (property "Reference" "#PWR0218" (id 0) (at 120.65 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 120.777 61.5442 0))
-    (property "Footprint" "" (id 2) (at 120.65 57.15 0)
+    (property "Value" "GND" (id 1) (at 120.777 47.5742 0))
+    (property "Footprint" "" (id 2) (at 120.65 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 120.65 57.15 0)
+    (property "Datasheet" "" (id 3) (at 120.65 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ff5cc64e-8d01-4a32-bf22-dd77f3b61831))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 110.49 53.34 0) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 110.49 39.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9a0781)
-    (property "Reference" "C166" (id 0) (at 107.5944 52.1716 0)
+    (property "Reference" "C166" (id 0) (at 107.5944 38.2016 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "6.8uF" (id 1) (at 107.5944 54.483 0)
+    (property "Value" "6.8uF" (id 1) (at 107.5944 40.513 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 110.49 53.34 0)
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 110.49 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 110.49 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 110.49 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "stash tantalum" (id 4) (at 110.49 53.34 0)
+    (property "MPN" "stash tantalum" (id 4) (at 110.49 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 110.49 53.34 0)
+    (property "Need_order" "0" (id 5) (at 110.49 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 96452a74-80ea-4dbe-b6ca-2e2f2be32413))
     (pin "2" (uuid 583128b7-12ce-41fd-b58e-6af71bfd11b7))
   )
 
-  (symbol (lib_id "power:GND") (at 110.49 57.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 110.49 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9a117e)
-    (property "Reference" "#PWR0217" (id 0) (at 110.49 63.5 0)
+    (property "Reference" "#PWR0217" (id 0) (at 110.49 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 110.617 61.5442 0))
-    (property "Footprint" "" (id 2) (at 110.49 57.15 0)
+    (property "Value" "GND" (id 1) (at 110.617 47.5742 0))
+    (property "Footprint" "" (id 2) (at 110.49 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 110.49 57.15 0)
+    (property "Datasheet" "" (id 3) (at 110.49 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 91e02dc0-5a26-40a2-b416-973af1e191ee))
   )
 
-  (symbol (lib_id "Device:C") (at 120.65 53.34 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 120.65 39.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9b744b)
-    (property "Reference" "C167" (id 0) (at 122.9868 52.1716 0)
+    (property "Reference" "C167" (id 0) (at 122.9868 38.2016 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 122.9868 54.483 0)
+    (property "Value" "0.1uF" (id 1) (at 122.9868 40.513 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 120.65 53.34 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 120.65 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 120.65 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 120.65 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 120.65 53.34 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 120.65 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 120.65 53.34 0)
+    (property "Need_order" "0" (id 5) (at 120.65 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 527d436a-68ee-4faa-bc18-f5a8e8f7353c))
     (pin "2" (uuid 55705ba3-6fb1-4231-9269-58c55598662f))
   )
 
-  (symbol (lib_id "Device:C") (at 130.81 53.34 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 130.81 39.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9b800a)
-    (property "Reference" "C168" (id 0) (at 133.1468 52.1716 0)
+    (property "Reference" "C168" (id 0) (at 133.1468 38.2016 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 133.1468 54.483 0)
+    (property "Value" "0.1uF" (id 1) (at 133.1468 40.513 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 130.81 53.34 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 130.81 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 130.81 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 130.81 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 130.81 53.34 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 130.81 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 130.81 53.34 0)
+    (property "Need_order" "0" (id 5) (at 130.81 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 696f2222-008c-4bf5-b421-89e3d0755a46))
     (pin "2" (uuid 6022a8a5-f4c6-440e-a7c2-158148de9d5a))
   )
 
-  (symbol (lib_id "Device:C") (at 140.97 53.34 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 140.97 39.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9b837a)
-    (property "Reference" "C170" (id 0) (at 143.3068 52.1716 0)
+    (property "Reference" "C170" (id 0) (at 143.3068 38.2016 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 143.3068 54.483 0)
+    (property "Value" "0.1uF" (id 1) (at 143.3068 40.513 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 140.97 53.34 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" (id 2) (at 140.97 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 140.97 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 140.97 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 140.97 53.34 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 140.97 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 140.97 53.34 0)
+    (property "Need_order" "0" (id 5) (at 140.97 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f5dfe4eb-28c6-4f33-bff5-2c8e46dd04a0))
     (pin "2" (uuid 575fd53f-1daa-4067-bc7a-72669dd56b20))
   )
 
-  (symbol (lib_id "Device:C") (at 160.02 53.34 180) (unit 1)
+  (symbol (lib_id "Device:C") (at 160.02 39.37 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9b95e1)
-    (property "Reference" "C173" (id 0) (at 162.941 52.1716 0)
+    (property "Reference" "C173" (id 0) (at 162.941 38.2016 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "10nF" (id 1) (at 162.941 54.483 0)
+    (property "Value" "10nF" (id 1) (at 162.941 40.513 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 159.0548 49.53 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 159.0548 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 160.02 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 160.02 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 160.02 53.34 0)
+    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 160.02 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 160.02 53.34 0)
+    (property "Need_order" "0" (id 5) (at 160.02 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 51440a0f-fda5-409a-af60-703488c8fb65))
     (pin "2" (uuid 3439136f-859b-46a3-b5cf-fd675d8ba11d))
   )
 
-  (symbol (lib_id "power:GND") (at 160.02 57.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 160.02 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9be581)
-    (property "Reference" "#PWR0224" (id 0) (at 160.02 63.5 0)
+    (property "Reference" "#PWR0224" (id 0) (at 160.02 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 160.147 61.5442 0))
-    (property "Footprint" "" (id 2) (at 160.02 57.15 0)
+    (property "Value" "GND" (id 1) (at 160.147 47.5742 0))
+    (property "Footprint" "" (id 2) (at 160.02 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 160.02 57.15 0)
+    (property "Datasheet" "" (id 3) (at 160.02 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 68480489-9f4e-442d-8670-a89d6b001407))
   )
 
-  (symbol (lib_id "power:GND") (at 170.18 57.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 170.18 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9beee7)
-    (property "Reference" "#PWR0225" (id 0) (at 170.18 63.5 0)
+    (property "Reference" "#PWR0225" (id 0) (at 170.18 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 170.307 61.5442 0))
-    (property "Footprint" "" (id 2) (at 170.18 57.15 0)
+    (property "Value" "GND" (id 1) (at 170.307 47.5742 0))
+    (property "Footprint" "" (id 2) (at 170.18 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 170.18 57.15 0)
+    (property "Datasheet" "" (id 3) (at 170.18 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d2e54877-8e85-4a8f-ba0a-db5c675b56f3))
   )
 
-  (symbol (lib_id "power:GND") (at 158.75 146.05 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 158.75 132.08 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e9cff09)
-    (property "Reference" "#PWR0223" (id 0) (at 158.75 152.4 0)
+    (property "Reference" "#PWR0223" (id 0) (at 158.75 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 158.877 150.4442 0))
-    (property "Footprint" "" (id 2) (at 158.75 146.05 0)
+    (property "Value" "GND" (id 1) (at 158.877 136.4742 0))
+    (property "Footprint" "" (id 2) (at 158.75 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 158.75 146.05 0)
+    (property "Datasheet" "" (id 3) (at 158.75 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 48a67261-0d3a-4253-86b7-bc5206eef2db))
   )
 
-  (symbol (lib_id "Connector:USB_B_Micro") (at 241.3 133.35 180) (unit 1)
+  (symbol (lib_id "Connector:USB_B_Micro") (at 241.3 119.38 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9d7021)
-    (property "Reference" "J34" (id 0) (at 247.142 130.7338 0)
+    (property "Reference" "J34" (id 0) (at 247.142 116.7638 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "USB" (id 1) (at 247.142 133.0452 0)
+    (property "Value" "USB" (id 1) (at 247.142 119.0752 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Connector_USB:USB_Micro-B_Molex-105017-0001" (id 2) (at 237.49 132.08 0)
+    (property "Footprint" "Connector_USB:USB_Micro-B_Molex-105017-0001" (id 2) (at 237.49 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 237.49 132.08 0)
+    (property "Datasheet" "~" (id 3) (at 237.49 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "Molex 104017-0001" (id 4) (at 241.3 133.35 0)
+    (property "MPN" "Molex 104017-0001" (id 4) (at 241.3 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 241.3 133.35 0)
+    (property "Need_order" "0" (id 5) (at 241.3 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 798b0360-3afd-4267-adf7-186a0354809f))
@@ -3549,19 +3695,19 @@
     (pin "6" (uuid 246a5add-7cf5-4fc9-99aa-ff3095a46c78))
   )
 
-  (symbol (lib_id "power:GND") (at 246.38 123.19 90) (unit 1)
+  (symbol (lib_id "power:GND") (at 246.38 109.22 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9e1af6)
-    (property "Reference" "#PWR0231" (id 0) (at 252.73 123.19 0)
+    (property "Reference" "#PWR0231" (id 0) (at 252.73 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 249.6312 123.063 90)
+    (property "Value" "GND" (id 1) (at 249.6312 109.093 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 246.38 123.19 0)
+    (property "Footprint" "" (id 2) (at 246.38 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 246.38 123.19 0)
+    (property "Datasheet" "" (id 3) (at 246.38 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e3b914a8-68f7-4ef2-b944-05204da163e8))
@@ -3670,90 +3816,90 @@
     (pin "1" (uuid c513f374-59d4-4d46-b644-4711b0b1ae96))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x02") (at 119.38 95.25 180) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x02") (at 119.38 81.28 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005eae68c7)
-    (property "Reference" "J31" (id 0) (at 117.3734 92.71 0)
+    (property "Reference" "J31" (id 0) (at 117.3734 78.74 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PC1314" (id 1) (at 117.3734 95.0214 0)
+    (property "Value" "PC1314" (id 1) (at 117.3734 81.0514 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 119.38 95.25 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 119.38 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 119.38 95.25 0)
+    (property "Datasheet" "~" (id 3) (at 119.38 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 119.38 95.25 0)
+    (property "Need_order" "0" (id 4) (at 119.38 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 5) (at 119.38 95.25 0)
+    (property "MPN" "" (id 5) (at 119.38 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7441dc99-943a-4dad-884f-f78f21b79690))
     (pin "2" (uuid 0fa9d8e0-f86b-467e-a658-735787770ec8))
   )
 
-  (symbol (lib_id "Device:R") (at 66.04 48.26 0) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 77.47 21.59 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005eb4f097)
-    (property "Reference" "R169" (id 0) (at 67.818 47.0916 0)
+    (property "Reference" "R169" (id 0) (at 80.01 20.3199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4.7k" (id 1) (at 67.818 49.403 0)
+    (property "Value" "4.7k" (id 1) (at 80.01 22.8599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 64.262 48.26 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 75.692 21.59 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 66.04 48.26 0)
+    (property "Datasheet" "~" (id 3) (at 77.47 21.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 66.04 48.26 0)
+    (property "Need_order" "0" (id 4) (at 77.47 21.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8be1ff39-519d-43ea-9536-cafd4865eda0))
     (pin "2" (uuid 508f5fc2-054f-4026-b01a-e60698e73b07))
   )
 
-  (symbol (lib_id "Device:R") (at 73.66 48.26 0) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 72.39 21.59 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005eb4f0a2)
-    (property "Reference" "R170" (id 0) (at 75.438 47.0916 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Reference" "R170" (id 0) (at 69.85 20.3199 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "4.7k" (id 1) (at 75.438 49.403 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "4.7k" (id 1) (at 69.85 22.8599 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 71.882 48.26 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 70.612 21.59 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 73.66 48.26 0)
+    (property "Datasheet" "~" (id 3) (at 72.39 21.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 73.66 48.26 0)
+    (property "Need_order" "0" (id 4) (at 72.39 21.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4dffbffc-699b-4e77-8084-f59d368983c2))
     (pin "2" (uuid b0ce4023-0cc0-4e62-a42b-ff6ba2ae1e67))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_02x04_Odd_Even") (at 194.31 123.19 0) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_02x04_Odd_Even") (at 194.31 109.22 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005eb61aec)
-    (property "Reference" "J33" (id 0) (at 195.58 115.1382 0))
-    (property "Value" "UART" (id 1) (at 195.58 117.4496 0))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x04_P2.54mm_Vertical_SMD" (id 2) (at 194.31 123.19 0)
+    (property "Reference" "J33" (id 0) (at 195.58 101.1682 0))
+    (property "Value" "UART" (id 1) (at 195.58 103.4796 0))
+    (property "Footprint" "Connector_PinHeader_1.27mm:PinHeader_2x04_P1.27mm_Vertical_SMD" (id 2) (at 194.31 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 194.31 123.19 0)
+    (property "Datasheet" "~" (id 3) (at 194.31 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 194.31 123.19 0)
+    (property "Need_order" "0" (id 4) (at 194.31 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 5) (at 194.31 123.19 0)
+    (property "MPN" "" (id 5) (at 194.31 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 107abb79-f29f-4768-8330-24aafa16471e))
@@ -3766,84 +3912,84 @@
     (pin "8" (uuid 89f048dd-f469-49fa-95b2-ea4cea33dc59))
   )
 
-  (symbol (lib_id "power:GND") (at 189.23 128.27 270) (unit 1)
+  (symbol (lib_id "power:GND") (at 189.23 114.3 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ec9b63b)
-    (property "Reference" "#PWR0226" (id 0) (at 182.88 128.27 0)
+    (property "Reference" "#PWR0226" (id 0) (at 182.88 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 185.9788 128.397 90)
+    (property "Value" "GND" (id 1) (at 185.9788 114.427 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 189.23 128.27 0)
+    (property "Footprint" "" (id 2) (at 189.23 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 189.23 128.27 0)
+    (property "Datasheet" "" (id 3) (at 189.23 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 15c5871b-85d4-4ef3-8b03-613f8ed3a1e1))
   )
 
-  (symbol (lib_id "Device:R") (at 53.34 85.09 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 53.34 101.6 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef25f58)
-    (property "Reference" "R168" (id 0) (at 53.34 78.74 90))
-    (property "Value" "5.1k" (id 1) (at 53.34 81.28 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 53.34 86.868 90)
+    (property "Reference" "R168" (id 0) (at 53.34 95.25 90))
+    (property "Value" "5.1k" (id 1) (at 53.34 97.79 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 53.34 103.378 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 53.34 85.09 0)
+    (property "Datasheet" "~" (id 3) (at 53.34 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 53.34 85.09 0)
+    (property "Need_order" "0" (id 4) (at 53.34 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c728358f-02b3-42fd-a7f0-73b151129359))
     (pin "2" (uuid 633f52e1-7778-495e-bf73-ce7f2532f08e))
   )
 
-  (symbol (lib_id "Device:C") (at 170.18 53.34 180) (unit 1)
+  (symbol (lib_id "Device:C") (at 170.18 39.37 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef45d74)
-    (property "Reference" "C175" (id 0) (at 173.101 52.1716 0)
+    (property "Reference" "C175" (id 0) (at 173.101 38.2016 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1uF" (id 1) (at 173.101 54.483 0)
+    (property "Value" "1uF" (id 1) (at 173.101 40.513 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 169.2148 49.53 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 169.2148 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 170.18 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 170.18 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "08055C105JAT2A" (id 4) (at 170.18 53.34 0)
+    (property "MPN" "08055C105JAT2A" (id 4) (at 170.18 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 170.18 53.34 0)
+    (property "Need_order" "0" (id 5) (at 170.18 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4e6a3028-cd22-47f2-92cf-90cbbf1e048d))
     (pin "2" (uuid 6494407c-4aa5-4b25-a7d2-1331e973b7e8))
   )
 
-  (symbol (lib_id "mpb:CSTNE16M0V530000R0") (at 113.03 87.63 270) (unit 1)
+  (symbol (lib_id "mpb:CSTNE16M0V530000R0") (at 113.03 73.66 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef516f7)
-    (property "Reference" "Y10" (id 0) (at 112.0267 81.28 90))
-    (property "Value" "CSTNE16M0V530000R0" (id 1) (at 111.76 93.5736 90)
+    (property "Reference" "Y10" (id 0) (at 112.0267 67.31 90))
+    (property "Value" "CSTNE16M0V530000R0" (id 1) (at 111.76 79.6036 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Crystal:Resonator_SMD_Murata_CSTxExxV-3Pin_3.0x1.1mm_HandSoldering" (id 2) (at 113.03 86.995 0)
+    (property "Footprint" "Crystal:Resonator_SMD_Murata_CSTxExxV-3Pin_3.0x1.1mm_HandSoldering" (id 2) (at 113.03 73.025 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 113.03 86.995 0)
+    (property "Datasheet" "~" (id 3) (at 113.03 73.025 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 113.03 87.63 0)
+    (property "Need_order" "0" (id 4) (at 113.03 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "CSTNE16M0V530000R" (id 5) (at 113.03 87.63 0)
+    (property "MPN" "CSTNE16M0V530000R" (id 5) (at 113.03 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9da07afe-3b9b-44c6-8580-6f2c222821ba))
@@ -3851,98 +3997,90 @@
     (pin "3" (uuid 79864d28-b105-4f22-8c4a-e43735f19144))
   )
 
-  (symbol (lib_id "power:GND") (at 107.95 87.63 270) (unit 1)
+  (symbol (lib_id "power:GND") (at 107.95 73.66 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef52dde)
-    (property "Reference" "#PWR0216" (id 0) (at 101.6 87.63 0)
+    (property "Reference" "#PWR0216" (id 0) (at 101.6 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 104.6988 87.757 90)
+    (property "Value" "GND" (id 1) (at 104.6988 73.787 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 107.95 87.63 0)
+    (property "Footprint" "" (id 2) (at 107.95 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 107.95 87.63 0)
+    (property "Datasheet" "" (id 3) (at 107.95 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6b85a150-049c-4c15-8e64-5e97b611a77c))
   )
 
-  (symbol (lib_id "Device:R") (at 120.65 87.63 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 120.65 73.66 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef57ec0)
-    (property "Reference" "R173" (id 0) (at 120.65 85.09 90))
-    (property "Value" "1M" (id 1) (at 120.65 82.55 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 120.65 89.408 90)
+    (property "Reference" "R173" (id 0) (at 120.65 71.12 90))
+    (property "Value" "1M" (id 1) (at 120.65 68.58 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 120.65 75.438 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 120.65 87.63 0)
+    (property "Datasheet" "~" (id 3) (at 120.65 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 120.65 87.63 0)
+    (property "Need_order" "0" (id 4) (at 120.65 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8a776035-44d7-419f-aa4a-b621dd62b75c))
     (pin "2" (uuid 371258fd-d2bc-41cb-a29e-0432e4c534ef))
   )
 
-  (symbol (lib_id "Device:LED") (at 102.87 132.08 90) (unit 1)
+  (symbol (lib_id "Device:LED") (at 59.69 149.86 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef8516c)
-    (property "Reference" "D23" (id 0) (at 100.33 132.3974 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "STATUS" (id 1) (at 100.33 134.9374 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 102.87 132.08 0)
+    (property "Reference" "D23" (id 0) (at 61.2775 153.67 0))
+    (property "Value" "STATUS" (id 1) (at 61.2775 156.21 0))
+    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 59.69 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 102.87 132.08 0)
+    (property "Datasheet" "~" (id 3) (at 59.69 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 102.87 132.08 0)
+    (property "Need_order" "0" (id 4) (at 59.69 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2c923a4b-83fc-4684-8bd7-e79f2667d777))
     (pin "2" (uuid 66b0519a-58f9-40bb-81d0-1f136f0f7347))
   )
 
-  (symbol (lib_id "Device:R") (at 102.87 124.46 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 52.07 149.86 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef88aaf)
-    (property "Reference" "R171" (id 0) (at 100.33 123.1899 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "510" (id 1) (at 100.33 125.7299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 101.092 124.46 90)
+    (property "Reference" "R171" (id 0) (at 52.07 153.67 90))
+    (property "Value" "510" (id 1) (at 52.07 156.21 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 52.07 151.638 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 102.87 124.46 0)
+    (property "Datasheet" "~" (id 3) (at 52.07 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 102.87 124.46 0)
+    (property "Need_order" "0" (id 4) (at 52.07 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e386ddef-16c0-42f4-84c9-6359b8eb7ea9))
     (pin "2" (uuid c2d35aa9-4978-43ed-ab79-25f367f9e7e6))
   )
 
-  (symbol (lib_id "Device:R") (at 229.87 123.19 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 229.87 109.22 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f0ee544)
-    (property "Reference" "R182" (id 0) (at 229.87 117.9322 90))
-    (property "Value" "0" (id 1) (at 229.87 120.2436 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 229.87 121.412 90)
+    (property "Reference" "R182" (id 0) (at 229.87 103.9622 90))
+    (property "Value" "0" (id 1) (at 229.87 106.2736 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 229.87 107.442 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 229.87 123.19 0)
+    (property "Datasheet" "~" (id 3) (at 229.87 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 229.87 123.19 0)
+    (property "Need_order" "0" (id 4) (at 229.87 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e2439441-901e-4312-8dc4-1d0d7eed767a))
@@ -3967,26 +4105,40 @@
     (pin "1" (uuid 7f71deea-f1df-4a70-bd14-b0e00469fe53))
   )
 
-  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 214.63 24.13 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 223.52 129.54 180) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 0a2de5c3-a0fc-4b42-8047-93224ef7ac22)
-    (property "Reference" "U12" (id 0) (at 214.63 17.9832 0))
-    (property "Value" "LD1117S33" (id 1) (at 214.63 20.2946 0))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 214.63 19.05 0)
+    (uuid 0dee90fc-7e2c-46e6-bc5b-fb254ccad02f)
+    (property "Reference" "#PWR0256" (id 0) (at 223.52 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 226.06 133.35 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 223.52 129.54 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 217.17 30.48 0)
+    (property "Datasheet" "" (id 3) (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 214.63 24.13 0)
+    (pin "1" (uuid 1b26e0a0-c20a-4908-80c7-d59539656dcb))
+  )
+
+  (symbol (lib_id "power:GND") (at 64.77 109.22 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 0f3582b8-116d-402e-be56-48ea1f5bd30c)
+    (property "Reference" "#PWR0242" (id 0) (at 58.42 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 60.96 109.2201 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 64.77 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LD1117S33CTR" (id 5) (at 214.63 24.13 0)
+    (property "Datasheet" "" (id 3) (at 64.77 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f96a9ca7-f100-4531-819a-c982c51f384e))
-    (pin "2" (uuid 5b208cbd-ef75-4e4e-bc42-56fa469bd18b))
-    (pin "3" (uuid 82fa79a7-bb2f-44fa-8183-c00b63a1e12e))
+    (pin "1" (uuid c5dada73-a562-4fd6-8543-fbd1cc7b3955))
   )
 
   (symbol (lib_id "Mechanical:MountingHole_Pad") (at 36.83 189.23 0) (unit 1)
@@ -4010,17 +4162,17 @@
     (pin "1" (uuid 69f95a71-7f50-48f4-926d-c459c894f511))
   )
 
-  (symbol (lib_id "power:GND") (at 22.86 99.06 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 15.24 99.06 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1663617a-c8c9-4e4f-8eef-c91cf75ebc62)
-    (property "Reference" "#PWR0211" (id 0) (at 22.86 105.41 0)
+    (property "Reference" "#PWR0211" (id 0) (at 15.24 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 22.987 103.4542 0))
-    (property "Footprint" "" (id 2) (at 22.86 99.06 0)
+    (property "Value" "GND" (id 1) (at 15.367 103.4542 0))
+    (property "Footprint" "" (id 2) (at 15.24 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 22.86 99.06 0)
+    (property "Datasheet" "" (id 3) (at 15.24 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 85b039ae-e834-4c3b-a9df-ed277886df5a))
@@ -4047,41 +4199,41 @@
     (pin "S2" (uuid 9c501498-4c39-4c48-9e86-bd08043c35c5))
   )
 
-  (symbol (lib_id "Device:R") (at 207.01 83.82 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 57.15 78.74 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1fd5f09b-0bbb-4404-9cc8-fb1128cc1369)
-    (property "Reference" "R178" (id 0) (at 209.55 82.5499 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (property "Reference" "R178" (id 0) (at 54.61 77.4699 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "TBD" (id 1) (at 209.55 85.0899 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (property "Value" "TBD" (id 1) (at 54.61 80.0099 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 208.788 83.82 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 58.928 78.74 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 207.01 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 57.15 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 207.01 83.82 0)
+    (property "Need_order" "" (id 4) (at 57.15 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a5a2d511-a390-4e33-bbc4-90513f3f3a63))
     (pin "2" (uuid 908c60bc-0af6-47b5-989f-3f8ec1943b19))
   )
 
-  (symbol (lib_id "power:GND") (at 198.12 104.14 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 81.28 83.82 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2366ff77-34fb-49f2-9fb7-c6e72e050dcf)
-    (property "Reference" "#PWR0227" (id 0) (at 198.12 110.49 0)
+    (property "Reference" "#PWR0227" (id 0) (at 81.28 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 198.247 108.5342 0)
+    (property "Value" "GND" (id 1) (at 81.407 88.2142 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 198.12 104.14 0)
+    (property "Footprint" "" (id 2) (at 81.28 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 198.12 104.14 0)
+    (property "Datasheet" "" (id 3) (at 81.28 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3e7e26c0-dc93-4d49-a228-281ede280790))
@@ -4144,76 +4296,59 @@
     (pin "1" (uuid 95567650-3aa4-4b4f-819a-99e3ade65306))
   )
 
-  (symbol (lib_id "power:GND") (at 22.86 77.47 0) (mirror x) (unit 1)
+  (symbol (lib_id "power:GND") (at 15.24 77.47 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2b057edf-a332-48c7-b51f-7163d9a1e192)
-    (property "Reference" "#PWR0210" (id 0) (at 22.86 71.12 0)
+    (property "Reference" "#PWR0210" (id 0) (at 15.24 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 22.987 73.0758 0))
-    (property "Footprint" "" (id 2) (at 22.86 77.47 0)
+    (property "Value" "GND" (id 1) (at 15.367 73.0758 0))
+    (property "Footprint" "" (id 2) (at 15.24 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 22.86 77.47 0)
+    (property "Datasheet" "" (id 3) (at 15.24 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2ada9296-b11b-4665-9b07-129bbe77229d))
   )
 
-  (symbol (lib_id "power:GND") (at 201.93 83.82 0) (mirror y) (unit 1)
+  (symbol (lib_id "power:GND") (at 53.34 71.12 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2da284cd-292d-4dd0-a54f-d524f908d4ee)
-    (property "Reference" "#PWR0228" (id 0) (at 201.93 90.17 0)
+    (property "Reference" "#PWR0228" (id 0) (at 46.99 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 201.803 88.2142 0)
+    (property "Value" "GND" (id 1) (at 48.9458 70.993 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 201.93 83.82 0)
+    (property "Footprint" "" (id 2) (at 53.34 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 201.93 83.82 0)
+    (property "Datasheet" "" (id 3) (at 53.34 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 18ae7f9d-dd6e-461f-b9a6-ba8f9c9b963b))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 228.6 24.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 3285e67d-e4d8-4140-b839-2c744988ef1f)
-    (property "Reference" "TP11" (id 0) (at 228.6 15.875 0))
-    (property "Value" "+3V3" (id 1) (at 228.6 18.1864 0))
-    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 233.68 24.13 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 233.68 24.13 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "0" (id 4) (at 228.6 24.13 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7b8e3ff0-b4b3-4149-8936-6fc7e73b2a33))
-  )
-
-  (symbol (lib_id "Device:C") (at 22.86 95.25 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 15.24 95.25 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3589a633-8b93-431a-86e6-ecd7ec5d5112)
-    (property "Reference" "C165" (id 0) (at 25.781 94.0816 0)
+    (property "Reference" "C165" (id 0) (at 18.161 94.0816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10nF" (id 1) (at 25.781 96.393 0)
+    (property "Value" "10nF" (id 1) (at 18.161 96.393 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 23.8252 99.06 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 16.2052 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 22.86 95.25 0)
+    (property "Datasheet" "~" (id 3) (at 15.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 22.86 95.25 0)
+    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 15.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 22.86 95.25 0)
+    (property "Need_order" "0" (id 5) (at 15.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 32ccc585-973e-47c1-aa1c-c7ac2984e937))
@@ -4241,24 +4376,42 @@
     (pin "1" (uuid 6b1d4397-cbe4-47ff-911a-2a569dc2cd4c))
   )
 
-  (symbol (lib_id "power:GND") (at 207.01 104.14 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 90.17 83.82 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 492d915d-6a7d-4709-8d26-2ade2f336559)
-    (property "Reference" "#PWR0229" (id 0) (at 207.01 110.49 0)
+    (property "Reference" "#PWR0229" (id 0) (at 90.17 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 207.137 108.5342 0)
+    (property "Value" "GND" (id 1) (at 90.297 88.2142 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 207.01 104.14 0)
+    (property "Footprint" "" (id 2) (at 90.17 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 207.01 104.14 0)
+    (property "Datasheet" "" (id 3) (at 90.17 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eeaba58b-ab0e-4f1c-954d-39aab0157bb7))
   )
 
+  (symbol (lib_id "power:GND") (at 81.28 99.06 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 4db29d9d-fdde-4092-9965-8df16edf0cf3)
+    (property "Reference" "#PWR0246" (id 0) (at 87.63 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 85.09 99.0599 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 81.28 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 81.28 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 17d1738e-6156-403f-b39e-db0266aad924))
+  )
+
   (symbol (lib_id "Switch:SW_Push") (at 25.4 123.19 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f29056f-ff34-463b-99a8-cf6a60f13465)
@@ -4280,25 +4433,25 @@
     (pin "2" (uuid e5a4398e-1af1-4ba8-9378-0ffc9cbba611))
   )
 
-  (symbol (lib_id "Device:C") (at 22.86 81.28 0) (mirror y) (unit 1)
+  (symbol (lib_id "Device:C") (at 15.24 81.28 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f565875-cda7-4964-8f58-a348359b9862)
-    (property "Reference" "C164" (id 0) (at 26.67 80.0099 0)
+    (property "Reference" "C164" (id 0) (at 19.05 80.0099 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "10nF" (id 1) (at 26.67 82.5499 0)
+    (property "Value" "10nF" (id 1) (at 19.05 82.5499 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 21.8948 85.09 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 14.2748 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 22.86 81.28 0)
+    (property "Datasheet" "~" (id 3) (at 15.24 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 22.86 81.28 0)
+    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 15.24 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 22.86 81.28 0)
+    (property "Need_order" "0" (id 5) (at 15.24 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 428bee30-a330-4714-b791-2aeebf0a6bd7))
@@ -4351,22 +4504,22 @@
     (pin "1" (uuid 89c2b951-d990-4cc8-98c3-48b859d669d0))
   )
 
-  (symbol (lib_id "Device:R") (at 198.12 92.71 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 81.28 72.39 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5d3adf51-3d6b-4c16-8874-f4c198b07f5c)
-    (property "Reference" "R177" (id 0) (at 195.58 91.4399 0)
+    (property "Reference" "R177" (id 0) (at 78.74 71.1199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "20k" (id 1) (at 195.58 93.9799 0)
+    (property "Value" "20k" (id 1) (at 78.74 73.6599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 199.898 92.71 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 83.058 72.39 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 198.12 92.71 0)
+    (property "Datasheet" "~" (id 3) (at 81.28 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 198.12 92.71 0)
+    (property "Need_order" "0" (id 4) (at 81.28 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 75c3bc96-7823-4c8d-b55c-d7ab8d8950f7))
@@ -4394,88 +4547,80 @@
     (pin "2" (uuid 59d4b91e-2e1c-4aed-b61d-1966d7eef639))
   )
 
-  (symbol (lib_id "power:GND") (at 214.63 31.75 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 643da255-4107-470d-83bc-ec93c598e306)
-    (property "Reference" "#PWR0230" (id 0) (at 214.63 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 214.757 36.1442 0))
-    (property "Footprint" "" (id 2) (at 214.63 31.75 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 214.63 31.75 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid cba12490-344c-4f69-806c-e9f2a8c9ee1f))
-  )
-
-  (symbol (lib_id "Device:C_Polarized_Small") (at 200.66 27.94 0) (mirror y) (unit 1)
+  (symbol (lib_id "Device:R") (at 34.29 97.79 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 67e97af9-c8ad-4fb5-b14c-c53150dd6546)
-    (property "Reference" "C177" (id 0) (at 198.12 26.1238 0)
+    (uuid 6c134fa6-bcec-4b3b-81d3-1230b3ae8558)
+    (property "Reference" "R163" (id 0) (at 36.83 96.5199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10uF" (id 1) (at 198.12 28.6638 0)
+    (property "Value" "5.1k" (id 1) (at 36.83 99.0599 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 27.94 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 32.512 97.79 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 200.66 27.94 0)
+    (property "Datasheet" "~" (id 3) (at 34.29 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "TAJA106K016RNJ" (id 4) (at 200.66 27.94 0)
+    (property "Need_order" "0" (id 4) (at 34.29 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5d0f982d-265e-496d-82d8-c3afe959dd88))
+    (pin "2" (uuid d4c64046-06fa-436d-9c50-1dff0cdb1a57))
+  )
+
+  (symbol (lib_id "Device:R") (at 266.7 48.26 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 6d6637a9-8be8-48f3-94de-74fe9cc43591)
+    (property "Reference" "R125" (id 0) (at 266.7 43.0022 90))
+    (property "Value" "100k" (id 1) (at 266.7 45.3136 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 266.7 50.038 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 200.66 27.94 0)
+    (property "Datasheet" "~" (id 3) (at 266.7 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "OriginalValue" "" (id 6) (at 200.66 27.94 0)
+    (property "Need_order" "0" (id 4) (at 266.7 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 17249725-7eb7-48db-8717-de720a141651))
-    (pin "2" (uuid 8ff82141-ee4d-4ba5-870a-9d35db6411df))
+    (pin "1" (uuid 7f327007-f681-45f9-9ff4-9cf9716ce840))
+    (pin "2" (uuid 6601faf3-1a4b-4836-8182-7ba03ab3f622))
   )
 
-  (symbol (lib_id "Device:R") (at 34.29 99.06 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 74.93 17.78 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 6c134fa6-bcec-4b3b-81d3-1230b3ae8558)
-    (property "Reference" "R163" (id 0) (at 35.56 97.79 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 7077bfcd-4a03-4253-aa48-1774e5e8e4a9)
+    (property "Reference" "#PWR0244" (id 0) (at 74.93 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "5.1k" (id 1) (at 35.56 95.25 0)
+    (property "Value" "+3V3" (id 1) (at 72.39 13.97 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 32.512 99.06 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 34.29 99.06 0)
+    (property "Footprint" "" (id 2) (at 74.93 17.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 34.29 99.06 0)
+    (property "Datasheet" "" (id 3) (at 74.93 17.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5d0f982d-265e-496d-82d8-c3afe959dd88))
-    (pin "2" (uuid d4c64046-06fa-436d-9c50-1dff0cdb1a57))
+    (pin "1" (uuid 7081f241-cddf-4a4e-842f-9824c2bfb783))
   )
 
-  (symbol (lib_id "Device:R") (at 266.7 48.26 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 6d6637a9-8be8-48f3-94de-74fe9cc43591)
-    (property "Reference" "R125" (id 0) (at 266.7 43.0022 90))
-    (property "Value" "100k" (id 1) (at 266.7 45.3136 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (id 2) (at 266.7 50.038 90)
+  (symbol (lib_id "power:GND") (at 64.77 99.06 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7428d9d6-2f33-4aeb-8480-41d58e13f4e9)
+    (property "Reference" "#PWR0239" (id 0) (at 58.42 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 266.7 48.26 0)
+    (property "Value" "GND" (id 1) (at 60.96 99.0601 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 64.77 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 4) (at 266.7 48.26 0)
+    (property "Datasheet" "" (id 3) (at 64.77 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7f327007-f681-45f9-9ff4-9cf9716ce840))
-    (pin "2" (uuid 6601faf3-1a4b-4836-8182-7ba03ab3f622))
+    (pin "1" (uuid f2f89a4f-b637-45e0-8679-ce96f3333d6c))
   )
 
   (symbol (lib_id "Device:R") (at 30.48 90.17 90) (unit 1)
@@ -4496,6 +4641,40 @@
     (pin "2" (uuid 063987b5-d885-4669-8cdc-b26d5408f63d))
   )
 
+  (symbol (lib_id "power:+3V3") (at 113.03 96.52 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7b5e7040-fee5-4d5b-863c-c02650ac8c7d)
+    (property "Reference" "#PWR0253" (id 0) (at 113.03 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 113.03 91.44 0))
+    (property "Footprint" "" (id 2) (at 113.03 96.52 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 113.03 96.52 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c326c9eb-3d1c-48c9-8d43-942f92281516))
+  )
+
+  (symbol (lib_id "power:GND") (at 81.28 91.44 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7d8d9469-58f4-402d-9b4c-e0f71ca2e960)
+    (property "Reference" "#PWR0245" (id 0) (at 87.63 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 85.09 91.4399 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 81.28 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 81.28 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 38b44e21-11b9-4b22-bd34-b91a3af0ca9a))
+  )
+
   (symbol (lib_id "Switch:SW_Push") (at 25.4 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7db10864-3ee4-4c1e-ac73-47ca151ae30e)
@@ -4517,43 +4696,61 @@
     (pin "2" (uuid 23ccad53-43ae-460a-af07-a99bc016b6c4))
   )
 
-  (symbol (lib_id "power:GND") (at 49.53 90.17 90) (unit 1)
+  (symbol (lib_id "power:GND") (at 64.77 91.44 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 81123d21-10ec-4e6a-8e5d-4a79505941bd)
+    (property "Reference" "#PWR0235" (id 0) (at 58.42 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 60.96 91.4401 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 64.77 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 64.77 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b8d3abd0-07a5-4a1a-acc4-41a9b1fa737d))
+  )
+
+  (symbol (lib_id "power:GND") (at 49.53 85.09 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 85444b88-8b95-493e-b685-624b3cab185d)
-    (property "Reference" "#PWR0214" (id 0) (at 55.88 90.17 0)
+    (property "Reference" "#PWR0214" (id 0) (at 55.88 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 53.34 90.1699 90)
+    (property "Value" "GND" (id 1) (at 53.34 85.0899 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "" (id 2) (at 49.53 90.17 0)
+    (property "Footprint" "" (id 2) (at 49.53 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 49.53 90.17 0)
+    (property "Datasheet" "" (id 3) (at 49.53 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4462b4d5-8a8a-4690-a98c-9de28d4cd161))
   )
 
-  (symbol (lib_id "Transistor_BJT:MMBT3904") (at 204.47 97.79 0) (unit 1)
+  (symbol (lib_id "Transistor_BJT:MMBT3904") (at 87.63 77.47 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8553d90b-df0b-4d3f-acf6-4dfd18026e03)
-    (property "Reference" "Q31" (id 0) (at 209.55 96.5199 0)
+    (property "Reference" "Q31" (id 0) (at 92.71 77.4699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "MMBT3904" (id 1) (at 209.55 99.0599 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "MMBT3904" (id 1) (at 92.71 78.7399 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 209.55 99.695 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 92.71 79.375 0)
       (effects (font (size 1.27 1.27) italic) (justify left) hide)
     )
-    (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N3904.pdf" (id 3) (at 204.47 97.79 0)
+    (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N3904.pdf" (id 3) (at 87.63 77.47 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "MPN" "MMBT3904,215" (id 4) (at 204.47 97.79 0)
+    (property "MPN" "MMBT3904,215" (id 4) (at 87.63 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 204.47 97.79 0)
+    (property "Need_order" "0" (id 5) (at 87.63 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8da557a8-6a20-4bbc-a8e5-209c10ead93b))
@@ -4561,32 +4758,38 @@
     (pin "3" (uuid 6c753937-8d45-4426-b1d0-a54033ee645e))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 226.06 27.94 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 8d1e0b9e-0a17-470c-8a44-d5a4d7fffe77)
-    (property "Reference" "C178" (id 0) (at 228.981 26.7716 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "6.8uF" (id 1) (at 228.981 29.083 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "power:+3V3") (at 82.55 118.11 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 89570779-33b8-47c3-b049-4d5d99ab9eef)
+    (property "Reference" "#PWR0249" (id 0) (at 82.55 121.92 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" (id 2) (at 226.06 27.94 0)
+    (property "Value" "+3V3" (id 1) (at 82.55 113.03 0))
+    (property "Footprint" "" (id 2) (at 82.55 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 226.06 27.94 0)
+    (property "Datasheet" "" (id 3) (at 82.55 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "stash tantalum" (id 4) (at 226.06 27.94 0)
+    (pin "1" (uuid b767830a-53e6-49ba-b953-d78ab3a9d92a))
+  )
+
+  (symbol (lib_id "power:GND") (at 81.28 121.92 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 8b74a43b-a613-4ec6-8bcd-c0ef509be423)
+    (property "Reference" "#PWR0248" (id 0) (at 87.63 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 226.06 27.94 0)
+    (property "Value" "GND" (id 1) (at 85.09 121.9199 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 81.28 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "OriginalValue" "" (id 6) (at 226.06 27.94 0)
+    (property "Datasheet" "" (id 3) (at 81.28 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid cc28053c-e092-4930-b72a-ecedc1d3f01e))
-    (pin "2" (uuid f110ac7a-3b72-4b8c-8451-8cee1ab46eb2))
+    (pin "1" (uuid 50e9e9c6-fef1-4f66-8065-6cb196626dc5))
   )
 
   (symbol (lib_id "power:GND") (at 62.23 34.29 0) (unit 1)
@@ -4607,6 +4810,38 @@
     (pin "1" (uuid 1e05e879-4287-47ea-bf7a-7933081cd69a))
   )
 
+  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 76.2 101.6 180) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 978306e3-ca6f-4a8f-9967-e903d311e475)
+    (property "Reference" "J11" (id 0) (at 76.2 87.63 0))
+    (property "Value" "CTRL2" (id 1) (at 80.01 87.63 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 76.2 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 76.2 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "53261-0871" (id 4) (at 76.2 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Molex" (id 5) (at 76.2 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "0" (id 6) (at 76.2 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 85fb9be4-6689-46ee-ae51-3e639524b18c))
+    (pin "2" (uuid 4ed0891d-ef14-4149-940e-e0d41609541b))
+    (pin "3" (uuid ab7c135c-ce61-4f04-adf7-c653e867f3e4))
+    (pin "4" (uuid 2d516c79-1116-4564-b256-6e4727adfe18))
+    (pin "5" (uuid ceafedc3-3917-4c33-9ab1-ebb6e36899e6))
+    (pin "6" (uuid 4cfb2c87-f77b-4859-b592-b71f5548947e))
+    (pin "7" (uuid e33eb9be-aae1-4e40-8525-acc5f6f509cf))
+    (pin "8" (uuid 47c5e867-f1eb-44f5-ab95-487827e4e3aa))
+  )
+
   (symbol (lib_id "Switch:SW_Push") (at 25.4 143.51 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9f8dc7f7-9572-4f76-ad8f-a55a40a629c0)
@@ -4628,25 +4863,103 @@
     (pin "2" (uuid 594d665a-0810-4b13-a27a-04204b7e61f0))
   )
 
-  (symbol (lib_id "Device:R_Potentiometer") (at 201.93 80.01 0) (mirror x) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 69.85 129.54 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid bf69cd11-9f7c-4d5a-9b2b-e60d0f8cf8d0)
-    (property "Reference" "RV7" (id 0) (at 199.39 78.7399 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (uuid a1964925-47fa-4709-86c3-01cb782b51a7)
+    (property "Reference" "J9" (id 0) (at 69.85 115.57 0))
+    (property "Value" "CTRL1" (id 1) (at 66.04 115.57 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Value" "10k" (id 1) (at 199.39 81.2799 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (property "Footprint" "Connector_Molex:Molex_PicoBlade_53261-0871_1x08-1MP_P1.25mm_Horizontal" (id 2) (at 69.85 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 69.85 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "53261-0871" (id 4) (at 69.85 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Molex" (id 5) (at 69.85 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "0" (id 6) (at 69.85 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 6282392a-041f-409d-ac87-ef7562d97a5a))
+    (pin "2" (uuid dfafec85-5f02-4e2c-be5d-c0d04b01dac3))
+    (pin "3" (uuid 9583a2ce-59a7-411d-aa2f-e93044f8bfa0))
+    (pin "4" (uuid 774aad8c-9317-4740-9846-afc6d511433c))
+    (pin "5" (uuid f6675e8b-16c1-490c-ab2f-2e128125b7e2))
+    (pin "6" (uuid 9611c653-87b7-4d10-b00a-1d2c5455bf45))
+    (pin "7" (uuid 9a08023f-5872-47c4-934c-e2f1ae777a58))
+    (pin "8" (uuid bffc2d3f-3b06-4843-a434-6d92e992d3c7))
+  )
+
+  (symbol (lib_id "power:+3V3") (at 266.7 20.32 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a9423071-d04a-4d24-8fd5-62dfbb110b5a)
+    (property "Reference" "#PWR0258" (id 0) (at 266.7 24.13 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 266.7 15.24 0))
+    (property "Footprint" "" (id 2) (at 266.7 20.32 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 266.7 20.32 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 718d83cd-2be5-437d-972a-d3797dbe017b))
+  )
+
+  (symbol (lib_id "power:GND") (at 81.28 109.22 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b8d59f35-1d13-4957-a637-206969024286)
+    (property "Reference" "#PWR0247" (id 0) (at 87.63 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 85.09 109.2199 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 81.28 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Potentiometer_THT:Potentiometer_Alps_RK09L_Single_Vertical" (id 2) (at 201.93 80.01 0)
+    (property "Datasheet" "" (id 3) (at 81.28 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/RK09L alps potentiometer.pdf" (id 3) (at 201.93 80.01 0)
+    (pin "1" (uuid e04f1271-591f-4458-8606-12c9de49d1de))
+  )
+
+  (symbol (lib_id "power:+3V3") (at 170.18 27.94 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid bf1fd3d9-cfc8-4cfa-b4f2-597343504ad8)
+    (property "Reference" "#PWR0254" (id 0) (at 170.18 31.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 170.18 22.86 0))
+    (property "Footprint" "" (id 2) (at 170.18 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 170.18 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "RK09L1140A5L (or A2U with longer shaft)" (id 4) (at 201.93 80.01 0)
+    (pin "1" (uuid b92b91b2-23b7-40e0-b1c1-b7916c64043f))
+  )
+
+  (symbol (lib_id "Device:R_Potentiometer") (at 57.15 71.12 90) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid bf69cd11-9f7c-4d5a-9b2b-e60d0f8cf8d0)
+    (property "Reference" "RV7" (id 0) (at 57.15 64.77 90))
+    (property "Value" "10k" (id 1) (at 57.15 67.31 90))
+    (property "Footprint" "Potentiometer_THT:Potentiometer_Alps_RK09L_Single_Vertical" (id 2) (at 57.15 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 201.93 80.01 0)
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/RK09L alps potentiometer.pdf" (id 3) (at 57.15 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "RK09L1140A5L (or A2U with longer shaft)" (id 4) (at 57.15 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "1" (id 5) (at 57.15 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0d96cd50-37a0-45bb-9a90-66684b3ad4eb))
@@ -4654,25 +4967,25 @@
     (pin "3" (uuid 1c11a50b-0a53-4c2f-938b-30d776821518))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 198.12 100.33 0) (mirror y) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 81.28 80.01 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c6708737-1979-4061-9eb1-fed1a80ccf62)
-    (property "Reference" "C176" (id 0) (at 195.58 99.0662 0)
+    (property "Reference" "C176" (id 0) (at 78.74 78.7462 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 195.58 101.6062 0)
+    (property "Value" "DNF" (id 1) (at 78.74 81.2862 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 198.12 100.33 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 81.28 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 198.12 100.33 0)
+    (property "Datasheet" "~" (id 3) (at 81.28 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 198.12 100.33 0)
+    (property "MPN" "" (id 4) (at 81.28 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 198.12 100.33 0)
+    (property "Need_order" "0" (id 5) (at 81.28 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 35725800-6833-447e-863a-fa57b9799e9a))
@@ -4701,6 +5014,56 @@
     (pin "2" (uuid 5133f860-356c-40f3-b607-7486346ecb6b))
   )
 
+  (symbol (lib_id "power:GND") (at 64.77 121.92 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid ccac1ed5-30bd-4d64-afde-17b59d1e7c29)
+    (property "Reference" "#PWR0243" (id 0) (at 58.42 121.92 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 60.96 121.9201 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 64.77 121.92 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 64.77 121.92 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b7077e0a-5dc5-42b7-aadb-b934941e9c0f))
+  )
+
+  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 69.85 99.06 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid ce4d5ec6-a6d4-4f4a-8064-f3a8ae44c97d)
+    (property "Reference" "J8" (id 0) (at 69.85 87.63 0))
+    (property "Value" "CTRL2" (id 1) (at 66.04 113.03 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 69.85 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 69.85 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "53261-0871" (id 4) (at 69.85 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Molex" (id 5) (at 69.85 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "0" (id 6) (at 69.85 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 16f75616-f719-41f5-9f2b-673d31440c7a))
+    (pin "2" (uuid fd0010f1-0777-40c0-9176-313818d68dd7))
+    (pin "3" (uuid b6081bf4-9987-4710-a75e-4c4dd170f2db))
+    (pin "4" (uuid 8c748b17-faf0-4cab-8204-517761a8d35f))
+    (pin "5" (uuid a67dc101-f1ee-41b4-b822-47e02c91942a))
+    (pin "6" (uuid 3bf37084-0e86-4482-b3a8-46d4600feb99))
+    (pin "7" (uuid b09eb381-0b34-4d64-8843-fbc5478c4a3f))
+    (pin "8" (uuid c0d24877-fce6-432c-aaa4-7b27e147c360))
+  )
+
   (symbol (lib_id "Device:R") (at 38.1 143.51 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cf978728-d91d-4c17-a0e4-44d8282018da)
@@ -4737,6 +5100,22 @@
     (pin "1" (uuid 8524ee7d-4a2c-4a96-aae0-b4fb7560847a))
   )
 
+  (symbol (lib_id "power:+3V3") (at 111.76 60.96 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid d9611d63-70d7-41e4-b28c-64031a5d1206)
+    (property "Reference" "#PWR0252" (id 0) (at 115.57 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 110.49 57.15 90))
+    (property "Footprint" "" (id 2) (at 111.76 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 111.76 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1db4af3e-5c31-4181-8641-f50fba68c4c0))
+  )
+
   (symbol (lib_id "Device:R") (at 251.46 48.26 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e8c78a4c-7bbc-4341-b4d8-fbaaaa06e550)
@@ -4791,6 +5170,38 @@
     (pin "2" (uuid ffdb836e-baea-49ff-852f-8d50d4c3d1a7))
   )
 
+  (symbol (lib_id "Connector_Generic:Conn_01x08") (at 76.2 127 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f6b08f82-e50d-4f78-9d60-e71fbd3ea21a)
+    (property "Reference" "J12" (id 0) (at 76.2 115.57 0))
+    (property "Value" "CTRL1" (id 1) (at 80.01 140.97 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 76.2 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 76.2 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "53261-0871" (id 4) (at 76.2 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Molex" (id 5) (at 76.2 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "0" (id 6) (at 76.2 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 78730ec9-1821-4e69-a597-f6e033fc0dce))
+    (pin "2" (uuid 463e2cee-5c22-4a43-be26-37964dec8f07))
+    (pin "3" (uuid c0963ad3-9626-44d2-bd95-4602c1db43f3))
+    (pin "4" (uuid b3ee9998-a956-4927-9015-78b424e5afab))
+    (pin "5" (uuid ffe5a508-f10d-4dc3-986f-92b96ef27bf0))
+    (pin "6" (uuid 8047dc2c-5760-4e2f-ac2f-56779b30bf9a))
+    (pin "7" (uuid 35bf981e-f721-4cfc-9990-86c326f9242f))
+    (pin "8" (uuid f6e91b41-7d97-49bb-a3b1-ab361a84c438))
+  )
+
   (symbol (lib_id "Mechanical:MountingHole_Pad") (at 31.75 189.23 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f6d1e0fe-79a7-41be-ab3f-2d8b834758cd)
@@ -4811,4 +5222,52 @@
     )
     (pin "1" (uuid 7835cbe0-a7ca-4b10-8925-7715408bccb4))
   )
+
+  (symbol (lib_id "power:+3V3") (at 187.96 105.41 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f7c562c0-e29a-4543-a0db-2bbec467f18f)
+    (property "Reference" "#PWR0255" (id 0) (at 187.96 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 187.96 100.33 0))
+    (property "Footprint" "" (id 2) (at 187.96 105.41 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 187.96 105.41 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e158344b-7d4f-47af-b7ff-edc056c1e2de))
+  )
+
+  (symbol (lib_id "power:+3V3") (at 110.49 35.56 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid fba5ffa7-6eb9-4140-844a-7249fb173e65)
+    (property "Reference" "#PWR0251" (id 0) (at 110.49 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 110.49 30.48 0))
+    (property "Footprint" "" (id 2) (at 110.49 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 110.49 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 01bf0e2c-0433-4d28-b20c-efe23ef9ad23))
+  )
+
+  (symbol (lib_id "power:+3V3") (at 259.08 48.26 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid fbd5540d-e8ac-4ab3-be6d-131fcfb9a61c)
+    (property "Reference" "#PWR0257" (id 0) (at 259.08 52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 259.08 43.18 0))
+    (property "Footprint" "" (id 2) (at 259.08 48.26 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 259.08 48.26 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c05c0915-b2a3-47fb-9c7a-2c46ba00a22c))
+  )
 )
-- 
cgit v1.2.3