Schematic work

3 files changed, 1505 insertions, 738 deletions

diff --git a/kicad-dart-70/baseband.kicad_sch b/kicad-dart-70/baseband.kicad_sch
index 1c3d06c..62693f9 100644
--- a/kicad-dart-70/baseband.kicad_sch
+++ b/kicad-dart-70/baseband.kicad_sch
@@ -3419,7 +3419,7 @@
   (junction (at 173.99 66.04) (diameter 0) (color 0 0 0 0)
     (uuid 43c88063-044a-47b7-b010-f3fb76152eec)
   )
-  (junction (at 375.92 182.88) (diameter 0) (color 0 0 0 0)
+  (junction (at 378.46 182.88) (diameter 0) (color 0 0 0 0)
     (uuid 446196fa-4af3-4fe1-9348-f02489c61276)
   )
   (junction (at 220.98 133.35) (diameter 0) (color 0 0 0 0)
@@ -3464,6 +3464,9 @@
   (junction (at 284.48 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 57f87f8b-2a84-4bc0-bc49-8f95c5b3f805)
   )
+  (junction (at 45.72 266.7) (diameter 0) (color 0 0 0 0)
+    (uuid 583a623a-9287-46cf-a94a-71ec7c67c85f)
+  )
   (junction (at 297.18 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 5c4341e3-29f4-4014-ad6b-9b4cb50156a6)
   )
@@ -3509,9 +3512,6 @@
   (junction (at 299.72 198.12) (diameter 0) (color 0 0 0 0)
     (uuid 79aa4561-3272-488a-aacc-d24a783bf3fa)
   )
-  (junction (at 45.72 262.89) (diameter 0) (color 0 0 0 0)
-    (uuid 82805698-6948-4458-acba-8dc2adc02007)
-  )
   (junction (at 347.98 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 88658da7-484b-4fb1-bd87-cf0fe9fbbc98)
   )
@@ -3891,6 +3891,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04868f85-bc69-4fa9-8e62-d78ffe5ae58e)
   )
+  (wire (pts (xy 38.1 266.7) (xy 36.83 266.7))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 049bc167-7861-4f83-a9e9-3c707dd00017)
+  )
   (wire (pts (xy 396.24 45.72) (xy 397.51 45.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04ef368b-f4e9-48da-956c-ee93cb3d01e8)
@@ -4008,10 +4012,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15e1025c-faeb-49ff-aaa3-6ba9acaabd98)
   )
-  (wire (pts (xy 45.72 262.89) (xy 44.45 262.89))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 15e6ceaa-8f70-4b35-984a-690822d99240)
-  )
   (wire (pts (xy 137.16 172.72) (xy 137.16 171.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1606d99f-0508-4f2e-b63b-47e62c4312ee)
@@ -4036,7 +4036,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 18c820d5-32a9-457f-9915-e42ed0717894)
   )
-  (wire (pts (xy 375.92 180.34) (xy 375.92 182.88))
+  (wire (pts (xy 378.46 180.34) (xy 378.46 182.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 19028db1-670b-4d84-9d20-5aa2f8585dd7)
   )
@@ -4108,7 +4108,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 22591446-6d82-47ac-b525-9e9deb496c8c)
   )
-  (wire (pts (xy 25.4 264.16) (xy 26.67 266.7))
+  (wire (pts (xy 26.67 264.16) (xy 26.67 266.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 226f524c-89b4-46ed-86fd-c8ea41059fd4)
   )
@@ -4296,7 +4296,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 37776474-3e55-452d-b61d-56f6c437c0b7)
   )
-  (wire (pts (xy 368.3 185.42) (xy 365.76 185.42))
+  (wire (pts (xy 370.84 185.42) (xy 365.76 185.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 37c4ff09-2526-492b-a9f8-7ea7ff67af23)
   )
@@ -4309,6 +4309,10 @@
     (uuid 38a62d51-e863-4b0e-8f07-7e1cafdb4037)
   )
 
+  (wire (pts (xy 45.72 266.7) (xy 45.72 270.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 38adb82f-7c90-4f5f-b4d7-ca79b45cc898)
+  )
   (wire (pts (xy 49.53 260.35) (xy 48.26 260.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 38d04039-5d82-48aa-b8b9-bc35b46616f0)
@@ -4424,10 +4428,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 44e993be-f2df-4e61-a598-dfd6e106a208)
   )
-  (wire (pts (xy 45.72 262.89) (xy 45.72 270.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 44ea3588-19dc-4c86-9c46-d1477a80d509)
-  )
   (wire (pts (xy 309.88 204.47) (xy 307.34 204.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 454e30d7-bcaa-4ad9-9d06-8047eb4476bc)
@@ -4820,6 +4820,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 71112969-491c-4030-a62d-0099394e646b)
   )
+  (wire (pts (xy 45.72 262.89) (xy 45.72 266.7))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7287233a-8bee-4cb7-972f-e88f9e8c9c05)
+  )
   (wire (pts (xy 220.98 80.01) (xy 222.25 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 729c2869-ff1d-44e5-93c5-e775e05584de)
@@ -4893,7 +4897,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7abfe5b2-5304-4361-be73-011f6c471ef4)
   )
-  (wire (pts (xy 368.3 180.34) (xy 365.76 180.34))
+  (wire (pts (xy 370.84 180.34) (xy 365.76 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b2dc696-1a10-4454-b7dd-774c3af412d0)
   )
@@ -5058,7 +5062,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90744d5e-9dab-4c38-a84a-09b4f88dc58e)
   )
-  (wire (pts (xy 375.92 182.88) (xy 375.92 185.42))
+  (wire (pts (xy 378.46 182.88) (xy 378.46 185.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90866162-ba8b-4466-8263-4e9b480069bc)
   )
@@ -5082,7 +5086,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93765598-e150-43be-8754-9fff6d7779c4)
   )
-  (wire (pts (xy 40.64 247.65) (xy 40.64 259.08))
+  (wire (pts (xy 40.64 247.65) (xy 40.64 261.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 94015603-4c45-4e6f-857d-4641ab93cf7a)
   )
@@ -5257,6 +5261,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a33ea5da-5463-41d0-b75e-df6939eed5db)
   )
+  (wire (pts (xy 36.83 266.7) (xy 36.83 265.43))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a398116c-e428-4246-b7bf-9ea509e788ba)
+  )
   (wire (pts (xy 50.8 220.98) (xy 50.8 222.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a3f168bf-fdef-4cd9-9a64-7266a3fb4fb1)
@@ -6051,10 +6059,6 @@
     (uuid ffaf0ed9-3944-4c9c-928a-1a354995ddcd)
   )
 
-  (text "70MHz" (at 340.36 114.3 270)
-    (effects (font (size 2 2)) (justify right bottom))
-    (uuid 060885c2-1854-423e-8da8-4e7ecef95166)
-  )
   (text "IF" (at 337.82 57.15 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0810db02-c536-4da4-8cb3-eb98acbf73f6)
@@ -6084,10 +6088,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3afae848-3ba1-40f3-a73d-cfa98c2ff8b2)
   )
-  (text "70MHz" (at 318.77 62.23 180)
-    (effects (font (size 2 2)) (justify right bottom))
-    (uuid 3b4fd6c7-c010-4fb3-bb29-7f63b0d4a922)
-  )
   (text "LO" (at 351.79 223.52 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3fd6c5a6-fbf7-4823-9549-5ce0df6556f3)
@@ -6116,7 +6116,7 @@
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 7077221a-9e28-4d4d-9d67-c484e9e76012)
   )
-  (text "TODO\nCalculate overall gain.\n Gain stage needed betwen XTAL filter and RF mixer?\nRecalculate all filters, make Chebychev\nDefine how to do CW\nMixer termination\n\n\nDone\nVoltage reg for IF amps (hybrid cascode: 9V)\nReplace mixers\nMic muting on RX\nLess clicky SPK muting\nRethink IF chain\nQER XTAL filter\nMove XTAL filter to header\nSeparate XTAL filter in/out better"
+  (text "TODO\nCalculate overall gain.\n Gain stage needed betwen XTAL filter and RF mixer?\nRecalculate all filters, make Chebychev\nDefine how to do CW\nMixer termination\nTry hang AGC EMRFD Fig 6.57\n\n\nDone\nVoltage reg for IF amps (hybrid cascode: 9V)\nReplace mixers\nMic muting on RX\nLess clicky SPK muting\nRethink IF chain\nQER XTAL filter\nMove XTAL filter to header\nSeparate XTAL filter in/out better"
     (at 0 -3.81 0)
     (effects (font (size 3 3) bold) (justify left bottom))
     (uuid 74c68bd1-c5af-4a14-af9a-5d066dace5fa)
@@ -6353,7 +6353,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 6eac4e27-ce42-4863-92ee-64c39c8490ac)
   )
-  (hierarchical_label "MUTE_SPKR" (shape input) (at 25.4 264.16 180)
+  (hierarchical_label "MUTE_SPKR" (shape input) (at 26.67 264.16 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7147b342-4ca8-4694-a1ec-b615c151a5d0)
   )
@@ -7111,25 +7111,21 @@
     (pin "2" (uuid 3d1c97c4-0ea6-49b5-8e16-2de5448ae48f))
   )
 
-  (symbol (lib_id "Device:R_POT") (at 40.64 262.89 0) (unit 1)
+  (symbol (lib_id "Device:R_POT") (at 36.83 261.62 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e501314)
-    (property "Reference" "RV?" (id 0) (at 38.1 261.6199 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "10k" (id 1) (at 38.1 264.1599 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 40.64 262.89 0)
+    (property "Reference" "RV?" (id 0) (at 36.83 255.27 90))
+    (property "Value" "10k" (id 1) (at 36.83 257.81 90))
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 36.83 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 40.64 262.89 0)
+    (property "Datasheet" "~" (id 3) (at 36.83 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "The one with the integrated switch" (id 4) (at 40.64 262.89 0)
+    (property "MPN" "The one with the integrated switch" (id 4) (at 36.83 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 40.64 262.89 0)
+    (property "Need_order" "" (id 5) (at 36.83 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0cd019ea-c79c-4441-973a-cc540e515d00))
@@ -9108,6 +9104,24 @@
     (pin "2" (uuid b301063c-d8d2-45dd-9062-ffb31bfcfd70))
   )
 
+  (symbol (lib_id "Device:R") (at 41.91 266.7 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 2822c65d-a563-4cca-aba1-54c19d2e5b41)
+    (property "Reference" "R?" (id 0) (at 41.91 260.35 90))
+    (property "Value" "TBD" (id 1) (at 41.91 262.89 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 41.91 264.922 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 41.91 266.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 41.91 266.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 04588739-de27-41d8-a6ca-4755be171298))
+    (pin "2" (uuid 42263b29-31ef-42bf-9dc1-5632c5fd67f3))
+  )
+
   (symbol (lib_id "power:GNDA") (at 262.89 209.55 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2a48f53c-3809-4098-9337-9f6dd17da892)
@@ -9744,19 +9758,19 @@
     (pin "2" (uuid 8f8d3a80-cc65-4650-b53d-399a37d70080))
   )
 
-  (symbol (lib_id "power:GNDA") (at 40.64 266.7 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 33.02 261.62 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 498d3abc-3b9c-4105-8b0a-be1494bba7c7)
-    (property "Reference" "#PWR?" (id 0) (at 40.64 273.05 0)
+    (property "Reference" "#PWR?" (id 0) (at 26.67 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 40.767 271.0942 0)
+    (property "Value" "GNDA" (id 1) (at 28.6258 261.747 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 40.64 266.7 0)
+    (property "Footprint" "" (id 2) (at 33.02 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 40.64 266.7 0)
+    (property "Datasheet" "" (id 3) (at 33.02 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4f30ed74-58d8-4ae8-b24f-596ba3aabaf8))
@@ -10812,21 +10826,21 @@
     (pin "2" (uuid 88f3ce54-7bf3-46a8-8be1-9a2f2e7949c0))
   )
 
-  (symbol (lib_id "Device:L") (at 372.11 185.42 90) (unit 1)
+  (symbol (lib_id "Device:L") (at 374.65 185.42 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8554cc98-0cbb-4f6a-b636-f2917076a214)
-    (property "Reference" "L?" (id 0) (at 372.11 187.96 90))
-    (property "Value" "TBD" (id 1) (at 372.11 190.5 90))
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 372.11 185.42 0)
+    (property "Reference" "L?" (id 0) (at 374.65 187.96 90))
+    (property "Value" "TBD" (id 1) (at 374.65 190.5 90))
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 374.65 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 372.11 185.42 0)
+    (property "Datasheet" "~" (id 3) (at 374.65 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 372.11 185.42 0)
+    (property "MPN" "" (id 4) (at 374.65 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 372.11 185.42 0)
+    (property "Need_order" "" (id 5) (at 374.65 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2abe157e-5f10-4bb4-8db4-f0c08e8422d0))
@@ -11222,19 +11236,19 @@
     (pin "2" (uuid 060b50cc-dfb0-4051-bf14-860fe9cdb674))
   )
 
-  (symbol (lib_id "power:GNDA") (at 375.92 182.88 90) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 378.46 182.88 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 942acf4b-8a96-4c46-ac34-0486d093be57)
-    (property "Reference" "#PWR?" (id 0) (at 382.27 182.88 0)
+    (property "Reference" "#PWR?" (id 0) (at 384.81 182.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 380.3142 182.753 0)
+    (property "Value" "GNDA" (id 1) (at 382.8542 182.753 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 375.92 182.88 0)
+    (property "Footprint" "" (id 2) (at 378.46 182.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 375.92 182.88 0)
+    (property "Datasheet" "" (id 3) (at 378.46 182.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3bbb210a-5efd-4f87-a973-41c11d7503c9))
@@ -11258,21 +11272,21 @@
     (pin "1" (uuid 535dce54-0bf0-4925-a459-8e52925a4685))
   )
 
-  (symbol (lib_id "Device:C") (at 372.11 180.34 270) (unit 1)
+  (symbol (lib_id "Device:C") (at 374.65 180.34 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9578d03f-4ecf-4253-ab7c-8492982a3872)
-    (property "Reference" "C?" (id 0) (at 372.11 172.72 90))
-    (property "Value" "TBD" (id 1) (at 372.11 175.26 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 368.3 181.3052 0)
+    (property "Reference" "C?" (id 0) (at 374.65 172.72 90))
+    (property "Value" "TBD" (id 1) (at 374.65 175.26 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 370.84 181.3052 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 372.11 180.34 0)
+    (property "Datasheet" "~" (id 3) (at 374.65 180.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 372.11 180.34 0)
+    (property "MPN" "" (id 4) (at 374.65 180.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 372.11 180.34 0)
+    (property "Need_order" "" (id 5) (at 374.65 180.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 543c7552-2762-4627-a0e8-75474b87a740))
diff --git a/kicad-dart-70/control.kicad_sch b/kicad-dart-70/control.kicad_sch
index 1b986de..8e78b63 100644
--- a/kicad-dart-70/control.kicad_sch
+++ b/kicad-dart-70/control.kicad_sch
@@ -407,131 +407,6 @@
         )
       )
     )
-    (symbol "Connector_Generic:Conn_01x12" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 15.24 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Conn_01x12" (id 1) (at 0 -17.78 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, 01x12, 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_01x12_1_1"
-        (rectangle (start -1.27 -15.113) (end 0 -15.367)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 -12.573) (end 0 -12.827)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (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 10.287) (end 0 10.033)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 12.827) (end 0 12.573)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 13.97) (end 1.27 -16.51)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-        (pin passive line (at -5.08 12.7 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 -10.16 0) (length 3.81)
-          (name "Pin_10" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -12.7 0) (length 3.81)
-          (name "Pin_11" (effects (font (size 1.27 1.27))))
-          (number "11" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -15.24 0) (length 3.81)
-          (name "Pin_12" (effects (font (size 1.27 1.27))))
-          (number "12" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 10.16 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 7.62 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 5.08 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 0 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 -2.54 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 -5.08 0) (length 3.81)
-          (name "Pin_8" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -7.62 0) (length 3.81)
-          (name "Pin_9" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector_Generic:Conn_02x03_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)))
@@ -1041,6 +916,351 @@
         )
       )
     )
+    (symbol "Device:RotaryEncoder_Switch" (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (id 0) (at 0 6.604 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "RotaryEncoder_Switch" (id 1) (at 0 -6.604 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at -3.81 4.064 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 6.604 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "rotary switch encoder switch push button" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Rotary encoder, dual channel, incremental quadrate outputs, with switch" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "RotaryEncoder*Switch*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "RotaryEncoder_Switch_0_1"
+        (rectangle (start -5.08 5.08) (end 5.08 -5.08)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+        (circle (center -3.81 0) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (arc (start -0.381 -2.794) (mid 2.3622 -0.0508) (end -0.381 2.667)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center -0.381 0) (radius 1.905)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -0.635 -1.778)
+            (xy -0.635 1.778)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -0.381 -1.778)
+            (xy -0.381 1.778)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -0.127 1.778)
+            (xy -0.127 -1.778)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 0)
+            (xy 3.429 0)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 1.016)
+            (xy 3.81 -1.016)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -5.08 -2.54)
+            (xy -3.81 -2.54)
+            (xy -3.81 -2.032)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -5.08 2.54)
+            (xy -3.81 2.54)
+            (xy -3.81 2.032)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.254 -3.048)
+            (xy -0.508 -2.794)
+            (xy 0.127 -2.413)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.254 2.921)
+            (xy -0.508 2.667)
+            (xy 0.127 2.286)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 5.08 -2.54)
+            (xy 4.318 -2.54)
+            (xy 4.318 -1.016)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 5.08 2.54)
+            (xy 4.318 2.54)
+            (xy 4.318 1.016)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -5.08 0)
+            (xy -3.81 0)
+            (xy -3.81 -1.016)
+            (xy -3.302 -2.032)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -4.318 0)
+            (xy -3.81 0)
+            (xy -3.81 1.016)
+            (xy -3.302 2.032)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 4.318 -1.016) (radius 0.127)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 4.318 1.016) (radius 0.127)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "RotaryEncoder_Switch_1_1"
+        (pin passive line (at -7.62 2.54 0) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "A" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -7.62 -2.54 0) (length 2.54)
+          (name "B" (effects (font (size 1.27 1.27))))
+          (number "B" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -7.62 0 0) (length 2.54)
+          (name "C" (effects (font (size 1.27 1.27))))
+          (number "C" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 7.62 2.54 180) (length 2.54)
+          (name "S1" (effects (font (size 1.27 1.27))))
+          (number "S1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 7.62 -2.54 180) (length 2.54)
+          (name "S2" (effects (font (size 1.27 1.27))))
+          (number "S2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Display_Character:WC1602A" (in_bom yes) (on_board yes)
+      (property "Reference" "DS" (id 0) (at -5.842 19.05 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "WC1602A" (id 1) (at 5.334 19.05 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "Display:WC1602A" (id 2) (at 0 -22.86 0)
+        (effects (font (size 1.27 1.27) italic) hide)
+      )
+      (property "Datasheet" "http://www.wincomlcd.com/pdf/WC1602A-SFYLYHTC06.pdf" (id 3) (at 17.78 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "display LCD dot-matrix" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "LCD 16x2 Alphanumeric , 8 bit parallel bus, 5V VDD" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "*WC*1602A*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "WC1602A_1_1"
+        (rectangle (start -7.62 17.78) (end 7.62 -17.78)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+        (pin power_in line (at 0 -20.32 90) (length 2.54)
+          (name "VSS" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 -5.08 0) (length 2.54)
+          (name "D3" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 -7.62 0) (length 2.54)
+          (name "D4" (effects (font (size 1.27 1.27))))
+          (number "11" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 -10.16 0) (length 2.54)
+          (name "D5" (effects (font (size 1.27 1.27))))
+          (number "12" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 -12.7 0) (length 2.54)
+          (name "D6" (effects (font (size 1.27 1.27))))
+          (number "13" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 -15.24 0) (length 2.54)
+          (name "D7" (effects (font (size 1.27 1.27))))
+          (number "14" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 10.16 7.62 180) (length 2.54)
+          (name "LED(+)" (effects (font (size 1.27 1.27))))
+          (number "15" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 10.16 5.08 180) (length 2.54)
+          (name "LED(-)" (effects (font (size 1.27 1.27))))
+          (number "16" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 0 20.32 270) (length 2.54)
+          (name "VDD" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 10.16 15.24 180) (length 2.54)
+          (name "VO" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 10.16 0) (length 2.54)
+          (name "RS" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 12.7 0) (length 2.54)
+          (name "R/W" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 15.24 0) (length 2.54)
+          (name "E" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 2.54 0) (length 2.54)
+          (name "D0" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 0 0) (length 2.54)
+          (name "D1" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 -2.54 0) (length 2.54)
+          (name "D2" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Jumper:SolderJumper_2_Open" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "JP" (id 0) (at 0 2.032 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "SolderJumper_2_Open" (id 1) (at 0 -2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "solder jumper SPST" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Solder Jumper, 2-pole, open" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SolderJumper*Open*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SolderJumper_2_Open_0_1"
+        (arc (start -0.254 1.016) (mid -1.27 0) (end -0.254 -1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start -0.254 1.016) (mid -1.27 0) (end -0.254 -1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (polyline
+          (pts
+            (xy -0.254 1.016)
+            (xy -0.254 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.254 1.016)
+            (xy 0.254 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0.254 -1.016) (mid 1.27 0) (end 0.254 1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0.254 -1.016) (mid 1.27 0) (end 0.254 1.016)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+      )
+      (symbol "SolderJumper_2_Open_1_1"
+        (pin passive line (at -3.81 0 0) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 3.81 0 180) (length 2.54)
+          (name "B" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "MCU_ST_STM32F1:STM32F103C8Tx" (in_bom yes) (on_board yes)
       (property "Reference" "U" (id 0) (at -15.24 36.83 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1264,6 +1484,118 @@
         )
       )
     )
+    (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))
+      )
+      (property "Value" "SW_Push" (id 1) (at 0 -1.524 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "switch normally-open pushbutton push-button" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Push button switch, generic, two pins" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SW_Push_0_1"
+        (circle (center -2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 1.27)
+            (xy 0 3.048)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 1.27)
+            (xy -2.54 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 5.08 0 180) (length 2.54)
+          (name "2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Switch:SW_SPDT" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (id 0) (at 0 4.318 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "SW_SPDT" (id 1) (at 0 -5.08 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" "switch single-pole double-throw spdt ON-ON" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Switch, single pole double throw" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SW_SPDT_0_0"
+        (circle (center -2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 2.032 -2.54) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "SW_SPDT_0_1"
+        (polyline
+          (pts
+            (xy -1.524 0.254)
+            (xy 1.651 2.286)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 2.032 2.54) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "SW_SPDT_1_1"
+        (pin passive line (at 5.08 2.54 180) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "B" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 5.08 -2.54 180) (length 2.54)
+          (name "C" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Transistor_BJT:MMBT3904" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1804,22 +2136,25 @@
     )
   )
 
+  (junction (at 34.29 81.28) (diameter 0) (color 0 0 0 0)
+    (uuid 1276659c-ff14-4940-b214-e27c5bbbd628)
+  )
   (junction (at 33.02 176.53) (diameter 0) (color 0 0 0 0)
     (uuid 13f32677-7358-4425-9e94-52afb3823ec5)
   )
-  (junction (at 43.18 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid 21443f6e-c9cb-43b6-9145-0fe007529b00)
-  )
   (junction (at 223.52 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 2a891096-042c-4004-b161-8bd2c0b59fd7)
   )
   (junction (at 149.86 69.85) (diameter 0) (color 0 0 0 0)
     (uuid 3b398e0a-4c10-4dcc-aa1f-5dcd51a576d9)
   )
+  (junction (at 69.85 92.71) (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)
     (uuid 3f43b8cc-e232-4de4-a8bc-56a1a1c0a87a)
   )
-  (junction (at 101.6 87.63) (diameter 0) (color 0 0 0 0)
+  (junction (at 124.46 87.63) (diameter 0) (color 0 0 0 0)
     (uuid 418a0e9c-c95f-4d4a-a88f-ec13faf3303c)
   )
   (junction (at 130.81 49.53) (diameter 0) (color 0 0 0 0)
@@ -1828,9 +2163,18 @@
   (junction (at 35.56 168.91) (diameter 0) (color 0 0 0 0)
     (uuid 497b9774-3128-4270-af26-430f6d704065)
   )
-  (junction (at 196.85 27.94) (diameter 0) (color 0 0 0 0)
+  (junction (at 22.86 81.28) (diameter 0) (color 0 0 0 0)
+    (uuid 50eddd67-6aa3-43d4-a67d-b80202184bf7)
+  )
+  (junction (at 110.49 49.53) (diameter 0) (color 0 0 0 0)
+    (uuid 5696bb77-ed27-45b2-b992-397d5b11d0ae)
+  )
+  (junction (at 256.54 43.18) (diameter 0) (color 0 0 0 0)
     (uuid 5cfe5589-d53d-4797-82e8-c31b86c5fbb8)
   )
+  (junction (at 69.85 82.55) (diameter 0) (color 0 0 0 0)
+    (uuid 60f9aea0-5552-4cff-adfd-7e3333a6c431)
+  )
   (junction (at 49.53 118.11) (diameter 0) (color 0 0 0 0)
     (uuid 6378f3a0-c10c-4ab8-a191-8014f1f995ab)
   )
@@ -1861,8 +2205,8 @@
   (junction (at 58.42 118.11) (diameter 0) (color 0 0 0 0)
     (uuid 807fdb88-f9c9-42d9-8e83-2c2f092f2280)
   )
-  (junction (at 54.61 93.98) (diameter 0) (color 0 0 0 0)
-    (uuid 8699357b-081e-4490-9c44-11d25a40de14)
+  (junction (at 22.86 86.36) (diameter 0) (color 0 0 0 0)
+    (uuid 85d4e31f-0a9c-44fe-988a-fd9d1c9f0d5f)
   )
   (junction (at 158.75 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 8847e751-6992-4f80-92c5-c3bef4b5dbf6)
@@ -1873,7 +2217,7 @@
   (junction (at 60.96 194.31) (diameter 0) (color 0 0 0 0)
     (uuid 8adc6e7b-379b-4805-954a-89eeb571e9d4)
   )
-  (junction (at 93.98 85.09) (diameter 0) (color 0 0 0 0)
+  (junction (at 116.84 85.09) (diameter 0) (color 0 0 0 0)
     (uuid 8c497335-9f19-4d8f-81b9-d3f6e5560190)
   )
   (junction (at 247.65 91.44) (diameter 0) (color 0 0 0 0)
@@ -1882,67 +2226,87 @@
   (junction (at 241.3 123.19) (diameter 0) (color 0 0 0 0)
     (uuid 9801ccc8-5152-40bb-932d-67072f8cd8ad)
   )
-  (junction (at 196.85 41.91) (diameter 0) (color 0 0 0 0)
+  (junction (at 256.54 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 9b396834-9f2e-4234-8e77-e2f453053d8c)
   )
   (junction (at 140.97 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 9cb0289b-897f-4a33-9575-6ead0989832a)
   )
+  (junction (at 91.44 82.55) (diameter 0) (color 0 0 0 0)
+    (uuid a306cb94-6ff0-43dc-b3ff-609bd041f651)
+  )
   (junction (at 60.96 171.45) (diameter 0) (color 0 0 0 0)
     (uuid ae10c814-dedf-4335-9619-5afa1682dcac)
   )
   (junction (at 148.59 180.34) (diameter 0) (color 0 0 0 0)
     (uuid b2ecb88a-4c09-46d5-b24a-de38dbb48f75)
   )
+  (junction (at 91.44 92.71) (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)
     (uuid b7e9cf10-b74e-4e80-a7f1-e33a29fe56de)
   )
   (junction (at 60.96 153.67) (diameter 0) (color 0 0 0 0)
     (uuid bbc11dec-0b3b-4dca-bca3-5e2a9ff62131)
   )
-  (junction (at 45.72 93.98) (diameter 0) (color 0 0 0 0)
-    (uuid ca6052ba-b6c7-4761-b3cb-c749f8cbf361)
+  (junction (at 69.85 102.87) (diameter 0) (color 0 0 0 0)
+    (uuid be9a62f2-23dd-41df-91a7-1f4ac377faf3)
   )
-  (junction (at 44.45 76.2) (diameter 0) (color 0 0 0 0)
-    (uuid cc016ca4-b9a4-4d80-91ba-91d6e0df5bcc)
+  (junction (at 34.29 86.36) (diameter 0) (color 0 0 0 0)
+    (uuid c2d3f10b-b9a2-4cb9-979d-644e3566b349)
   )
-  (junction (at 54.61 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid d0164702-426e-4c87-abe5-fbfeda4c6ede)
-  )
-  (junction (at 44.45 78.74) (diameter 0) (color 0 0 0 0)
-    (uuid d28c26df-aeff-4f6a-a1dc-f734efaf55cb)
+  (junction (at 91.44 72.39) (diameter 0) (color 0 0 0 0)
+    (uuid cc016ca4-b9a4-4d80-91ba-91d6e0df5bcc)
   )
   (junction (at 49.53 140.97) (diameter 0) (color 0 0 0 0)
     (uuid dadd1271-de02-4ddc-9037-691c1071fc0f)
   )
-  (junction (at 151.13 30.48) (diameter 0) (color 0 0 0 0)
+  (junction (at 274.32 20.32) (diameter 0) (color 0 0 0 0)
     (uuid e04409c2-b3ba-460e-bddc-62e0044901c2)
   )
   (junction (at 170.18 49.53) (diameter 0) (color 0 0 0 0)
     (uuid e1640c92-0a7b-4990-ae42-e9436c2a460d)
   )
-  (junction (at 44.45 81.28) (diameter 0) (color 0 0 0 0)
-    (uuid e4f6c439-e664-4982-a00a-ae1d4844df2b)
-  )
-  (junction (at 229.87 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 77.47 20.32) (diameter 0) (color 0 0 0 0)
     (uuid eab7c737-4450-406f-9f80-b2e18bb45dd6)
   )
-  (junction (at 151.13 38.1) (diameter 0) (color 0 0 0 0)
+  (junction (at 274.32 27.94) (diameter 0) (color 0 0 0 0)
     (uuid ed74c2b7-a3ac-4886-84f5-377b5e1bbbfc)
   )
 
+  (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 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))
+  (no_connect (at 29.21 20.32) (uuid 5e0f13bf-804a-411e-8f5a-2678db83e4a0))
   (no_connect (at 31.75 179.07) (uuid 5f209d3b-570b-41be-bac1-da0e75bd9c30))
+  (no_connect (at 19.05 38.1) (uuid 657b9520-f4f5-4bbd-96e9-e7037197e3d3))
+  (no_connect (at 19.05 53.34) (uuid 68b3df11-6847-4453-820a-85d602ac575b))
+  (no_connect (at 19.05 43.18) (uuid 7470b900-3f1e-497f-b369-8aad981a3392))
   (no_connect (at 31.75 173.99) (uuid 88dece5e-42d2-4a10-900f-3cb59dfd1690))
+  (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 19.05 27.94) (uuid cbf32607-4f05-4315-90ea-7b1ad43a34e7))
   (no_connect (at 106.045 192.405) (uuid e03d7bc9-2bd0-42b5-96ba-4ca164fb4c50))
+  (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))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 006bc43b-d3a8-4a38-a8dc-5a24da3f9b4d)
   )
-  (wire (pts (xy 27.94 93.98) (xy 45.72 93.98))
+  (wire (pts (xy 49.53 26.67) (xy 60.96 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0368658f-3125-4888-be8d-2d00cf819e46)
+    (uuid 0172fa94-4b7c-4d5e-bde6-27bb171b91e9)
+  )
+  (wire (pts (xy 34.29 91.44) (xy 34.29 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 035870a0-33fd-4542-9093-58d01a043d61)
   )
   (wire (pts (xy 119.38 74.93) (xy 132.08 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1952,14 +2316,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0673bd15-bb27-42a3-b8dd-ff34de638161)
   )
-  (wire (pts (xy 53.34 93.98) (xy 54.61 93.98))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 08895aac-0eaf-4885-9893-39d7cbab257b)
-  )
   (wire (pts (xy 46.99 143.51) (xy 60.96 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09dffe2f-119c-4acf-b279-934de0a0dda7)
   )
+  (wire (pts (xy 22.86 87.63) (xy 22.86 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1021e01a-7480-4604-9b82-a8d70899e83d)
+  )
+  (wire (pts (xy 83.82 82.55) (xy 80.01 82.55))
+    (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))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11b49d13-b047-4242-be65-9a9b1c80ec58)
@@ -1976,6 +2344,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 16010e58-8aee-45c1-99df-d1cc2bd80779)
   )
+  (wire (pts (xy 110.49 55.88) (xy 110.49 57.15))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1a795a6f-1bc6-41fb-82d7-5ae528094d84)
+  )
   (wire (pts (xy 58.42 135.89) (xy 58.42 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1afdd221-608b-420b-8eb2-861de263adb5)
@@ -1984,15 +2356,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1fcbe337-d147-4e02-846e-7f1ec4528bd0)
   )
-  (wire (pts (xy 27.94 76.2) (xy 34.29 76.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 22abab2e-9885-4da7-9852-348f356dd096)
-  )
   (wire (pts (xy 130.81 49.53) (xy 140.97 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2330a65f-a667-4564-b2ea-fd267508069a)
   )
-  (wire (pts (xy 137.16 30.48) (xy 151.13 30.48))
+  (wire (pts (xy 260.35 20.32) (xy 274.32 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23425199-2ac8-404e-b295-8bb0276f526e)
   )
@@ -2004,11 +2372,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23d269d6-d694-442a-bf5d-98bf3544fc31)
   )
-  (wire (pts (xy 86.36 123.19) (xy 82.55 123.19))
+  (wire (pts (xy 85.09 123.19) (xy 82.55 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2415334a-b998-4d19-a8b5-e60e8af2aff4)
   )
-  (wire (pts (xy 146.05 35.56) (xy 146.05 38.1))
+  (wire (pts (xy 269.24 25.4) (xy 269.24 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2480dd87-1dff-4a50-81a2-52ef161ac45c)
   )
@@ -2016,14 +2384,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 251435cb-df17-46ab-aac4-3d24ccac8db0)
   )
-  (wire (pts (xy 53.34 96.52) (xy 54.61 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 251bbd6b-00ad-4956-8621-28b4b522b62b)
-  )
   (wire (pts (xy 223.52 133.35) (xy 233.68 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25ada721-670a-4020-ae0b-77410c4e375a)
   )
+  (wire (pts (xy 83.82 72.39) (xy 80.01 72.39))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2965eaa9-5c83-4078-a673-05e36103f2d1)
+  )
   (wire (pts (xy 33.02 176.53) (xy 35.56 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2d68cb5d-30df-4657-8750-10f8b1c43a3d)
@@ -2032,7 +2400,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2f06a385-de72-4063-8346-234d2a5fb931)
   )
-  (wire (pts (xy 229.87 90.17) (xy 233.68 90.17))
+  (wire (pts (xy 77.47 20.32) (xy 81.28 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 317a2bf1-677c-46ed-b6b4-eef240063844)
   )
@@ -2044,10 +2412,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 34d6d782-5641-4526-b346-05de03ea8c0e)
   )
-  (wire (pts (xy 43.18 88.9) (xy 43.18 96.52))
+  (polyline (pts (xy 59.69 15.24) (xy 59.69 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 36915340-9dd2-4d10-bb2e-946e32cc121b)
+    (uuid 36dbbb14-ed77-4633-af35-90660d2143f3)
   )
+
   (wire (pts (xy 120.65 49.53) (xy 130.81 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 37e843e9-2538-4a91-9a9b-f536fa0a9e84)
@@ -2060,14 +2429,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3d927ca0-f4ad-42ab-b902-dfef8d84eebb)
   )
-  (wire (pts (xy 226.06 90.17) (xy 229.87 90.17))
+  (wire (pts (xy 73.66 20.32) (xy 77.47 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3f4ca593-2b3f-4c1d-83fb-6afbc1dc83bd)
   )
+  (wire (pts (xy 115.57 135.89) (xy 115.57 138.43))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3f4f4435-0d48-417e-8f86-def0fd108af7)
+  )
   (wire (pts (xy 148.59 186.69) (xy 158.75 186.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3fc3a397-ec3a-4314-aa6a-44925ef4cbbe)
   )
+  (polyline (pts (xy 15.24 15.24) (xy 59.69 15.24))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 437ebe18-8f4c-4d60-9ade-e76424d17726)
+  )
+
   (wire (pts (xy 158.75 180.34) (xy 160.02 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4736f749-4a0e-4a05-b1aa-d51f1c3fc23d)
@@ -2076,15 +2454,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4829bee0-faa8-43f7-b2d7-8a6e5d1b3050)
   )
-  (wire (pts (xy 45.72 81.28) (xy 44.45 81.28))
+  (wire (pts (xy 34.29 76.2) (xy 34.29 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4b9a4b22-a241-4855-9d5c-4ff2f9005b1b)
+    (uuid 487cb37f-32e1-4fcc-b649-1ddd891984c5)
   )
   (wire (pts (xy 124.46 92.71) (xy 132.08 92.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4cd135a5-fdd1-4851-864a-dadf7c96d9ff)
   )
-  (wire (pts (xy 137.16 35.56) (xy 146.05 35.56))
+  (wire (pts (xy 69.85 72.39) (xy 69.85 82.55))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4d43e674-c1c0-4e11-b129-01108db367aa)
+  )
+  (wire (pts (xy 260.35 25.4) (xy 269.24 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4f69bb40-cbf2-45c5-8c23-3e0667e1f6c1)
   )
@@ -2096,49 +2478,58 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 564c737a-c22b-400c-8665-990100e2bad2)
   )
-  (wire (pts (xy 44.45 76.2) (xy 44.45 73.66))
+  (wire (pts (xy 91.44 72.39) (xy 91.44 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 58a22765-7f2e-4f66-9ea8-f56fcca75dda)
   )
+  (wire (pts (xy 83.82 92.71) (xy 80.01 92.71))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 595e8034-8a59-4a5c-b366-f8604d8aa4da)
+  )
   (wire (pts (xy 52.07 171.45) (xy 50.8 171.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5c661c17-3ab4-49c7-8add-a626d1753c0b)
   )
-  (wire (pts (xy 27.94 96.52) (xy 43.18 96.52))
+  (wire (pts (xy 110.49 49.53) (xy 110.49 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5d4ed9ca-985c-4d79-b913-0fd671b604bc)
+    (uuid 5e8f43a4-e869-473e-b093-0ec79ea19580)
   )
   (wire (pts (xy 226.06 128.27) (xy 233.68 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5f48357f-c353-4808-811f-74ed7ffaa7c6)
   )
-  (wire (pts (xy 146.05 38.1) (xy 151.13 38.1))
+  (wire (pts (xy 269.24 27.94) (xy 274.32 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 61b6f2c4-b226-47d6-bbd8-9d67fcaf35c3)
   )
-  (wire (pts (xy 196.85 41.91) (xy 209.55 41.91))
+  (wire (pts (xy 256.54 57.15) (xy 269.24 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 61e795c9-5bb5-48b3-b7a0-cb64f04c7adc)
   )
+  (wire (pts (xy 83.82 102.87) (xy 80.01 102.87))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 66d98295-60ac-4b7d-a181-3284b2b387bc)
+  )
   (wire (pts (xy 49.53 140.97) (xy 49.53 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 66e3bb6e-3039-4f64-a55c-f43a1345d149)
   )
-  (wire (pts (xy 101.6 90.17) (xy 101.6 87.63))
+  (wire (pts (xy 124.46 90.17) (xy 124.46 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 677a1070-c11b-49a9-8186-12e0a3e880b1)
   )
-  (wire (pts (xy 226.06 102.87) (xy 226.06 97.79))
+  (wire (pts (xy 73.66 33.02) (xy 73.66 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 679e5b0e-a017-43d8-8845-79a886253d82)
   )
-  (wire (pts (xy 49.53 128.27) (xy 49.53 133.35))
+  (polyline (pts (xy 15.24 15.24) (xy 15.24 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6ed67694-fff8-461d-af41-a54796b26eb7)
+    (uuid 6c1a4ff4-84d5-4723-9271-598658bada11)
   )
-  (wire (pts (xy 27.94 99.06) (xy 29.21 99.06))
+
+  (wire (pts (xy 49.53 128.27) (xy 49.53 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6f581e98-caac-4a3a-b0ed-76aab462e56a)
+    (uuid 6ed67694-fff8-461d-af41-a54796b26eb7)
   )
   (wire (pts (xy 165.1 125.73) (xy 180.34 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2188,15 +2579,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 822cf157-ecb8-46d7-8cc6-5f0248fd6b37)
   )
-  (wire (pts (xy 45.72 88.9) (xy 45.72 93.98))
+  (wire (pts (xy 91.44 82.55) (xy 91.44 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 82f0532d-1a6d-464b-ad29-fc3e8108d6a8)
+    (uuid 83b77b4d-dcc2-4e93-a5f3-1d1480646393)
   )
-  (wire (pts (xy 195.58 36.83) (xy 196.85 36.83))
+  (wire (pts (xy 255.27 52.07) (xy 256.54 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 875404be-e359-458a-af29-1bd3403dd55f)
   )
-  (wire (pts (xy 233.68 102.87) (xy 226.06 102.87))
+  (wire (pts (xy 49.53 31.75) (xy 60.96 31.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8cf3b989-d323-4aa3-888a-229ee0855e8a)
+  )
+  (wire (pts (xy 69.85 92.71) (xy 69.85 102.87))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8d760ab7-cb5d-426a-b4aa-fb7e0964cb41)
+  )
+  (wire (pts (xy 81.28 33.02) (xy 73.66 33.02))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8f577817-ea32-42aa-bedc-809b6d0ffec6)
   )
@@ -2204,11 +2603,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9004cee7-358e-4c08-9d64-a05f28a4e7b6)
   )
-  (wire (pts (xy 101.6 87.63) (xy 132.08 87.63))
+  (wire (pts (xy 22.86 81.28) (xy 26.67 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 901dc96c-698d-427d-880a-ee46536a481f)
+  )
+  (wire (pts (xy 124.46 87.63) (xy 132.08 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92cf4db4-2dba-4763-9cd8-3c7f8aff8f24)
   )
-  (wire (pts (xy 101.6 90.17) (xy 92.71 90.17))
+  (wire (pts (xy 124.46 90.17) (xy 115.57 90.17))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93b580d1-c2df-48c4-9d06-465ca9d3eebc)
   )
@@ -2216,15 +2619,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9540b4d6-8885-4843-a659-943f7e3bc69a)
   )
-  (wire (pts (xy 27.94 78.74) (xy 34.29 78.74))
+  (wire (pts (xy 115.57 138.43) (xy 132.08 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 99a76074-fcd3-4150-83c8-79f76bdad1c5)
+    (uuid 9c00f763-4387-4dca-9d2a-687600fcbd31)
   )
-  (wire (pts (xy 72.39 143.51) (xy 86.36 143.51))
+  (wire (pts (xy 72.39 143.51) (xy 85.09 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c221d52-946b-4b75-8659-2771c7e549f2)
   )
-  (wire (pts (xy 86.36 143.51) (xy 86.36 130.81))
+  (wire (pts (xy 85.09 143.51) (xy 85.09 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9cdc04e7-a7c1-410b-8dd7-1b5a287afb98)
   )
@@ -2244,7 +2647,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a32fe8ab-5810-40f6-8eab-48332c0ee5a0)
   )
-  (wire (pts (xy 196.85 34.29) (xy 196.85 27.94))
+  (wire (pts (xy 256.54 49.53) (xy 256.54 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a560f403-c7e0-4d97-9b6c-c5351bebb237)
   )
@@ -2252,7 +2655,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a5e5a32b-d259-4833-9676-56ada82e83c2)
   )
-  (wire (pts (xy 209.55 34.29) (xy 209.55 27.94))
+  (wire (pts (xy 269.24 49.53) (xy 269.24 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a6e0def8-4f4c-4324-b688-07d61c9eec31)
   )
@@ -2260,7 +2663,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab5db7e5-9de7-449f-b70b-9d0dd610b10b)
   )
-  (wire (pts (xy 93.98 87.63) (xy 93.98 85.09))
+  (wire (pts (xy 116.84 87.63) (xy 116.84 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac5a5c45-797a-4bbe-bfd5-5ce5a8aa3463)
   )
@@ -2300,19 +2703,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b555eee7-8149-4892-8ba4-057aabcbbee2)
   )
-  (wire (pts (xy 54.61 96.52) (xy 63.5 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b9937346-f6e7-4a0d-8b88-940809bc0c5f)
-  )
-  (wire (pts (xy 41.91 78.74) (xy 44.45 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b9e0ba15-f372-4a9e-a627-d594778258ac)
-  )
   (wire (pts (xy 181.61 125.73) (xy 181.61 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b9fce689-53c2-4275-98d8-2c8da9bd740a)
   )
-  (wire (pts (xy 93.98 85.09) (xy 92.71 85.09))
+  (wire (pts (xy 116.84 85.09) (xy 115.57 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ba80136a-34d0-4a97-a9c9-c43ab3f7be6e)
   )
@@ -2320,6 +2715,10 @@
     (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))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bc913ca4-9065-43d2-9d7f-c7073d14811d)
+  )
   (wire (pts (xy 49.53 140.97) (xy 54.61 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bf1ffc03-ba94-43f6-8d0a-0dfaedf70cc2)
@@ -2332,14 +2731,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c10ea781-e4dc-44b9-a7e1-86f7cdfec5ac)
   )
-  (wire (pts (xy 44.45 81.28) (xy 43.18 81.28))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c3c15276-82a5-4b64-990f-7f503a97141e)
-  )
   (wire (pts (xy 31.75 168.91) (xy 35.56 168.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c62fcb1d-df7b-4385-a018-f5ef16263000)
   )
+  (wire (pts (xy 22.86 81.28) (xy 16.51 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c71a0f1c-e0a1-4cfb-a1c2-249d4b359638)
+  )
   (wire (pts (xy 60.96 143.51) (xy 64.77 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c898c0c5-e142-46d8-96c8-7be1e3bc68ad)
@@ -2348,11 +2747,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca0eab8e-e3fd-464d-bb03-d1603b8a651b)
   )
-  (wire (pts (xy 209.55 41.91) (xy 209.55 39.37))
+  (wire (pts (xy 269.24 57.15) (xy 269.24 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca12753c-a5f4-49a4-bb14-a01420a86edb)
   )
-  (wire (pts (xy 233.68 100.33) (xy 233.68 97.79))
+  (wire (pts (xy 81.28 30.48) (xy 81.28 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cf02db11-2ff8-4f79-b3e9-9802575ab786)
   )
@@ -2372,15 +2771,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d312eda9-74a3-4e19-8d05-4177ec0e1f00)
   )
-  (wire (pts (xy 43.18 96.52) (xy 45.72 96.52))
+  (wire (pts (xy 26.67 86.36) (xy 22.86 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d3ea5011-250b-4076-bf21-0457c1dc2816)
+    (uuid d4d81f67-fac4-4771-8b7d-f2089683330d)
   )
   (wire (pts (xy 49.53 118.11) (xy 49.53 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d84cf9cf-df80-49cb-bd44-af405b2b4fee)
   )
-  (wire (pts (xy 209.55 27.94) (xy 196.85 27.94))
+  (wire (pts (xy 269.24 43.18) (xy 256.54 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d8e238b6-5437-4b14-9ba7-0337f0b828ab)
   )
@@ -2396,21 +2795,21 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dba4ad5b-8704-4fc8-9247-b9c4709cf1cf)
   )
-  (wire (pts (xy 132.08 85.09) (xy 93.98 85.09))
+  (wire (pts (xy 49.53 34.29) (xy 62.23 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dcbc5a2e-2561-4663-8736-09acc9fe0209)
+    (uuid dc2567a8-f67d-423b-a6b0-f3bf10022eef)
   )
-  (wire (pts (xy 44.45 81.28) (xy 44.45 78.74))
+  (wire (pts (xy 16.51 86.36) (xy 22.86 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dcff1695-539e-442e-afee-9485378ce13a)
+    (uuid dc3924cb-3c6c-488f-b9d5-465b4a917136)
   )
-  (wire (pts (xy 138.43 186.69) (xy 148.59 186.69))
+  (wire (pts (xy 132.08 85.09) (xy 116.84 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ddcf9a83-0126-4df6-88fa-3363d508d3a6)
+    (uuid dcbc5a2e-2561-4663-8736-09acc9fe0209)
   )
-  (wire (pts (xy 41.91 76.2) (xy 44.45 76.2))
+  (wire (pts (xy 138.43 186.69) (xy 148.59 186.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dea160a0-c7eb-439d-aa99-b60757115fc7)
+    (uuid ddcf9a83-0126-4df6-88fa-3363d508d3a6)
   )
   (wire (pts (xy 158.75 146.05) (xy 152.4 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2428,6 +2827,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e7130644-c4ae-4f9d-997d-5b4fa9d09578)
   )
+  (polyline (pts (xy 59.69 63.5) (xy 15.24 63.5))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e8e850c4-7708-4bbf-84e9-a768c6d278e3)
+  )
+
   (wire (pts (xy 46.99 130.81) (xy 59.69 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e91ad237-6778-4565-a41c-5451c22b839e)
@@ -2436,7 +2840,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e98e7eb7-9737-4f2e-99d0-92ee149d1392)
   )
-  (wire (pts (xy 44.45 78.74) (xy 44.45 76.2))
+  (wire (pts (xy 91.44 102.87) (xy 91.44 92.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb5c3818-51cd-4092-a6a2-1d306912382e)
   )
@@ -2444,18 +2848,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ec3165fe-59c9-43eb-8ddf-d44b9735718a)
   )
-  (wire (pts (xy 196.85 41.91) (xy 196.85 39.37))
+  (wire (pts (xy 256.54 57.15) (xy 256.54 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eca73914-6f4b-487c-b8f6-6bedca0fa3fb)
   )
-  (wire (pts (xy 54.61 93.98) (xy 63.5 93.98))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid eccdf86f-23ac-4077-b13e-27dc356e9a70)
-  )
   (wire (pts (xy 123.19 80.01) (xy 132.08 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ed265626-f6f5-4029-beb9-f6ad275e86b5)
   )
+  (wire (pts (xy 91.44 92.71) (xy 91.44 82.55))
+    (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))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f1353e9e-7eae-44e9-872c-ec11c41e5657)
@@ -2464,7 +2868,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f46f4b86-daf6-4869-98cb-928039f00f5f)
   )
-  (wire (pts (xy 210.82 36.83) (xy 209.55 36.83))
+  (wire (pts (xy 270.51 52.07) (xy 269.24 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f683b564-906b-42f6-a233-cd22c58657dd)
   )
@@ -2472,16 +2876,28 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6c96c0d-4cf7-4e5a-ad96-cb52e5fda138)
   )
+  (wire (pts (xy 69.85 82.55) (xy 69.85 92.71))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f928df12-b33b-4d6e-8a51-572bf83802ca)
+  )
 
   (text "Yaesu documents\nhave reversed\nnumbering" (at 30.48 152.4 0)
     (effects (font (size 1.1938 1.1938)) (justify left bottom))
     (uuid 00d22a94-4415-4f7c-bba5-9ac8913c5f96)
   )
-  (text "TODO\nDecide VMIC (8V on MH-42)\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020"
+  (text "TODO\nAdd cable between main board and control\nDecide VMIC (8V on MH-42)\n\nDone\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020"
     (at 1.27 -15.24 0)
     (effects (font (size 3 3)) (justify left bottom))
     (uuid 1154c567-1e30-4104-a3b9-6b57e1efe0f8)
   )
+  (text "DISP_5V" (at 49.53 31.75 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 1ae70af6-ac4a-4a28-aff8-9077e17e3e61)
+  )
+  (text "DISP_GND" (at 49.53 34.29 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 2a4a455a-d851-42f3-92ae-dce395b66e62)
+  )
   (text "TIM1 CH1" (at 173.99 123.19 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 49389a66-8741-452b-8284-834f65c51e1b)
@@ -2491,8 +2907,8 @@
     (effects (font (size 1.1938 1.1938)) (justify left bottom))
     (uuid 74796a55-82bc-4f74-9e9c-c7cb232069e3)
   )
-  (text "Low pass filter for CW sidetone,\nfinally unused. STATUS LED replaced\nby piezo buzzer instead."
-    (at 105.41 173.99 0)
+  (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)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 76d9276c-0bff-44cf-81b5-cc0de1c97f12)
   )
@@ -2500,6 +2916,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7ea15999-0781-4c2e-a266-2adaf5a39946)
   )
+  (text "LCD: use a 5V\ncharacter display,\nand Adafruit 292\nbackpack with\n3V3 I2C.\n"
+    (at 58.42 62.23 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 957effad-d1d8-4a6b-8428-056683589978)
+  )
   (text "Yaesu MH-34\nS : GND\nR1: Mic/PTT\nR2: (clone)\nT : SPK\n\nPTT: 2.2k to GND"
     (at 14.986 194.818 0)
     (effects (font (size 1.1938 1.1938)) (justify left bottom))
@@ -2513,10 +2934,9 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d5605fa7-538d-473c-8da8-4e6409672b1d)
   )
-  (text "LCD: use a 5V character display, and Adafruit 292 backpack with 3V3 I2C.\n\nButtons: floating when open, connect to GND when pressed\n(Buttons 0 and 1 were previously floating when open, connect to GND\nthrough resistors when pressed for multiplexing several buttons, but that\nmakes it impossible to use interrupts, and I didn't need more than 4\nbuttons in the end.)\n\nCoder: connect as in datasheet PEC12R"
-    (at 16.51 66.04 0)
+  (text "DISP_DAT" (at 49.53 26.67 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid f84570f0-8f86-40f4-8c85-4d0ad12444b2)
+    (uuid e1ee8c3a-d18b-43d4-92e4-74a5b6e689c1)
   )
   (text "Sequence:\nSEQ0: Baseband + Anglian\nSEQ1: External PA\nSEQ2: External Relay + Transverter"
     (at 166.37 81.28 0)
@@ -2527,6 +2947,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid fb6ae0ae-5f09-42f3-a277-43e9524a252b)
   )
+  (text "DISP_CLK" (at 49.53 29.21 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid fd29d2ff-b67b-4b37-95fa-5b64b72e1a7d)
+  )
 
   (label "USB_DP" (at 226.06 133.35 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -2544,8 +2968,8 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0886377c-acad-41ba-a045-1d436eadaaab)
   )
-  (label "MIC_SW2" (at 68.58 130.81 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (label "MIC_SW2" (at 74.93 130.81 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0e39e32b-7468-4f6e-a6f0-b54d61a16933)
   )
   (label "BTN1" (at 132.08 102.87 180)
@@ -2560,7 +2984,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1c36527b-20ab-4863-8486-3913ee2e57f4)
   )
-  (label "I2C2_SDA" (at 233.68 100.33 0)
+  (label "I2C2_SDA" (at 81.28 30.48 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 23d0e929-f5a1-4c62-b387-0887d9659f38)
   )
@@ -2568,22 +2992,14 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 34f20938-82be-4faa-a3bd-ea4ff60955a6)
   )
-  (label "BOOT1" (at 218.44 36.83 0)
+  (label "BOOT1" (at 278.13 52.07 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3a41f6b2-d64e-4fc9-9c78-62461e28f42c)
   )
-  (label "STATUSn" (at 148.59 166.37 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 3d0ee88c-fab5-44ff-91c4-a21e663a09de)
-  )
   (label "BTN2" (at 132.08 133.35 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3fcf515a-b2e5-4769-a263-706606d34687)
   )
-  (label "ENC_A" (at 63.5 96.52 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 4159a1b3-645b-4fcf-a72d-9242b2067a63)
-  )
   (label "I2C2_SDA" (at 201.93 125.73 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 474da0bb-a80f-4ce4-b14e-5f26d8f31e91)
@@ -2620,18 +3036,18 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5c5b3284-d7e2-4069-8087-eaf4a8346272)
   )
+  (label "ENC_B" (at 16.51 81.28 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 5e4e2554-e691-40cb-837f-552b7d5bc858)
+  )
   (label "CW_RING" (at 132.08 125.73 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5fa23453-de94-4f47-ab66-80326a468ae1)
   )
-  (label "I2C2_SCL" (at 233.68 102.87 0)
+  (label "I2C2_SCL" (at 81.28 33.02 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 61d63f1b-dbdf-4e18-9e78-d70eac21ae65)
   )
-  (label "I2C2_SCL" (at 27.94 91.44 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 657bd73d-9c40-4ca8-b3ea-e75927d498b6)
-  )
   (label "I2C2_SDA" (at 132.08 130.81 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 6c1d0ff6-53d9-4a5b-89a8-5313d6ca7d94)
@@ -2648,7 +3064,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 7288ce3d-ad6e-43f5-96ca-99065d7798d0)
   )
-  (label "ENC_BTN" (at 36.83 99.06 0)
+  (label "ENC_BTN" (at 57.15 81.28 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 73b08644-febb-4c1e-9b8f-826cf4cd7348)
   )
@@ -2672,11 +3088,11 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8233de19-691a-4981-9177-f647c5ab854c)
   )
-  (label "BTN2" (at 27.94 81.28 0)
+  (label "BTN2" (at 80.01 92.71 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8b8cbcc8-2fab-4017-82d7-9e2b0dd87d55)
   )
-  (label "RESETn" (at 137.16 40.64 0)
+  (label "RESETn" (at 260.35 30.48 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8ce5f070-df4e-4d8d-b78f-3ef1b6a0875c)
   )
@@ -2688,6 +3104,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 92ba8945-0271-4dc3-a102-541bc7646045)
   )
+  (label "DISP_LAT" (at 49.53 24.13 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 92f4b848-251e-40e0-b324-8b9b23c0d808)
+  )
   (label "PC14" (at 132.08 95.25 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 94b40fef-8e3d-4a32-a137-035c86ca86c8)
@@ -2696,11 +3116,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a4813917-c395-4e03-b658-4133a12249cd)
   )
-  (label "I2C2_SDA" (at 27.94 88.9 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid acee6893-1f8a-43f2-93df-e612d6c0d353)
-  )
-  (label "SWCLK" (at 137.16 33.02 0)
+  (label "SWCLK" (at 260.35 22.86 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b4b8fad9-0954-4267-898b-11fce62b39de)
   )
@@ -2712,11 +3128,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bf046f55-cad5-4e6d-8fc5-1978a2a4f4dc)
   )
-  (label "BTN3" (at 27.94 83.82 0)
+  (label "BTN3" (at 80.01 102.87 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c40d36bb-2efa-4bc3-859b-223faaa66f3e)
   )
-  (label "BTN0" (at 27.94 76.2 0)
+  (label "BTN0" (at 80.01 72.39 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c435621a-1e7b-4aea-a701-d5d27a54bd0d)
   )
@@ -2724,6 +3140,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c8ce7d0f-bd8a-416c-9bb9-339f4090a830)
   )
+  (label "I2C2_SCL" (at 60.96 29.21 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid c90387a3-7222-414a-9f26-d5d7b7d40104)
+  )
   (label "CW_TIP" (at 132.08 123.19 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c97ec1e3-38c3-4514-9704-1b06a25c7c8d)
@@ -2732,11 +3152,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid cf672f56-2d68-4c6c-a783-23e23c937b72)
   )
-  (label "ENC_B" (at 63.5 93.98 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid d7b44d07-2cb6-4c10-bad9-adf2185ee6fd)
-  )
-  (label "SWDIO" (at 137.16 38.1 0)
+  (label "SWDIO" (at 260.35 27.94 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e42b8b80-020c-4fee-b000-fd91abf3966d)
   )
@@ -2744,6 +3160,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e721791d-da51-4bae-ab44-002be5ea386c)
   )
+  (label "I2C2_SDA" (at 60.96 26.67 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid e75faf61-76fe-4e22-b01e-16c228ce55be)
+  )
   (label "MIC_SW2" (at 165.1 113.03 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e93f1ff9-82cc-426b-b31b-274f08cc4327)
@@ -2764,11 +3184,15 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid f686f314-e4c1-4c2d-a83a-58da96d3edf9)
   )
-  (label "BTN1" (at 27.94 78.74 0)
+  (label "ENC_A" (at 16.51 86.36 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid f7a8cf05-b405-47d6-a8ce-eb5ffec4afaa)
+  )
+  (label "BTN1" (at 80.01 82.55 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f82b8be3-e209-4493-8527-8e48e4d9c1ce)
   )
-  (label "BOOT0" (at 187.96 36.83 180)
+  (label "BOOT0" (at 247.65 52.07 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid fd2d066c-2ff9-43c4-ab8e-a65d2b71b5c1)
   )
@@ -2787,10 +3211,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "+5VA" (shape input) (at 27.94 86.36 0) (fields_autoplaced)
+  (global_label "+5VA" (shape input) (at 60.96 31.75 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 30f27120-8919-4f22-a0e2-49bd0c1104a0)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 33.02 -54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2872,73 +3296,6 @@
     (pin "2" (uuid 7e09dacf-e7df-4d1b-ae00-782e58d5681e))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x12") (at 22.86 88.9 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005e523241)
-    (property "Reference" "J?" (id 0) (at 20.8534 86.36 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "UI" (id 1) (at 20.8534 88.6714 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x12_P2.54mm_Vertical" (id 2) (at 22.86 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 22.86 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 22.86 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" " Adafruit 292 and PEC12R-4022F-S0024" (id 5) (at 22.86 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 94049d55-f0d7-40ad-b552-9b206e52f022))
-    (pin "10" (uuid 18a82b42-2202-42c2-bf5c-5f6ee35bca85))
-    (pin "11" (uuid 24617945-3769-4e0c-87ab-d43abbbb6bf3))
-    (pin "12" (uuid ca4ab7e3-5366-4cd4-b7fe-b51b382d5295))
-    (pin "2" (uuid 262f98f5-73a1-456d-a698-36df5b63acd9))
-    (pin "3" (uuid d24687b6-05ef-4c89-a821-ee9b72be1fc1))
-    (pin "4" (uuid 96b2b064-bd0b-41d8-880e-8a037c895191))
-    (pin "5" (uuid 7f53f9c5-42a9-4a18-b3e9-1febfec9f0f2))
-    (pin "6" (uuid 601e3a22-eb0c-42de-95ec-980585c4d798))
-    (pin "7" (uuid 1c1abc93-b44d-4ee3-9ae5-ed6e32c673e1))
-    (pin "8" (uuid 60834ccb-1317-4836-ade3-cd71d3de34a5))
-    (pin "9" (uuid 04111bb4-122c-4a44-8021-ccdb67968b54))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 27.94 73.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005e5452ea)
-    (property "Reference" "#PWR?" (id 0) (at 27.94 77.47 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at 28.321 69.2658 0))
-    (property "Footprint" "" (id 2) (at 27.94 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 27.94 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0f984dd2-9dd1-40b7-bb0c-76c12276f44c))
-  )
-
-  (symbol (lib_id "power:GND") (at 54.61 86.36 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005e566926)
-    (property "Reference" "#PWR?" (id 0) (at 54.61 80.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 54.483 81.9658 0))
-    (property "Footprint" "" (id 2) (at 54.61 86.36 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 54.61 86.36 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0ba81a2c-e87f-4b76-8e66-4ed8d0357318))
-  )
-
   (symbol (lib_id "Device:Ferrite_Bead") (at 170.18 45.72 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e5709c5)
@@ -3193,8 +3550,12 @@
   (symbol (lib_id "Device:R") (at 78.74 127 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e75c12e)
-    (property "Reference" "R?" (id 0) (at 83.9978 127 90))
-    (property "Value" "470k" (id 1) (at 81.6864 127 90))
+    (property "Reference" "R?" (id 0) (at 74.93 125.73 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "470k" (id 1) (at 72.39 128.27 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
     (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 80.518 127 90)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3208,18 +3569,22 @@
     (pin "2" (uuid 731710ea-1c66-457c-b41d-b9f4bf6588ea))
   )
 
-  (symbol (lib_id "Device:R") (at 86.36 127 180) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 85.09 127 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e75cf25)
-    (property "Reference" "R?" (id 0) (at 91.6178 127 90))
-    (property "Value" "470k" (id 1) (at 89.3064 127 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 88.138 127 90)
+    (property "Reference" "R?" (id 0) (at 87.63 125.7299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "470k" (id 1) (at 87.63 128.2699 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 86.868 127 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 127 0)
+    (property "Datasheet" "~" (id 3) (at 85.09 127 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 86.36 127 0)
+    (property "Need_order" "" (id 4) (at 85.09 127 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid af94f062-8b86-4abc-8c98-0cf73b568538))
@@ -3242,36 +3607,36 @@
     (pin "1" (uuid d1a559ae-6ae1-408b-b2fc-acf48b1947c7))
   )
 
-  (symbol (lib_id "Device:R") (at 38.1 78.74 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 87.63 102.87 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e769b25)
-    (property "Reference" "R?" (id 0) (at 38.1 81.661 90))
-    (property "Value" "5k1" (id 1) (at 38.1 83.9724 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 38.1 80.518 90)
+    (property "Reference" "R?" (id 0) (at 87.63 105.791 90))
+    (property "Value" "5k1" (id 1) (at 87.63 108.1024 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 87.63 104.648 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 38.1 78.74 0)
+    (property "Datasheet" "~" (id 3) (at 87.63 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 38.1 78.74 0)
+    (property "Need_order" "" (id 4) (at 87.63 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1cb9db02-79bb-4e6e-9f31-aed30a81217b))
     (pin "2" (uuid 2aba1e16-1f50-4bfc-9b1b-e74806910828))
   )
 
-  (symbol (lib_id "Device:R") (at 38.1 76.2 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 87.63 72.39 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e769b30)
-    (property "Reference" "R?" (id 0) (at 38.1 70.9422 90))
-    (property "Value" "5k1" (id 1) (at 38.1 73.2536 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 38.1 77.978 90)
+    (property "Reference" "R?" (id 0) (at 87.63 67.1322 90))
+    (property "Value" "5k1" (id 1) (at 87.63 69.4436 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 87.63 74.168 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 38.1 76.2 0)
+    (property "Datasheet" "~" (id 3) (at 87.63 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 38.1 76.2 0)
+    (property "Need_order" "" (id 4) (at 87.63 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 827bf8cb-b8fe-441c-9820-6008651e5541))
@@ -3342,18 +3707,18 @@
     (pin "9" (uuid bc82a952-f29c-4e66-8fc2-c7523678b685))
   )
 
-  (symbol (lib_id "Device:R") (at 191.77 36.83 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 251.46 52.07 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e8f622a)
-    (property "Reference" "R?" (id 0) (at 191.77 31.5722 90))
-    (property "Value" "100k" (id 1) (at 191.77 33.8836 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 191.77 35.052 90)
+    (property "Reference" "R?" (id 0) (at 251.46 46.8122 90))
+    (property "Value" "100k" (id 1) (at 251.46 49.1236 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 251.46 50.292 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 191.77 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 251.46 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 191.77 36.83 0)
+    (property "Need_order" "" (id 4) (at 251.46 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 95a71d93-aef8-4f84-b170-b48326c73e8f))
@@ -3790,25 +4155,25 @@
     (pin "1" (uuid e3b914a8-68f7-4ef2-b944-05204da163e8))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x05") (at 132.08 35.56 0) (mirror y) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x05") (at 255.27 25.4 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9ed23f)
-    (property "Reference" "J?" (id 0) (at 130.0734 38.1 0)
+    (property "Reference" "J?" (id 0) (at 253.2634 27.94 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PROG" (id 1) (at 130.0734 35.7886 0)
+    (property "Value" "PROG" (id 1) (at 253.2634 25.6286 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x05_P2.54mm_Vertical" (id 2) (at 132.08 35.56 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x05_P2.54mm_Vertical" (id 2) (at 255.27 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 132.08 35.56 0)
+    (property "Datasheet" "~" (id 3) (at 255.27 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 132.08 35.56 0)
+    (property "Need_order" "" (id 4) (at 255.27 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 5) (at 132.08 35.56 0)
+    (property "MPN" "" (id 5) (at 255.27 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1aeeca73-725e-434c-a493-645b95a207c6))
@@ -3818,90 +4183,90 @@
     (pin "5" (uuid 1225679e-dd0c-4ad6-8a57-6f4a4f0e615b))
   )
 
-  (symbol (lib_id "Device:C") (at 151.13 34.29 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 274.32 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9edab8)
-    (property "Reference" "C?" (id 0) (at 153.4668 33.1216 0)
+    (property "Reference" "C?" (id 0) (at 276.6568 22.9616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 153.4668 35.433 0)
+    (property "Value" "0.1uF" (id 1) (at 276.6568 25.273 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 151.13 34.29 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 274.32 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 151.13 34.29 0)
+    (property "Datasheet" "~" (id 3) (at 274.32 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 151.13 34.29 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 274.32 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 151.13 34.29 0)
+    (property "Need_order" "" (id 5) (at 274.32 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 18b4a4fc-4df1-4039-9a06-3a8ba3078860))
     (pin "2" (uuid b7f8e358-1d98-4c2c-834d-6a80dd75a23d))
   )
 
-  (symbol (lib_id "power:GND") (at 151.13 38.1 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 274.32 27.94 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9f84a2)
-    (property "Reference" "#PWR?" (id 0) (at 151.13 44.45 0)
+    (property "Reference" "#PWR?" (id 0) (at 274.32 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 151.257 42.4942 0))
-    (property "Footprint" "" (id 2) (at 151.13 38.1 0)
+    (property "Value" "GND" (id 1) (at 274.447 32.3342 0))
+    (property "Footprint" "" (id 2) (at 274.32 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 151.13 38.1 0)
+    (property "Datasheet" "" (id 3) (at 274.32 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b778e56d-aef3-48ca-a7ce-57459e070477))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 151.13 30.48 0) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 274.32 20.32 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9f87ce)
-    (property "Reference" "#PWR?" (id 0) (at 151.13 34.29 0)
+    (property "Reference" "#PWR?" (id 0) (at 274.32 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 151.511 26.0858 0))
-    (property "Footprint" "" (id 2) (at 151.13 30.48 0)
+    (property "Value" "+3.3V" (id 1) (at 274.701 15.9258 0))
+    (property "Footprint" "" (id 2) (at 274.32 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 151.13 30.48 0)
+    (property "Datasheet" "" (id 3) (at 274.32 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e7d2c337-5654-42ce-9869-b8ea54f6eed4))
   )
 
-  (symbol (lib_id "Device:R") (at 214.63 36.83 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 274.32 52.07 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9fa9c2)
-    (property "Reference" "R?" (id 0) (at 214.63 31.5722 90))
-    (property "Value" "100k" (id 1) (at 214.63 33.8836 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 214.63 38.608 90)
+    (property "Reference" "R?" (id 0) (at 274.32 46.8122 90))
+    (property "Value" "100k" (id 1) (at 274.32 49.1236 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 274.32 53.848 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 214.63 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 274.32 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 214.63 36.83 0)
+    (property "Need_order" "" (id 4) (at 274.32 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1b3a2181-e181-4f05-8f4f-247eebe0a768))
     (pin "2" (uuid 2d4e2f6c-b463-43ab-8c78-671cce916947))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_02x03_Odd_Even") (at 201.93 36.83 0) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_02x03_Odd_Even") (at 261.62 52.07 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ea2664b)
-    (property "Reference" "J?" (id 0) (at 203.2 28.7782 0))
-    (property "Value" "BOOT" (id 1) (at 203.2 31.0896 0))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical" (id 2) (at 201.93 36.83 0)
+    (property "Reference" "J?" (id 0) (at 262.89 44.0182 0))
+    (property "Value" "BOOT" (id 1) (at 262.89 46.3296 0))
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical" (id 2) (at 261.62 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 201.93 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 261.62 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid efe0f9a5-137b-42fa-9ae9-707f216d634c))
@@ -3912,33 +4277,33 @@
     (pin "6" (uuid 3adb3f09-9e95-4f7f-90a2-85763dd02772))
   )
 
-  (symbol (lib_id "power:GND") (at 196.85 41.91 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 256.54 57.15 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ea3264a)
-    (property "Reference" "#PWR?" (id 0) (at 196.85 48.26 0)
+    (property "Reference" "#PWR?" (id 0) (at 256.54 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 196.977 46.3042 0))
-    (property "Footprint" "" (id 2) (at 196.85 41.91 0)
+    (property "Value" "GND" (id 1) (at 256.667 61.5442 0))
+    (property "Footprint" "" (id 2) (at 256.54 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 196.85 41.91 0)
+    (property "Datasheet" "" (id 3) (at 256.54 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c513f374-59d4-4d46-b644-4711b0b1ae96))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 196.85 27.94 0) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 256.54 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ea3d79e)
-    (property "Reference" "#PWR?" (id 0) (at 196.85 31.75 0)
+    (property "Reference" "#PWR?" (id 0) (at 256.54 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 197.231 23.5458 0))
-    (property "Footprint" "" (id 2) (at 196.85 27.94 0)
+    (property "Value" "+3.3V" (id 1) (at 256.921 38.7858 0))
+    (property "Footprint" "" (id 2) (at 256.54 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 196.85 27.94 0)
+    (property "Datasheet" "" (id 3) (at 256.54 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8ce4231a-086e-410a-a490-b0288ec6d7a1))
@@ -3969,61 +4334,61 @@
     (pin "2" (uuid 0fa9d8e0-f86b-467e-a658-735787770ec8))
   )
 
-  (symbol (lib_id "Device:R") (at 226.06 93.98 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 73.66 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005eb4f097)
-    (property "Reference" "R?" (id 0) (at 227.838 92.8116 0)
+    (property "Reference" "R?" (id 0) (at 75.438 22.9616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4k7" (id 1) (at 227.838 95.123 0)
+    (property "Value" "4k7" (id 1) (at 75.438 25.273 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 224.282 93.98 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 71.882 24.13 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 226.06 93.98 0)
+    (property "Datasheet" "~" (id 3) (at 73.66 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 226.06 93.98 0)
+    (property "Need_order" "" (id 4) (at 73.66 24.13 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 233.68 93.98 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 81.28 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005eb4f0a2)
-    (property "Reference" "R?" (id 0) (at 235.458 92.8116 0)
+    (property "Reference" "R?" (id 0) (at 83.058 22.9616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4k7" (id 1) (at 235.458 95.123 0)
+    (property "Value" "4k7" (id 1) (at 83.058 25.273 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 231.902 93.98 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 79.502 24.13 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 233.68 93.98 0)
+    (property "Datasheet" "~" (id 3) (at 81.28 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 233.68 93.98 0)
+    (property "Need_order" "" (id 4) (at 81.28 24.13 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 "power:+3.3V") (at 229.87 90.17 0) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 77.47 20.32 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005eb4f0ad)
-    (property "Reference" "#PWR?" (id 0) (at 229.87 93.98 0)
+    (property "Reference" "#PWR?" (id 0) (at 77.47 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 230.251 85.7758 0))
-    (property "Footprint" "" (id 2) (at 229.87 90.17 0)
+    (property "Value" "+3.3V" (id 1) (at 77.851 15.9258 0))
+    (property "Footprint" "" (id 2) (at 77.47 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 229.87 90.17 0)
+    (property "Datasheet" "" (id 3) (at 77.47 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ba2a14ba-0af3-4bee-b212-85958d2f2508))
@@ -4131,186 +4496,40 @@
     (pin "1" (uuid 4fbca443-4e18-4ded-9775-1a307b5ef03b))
   )
 
-  (symbol (lib_id "Device:R") (at 33.02 99.06 90) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 53.34 81.28 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef25f58)
-    (property "Reference" "R?" (id 0) (at 33.02 101.981 90))
-    (property "Value" "5k1" (id 1) (at 33.02 104.2924 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 33.02 100.838 90)
+    (property "Reference" "R?" (id 0) (at 53.34 74.93 90))
+    (property "Value" "5k1" (id 1) (at 53.34 77.47 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 53.34 83.058 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 33.02 99.06 0)
+    (property "Datasheet" "~" (id 3) (at 53.34 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 33.02 99.06 0)
+    (property "Need_order" "" (id 4) (at 53.34 81.28 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 "power:GND") (at 54.61 104.14 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef27a04)
-    (property "Reference" "#PWR?" (id 0) (at 54.61 110.49 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 54.737 108.5342 0))
-    (property "Footprint" "" (id 2) (at 54.61 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 54.61 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ede7045a-591c-44d7-b477-76b557990cef))
-  )
-
-  (symbol (lib_id "Device:R") (at 45.72 85.09 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef2815a)
-    (property "Reference" "R?" (id 0) (at 47.498 83.9216 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "5k1" (id 1) (at 47.498 86.233 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 47.498 85.09 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 45.72 85.09 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 45.72 85.09 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7c8f9579-7aac-48f7-b66c-d6431c0a4243))
-    (pin "2" (uuid 71fc6548-90f2-49b3-9b88-be24c2fa0611))
-  )
-
-  (symbol (lib_id "Device:R") (at 43.18 85.09 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef2894e)
-    (property "Reference" "R?" (id 0) (at 41.91 86.36 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "5k1" (id 1) (at 41.91 88.9 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 44.958 85.09 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 43.18 85.09 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 43.18 85.09 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 537ad05d-c320-4403-8022-1ded6cac1b23))
-    (pin "2" (uuid 391436f2-296b-4efe-a1f1-ecff69150f8d))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 44.45 73.66 0) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 91.44 69.85 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef2bf90)
-    (property "Reference" "#PWR?" (id 0) (at 44.45 77.47 0)
+    (property "Reference" "#PWR?" (id 0) (at 91.44 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 44.831 69.2658 0))
-    (property "Footprint" "" (id 2) (at 44.45 73.66 0)
+    (property "Value" "+3.3V" (id 1) (at 91.821 65.4558 0))
+    (property "Footprint" "" (id 2) (at 91.44 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 44.45 73.66 0)
+    (property "Datasheet" "" (id 3) (at 91.44 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid db133e5e-3ea2-4211-b4d6-474f750b55e8))
   )
 
-  (symbol (lib_id "Device:R") (at 49.53 93.98 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef2cc5e)
-    (property "Reference" "R?" (id 0) (at 49.53 88.7222 90))
-    (property "Value" "5k1" (id 1) (at 49.53 91.0336 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 49.53 95.758 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 49.53 93.98 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 49.53 93.98 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 9a607735-44a1-4187-91f5-04fd55a62006))
-    (pin "2" (uuid 06849207-00de-45c6-9c74-291ecff56d6c))
-  )
-
-  (symbol (lib_id "Device:R") (at 49.53 96.52 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef2d7d8)
-    (property "Reference" "R?" (id 0) (at 49.53 99.441 90))
-    (property "Value" "5k1" (id 1) (at 49.53 101.7524 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 49.53 94.742 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 49.53 96.52 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 49.53 96.52 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a1402d00-5f3b-4ecb-aa79-fa1bda45ea47))
-    (pin "2" (uuid b6695223-8dbd-4362-a9ac-b4377991a12a))
-  )
-
-  (symbol (lib_id "Device:C") (at 54.61 90.17 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef325cf)
-    (property "Reference" "C?" (id 0) (at 57.531 89.0016 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10nF" (id 1) (at 57.531 91.313 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 55.5752 93.98 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 54.61 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 54.61 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 54.61 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 80b766b4-4e67-4021-93fd-430d4026e864))
-    (pin "2" (uuid b27fbfca-98c7-4db7-aec9-f129072387c9))
-  )
-
-  (symbol (lib_id "Device:C") (at 54.61 100.33 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef32f46)
-    (property "Reference" "C?" (id 0) (at 57.531 99.1616 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10nF" (id 1) (at 57.531 101.473 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 55.5752 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 54.61 100.33 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 54.61 100.33 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 54.61 100.33 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 48506f31-24d2-459a-84b5-2cde043f3b1b))
-    (pin "2" (uuid a0963835-deea-41de-8aa1-391e933dcd93))
-  )
-
   (symbol (lib_id "Connector:6P6C") (at 36.83 138.43 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef3c6dd)
@@ -4397,37 +4616,23 @@
     (pin "2" (uuid 6494407c-4aa5-4b25-a7d2-1331e973b7e8))
   )
 
-  (symbol (lib_id "power:GND") (at 27.94 101.6 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef49e5c)
-    (property "Reference" "#PWR?" (id 0) (at 27.94 107.95 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 28.067 105.9942 0))
-    (property "Footprint" "" (id 2) (at 27.94 101.6 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 27.94 101.6 0)
+  (symbol (lib_id "mpb:CSTNE16M0V530000R0") (at 113.03 87.63 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 00000000-0000-0000-0000-00005ef516f7)
+    (property "Reference" "Y?" (id 0) (at 112.0267 81.28 90))
+    (property "Value" "CSTNE16M0V530000R0" (id 1) (at 111.76 93.5736 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 6411ea06-1b60-414c-8183-de7a36926cbb))
-  )
-
-  (symbol (lib_id "mpb:CSTNE16M0V530000R0") (at 90.17 87.63 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef516f7)
-    (property "Reference" "Y?" (id 0) (at 88.9 95.885 90))
-    (property "Value" "CSTNE16M0V530000R0" (id 1) (at 88.9 93.5736 90))
-    (property "Footprint" "Crystal:Resonator_SMD_muRata_CSTxExxV-3Pin_3.0x1.1mm" (id 2) (at 90.17 86.995 0)
+    (property "Footprint" "Crystal:Resonator_SMD_muRata_CSTxExxV-3Pin_3.0x1.1mm" (id 2) (at 113.03 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 90.17 86.995 0)
+    (property "Datasheet" "~" (id 3) (at 113.03 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 90.17 87.63 0)
+    (property "Need_order" "" (id 4) (at 113.03 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "CSTNE16M0V530000R0" (id 5) (at 90.17 87.63 0)
+    (property "MPN" "CSTNE16M0V530000R0" (id 5) (at 113.03 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9da07afe-3b9b-44c6-8580-6f2c222821ba))
@@ -4435,91 +4640,97 @@
     (pin "3" (uuid 79864d28-b105-4f22-8c4a-e43735f19144))
   )
 
-  (symbol (lib_id "power:GND") (at 85.09 87.63 270) (unit 1)
+  (symbol (lib_id "power:GND") (at 107.95 87.63 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef52dde)
-    (property "Reference" "#PWR?" (id 0) (at 78.74 87.63 0)
+    (property "Reference" "#PWR?" (id 0) (at 101.6 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 81.8388 87.757 90)
+    (property "Value" "GND" (id 1) (at 104.6988 87.757 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 85.09 87.63 0)
+    (property "Footprint" "" (id 2) (at 107.95 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 85.09 87.63 0)
+    (property "Datasheet" "" (id 3) (at 107.95 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6b85a150-049c-4c15-8e64-5e97b611a77c))
   )
 
-  (symbol (lib_id "Device:R") (at 97.79 87.63 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 120.65 87.63 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef57ec0)
-    (property "Reference" "R?" (id 0) (at 97.79 85.09 90))
-    (property "Value" "1M" (id 1) (at 97.79 82.55 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 97.79 89.408 90)
+    (property "Reference" "R?" (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_Pad1.05x0.95mm_HandSolder" (id 2) (at 120.65 89.408 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 97.79 87.63 0)
+    (property "Datasheet" "~" (id 3) (at 120.65 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 97.79 87.63 0)
+    (property "Need_order" "" (id 4) (at 120.65 87.63 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 152.4 166.37 0) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:LED") (at 115.57 132.08 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef8516c)
-    (property "Reference" "D?" (id 0) (at 152.2222 160.8836 0))
-    (property "Value" "STATUS" (id 1) (at 152.2222 163.195 0))
-    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 152.4 166.37 0)
+    (property "Reference" "D?" (id 0) (at 113.03 132.3974 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "STATUS" (id 1) (at 113.03 134.9374 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 115.57 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 152.4 166.37 0)
+    (property "Datasheet" "~" (id 3) (at 115.57 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 152.4 166.37 0)
+    (property "Need_order" "" (id 4) (at 115.57 132.08 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 160.02 166.37 270) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R") (at 115.57 124.46 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef88aaf)
-    (property "Reference" "R?" (id 0) (at 160.02 161.1122 90))
-    (property "Value" "510" (id 1) (at 160.02 163.4236 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 160.02 164.592 90)
+    (property "Reference" "R?" (id 0) (at 113.03 123.1899 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "510" (id 1) (at 113.03 125.7299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 113.792 124.46 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 160.02 166.37 0)
+    (property "Datasheet" "~" (id 3) (at 115.57 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 160.02 166.37 0)
+    (property "Need_order" "" (id 4) (at 115.57 124.46 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 "power:+3.3V") (at 163.83 166.37 270) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "power:+3.3V") (at 115.57 120.65 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005ef9cdf8)
-    (property "Reference" "#PWR?" (id 0) (at 160.02 166.37 0)
+    (property "Reference" "#PWR?" (id 0) (at 115.57 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 167.0812 166.751 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 163.83 166.37 0)
+    (property "Value" "+3.3V" (id 1) (at 115.57 115.57 0))
+    (property "Footprint" "" (id 2) (at 115.57 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 163.83 166.37 0)
+    (property "Datasheet" "" (id 3) (at 115.57 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 95f6c4f0-2131-4a77-85b2-ee8cc48ef165))
@@ -4612,6 +4823,24 @@
     (pin "2" (uuid d93659c4-a15b-4f47-8c3b-6170cbe4dcf4))
   )
 
+  (symbol (lib_id "power:GND") (at 34.29 83.82 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 089dcddd-a013-499d-91ab-3fd26b703eb2)
+    (property "Reference" "#PWR?" (id 0) (at 27.94 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 30.48 83.8201 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 34.29 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 34.29 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7f71deea-f1df-4a70-bd14-b0e00469fe53))
+  )
+
   (symbol (lib_id "power:GND") (at 74.93 166.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1211f94d-cbad-484a-97ed-4e3906e1c82c)
@@ -4630,6 +4859,43 @@
     (pin "1" (uuid 1f97d655-a5ab-4d46-9c12-925d1d6b490f))
   )
 
+  (symbol (lib_id "power:GND") (at 22.86 95.25 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 1663617a-c8c9-4e4f-8eef-c91cf75ebc62)
+    (property "Reference" "#PWR?" (id 0) (at 22.86 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 22.987 99.6442 0))
+    (property "Footprint" "" (id 2) (at 22.86 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 22.86 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 85b039ae-e834-4c3b-a9df-ed277886df5a))
+  )
+
+  (symbol (lib_id "Device:RotaryEncoder_Switch") (at 41.91 83.82 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 1dc4ed3a-469f-46e6-b7b1-2b1bf7df00d3)
+    (property "Reference" "SW?" (id 0) (at 41.91 73.66 0))
+    (property "Value" "PEC12R" (id 1) (at 41.91 76.2 0))
+    (property "Footprint" "" (id 2) (at 38.1 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 41.91 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "PEC12R-4022F-S0024 " (id 4) (at 41.91 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "A" (uuid eb05388f-2222-40d5-8f6d-cbfcb33eba66))
+    (pin "B" (uuid b7e38ce0-062d-4656-9843-1d99da99b2b8))
+    (pin "C" (uuid 38034fc1-cc77-4133-aaff-71eb7fdd28c4))
+    (pin "S1" (uuid 951aca20-6622-4984-acde-c988d51b6de1))
+    (pin "S2" (uuid 9c501498-4c39-4c48-9e86-bd08043c35c5))
+  )
+
   (symbol (lib_id "power:GND") (at 53.34 194.31 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2095829c-4a54-4f66-a46b-f695ceb3dca7)
@@ -4648,6 +4914,55 @@
     (pin "1" (uuid 7c9fa03f-766d-4f52-8201-9347a23cfc7b))
   )
 
+  (symbol (lib_id "Display_Character:WC1602A") (at 29.21 40.64 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 25535967-585a-4c92-a642-e1561208c1e0)
+    (property "Reference" "DS?" (id 0) (at 31.2294 17.78 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "WC1602A" (id 1) (at 31.2294 20.32 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Display:WC1602A" (id 2) (at 29.21 63.5 0)
+      (effects (font (size 1.27 1.27) italic) hide)
+    )
+    (property "Datasheet" "http://www.wincomlcd.com/pdf/WC1602A-SFYLYHTC06.pdf" (id 3) (at 46.99 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4e3f9f36-bf45-469b-b43e-a871373071ca))
+    (pin "10" (uuid 2d5bfb49-c585-41d5-8d72-dbe5efd4a3d2))
+    (pin "11" (uuid 999568b7-8074-42df-804e-1325308fd927))
+    (pin "12" (uuid 7a7933b2-5560-47ac-ae95-f3314f015c68))
+    (pin "13" (uuid 6bb75bdb-c3e9-42a2-916f-e8079e633adf))
+    (pin "14" (uuid 7574df2d-6c66-407f-a03b-a6c183688a05))
+    (pin "15" (uuid 40168534-9e4e-4b8b-affd-e490fffb4a8f))
+    (pin "16" (uuid e517c5e0-cfcb-4d19-8969-fdf3efcdfc83))
+    (pin "2" (uuid b5533edf-ec01-4588-a852-843fb14ee7d0))
+    (pin "3" (uuid fdfb6d9f-166a-4739-b240-32a9644474f3))
+    (pin "4" (uuid 325a93ed-858f-4529-a735-c649534326b3))
+    (pin "5" (uuid a48a64fe-ced7-4860-acbd-a50122e7f407))
+    (pin "6" (uuid c90cbe15-4776-4fb2-9b78-d92d4d8893a2))
+    (pin "7" (uuid eec13666-eabc-411f-808d-010677dbb9e1))
+    (pin "8" (uuid d6dc5d1c-85a0-477f-b9ae-59bd0e24918b))
+    (pin "9" (uuid f284f9fc-39f6-4644-8e1f-a18501cdb9dc))
+  )
+
+  (symbol (lib_id "power:GND") (at 22.86 73.66 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 2b057edf-a332-48c7-b51f-7163d9a1e192)
+    (property "Reference" "#PWR?" (id 0) (at 22.86 67.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 22.987 69.2658 0))
+    (property "Footprint" "" (id 2) (at 22.86 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 22.86 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2ada9296-b11b-4665-9b07-129bbe77229d))
+  )
+
   (symbol (lib_id "Device:C") (at 60.96 149.86 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2b093791-02c0-46bf-a557-6593142f2ea6)
@@ -4722,6 +5037,47 @@
     (pin "2" (uuid 45d7b931-6a8e-493c-b879-d8893a361b82))
   )
 
+  (symbol (lib_id "Device:C") (at 22.86 91.44 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 3589a633-8b93-431a-86e6-ecd7ec5d5112)
+    (property "Reference" "C?" (id 0) (at 25.781 90.2716 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10nF" (id 1) (at 25.781 92.583 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 23.8252 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 22.86 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 22.86 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 22.86 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 32ccc585-973e-47c1-aa1c-c7ac2984e937))
+    (pin "2" (uuid 6800762a-b76d-4620-9d89-91baec712926))
+  )
+
+  (symbol (lib_id "power:+3.3V") (at 34.29 68.58 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 39e34b2f-3466-4e25-a0f6-f6e19b2fb2bd)
+    (property "Reference" "#PWR?" (id 0) (at 34.29 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 33.909 64.1858 0))
+    (property "Footprint" "" (id 2) (at 34.29 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 34.29 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c7e36ef3-a590-4e5a-8c60-4eed5ed8d6a9))
+  )
+
   (symbol (lib_id "Device:R") (at 63.5 161.29 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3a6f2379-28e7-4737-a8e7-34dc79ea3973)
@@ -4784,6 +5140,77 @@
     (pin "1" (uuid e20ae59e-6d3a-42f6-979e-aee19a4ca64c))
   )
 
+  (symbol (lib_id "Switch:SW_Push") (at 74.93 72.39 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 4f29056f-ff34-463b-99a8-cf6a60f13465)
+    (property "Reference" "SW?" (id 0) (at 74.93 64.77 0))
+    (property "Value" "A" (id 1) (at 74.93 67.31 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 74.93 67.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 74.93 67.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "FSM8JH" (id 4) (at 74.93 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5081bdb1-fce5-4c03-9fc9-daddf00bbce4))
+    (pin "2" (uuid e5a4398e-1af1-4ba8-9378-0ffc9cbba611))
+  )
+
+  (symbol (lib_id "Device:C") (at 22.86 77.47 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 4f565875-cda7-4964-8f58-a348359b9862)
+    (property "Reference" "C?" (id 0) (at 26.67 76.1999 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "10nF" (id 1) (at 26.67 78.7399 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 21.8948 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 22.86 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at 22.86 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 22.86 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 428bee30-a330-4714-b791-2aeebf0a6bd7))
+    (pin "2" (uuid e081ddd6-6b44-455a-a12f-63491d0603eb))
+  )
+
+  (symbol (lib_id "Connector_Generic:Conn_01x05") (at 44.45 29.21 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 506a0b7c-538b-4f2d-a836-39eb1e6b72ed)
+    (property "Reference" "J?" (id 0) (at 42.4434 31.75 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Adafruit 292" (id 1) (at 50.8 38.1 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x05_P2.54mm_Vertical" (id 2) (at 44.45 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 44.45 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 44.45 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 5) (at 44.45 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 6b50f10c-27a6-43ac-b1c6-32f32208c5f7))
+    (pin "2" (uuid 977aa5bc-fcdd-4523-b94d-236c34c0ae7b))
+    (pin "3" (uuid 3bff4eaf-c05d-4b62-b2ac-bb6b5383f582))
+    (pin "4" (uuid e5b1d4b0-e53e-4dc4-898f-c2b6e2b59a50))
+    (pin "5" (uuid c05f4a6a-abfc-42f3-9e64-1b295fa618ff))
+  )
+
   (symbol (lib_id "Device:Ferrite_Bead") (at 64.77 194.31 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 558d2cd0-785b-4cc2-9356-927403f57ab9)
@@ -4835,6 +5262,24 @@
     (pin "2" (uuid 4311d211-1c92-420a-8eff-6bd635d7be4e))
   )
 
+  (symbol (lib_id "Switch:SW_Push") (at 74.93 102.87 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 619c50d2-759c-4636-a95c-320e5ecef500)
+    (property "Reference" "SW?" (id 0) (at 74.93 95.25 0))
+    (property "Value" "D" (id 1) (at 74.93 97.79 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 74.93 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 74.93 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "FSM8JH" (id 4) (at 74.93 102.87 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ad4206cf-4e17-4678-b932-d7858818310b))
+    (pin "2" (uuid 59d4b91e-2e1c-4aed-b61d-1966d7eef639))
+  )
+
   (symbol (lib_id "Device:Ferrite_Bead") (at 55.88 171.45 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6550e793-631b-48e6-84a7-fb5c809fdef3)
@@ -4858,6 +5303,28 @@
     (pin "2" (uuid 93c4c050-d373-4117-911d-7d3cab9af35f))
   )
 
+  (symbol (lib_id "Device:R") (at 34.29 95.25 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 6c134fa6-bcec-4b3b-81d3-1230b3ae8558)
+    (property "Reference" "R?" (id 0) (at 35.56 93.98 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "5k1" (id 1) (at 35.56 91.44 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 32.512 95.25 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 34.29 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 34.29 95.25 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:Ferrite_Bead") (at 39.37 176.53 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6fd5a420-2fd9-46e7-b383-2e6213985228)
@@ -4881,6 +5348,60 @@
     (pin "2" (uuid c844cd40-45ca-4a7d-a124-240672186065))
   )
 
+  (symbol (lib_id "Device:R") (at 30.48 86.36 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 767b0790-f937-47ca-a0ce-b7c87f7096d0)
+    (property "Reference" "R?" (id 0) (at 31.75 88.9 90))
+    (property "Value" "5k1" (id 1) (at 30.48 86.36 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 30.48 88.138 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 30.48 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 30.48 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 6b68e610-85ea-439a-91ee-e0d9f2875008))
+    (pin "2" (uuid 063987b5-d885-4669-8cdc-b26d5408f63d))
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 74.93 82.55 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7db10864-3ee4-4c1e-ac73-47ca151ae30e)
+    (property "Reference" "SW?" (id 0) (at 74.93 74.93 0))
+    (property "Value" "B" (id 1) (at 74.93 77.47 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 74.93 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 74.93 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "FSM8JH" (id 4) (at 74.93 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a0379bf2-25de-4a0c-9bfe-a22282bcef07))
+    (pin "2" (uuid 23ccad53-43ae-460a-af07-a99bc016b6c4))
+  )
+
+  (symbol (lib_id "power:GND") (at 49.53 86.36 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 85444b88-8b95-493e-b685-624b3cab185d)
+    (property "Reference" "#PWR?" (id 0) (at 55.88 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 53.34 86.3599 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 49.53 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 49.53 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4462b4d5-8a8a-4690-a98c-9de28d4cd161))
+  )
+
   (symbol (lib_id "power:GND") (at 48.26 118.11 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8760b43f-eb45-4ac6-a7b1-63d847f10a11)
@@ -4920,6 +5441,62 @@
     (pin "2" (uuid 4c0fd16a-2a4f-4765-bfc7-201b2484e693))
   )
 
+  (symbol (lib_id "power:GND") (at 62.23 34.29 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 8ec857ce-314d-4788-a607-34a5d772b84f)
+    (property "Reference" "#PWR?" (id 0) (at 62.23 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 62.2301 38.1 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 62.23 34.29 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 62.23 34.29 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1e05e879-4287-47ea-bf7a-7933081cd69a))
+  )
+
+  (symbol (lib_id "Switch:SW_SPDT") (at -25.4 40.64 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9dc37d33-17cd-443c-8e0e-89397f54d8f6)
+    (property "Reference" "SW?" (id 0) (at -21.717 39.8053 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "SW_SPDT" (id 1) (at -21.717 42.3422 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Button_Switch_SMD:SW_SPDT_PCM12" (id 2) (at -25.4 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at -25.4 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5b08e10f-9853-48de-9a13-13fefea2bd96))
+    (pin "2" (uuid 87a70d28-df4e-4a5f-b369-793048518614))
+    (pin "3" (uuid bc0f3f3e-30cb-44e4-bae1-ad6fbd74e3a7))
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 74.93 92.71 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9f8dc7f7-9572-4f76-ad8f-a55a40a629c0)
+    (property "Reference" "SW?" (id 0) (at 74.93 85.09 0))
+    (property "Value" "C" (id 1) (at 74.93 87.63 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 74.93 87.63 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 74.93 87.63 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "FSM8JH" (id 4) (at 74.93 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ae7b029c-0eaa-45c4-afde-c08836a92fda))
+    (pin "2" (uuid 594d665a-0810-4b13-a27a-04204b7e61f0))
+  )
+
   (symbol (lib_id "Device:C") (at 53.34 118.11 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a164cd11-f000-430f-a28b-6641e65b3ca7)
@@ -4990,6 +5567,28 @@
     (pin "2" (uuid 8213f660-3135-44df-a468-8714c235ec07))
   )
 
+  (symbol (lib_id "Device:R") (at 34.29 72.39 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c8a1188e-e876-4d3c-9e6d-950085a29bad)
+    (property "Reference" "R?" (id 0) (at 32.512 71.2216 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "5k1" (id 1) (at 32.512 73.533 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 32.512 72.39 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 34.29 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 34.29 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid de2aa812-6cf0-440e-baa8-98679cac96da))
+    (pin "2" (uuid 5133f860-356c-40f3-b607-7486346ecb6b))
+  )
+
   (symbol (lib_id "Device:C") (at 57.15 194.31 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cc41edbb-be81-4375-a555-6cc1918bc3d5)
@@ -5032,6 +5631,79 @@
     (pin "1" (uuid 92d1c498-221a-4636-885f-eb0d77940378))
   )
 
+  (symbol (lib_id "Jumper:SolderJumper_2_Open") (at -39.37 38.1 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid cefe46b5-8172-4995-acfc-61582814bb65)
+    (property "Reference" "JP?" (id 0) (at -37.719 38.5338 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "SolderJumper_2_Open" (id 1) (at -41.0209 39.8022 90)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" (id 2) (at -39.37 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at -39.37 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b5fc297e-3ad5-487d-94e0-b10d011cc711))
+    (pin "2" (uuid 66b25fb2-2be4-41ba-ba70-ef4b7fd294e5))
+  )
+
+  (symbol (lib_id "Device:R") (at 87.63 92.71 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid cf978728-d91d-4c17-a0e4-44d8282018da)
+    (property "Reference" "R?" (id 0) (at 87.63 95.631 90))
+    (property "Value" "5k1" (id 1) (at 87.63 97.9424 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 87.63 94.488 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 87.63 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 87.63 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e8e04eb3-686f-4701-a8c7-ef4bddff97ec))
+    (pin "2" (uuid cb9aa452-9646-4b91-9e88-385a8c068c58))
+  )
+
+  (symbol (lib_id "power:GND") (at 69.85 102.87 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid d26ca59e-2a5b-46c3-8720-581fe33c0968)
+    (property "Reference" "#PWR?" (id 0) (at 69.85 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 69.8501 106.68 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 69.85 102.87 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 69.85 102.87 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8524ee7d-4a2c-4a96-aae0-b4fb7560847a))
+  )
+
+  (symbol (lib_id "power:+3.3V") (at 34.29 99.06 180) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid d644dea4-af03-470e-a4f7-febe6a12f232)
+    (property "Reference" "#PWR?" (id 0) (at 34.29 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 31.75 102.87 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 34.29 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 34.29 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid eb1cd744-a17a-4035-9b5e-4437265c797f))
+  )
+
   (symbol (lib_id "power:GND") (at 60.96 153.67 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid dfa1a545-7068-432f-945a-840b274ad1fc)
@@ -5072,6 +5744,42 @@
     (pin "TN" (uuid f790fc32-86b9-4f1e-998f-ba7a64b6f0eb))
   )
 
+  (symbol (lib_id "Device:R") (at 87.63 82.55 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid edc5349b-e805-4477-845b-10e62fa3946a)
+    (property "Reference" "R?" (id 0) (at 87.63 85.471 90))
+    (property "Value" "5k1" (id 1) (at 87.63 87.7824 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 87.63 84.328 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 87.63 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 87.63 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d0b35db3-4b74-4918-8c61-357755ac0ecf))
+    (pin "2" (uuid c2a52326-b5b3-4308-a25b-3f5d672337a7))
+  )
+
+  (symbol (lib_id "Device:R") (at 30.48 81.28 270) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid f274aaf7-f368-439a-bc64-9d604f8c4329)
+    (property "Reference" "R?" (id 0) (at 31.75 78.74 90))
+    (property "Value" "5k1" (id 1) (at 30.48 81.28 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 30.48 83.058 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 30.48 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 30.48 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1de92ba0-8564-4289-a169-59f70825a42c))
+    (pin "2" (uuid ffdb836e-baea-49ff-852f-8d50d4c3d1a7))
+  )
+
   (symbol (lib_id "Device:R") (at 60.96 184.15 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb9b2725-d30e-49f7-a32a-886f6d91f5f8)
diff --git a/kicad-dart-70/kicad-dart-70.kicad_sch b/kicad-dart-70/kicad-dart-70.kicad_sch
index d9a634f..93fe6be 100644
--- a/kicad-dart-70/kicad-dart-70.kicad_sch
+++ b/kicad-dart-70/kicad-dart-70.kicad_sch
@@ -3797,12 +3797,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e53c532"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e5452ea"
-      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e566926"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/00000000-0000-0000-0000-00005e5ccb3b"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -3953,9 +3947,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef1fe09"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef27a04"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef2bf90"
       (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
     )
@@ -3965,9 +3956,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef3fc0a"
       (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef49e5c"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef52dde"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
@@ -4043,6 +4031,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/07c2e9bf-59dc-4b5e-8bb9-12cc7ab70cd3"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/089dcddd-a013-499d-91ab-3fd26b703eb2"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/0a66f684-42c8-4454-8b00-30b8c4ea5d56"
       (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
     )
@@ -4064,6 +4055,9 @@
     (path "/15141d00-2169-455b-946f-57f60b1f9d23"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/1663617a-c8c9-4e4f-8eef-c91cf75ebc62"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/185efd6b-f96f-4eeb-a457-2c5727f22e1b"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4094,6 +4088,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/2a48f53c-3809-4098-9337-9f6dd17da892"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/2b057edf-a332-48c7-b51f-7163d9a1e192"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/2d64fde1-91e4-4312-bfa7-32529b11feaa"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4109,6 +4106,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/380e4a08-535f-4ff1-80aa-03c1c1ab6868"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/39e34b2f-3466-4e25-a0f6-f6e19b2fb2bd"
+      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/3e0f02ae-18a4-4d00-86b1-04933f57d0f1"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4196,6 +4196,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/7e2103d9-af7c-4f98-9141-746addee95a7"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/85444b88-8b95-493e-b685-624b3cab185d"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/85bb27d5-4889-40d9-977f-794a0760e599"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4226,6 +4229,9 @@
     (path "/8e0c01ec-d64c-429b-93e5-878cb33c117d"
       (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/8ec857ce-314d-4788-a607-34a5d772b84f"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/942acf4b-8a96-4c46-ac34-0486d093be57"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4337,12 +4343,18 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/cdae1967-cfbb-43d1-860b-9d58cdcfd99f"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/d26ca59e-2a5b-46c3-8720-581fe33c0968"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/d4945a82-a7fe-4d4d-9d20-acb8b3935d7d"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
     (path "/d563f9fe-7347-41ac-ae29-d6a80db66659"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/d644dea4-af03-470e-a4f7-febe6a12f232"
+      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
+    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/dfa1a545-7068-432f-945a-840b274ad1fc"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
@@ -4613,12 +4625,6 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/00000000-0000-0000-0000-00005ee5f57b"
       (reference "C?") (unit 1) (value "DNF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef325cf"
-      (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef32f46"
-      (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef45d74"
       (reference "C?") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -4724,6 +4730,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/351f1262-661f-4576-928d-3fa2a3442b5f"
       (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/3589a633-8b93-431a-86e6-ecd7ec5d5112"
+      (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
     (path "/35f82547-5ee1-4384-9d87-cf5e2a8d5d62"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -4745,6 +4754,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/4e6fc76b-450c-4792-9a36-cac0f875f94a"
       (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/4f565875-cda7-4964-8f58-a348359b9862"
+      (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
     (path "/4f85864b-dffa-48c5-a3ea-03c083def1f8"
       (reference "C?") (unit 1) (value "22uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
     )
@@ -4976,6 +4988,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/ff685770-fb1b-4e72-b8d3-5b5f54435f89"
       (reference "D?") (unit 1) (value "1N4148W") (footprint "Diode_SMD:D_SOD-123F")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/25535967-585a-4c92-a642-e1561208c1e0"
+      (reference "DS?") (unit 1) (value "WC1602A") (footprint "Display:WC1602A")
+    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e5709c5"
       (reference "FB?") (unit 1) (value "BLM18BB221SN1D") (footprint "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -4997,9 +5012,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/6fd5a420-2fd9-46e7-b383-2e6213985228"
       (reference "FB?") (unit 1) (value "BLM18BB221SN1D") (footprint "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e523241"
-      (reference "J?") (unit 1) (value "UI") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x12_P2.54mm_Vertical")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e89c9a4"
       (reference "J?") (unit 1) (value "CW_TONE") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
     )
@@ -5033,6 +5045,9 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef3c6dd"
       (reference "J?") (unit 1) (value "MIC") (footprint "picardy:RJ25_WE_615006138421")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/506a0b7c-538b-4f2d-a836-39eb1e6b72ed"
+      (reference "J?") (unit 1) (value "Adafruit 292") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x05_P2.54mm_Vertical")
+    )
     (path "/677314cf-085c-44b6-bb48-31621b837e1c"
       (reference "J?") (unit 1) (value "12V") (footprint "")
     )
@@ -5060,6 +5075,9 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/ba9f1805-1284-45fe-a19c-34c69217696e"
       (reference "JP?") (unit 1) (value "ENA 5V") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/cefe46b5-8172-4995-acfc-61582814bb65"
+      (reference "JP?") (unit 1) (value "SolderJumper_2_Open") (footprint "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm")
+    )
     (path "/3c35e8c1-44a3-4695-8d74-5e45cb8dd1ff"
       (reference "K?") (unit 1) (value "G6K-2F-RF-3V") (footprint "Relay_SMD:Relay_DPDT_Omron_G6K-2F")
     )
@@ -5438,18 +5456,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef25f58"
       (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef2815a"
-      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef2894e"
-      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef2cc5e"
-      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
-    )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef2d7d8"
-      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
-    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef57ec0"
       (reference "R?") (unit 1) (value "1M") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5546,6 +5552,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/27482926-3ce9-4b9b-9f3d-814d2d49c051"
       (reference "R?") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/2822c65d-a563-4cca-aba1-54c19d2e5b41"
+      (reference "R?") (unit 1) (value "TBD") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/2c4d679d-68ef-46f3-b0bc-ef543fc52489"
       (reference "R?") (unit 1) (value "DNF") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5609,6 +5618,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/6ad962bf-6e3d-4813-b3dc-438628adaefa"
       (reference "R?") (unit 1) (value "100") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/6c134fa6-bcec-4b3b-81d3-1230b3ae8558"
+      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/6e1d6d12-33c4-4425-b777-e6be89c751b6"
       (reference "R?") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5618,6 +5630,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/75737e8b-3d97-41ce-b2a5-970d0cedc2f1"
       (reference "R?") (unit 1) (value "3.3k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/767b0790-f937-47ca-a0ce-b7c87f7096d0"
+      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/7680a135-d673-42e2-8e36-1642fa43eb67"
       (reference "R?") (unit 1) (value "3.3k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5729,9 +5744,15 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c767f483-3e93-47f9-b5ad-2a18baed1af5"
       (reference "R?") (unit 1) (value "22") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/c8a1188e-e876-4d3c-9e6d-950085a29bad"
+      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c9dd5951-2a7b-4a0f-bd40-bf21c1ffc44f"
       (reference "R?") (unit 1) (value "100") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/cf978728-d91d-4c17-a0e4-44d8282018da"
+      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/d048f85a-e298-40d5-b96d-4dc1c1a1815f"
       (reference "R?") (unit 1) (value "DNF") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5765,6 +5786,12 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/ec5214c1-0ae2-42b3-8bc8-6fa8ab10fe5e"
       (reference "R?") (unit 1) (value "47") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/edc5349b-e805-4477-845b-10e62fa3946a"
+      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/f274aaf7-f368-439a-bc64-9d604f8c4329"
+      (reference "R?") (unit 1) (value "5k1") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f63827cb-d41f-4b76-9829-720cb70fe748"
       (reference "R?") (unit 1) (value "680") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5795,6 +5822,24 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e897d70"
       (reference "RV?") (unit 1) (value "500") (footprint "Potentiometer_SMD:Potentiometer_Bourns_3214W_Vertical")
     )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/1dc4ed3a-469f-46e6-b7b1-2b1bf7df00d3"
+      (reference "SW?") (unit 1) (value "PEC12R") (footprint "")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/4f29056f-ff34-463b-99a8-cf6a60f13465"
+      (reference "SW?") (unit 1) (value "A") (footprint "Button_Switch_THT:SW_PUSH_6mm")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/619c50d2-759c-4636-a95c-320e5ecef500"
+      (reference "SW?") (unit 1) (value "D") (footprint "Button_Switch_THT:SW_PUSH_6mm")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/7db10864-3ee4-4c1e-ac73-47ca151ae30e"
+      (reference "SW?") (unit 1) (value "B") (footprint "Button_Switch_THT:SW_PUSH_6mm")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/9dc37d33-17cd-443c-8e0e-89397f54d8f6"
+      (reference "SW?") (unit 1) (value "SW_SPDT") (footprint "Button_Switch_SMD:SW_SPDT_PCM12")
+    )
+    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/9f8dc7f7-9572-4f76-ad8f-a55a40a629c0"
+      (reference "SW?") (unit 1) (value "C") (footprint "Button_Switch_THT:SW_PUSH_6mm")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/168ee993-6a85-48af-b8f8-0d87ada9138a"
       (reference "T?") (unit 1) (value "10t tri, 43, or MABA-009488") (footprint "")
     )