From c9502c5f08ceb414693ab3b6920c43c377cfeb40 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 23 Jan 2023 17:56:17 +0100
Subject: Add connectors for FE, PA and Control

---
 kicad-dart-70/control.kicad_sch | 1918 +++++++--------------------------------
 1 file changed, 326 insertions(+), 1592 deletions(-)

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

diff --git a/kicad-dart-70/control.kicad_sch b/kicad-dart-70/control.kicad_sch
index a28b027..975a63d 100644
--- a/kicad-dart-70/control.kicad_sch
+++ b/kicad-dart-70/control.kicad_sch
@@ -13,133 +13,39 @@
   )
 
   (lib_symbols
-    (symbol "Connector:6P6C" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at -5.08 11.43 0)
-        (effects (font (size 1.27 1.27)) (justify right))
+    (symbol "Connector:TestPoint" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "6P6C" (id 1) (at 2.54 11.43 0)
-        (effects (font (size 1.27 1.27)) (justify left))
+      (property "Value" "TestPoint" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0.635 90)
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0.635 90)
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "6P6C RJ female connector" (id 4) (at 0 0 0)
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "RJ connector, 6P6C (6 positions 6 connected), RJ12/RJ18/RJ25" (id 5) (at 0 0 0)
+      (property "ki_description" "test point" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "6P6C* RJ12* RJ18* RJ25*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "6P6C_0_1"
-        (polyline
-          (pts
-            (xy -6.35 -1.905)
-            (xy -5.08 -1.905)
-            (xy -5.08 -1.905)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 -0.635)
-            (xy -5.08 -0.635)
-            (xy -5.08 -0.635)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 0.635)
-            (xy -5.08 0.635)
-            (xy -5.08 0.635)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 1.905)
-            (xy -5.08 1.905)
-            (xy -5.08 1.905)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 3.175)
-            (xy -5.08 3.175)
-            (xy -5.08 3.175)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -5.08 4.445)
-            (xy -6.35 4.445)
-            (xy -6.35 4.445)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 -4.445)
-            (xy -6.35 6.985)
-            (xy 3.81 6.985)
-            (xy 3.81 4.445)
-            (xy 5.08 4.445)
-            (xy 5.08 3.175)
-            (xy 6.35 3.175)
-            (xy 6.35 -0.635)
-            (xy 5.08 -0.635)
-            (xy 5.08 -1.905)
-            (xy 3.81 -1.905)
-            (xy 3.81 -4.445)
-            (xy -6.35 -4.445)
-            (xy -6.35 -4.445)
-          )
+      (symbol "TestPoint_0_1"
+        (circle (center 0 3.302) (radius 0.762)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (rectangle (start 7.62 10.16) (end -7.62 -7.62)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
       )
-      (symbol "6P6C_1_1"
-        (pin passive line (at 10.16 -5.08 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
+      (symbol "TestPoint_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 10.16 -2.54 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 0 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 2.54 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 5.08 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 7.62 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "Connector:USB_B_Micro" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
@@ -1194,73 +1100,6 @@
         )
       )
     )
-    (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))
@@ -1484,196 +1323,101 @@
         )
       )
     )
-    (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)
+    (symbol "Regulator_Linear:LD1117S33TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "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 "Value" "LD1117S33TR_SOT223" (id 1) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "ki_description" "Push button switch, generic, two pins" (id 5) (at 0 0 0)
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (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)
+      (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 2.54 -6.35 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "ki_keywords" "REGULATOR LDO 3.3V" (id 4) (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)
+      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT-223" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Switch, single pole double throw" (id 5) (at 0 0 0)
+      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (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 "LD1117S33TR_SOT223_0_1"
+        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
         )
       )
-      (symbol "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))))
+      (symbol "LD1117S33TR_SOT223_1_1"
+        (pin power_in line (at 0 -7.62 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "B" (effects (font (size 1.27 1.27))))
+        (pin power_out line (at 7.62 0 180) (length 2.54)
+          (name "VO" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 5.08 -2.54 180) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
+        (pin power_in line (at -7.62 0 0) (length 2.54)
+          (name "VI" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
       )
     )
-    (symbol "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))
-      )
-      (property "Value" "MMBT3904" (id 1) (at 5.08 0 0)
+    (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 "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 5.08 -1.905 0)
-        (effects (font (size 1.27 1.27) italic) (justify left) hide)
+      (property "Value" "SW_Push" (id 1) (at 0 -1.524 0)
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left) hide)
+      (property "Footprint" "" (id 2) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "NPN Transistor" (id 4) (at 0 0 0)
+      (property "Datasheet" "~" (id 3) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, SOT-23" (id 5) (at 0 0 0)
+      (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_fp_filters" "SOT?23*" (id 6) (at 0 0 0)
+      (property "ki_description" "Push button switch, generic, two pins" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "MMBT3904_0_1"
-        (polyline
-          (pts
-            (xy 0.635 0.635)
-            (xy 2.54 2.54)
-          )
+      (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.635 -0.635)
-            (xy 2.54 -2.54)
-            (xy 2.54 -2.54)
+            (xy 0 1.27)
+            (xy 0 3.048)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 0.635 1.905)
-            (xy 0.635 -1.905)
-            (xy 0.635 -1.905)
+            (xy 2.54 1.27)
+            (xy -2.54 1.27)
           )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 1.27 -1.778)
-            (xy 1.778 -1.27)
-            (xy 2.286 -2.286)
-            (xy 1.27 -1.778)
-            (xy 1.27 -1.778)
-          )
+        (circle (center 2.032 0) (radius 0.508)
           (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (circle (center 1.27 0) (radius 2.8194)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-      )
-      (symbol "MMBT3904_1_1"
-        (pin input line (at -5.08 0 0) (length 5.715)
-          (name "B" (effects (font (size 1.27 1.27))))
+        (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 2.54 -5.08 90) (length 2.54)
-          (name "E" (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))))
         )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "mpb:CSTNE16M0V530000R0" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
@@ -1821,267 +1565,46 @@
         )
       )
     )
-    (symbol "mpb:CUI-SJ-3524-SMT-TR" (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 8.89 0)
-        (effects (font (size 1.27 1.27)))
+    (symbol "power:+3.3V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
+        (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "CUI-SJ-3524-SMT-TR" (id 1) (at 0 6.35 0)
+      (property "Value" "+3.3V" (id 1) (at 0 3.556 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "Connector_Audio:Jack_3.5mm_CUI_SJ-3524-SMT_Horizontal" (id 2) (at -6.35 -2.54 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "https://www.mouser.ch/datasheet/2/670/sj-352x-smt_series-1313220.pdf" (id 3) (at -36.83 13.97 0)
+      (property "Footprint" "" (id 2) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "audio jack receptacle stereo headphones phones TRS connector" (id 4) (at 0 0 0)
+      (property "Datasheet" "" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Audio Jack, 3 Poles (Stereo / TRS), Switched tip" (id 5) (at 0 0 0)
+      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "*SJ-3524*" (id 6) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "CUI-SJ-3524-SMT-TR_0_1"
-        (rectangle (start -5.08 -5.08) (end -6.35 -7.62)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
+      (symbol "+3.3V_0_1"
         (polyline
           (pts
-            (xy 1.778 -5.334)
-            (xy 2.032 -5.842)
+            (xy -0.762 1.27)
+            (xy 0 2.54)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 0 -5.08)
-            (xy 0.635 -5.715)
-            (xy 1.27 -5.08)
-            (xy 2.54 -5.08)
+            (xy 0 0)
+            (xy 0 2.54)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 2.54 -7.62)
-            (xy 1.778 -7.62)
-            (xy 1.778 -5.334)
-            (xy 1.524 -5.842)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.905 -5.08)
-            (xy -1.27 -5.715)
-            (xy -0.635 -5.08)
-            (xy -0.635 0)
-            (xy 2.54 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 2.54)
-            (xy -2.54 2.54)
-            (xy -2.54 -5.08)
-            (xy -3.175 -5.715)
-            (xy -3.81 -5.08)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 2.54 3.81) (end -5.08 -10.16)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-      )
-      (symbol "CUI-SJ-3524-SMT-TR_1_1"
-        (pin passive line (at 5.08 0 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "R" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 2.54 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "S" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 -5.08 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "T" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 -7.62 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "TN" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "mpb:CUI-SJ-43515TS-SMT" (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 8.89 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "CUI-SJ-43515TS-SMT" (id 1) (at 0 6.35 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "mpb:Jack_3.5mm_CUI_SJ-43515TS-SMT" (id 2) (at -5.08 -13.97 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "https://www.mouser.ch/datasheet/2/670/sj_4351x_smt-1779337.pdf" (id 3) (at -2.54 -1.27 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "audio jack receptacle stereo headphones phones TRS connector" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Audio Jack, 4 Poles (Stereo / TRS), Switched tip" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "*SJ-3524*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "CUI-SJ-43515TS-SMT_0_1"
-        (rectangle (start -5.08 -5.08) (end -6.35 -7.62)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -5.08 5.08) (end 5.08 -8.89)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-        (polyline
-          (pts
-            (xy 4.318 -5.334)
-            (xy 4.572 -5.842)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 -5.08)
-            (xy 3.175 -5.715)
-            (xy 3.81 -5.08)
-            (xy 5.08 -5.08)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 5.08 -7.62)
-            (xy 4.318 -7.62)
-            (xy 4.318 -5.334)
-            (xy 4.064 -5.842)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.905 -5.08)
-            (xy -1.27 -5.715)
-            (xy -0.635 -5.08)
-            (xy -0.635 0)
-            (xy 5.08 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 -5.08)
-            (xy 0.635 -5.715)
-            (xy 1.27 -5.08)
-            (xy 1.27 -2.54)
-            (xy 5.08 -2.54)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 5.08 2.54)
-            (xy -2.54 2.54)
-            (xy -2.54 -5.08)
-            (xy -3.175 -5.715)
-            (xy -3.81 -5.08)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "CUI-SJ-43515TS-SMT_1_1"
-        (pin no_connect line (at -7.62 2.54 0) (length 2.54) hide
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "NC" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 0 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "R1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 -2.54 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "R2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 2.54 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "S" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 -5.08 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "T" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 -7.62 180) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "TN" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "power:+3.3V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Value" "+3.3V" (id 1) (at 0 3.556 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "+3.3V_0_1"
-        (polyline
-          (pts
-            (xy -0.762 1.27)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 0)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 2.54)
-            (xy 0.762 1.27)
+            (xy 0 2.54)
+            (xy 0.762 1.27)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
@@ -2139,16 +1662,16 @@
   (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 223.52 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 2a891096-042c-4004-b161-8bd2c0b59fd7)
   )
+  (junction (at 102.87 24.13) (diameter 0) (color 0 0 0 0)
+    (uuid 365db125-0d05-4a3b-80f5-776f84224f16)
+  )
   (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)
+  (junction (at 20.32 139.7) (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)
@@ -2160,9 +1683,6 @@
   (junction (at 130.81 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 463e71c6-e035-4ed0-9a41-c3c9633f2c78)
   )
-  (junction (at 35.56 168.91) (diameter 0) (color 0 0 0 0)
-    (uuid 497b9774-3128-4270-af26-430f6d704065)
-  )
   (junction (at 22.86 81.28) (diameter 0) (color 0 0 0 0)
     (uuid 50eddd67-6aa3-43d4-a67d-b80202184bf7)
   )
@@ -2172,18 +1692,9 @@
   (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)
+  (junction (at 20.32 129.54) (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)
-  )
-  (junction (at 50.8 171.45) (diameter 0) (color 0 0 0 0)
-    (uuid 6a4fb687-120e-40bf-9b35-7e9d2fc384cf)
-  )
-  (junction (at 60.96 143.51) (diameter 0) (color 0 0 0 0)
-    (uuid 7006f49f-0e13-43be-b1bb-f26a3d387008)
-  )
   (junction (at 149.86 146.05) (diameter 0) (color 0 0 0 0)
     (uuid 70b621b6-45b5-43cb-9683-d589118723d7)
   )
@@ -2202,27 +1713,21 @@
   (junction (at 138.43 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 7efaeda2-e767-44b9-adb2-3a0c3f4d2f1d)
   )
-  (junction (at 58.42 118.11) (diameter 0) (color 0 0 0 0)
-    (uuid 807fdb88-f9c9-42d9-8e83-2c2f092f2280)
-  )
   (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)
   )
-  (junction (at 82.55 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid 88ec470b-1595-4040-bc2a-91476c84ca2e)
-  )
-  (junction (at 60.96 194.31) (diameter 0) (color 0 0 0 0)
-    (uuid 8adc6e7b-379b-4805-954a-89eeb571e9d4)
-  )
   (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)
     (uuid 9098a6bf-eae0-4636-90c3-6c2f5d9401fd)
   )
+  (junction (at 128.27 24.13) (diameter 0) (color 0 0 0 0)
+    (uuid 950bee3f-9e72-4e30-a26d-44d6909f7316)
+  )
   (junction (at 241.3 123.19) (diameter 0) (color 0 0 0 0)
     (uuid 9801ccc8-5152-40bb-932d-67072f8cd8ad)
   )
@@ -2232,35 +1737,29 @@
   (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)
+  (junction (at 41.91 129.54) (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)
+  (junction (at 41.91 139.7) (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 69.85 102.87) (diameter 0) (color 0 0 0 0)
+  (junction (at 20.32 149.86) (diameter 0) (color 0 0 0 0)
     (uuid be9a62f2-23dd-41df-91a7-1f4ac377faf3)
   )
   (junction (at 34.29 86.36) (diameter 0) (color 0 0 0 0)
     (uuid c2d3f10b-b9a2-4cb9-979d-644e3566b349)
   )
-  (junction (at 91.44 72.39) (diameter 0) (color 0 0 0 0)
-    (uuid cc016ca4-b9a4-4d80-91ba-91d6e0df5bcc)
+  (junction (at 116.84 31.75) (diameter 0) (color 0 0 0 0)
+    (uuid c919be4d-1323-48ff-9b47-63e806eb379b)
   )
-  (junction (at 49.53 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid dadd1271-de02-4ddc-9037-691c1071fc0f)
+  (junction (at 41.91 119.38) (diameter 0) (color 0 0 0 0)
+    (uuid cc016ca4-b9a4-4d80-91ba-91d6e0df5bcc)
   )
   (junction (at 274.32 20.32) (diameter 0) (color 0 0 0 0)
     (uuid e04409c2-b3ba-460e-bddc-62e0044901c2)
@@ -2274,6 +1773,9 @@
   (junction (at 274.32 27.94) (diameter 0) (color 0 0 0 0)
     (uuid ed74c2b7-a3ac-4886-84f5-377b5e1bbbfc)
   )
+  (junction (at 130.81 24.13) (diameter 0) (color 0 0 0 0)
+    (uuid edb71222-40e6-4859-afb6-9f8493972161)
+  )
 
   (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))
@@ -2283,16 +1785,13 @@
   (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))
 
@@ -2308,23 +1807,31 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 035870a0-33fd-4542-9093-58d01a043d61)
   )
+  (wire (pts (xy 124.46 24.13) (xy 128.27 24.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 044e08b9-e685-498e-bd87-b8524296a144)
+  )
   (wire (pts (xy 119.38 74.93) (xy 132.08 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0454b0ed-4e94-46b1-9058-7210ddee62e4)
   )
+  (wire (pts (xy 102.87 31.75) (xy 116.84 31.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 049c481d-6ebe-4dd1-9faa-e600aef235d0)
+  )
   (wire (pts (xy 247.65 91.44) (xy 251.46 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0673bd15-bb27-42a3-b8dd-ff34de638161)
   )
-  (wire (pts (xy 46.99 143.51) (xy 60.96 143.51))
+  (wire (pts (xy 170.18 140.97) (xy 165.1 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 09dffe2f-119c-4acf-b279-934de0a0dda7)
+    (uuid 092bd70b-48e0-45b7-9940-021b2d382881)
   )
   (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))
+  (wire (pts (xy 34.29 129.54) (xy 30.48 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 10acd6cf-9aa0-464b-9051-98ec9eb1cee0)
   )
@@ -2332,25 +1839,21 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11b49d13-b047-4242-be65-9a9b1c80ec58)
   )
-  (wire (pts (xy 31.75 171.45) (xy 50.8 171.45))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 14f144cf-94b7-4e9b-be67-5ca1bbff69f2)
-  )
   (wire (pts (xy 251.46 100.33) (xy 260.35 100.33))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15328724-62c0-4c64-8165-7ba7fa235831)
   )
-  (wire (pts (xy 67.31 130.81) (xy 78.74 130.81))
+  (wire (pts (xy 127 115.57) (xy 132.08 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 16010e58-8aee-45c1-99df-d1cc2bd80779)
+    (uuid 1627b889-41c1-4638-81bb-2059620a165d)
   )
-  (wire (pts (xy 110.49 55.88) (xy 110.49 57.15))
+  (wire (pts (xy 127 125.73) (xy 132.08 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1a795a6f-1bc6-41fb-82d7-5ae528094d84)
+    (uuid 166aacf9-9169-4bbe-a203-0c1180fa7c79)
   )
-  (wire (pts (xy 58.42 135.89) (xy 58.42 118.11))
+  (wire (pts (xy 110.49 55.88) (xy 110.49 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1afdd221-608b-420b-8eb2-861de263adb5)
+    (uuid 1a795a6f-1bc6-41fb-82d7-5ae528094d84)
   )
   (wire (pts (xy 243.84 102.87) (xy 243.84 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2372,10 +1875,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23d269d6-d694-442a-bf5d-98bf3544fc31)
   )
-  (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 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)
@@ -2388,17 +1887,17 @@
     (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))
+  (wire (pts (xy 34.29 119.38) (xy 30.48 119.38))
     (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))
+  (wire (pts (xy 127 123.19) (xy 132.08 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2d68cb5d-30df-4657-8750-10f8b1c43a3d)
+    (uuid 2bd08fdd-e559-4112-af36-bdef9848d0a6)
   )
-  (wire (pts (xy 58.42 118.11) (xy 59.69 118.11))
+  (wire (pts (xy 137.16 24.13) (xy 130.81 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2f06a385-de72-4063-8346-234d2a5fb931)
+    (uuid 2da947aa-ae17-4b65-af50-1f4c2e060828)
   )
   (wire (pts (xy 77.47 20.32) (xy 81.28 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2421,6 +1920,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3a013e8f-5b12-499b-8d2d-0ad49966db1a)
   )
+  (wire (pts (xy 102.87 24.13) (xy 102.87 25.4))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3c7ec0d6-65f7-4e0f-bf39-65992df7174f)
+  )
   (wire (pts (xy 158.75 181.61) (xy 158.75 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3d927ca0-f4ad-42ab-b902-dfef8d84eebb)
@@ -2458,7 +1961,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4cd135a5-fdd1-4851-864a-dadf7c96d9ff)
   )
-  (wire (pts (xy 69.85 72.39) (xy 69.85 82.55))
+  (wire (pts (xy 20.32 119.38) (xy 20.32 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d43e674-c1c0-4e11-b129-01108db367aa)
   )
@@ -2470,21 +1973,25 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 500298f6-b9ed-4e53-bde6-024545f1a90a)
   )
-  (wire (pts (xy 45.72 138.43) (xy 46.99 138.43))
+  (wire (pts (xy 128.27 24.13) (xy 130.81 24.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 53ca9047-4473-49bf-9a5c-d4ba6da3881d)
+  )
+  (wire (pts (xy 170.18 113.03) (xy 165.1 113.03))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 564c737a-c22b-400c-8665-990100e2bad2)
+    (uuid 58858fad-19b5-45d5-8bd8-d4867a5f0d29)
   )
-  (wire (pts (xy 91.44 72.39) (xy 91.44 69.85))
+  (wire (pts (xy 41.91 119.38) (xy 41.91 116.84))
     (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))
+  (wire (pts (xy 34.29 139.7) (xy 30.48 139.7))
     (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))
+  (wire (pts (xy 102.87 30.48) (xy 102.87 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5c661c17-3ab4-49c7-8add-a626d1753c0b)
+    (uuid 5c2835f1-d56c-4019-9ef3-09fd3e460220)
   )
   (wire (pts (xy 110.49 49.53) (xy 110.49 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2502,14 +2009,10 @@
     (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))
+  (wire (pts (xy 34.29 149.86) (xy 30.48 149.86))
     (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 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)
@@ -2523,10 +2026,6 @@
     (uuid 6c1a4ff4-84d5-4723-9271-598658bada11)
   )
 
-  (wire (pts (xy 49.53 128.27) (xy 49.53 133.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (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))
     (uuid 6f75ea3e-6135-44f5-9313-1aad839ab6f6)
@@ -2539,10 +2038,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 75080b0b-6140-45af-8605-622af6de8bea)
   )
-  (wire (pts (xy 46.99 140.97) (xy 49.53 140.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 76acc36c-a2a1-41e6-a41b-3d2782098bb1)
-  )
   (wire (pts (xy 223.52 133.35) (xy 220.98 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 771145ed-2e00-4172-ac95-37a36c6a35ce)
@@ -2555,10 +2050,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7d512d14-3ca4-4934-b506-eb07d268c7dc)
   )
-  (wire (pts (xy 59.69 171.45) (xy 60.96 171.45))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7e818ab5-daa1-4f81-8e5b-7a6aa233292b)
-  )
   (wire (pts (xy 147.32 146.05) (xy 144.78 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7f2c9904-545b-4337-acd6-8707e0924818)
@@ -2567,15 +2058,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7fa098fb-b644-4e64-920e-8328b5d12f21)
   )
-  (wire (pts (xy 60.96 187.96) (xy 60.96 194.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 80f7bbd0-bec0-4cb1-9503-e3687c98ec1e)
-  )
   (wire (pts (xy 144.78 68.58) (xy 137.16 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 822cf157-ecb8-46d7-8cc6-5f0248fd6b37)
   )
-  (wire (pts (xy 91.44 82.55) (xy 91.44 72.39))
+  (wire (pts (xy 41.91 129.54) (xy 41.91 119.38))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83b77b4d-dcc2-4e93-a5f3-1d1480646393)
   )
@@ -2583,11 +2070,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 875404be-e359-458a-af29-1bd3403dd55f)
   )
+  (wire (pts (xy 170.18 110.49) (xy 165.1 110.49))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8916cfb5-5541-43a9-8e0e-951b776d485c)
+  )
+  (wire (pts (xy 102.87 21.59) (xy 102.87 24.13))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8aacfdd5-15da-46ff-b53e-da8342d51270)
+  )
   (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))
+  (wire (pts (xy 20.32 139.7) (xy 20.32 149.86))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d760ab7-cb5d-426a-b4aa-fb7e0964cb41)
   )
@@ -2611,22 +2106,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93b580d1-c2df-48c4-9d06-465ca9d3eebc)
   )
-  (wire (pts (xy 35.56 161.29) (xy 59.69 161.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9540b4d6-8885-4843-a659-943f7e3bc69a)
-  )
   (wire (pts (xy 115.57 138.43) (xy 132.08 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c00f763-4387-4dca-9d2a-687600fcbd31)
   )
-  (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 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)
-  )
   (wire (pts (xy 220.98 130.81) (xy 233.68 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f7324c5-50a2-442c-8a80-edf04aa2b2ac)
@@ -2635,10 +2118,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f7b3295-d16c-467f-88f6-2ab8ee650e3a)
   )
-  (wire (pts (xy 35.56 168.91) (xy 36.195 168.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a2873055-b8ab-487a-9485-446d15b62f90)
-  )
   (wire (pts (xy 149.86 69.85) (xy 147.32 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a32fe8ab-5810-40f6-8eab-48332c0ee5a0)
@@ -2647,10 +2126,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a560f403-c7e0-4d97-9b6c-c5351bebb237)
   )
-  (wire (pts (xy 82.55 123.19) (xy 78.74 123.19))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a5e5a32b-d259-4833-9676-56ada82e83c2)
-  )
   (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)
@@ -2663,42 +2138,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac5a5c45-797a-4bbe-bfd5-5ce5a8aa3463)
   )
-  (wire (pts (xy 106.045 189.865) (xy 112.395 189.865))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ae9a2cfc-2e02-4731-9394-e388bba596f8)
-  )
-  (wire (pts (xy 43.815 168.91) (xy 44.45 168.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid aea16cf2-4f65-409f-b3b9-3c332f390e93)
-  )
-  (wire (pts (xy 33.02 181.61) (xy 33.02 176.53))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid afe17981-95bb-4580-8c01-d624572574ed)
-  )
   (wire (pts (xy 152.4 146.05) (xy 149.86 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b05af61d-3c1d-44cf-aea2-61fd169c9d1a)
   )
-  (wire (pts (xy 49.53 118.11) (xy 48.26 118.11))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b2493615-6469-4f85-ae30-0eeac98199a6)
-  )
   (wire (pts (xy 149.86 49.53) (xy 149.86 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b3eebb03-af8c-48e8-a7d9-5ec3741206fa)
   )
-  (wire (pts (xy 58.42 118.11) (xy 57.15 118.11))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b4d405a4-25a6-44ef-96e1-b56b6b5ce995)
-  )
-  (wire (pts (xy 49.53 153.67) (xy 60.96 153.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b506d6e3-f5de-46c8-8eaa-ee5b62c6abd9)
-  )
-  (wire (pts (xy 106.045 184.785) (xy 112.395 184.785))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b555eee7-8149-4892-8ba4-057aabcbbee2)
-  )
   (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)
@@ -2715,30 +2162,14 @@
     (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)
-  )
-  (wire (pts (xy 49.53 133.35) (xy 46.99 133.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c0185e34-c51b-4c62-a463-ad6cb00d29af)
-  )
-  (wire (pts (xy 33.02 176.53) (xy 31.75 176.53))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c10ea781-e4dc-44b9-a7e1-86f7cdfec5ac)
-  )
-  (wire (pts (xy 31.75 168.91) (xy 35.56 168.91))
+  (wire (pts (xy 170.18 115.57) (xy 165.1 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c62fcb1d-df7b-4385-a018-f5ef16263000)
+    (uuid bcb9de97-da39-48c2-ba62-52171a3a19f8)
   )
   (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)
-  )
   (wire (pts (xy 180.34 123.19) (xy 189.23 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca0eab8e-e3fd-464d-bb03-d1603b8a651b)
@@ -2747,34 +2178,30 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca12753c-a5f4-49a4-bb14-a01420a86edb)
   )
-  (wire (pts (xy 81.28 30.48) (xy 81.28 27.94))
+  (wire (pts (xy 102.87 24.13) (xy 109.22 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cf02db11-2ff8-4f79-b3e9-9802575ab786)
+    (uuid cda471cd-ed64-4f58-b827-5f282321cb92)
   )
-  (wire (pts (xy 60.96 143.51) (xy 60.96 146.05))
+  (wire (pts (xy 81.28 30.48) (xy 81.28 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d063f6b1-c663-433a-bf5e-7441a08f16ea)
+    (uuid cf02db11-2ff8-4f79-b3e9-9802575ab786)
   )
-  (wire (pts (xy 154.94 49.53) (xy 154.94 69.85))
+  (wire (pts (xy 128.27 24.13) (xy 128.27 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d1ea7795-8403-4edb-b959-1b29f77ed16f)
+    (uuid d030b1b5-66ea-4dee-aa8b-a368d46b7f2a)
   )
-  (wire (pts (xy 46.99 135.89) (xy 58.42 135.89))
+  (wire (pts (xy 116.84 31.75) (xy 128.27 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d26a8420-78a3-4a9e-b4f4-5a9910f59c4d)
+    (uuid d0c49abc-3258-4c00-a10f-f54b5d0253a5)
   )
-  (wire (pts (xy 68.58 171.45) (xy 69.85 171.45))
+  (wire (pts (xy 154.94 49.53) (xy 154.94 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d312eda9-74a3-4e19-8d05-4177ec0e1f00)
+    (uuid d1ea7795-8403-4edb-b959-1b29f77ed16f)
   )
   (wire (pts (xy 26.67 86.36) (xy 22.86 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (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 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)
@@ -2811,6 +2238,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e382fedc-c868-44fd-9740-47cc05b15c1c)
   )
+  (wire (pts (xy 170.18 105.41) (xy 165.1 105.41))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e4a40ea1-de8c-4913-8d95-0a86c0054fcc)
+  )
   (wire (pts (xy 226.06 123.19) (xy 226.06 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e584287a-6232-40cf-a082-8dea5986b945)
@@ -2823,27 +2254,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e7130644-c4ae-4f9d-997d-5b4fa9d09578)
   )
+  (wire (pts (xy 127 110.49) (xy 132.08 110.49))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e719e133-06c8-48a5-8b34-3a33eec285a2)
+  )
   (polyline (pts (xy 59.69 63.5) (xy 15.24 63.5))
     (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)
-  )
-  (wire (pts (xy 60.96 171.45) (xy 60.96 180.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e98e7eb7-9737-4f2e-99d0-92ee149d1392)
-  )
-  (wire (pts (xy 91.44 102.87) (xy 91.44 92.71))
+  (wire (pts (xy 41.91 149.86) (xy 41.91 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb5c3818-51cd-4092-a6a2-1d306912382e)
   )
-  (wire (pts (xy 35.56 161.29) (xy 35.56 168.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ec3165fe-59c9-43eb-8ddf-d44b9735718a)
-  )
   (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)
@@ -2852,7 +2275,7 @@
     (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))
+  (wire (pts (xy 41.91 139.7) (xy 41.91 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ee955228-8cba-41df-9590-142549e57cef)
   )
@@ -2860,6 +2283,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f1353e9e-7eae-44e9-872c-ec11c41e5657)
   )
+  (wire (pts (xy 170.18 107.95) (xy 165.1 107.95))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f1ef3bae-8492-482a-bb52-c850c5dd92fa)
+  )
+  (wire (pts (xy 128.27 30.48) (xy 128.27 31.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f2333ea0-3cdc-40cc-b541-5643d95d4956)
+  )
   (wire (pts (xy 149.86 146.05) (xy 147.32 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f46f4b86-daf6-4869-98cb-928039f00f5f)
@@ -2872,16 +2303,12 @@
     (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))
+  (wire (pts (xy 20.32 129.54) (xy 20.32 139.7))
     (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\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"
+  (text "TODO\n\n\nDone\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020\nAdd cable between main board and control"
     (at 1.27 -15.24 0)
     (effects (font (size 3 3)) (justify left bottom))
     (uuid 1154c567-1e30-4104-a3b9-6b57e1efe0f8)
@@ -2903,11 +2330,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 49389a66-8741-452b-8284-834f65c51e1b)
   )
-  (text "Yaesu MH-42 microphone\nhas buttons connected through\nresistors to GND on both\nMIC_SW1 and MIC_SW2"
-    (at 15.24 123.19 0)
-    (effects (font (size 1.1938 1.1938)) (justify left bottom))
-    (uuid 74796a55-82bc-4f74-9e9c-c7cb232069e3)
-  )
   (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))
@@ -2922,11 +2344,6 @@
     (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))
-    (uuid a3fa1e23-753d-47fd-a22c-6b4495b4078c)
-  )
   (text "TIM3 CH2" (at 172.72 120.65 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a632aa3e-0113-4f5d-90b5-27bac9ed8392)
@@ -2956,26 +2373,14 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0470f6f8-3373-4410-9688-3749de7c241a)
   )
-  (label "MIC_SW2" (at 74.93 156.21 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 0628db56-eb4e-4b95-a513-4549fb02bb96)
-  )
   (label "SDA" (at 132.08 120.65 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0886377c-acad-41ba-a045-1d436eadaaab)
   )
-  (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)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0ece2b87-02c1-4250-9204-efdee0b5a9d0)
   )
-  (label "MIC_SW1" (at 74.93 143.51 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 1b73c962-e471-4ec3-ab97-9114c97a5609)
-  )
   (label "PB15" (at 201.93 128.27 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1c36527b-20ab-4863-8486-3913ee2e57f4)
@@ -2984,10 +2389,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 23d0e929-f5a1-4c62-b387-0887d9659f38)
   )
-  (label "MIC_SW1" (at 165.1 110.49 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 34f20938-82be-4faa-a3bd-ea4ff60955a6)
-  )
   (label "BOOT1" (at 278.13 52.07 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3a41f6b2-d64e-4fc9-9c78-62461e28f42c)
@@ -3012,10 +2413,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 502090da-c5a3-4316-9f8a-2de92274b2b8)
   )
-  (label "CW_RING" (at 112.395 184.785 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 5126ac84-dc56-4e60-b120-fd81ef65886b)
-  )
   (label "ENC_BTN" (at 132.08 97.79 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 588d3cbf-6c0a-4102-8f72-574f6ea20133)
@@ -3036,10 +2433,6 @@
     (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 81.28 33.02 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 61d63f1b-dbdf-4e18-9e78-d70eac21ae65)
@@ -3068,10 +2461,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7803a0ea-b6d3-457b-b195-42c8dc80b579)
   )
-  (label "CW_TIP" (at 112.395 189.865 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 78ce8c1e-89e0-4419-807a-81faccaa13a1)
-  )
   (label "XTAL1" (at 132.08 85.09 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 794e55a0-75fe-436a-8b64-c2f248c65f18)
@@ -3084,7 +2473,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8233de19-691a-4981-9177-f647c5ab854c)
   )
-  (label "BTN2" (at 80.01 92.71 0)
+  (label "BTN2" (at 30.48 139.7 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8b8cbcc8-2fab-4017-82d7-9e2b0dd87d55)
   )
@@ -3124,11 +2513,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bf046f55-cad5-4e6d-8fc5-1978a2a4f4dc)
   )
-  (label "BTN3" (at 80.01 102.87 0)
+  (label "BTN3" (at 30.48 149.86 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c40d36bb-2efa-4bc3-859b-223faaa66f3e)
   )
-  (label "BTN0" (at 80.01 72.39 0)
+  (label "BTN0" (at 30.48 119.38 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c435621a-1e7b-4aea-a701-d5d27a54bd0d)
   )
@@ -3140,10 +2529,6 @@
     (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)
-  )
   (label "PWM_CW" (at 129.54 180.34 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid cf672f56-2d68-4c6c-a783-23e23c937b72)
@@ -3160,10 +2545,6 @@
     (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)
-  )
   (label "RESETn" (at 132.08 74.93 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e9862dd4-26d2-4ddd-91fc-972d848045f5)
@@ -3184,7 +2565,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f7a8cf05-b405-47d6-a8ce-eb5ffec4afaa)
   )
-  (label "BTN1" (at 80.01 82.55 0)
+  (label "BTN1" (at 30.48 129.54 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f82b8be3-e209-4493-8527-8e48e4d9c1ce)
   )
@@ -3193,20 +2574,6 @@
     (uuid fd2d066c-2ff9-43c4-ab8e-a65d2b71b5c1)
   )
 
-  (global_label "+VMIC" (shape input) (at 67.31 118.11 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 126f84ae-523c-4569-b046-7ee124f46a5a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 75.7102 118.0306 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SDA" (shape input) (at 260.35 100.33 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 1e4121a8-838d-461e-bd87-c7b273513df5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
   (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)
@@ -3214,46 +2581,52 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "SCL" (shape input) (at 260.35 102.87 0) (fields_autoplaced)
+
+  (hierarchical_label "MIC_SW2" (shape input) (at 170.18 113.03 0)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 67ed65af-3dae-472c-882d-b64c8e40e12c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
+    (uuid 0ed13e72-3769-439e-b137-a792eb4ec391)
   )
-  (global_label "+VMIC" (shape input) (at 68.58 194.31 0) (fields_autoplaced)
+  (hierarchical_label "SDA" (shape bidirectional) (at 260.35 100.33 0)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 691cbaf2-cd00-48de-a72e-b325b9c4b788)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 76.9802 194.2306 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
+    (uuid 0ef1b66f-e76b-4202-84a8-3a5c6b43b54d)
   )
-
-  (hierarchical_label "EN_TX" (shape output) (at 132.08 115.57 180)
+  (hierarchical_label "12V" (shape input) (at 102.87 21.59 180)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 1482a397-7070-4a7f-87fc-b4a801f5cfa9)
+  )
+  (hierarchical_label "CW_RING" (shape input) (at 127 125.73 180)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 16a9ff70-bfb0-43c0-91e2-031c952ed930)
+  )
+  (hierarchical_label "MIC_SW1" (shape input) (at 170.18 110.49 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 1718dc82-e46c-4c2e-af5a-768580eea712)
+  )
+  (hierarchical_label "SCL" (shape bidirectional) (at 260.35 102.87 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 474d99d2-54fe-431f-a744-fd4a289e3a63)
+  )
+  (hierarchical_label "EN_TX" (shape output) (at 127 115.57 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4a151dd5-28d8-42af-b70d-d52cf427540e)
   )
-  (hierarchical_label "MUTE_SPKR" (shape output) (at 165.1 107.95 0)
+  (hierarchical_label "MUTE_SPKR" (shape output) (at 170.18 107.95 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 4f4277d9-4ff1-4fe4-9af0-84cedee4b2b6)
   )
-  (hierarchical_label "CW_KEYn" (shape output) (at 165.1 140.97 0)
+  (hierarchical_label "CW_KEYn" (shape output) (at 170.18 140.97 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 5b1cf420-b469-4a8f-a998-9abdfd8b7687)
   )
-  (hierarchical_label "EN_RX" (shape output) (at 132.08 110.49 180)
+  (hierarchical_label "EN_RX" (shape output) (at 127 110.49 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 92563de1-61c4-4e3f-8603-96474790934f)
   )
-  (hierarchical_label "AF_OUT" (shape input) (at 49.53 133.35 0)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid b6fc4182-53d3-44c8-80e1-53918daa9139)
-  )
-  (hierarchical_label "MIC" (shape output) (at 54.61 140.97 0)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid c83a95be-f351-410b-916d-b5948688be99)
+  (hierarchical_label "CW_TIP" (shape input) (at 127 123.19 180)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid a263031f-c5bf-414f-9c78-a88827a06381)
   )
-  (hierarchical_label "S_METER" (shape input) (at 165.1 115.57 0)
+  (hierarchical_label "S_METER" (shape input) (at 170.18 115.57 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d205f026-5c37-4a8f-96d0-c67ab0976f34)
   )
@@ -3261,14 +2634,10 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d618158f-4184-4754-aa33-65a98e706342)
   )
-  (hierarchical_label "MUTE_MICn" (shape output) (at 165.1 105.41 0)
+  (hierarchical_label "MUTE_MICn" (shape output) (at 170.18 105.41 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid e721274f-b458-4ab5-8d4d-44bffaffa7c9)
   )
-  (hierarchical_label "MIC" (shape output) (at 69.85 171.45 0)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid f7eae3d8-96c7-42ba-82fd-acd44d078707)
-  )
 
   (symbol (lib_id "Device:R") (at 115.57 74.93 90) (unit 1)
     (in_bom yes) (on_board yes)
@@ -3539,96 +2908,36 @@
     (pin "1" (uuid f13faca8-8229-4808-b571-33ef94ff0768))
   )
 
-  (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 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)
-    )
-    (property "Datasheet" "~" (id 3) (at 78.74 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 78.74 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 68b59c96-662f-4949-89e6-9781bcceba48))
-    (pin "2" (uuid 731710ea-1c66-457c-b41d-b9f4bf6588ea))
-  )
-
-  (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 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 85.09 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (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))
-    (pin "2" (uuid aea01a7d-0850-4283-a0f1-ea9758667b13))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 82.55 123.19 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005e75d0e3)
-    (property "Reference" "#PWR?" (id 0) (at 82.55 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at 82.931 118.7958 0))
-    (property "Footprint" "" (id 2) (at 82.55 123.19 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 82.55 123.19 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d1a559ae-6ae1-408b-b2fc-acf48b1947c7))
-  )
-
-  (symbol (lib_id "Device:R") (at 87.63 102.87 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 38.1 149.86 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e769b25)
-    (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)
+    (property "Reference" "R?" (id 0) (at 38.1 152.781 90))
+    (property "Value" "5k1" (id 1) (at 38.1 155.0924 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 38.1 151.638 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 87.63 102.87 0)
+    (property "Datasheet" "~" (id 3) (at 38.1 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 87.63 102.87 0)
+    (property "Need_order" "" (id 4) (at 38.1 149.86 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 87.63 72.39 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 38.1 119.38 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e769b30)
-    (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)
+    (property "Reference" "R?" (id 0) (at 38.1 114.1222 90))
+    (property "Value" "5k1" (id 1) (at 38.1 116.4336 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 38.1 121.158 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 87.63 72.39 0)
+    (property "Datasheet" "~" (id 3) (at 38.1 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 87.63 72.39 0)
+    (property "Need_order" "" (id 4) (at 38.1 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 827bf8cb-b8fe-441c-9820-6008651e5541))
@@ -4447,47 +3756,6 @@
     (pin "1" (uuid 15c5871b-85d4-4ef3-8b03-613f8ed3a1e1))
   )
 
-  (symbol (lib_id "mpb:CUI-SJ-3524-SMT-TR") (at 100.965 184.785 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef19c71)
-    (property "Reference" "J?" (id 0) (at 100.5078 176.53 0))
-    (property "Value" "CW Key" (id 1) (at 100.5078 178.8414 0))
-    (property "Footprint" "Connector_Audio:Jack_3.5mm_CUI_SJ-3524-SMT_Horizontal" (id 2) (at 100.965 184.785 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 100.965 184.785 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "SJ-3523-SMT-TR" (id 4) (at 100.965 184.785 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 100.965 184.785 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "R" (uuid ec33585b-877f-4118-ae3a-7c6f1f5ecb59))
-    (pin "S" (uuid 9d1dc34d-63ed-43b9-b502-3e5f11e69d8c))
-    (pin "T" (uuid 09404712-b75e-4a98-9448-c17dc18b812a))
-    (pin "TN" (uuid 51220069-eb93-4a0d-9112-dbd4b62d80ad))
-  )
-
-  (symbol (lib_id "power:GND") (at 106.045 182.245 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef1fe09)
-    (property "Reference" "#PWR?" (id 0) (at 112.395 182.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 109.2962 182.118 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 106.045 182.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 106.045 182.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 4fbca443-4e18-4ded-9775-1a307b5ef03b))
-  )
-
   (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)
@@ -4506,65 +3774,22 @@
     (pin "2" (uuid 633f52e1-7778-495e-bf73-ce7f2532f08e))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 91.44 69.85 0) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 41.91 116.84 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef2bf90)
-    (property "Reference" "#PWR?" (id 0) (at 91.44 73.66 0)
+    (property "Reference" "#PWR?" (id 0) (at 41.91 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 91.821 65.4558 0))
-    (property "Footprint" "" (id 2) (at 91.44 69.85 0)
+    (property "Value" "+3.3V" (id 1) (at 42.291 112.4458 0))
+    (property "Footprint" "" (id 2) (at 41.91 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 69.85 0)
+    (property "Datasheet" "" (id 3) (at 41.91 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid db133e5e-3ea2-4211-b4d6-474f750b55e8))
   )
 
-  (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)
-    (property "Reference" "J?" (id 0) (at 38.2778 124.0282 0))
-    (property "Value" "MIC" (id 1) (at 38.2778 126.3396 0))
-    (property "Footprint" "picardy:RJ25_WE_615006138421" (id 2) (at 36.83 137.795 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 36.83 137.795 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "615006138421" (id 4) (at 36.83 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 36.83 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 45fbf304-3141-4d25-95fa-f688f12a590d))
-    (pin "2" (uuid 475b5df6-9c0e-4348-8727-f53bb6dc50d7))
-    (pin "3" (uuid 100614f3-e95f-40a5-81a7-83b0ba9f091f))
-    (pin "4" (uuid d4ea2903-c47c-419b-b8da-ad3a40b21ebf))
-    (pin "5" (uuid b1ed5765-db97-4199-b7ce-8f61ba27a3cf))
-    (pin "6" (uuid 548c1d6a-33a8-4045-b0bc-d7a63f063729))
-  )
-
-  (symbol (lib_id "power:GND") (at 45.72 138.43 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ef3d0e7)
-    (property "Reference" "#PWR?" (id 0) (at 52.07 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 48.9712 138.303 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 45.72 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 45.72 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid b8a87715-bbc3-490f-b768-3d022d6a563a))
-  )
-
   (symbol (lib_id "power:+3.3V") (at 111.76 74.93 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ef3fc0a)
@@ -4728,75 +3953,6 @@
     (pin "1" (uuid 95f6c4f0-2131-4a77-85b2-ee8cc48ef165))
   )
 
-  (symbol (lib_id "Device:Ferrite_Bead") (at 63.5 130.81 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005efb83e1)
-    (property "Reference" "FB?" (id 0) (at 63.4492 125.73 90))
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 63.5 126.1618 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 63.5 132.588 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 63.5 130.81 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 63.5 130.81 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 63.5 130.81 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f42bbb56-a3b4-4e42-92c3-bc8b90520476))
-    (pin "2" (uuid e5ced5b1-650c-4f27-94d3-cd28da0a39bb))
-  )
-
-  (symbol (lib_id "Device:Ferrite_Bead") (at 68.58 143.51 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005efc17b0)
-    (property "Reference" "FB?" (id 0) (at 68.5292 138.43 90))
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 68.58 138.8618 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 68.58 145.288 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 68.58 143.51 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 68.58 143.51 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 68.58 143.51 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5ca494b7-f812-4fa3-93aa-2500d10260bf))
-    (pin "2" (uuid 3412279f-93e6-4253-8f6a-b23768ae6dfe))
-  )
-
-  (symbol (lib_id "Device:Ferrite_Bead") (at 63.5 118.11 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005efd660c)
-    (property "Reference" "FB?" (id 0) (at 63.4492 113.03 90))
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 63.5 113.4618 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 63.5 119.888 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 63.5 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 63.5 118.11 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 63.5 118.11 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e9216810-d09b-4b0e-b7c1-5b5ca10581fb))
-    (pin "2" (uuid 497b03a3-3c33-44a1-aedf-2cf03c4b45cf))
-  )
-
   (symbol (lib_id "Device:R") (at 229.87 123.19 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f0ee544)
@@ -4833,22 +3989,26 @@
     (pin "1" (uuid 7f71deea-f1df-4a70-bd14-b0e00469fe53))
   )
 
-  (symbol (lib_id "power:GND") (at 74.93 166.37 0) (unit 1)
+  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 116.84 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 1211f94d-cbad-484a-97ed-4e3906e1c82c)
-    (property "Reference" "#PWR?" (id 0) (at 74.93 172.72 0)
+    (uuid 0a2de5c3-a0fc-4b42-8047-93224ef7ac22)
+    (property "Reference" "U?" (id 0) (at 116.84 17.9832 0))
+    (property "Value" "LD1117S33" (id 1) (at 116.84 20.2946 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 116.84 19.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 75.057 169.6212 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
+    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 119.38 30.48 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 74.93 166.37 0)
+    (property "Need_order" "" (id 4) (at 116.84 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 74.93 166.37 0)
+    (property "MPN" "LD1117S33CTR" (id 5) (at 116.84 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1f97d655-a5ab-4d46-9c12-925d1d6b490f))
+    (pin "1" (uuid f96a9ca7-f100-4531-819a-c982c51f384e))
+    (pin "2" (uuid 5b208cbd-ef75-4e4e-bc42-56fa469bd18b))
+    (pin "3" (uuid 82fa79a7-bb2f-44fa-8183-c00b63a1e12e))
   )
 
   (symbol (lib_id "power:GND") (at 22.86 95.25 0) (unit 1)
@@ -4888,24 +4048,6 @@
     (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)
-    (property "Reference" "#PWR?" (id 0) (at 46.99 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 50.0888 194.437 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "" (id 2) (at 53.34 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 53.34 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (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)
@@ -4955,78 +4097,21 @@
     (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)
-    (property "Reference" "C?" (id 0) (at 63.5 147.32 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "100pF" (id 1) (at 63.5 149.86 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 61.9252 153.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 60.96 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 60.96 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 60.96 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 60.96 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid dab09282-febd-4249-9cd4-3524830e9b56))
-    (pin "2" (uuid 67b653bc-0388-49c8-b961-440d54f8e151))
-  )
-
-  (symbol (lib_id "Device:C") (at 50.8 175.26 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 2bbeeb72-f562-464f-a2d8-22926ab39a60)
-    (property "Reference" "C?" (id 0) (at 54.61 175.26 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "100pF" (id 1) (at 54.61 177.8 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 51.7652 179.07 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 50.8 175.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 50.8 175.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 50.8 175.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 50.8 175.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 85b3e6c6-6d6b-4b78-af6a-064b6c1bfb1e))
-    (pin "2" (uuid bad3e2d1-a4ab-4609-bf8a-97fb15de6e81))
-  )
-
-  (symbol (lib_id "Device:R") (at 40.005 168.91 270) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 130.81 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 333e6c20-1755-4453-855a-6fc389cf46d5)
-    (property "Reference" "R?" (id 0) (at 40.64 166.37 90))
-    (property "Value" "10" (id 1) (at 39.37 168.91 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 40.005 167.132 90)
+    (uuid 3285e67d-e4d8-4140-b839-2c744988ef1f)
+    (property "Reference" "TP?" (id 0) (at 130.81 15.875 0))
+    (property "Value" "+3V3" (id 1) (at 130.81 18.1864 0))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 135.89 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 40.005 168.91 0)
+    (property "Datasheet" "~" (id 3) (at 135.89 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 40.005 168.91 0)
+    (property "Need_order" "" (id 4) (at 130.81 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 98b1cee9-3ab8-406e-813f-dbc2bcfce121))
-    (pin "2" (uuid 45d7b931-6a8e-493c-b879-d8893a361b82))
+    (pin "1" (uuid 7b8e3ff0-b4b3-4149-8936-6fc7e73b2a33))
   )
 
   (symbol (lib_id "Device:C") (at 22.86 91.44 0) (unit 1)
@@ -5070,80 +4155,18 @@
     (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)
-    (property "Reference" "R?" (id 0) (at 60.96 158.75 90))
-    (property "Value" "0" (id 1) (at 63.5 161.29 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 63.5 159.512 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 63.5 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 63.5 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 423d27a9-8caf-4a9e-89e4-be82bb3506b9))
-    (pin "2" (uuid 7a602281-3562-4f6c-99d1-3d891dd8c565))
-  )
-
-  (symbol (lib_id "Transistor_BJT:MMBT3904") (at 72.39 161.29 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 409e814b-31f0-4306-846c-d0d7410cb329)
-    (property "Reference" "Q?" (id 0) (at 77.2414 160.1216 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "MMBT3904" (id 1) (at 77.2414 162.433 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 77.47 163.195 0)
-      (effects (font (size 1.27 1.27) italic) (justify left) hide)
-    )
-    (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N3904.pdf" (id 3) (at 72.39 161.29 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "MPN" "MMBT3904LT1G" (id 4) (at 72.39 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 72.39 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 905870b6-2e9c-48a3-b49a-0a7a9bea3e52))
-    (pin "2" (uuid 0ab4a28e-7fc8-4a37-ab31-6c4cd0cbb314))
-    (pin "3" (uuid 7b72c054-7453-4a9a-89f6-7ee28b6bb83e))
-  )
-
-  (symbol (lib_id "power:GND") (at 44.45 168.91 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 46b3c9a2-d3d6-42c0-b381-52f03f14891d)
-    (property "Reference" "#PWR?" (id 0) (at 50.8 168.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 47.7012 168.783 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "" (id 2) (at 44.45 168.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 44.45 168.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e20ae59e-6d3a-42f6-979e-aee19a4ca64c))
-  )
-
-  (symbol (lib_id "Switch:SW_Push") (at 74.93 72.39 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 25.4 119.38 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)
+    (property "Reference" "SW?" (id 0) (at 25.4 111.76 0))
+    (property "Value" "A" (id 1) (at 25.4 114.3 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 25.4 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 74.93 67.31 0)
+    (property "Datasheet" "~" (id 3) (at 25.4 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "FSM8JH" (id 4) (at 74.93 72.39 0)
+    (property "MPN" "FSM8JH" (id 4) (at 25.4 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5081bdb1-fce5-4c03-9fc9-daddf00bbce4))
@@ -5203,96 +4226,66 @@
     (pin "5" (uuid c05f4a6a-abfc-42f3-9e64-1b295fa618ff))
   )
 
-  (symbol (lib_id "Device:Ferrite_Bead") (at 64.77 194.31 90) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 25.4 149.86 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 558d2cd0-785b-4cc2-9356-927403f57ab9)
-    (property "Reference" "FB?" (id 0) (at 64.7192 189.23 90))
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 64.77 189.6618 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 64.77 196.088 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 64.77 194.31 0)
+    (uuid 619c50d2-759c-4636-a95c-320e5ecef500)
+    (property "Reference" "SW?" (id 0) (at 25.4 142.24 0))
+    (property "Value" "D" (id 1) (at 25.4 144.78 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 25.4 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 64.77 194.31 90)
+    (property "Datasheet" "~" (id 3) (at 25.4 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 64.77 194.31 90)
+    (property "MPN" "FSM8JH" (id 4) (at 25.4 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e65b1735-796a-4f08-956c-882484de9909))
-    (pin "2" (uuid 4b6494c7-5994-460b-966b-498bf64e8db2))
+    (pin "1" (uuid ad4206cf-4e17-4678-b932-d7858818310b))
+    (pin "2" (uuid 59d4b91e-2e1c-4aed-b61d-1966d7eef639))
   )
 
-  (symbol (lib_id "Device:C") (at 49.53 124.46 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5f092c82-6a6f-4493-ae72-11bbd4c142c3)
-    (property "Reference" "C?" (id 0) (at 53.34 123.1899 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "100pF" (id 1) (at 53.34 125.7299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 48.5648 120.65 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 49.53 124.46 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 49.53 124.46 0)
+  (symbol (lib_id "power:GND") (at 116.84 31.75 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 643da255-4107-470d-83bc-ec93c598e306)
+    (property "Reference" "#PWR?" (id 0) (at 116.84 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 49.53 124.46 0)
+    (property "Value" "GND" (id 1) (at 116.967 36.1442 0))
+    (property "Footprint" "" (id 2) (at 116.84 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "OriginalValue" "" (id 6) (at 49.53 124.46 0)
+    (property "Datasheet" "" (id 3) (at 116.84 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid de56a338-194d-48f2-b716-224d8663fd1c))
-    (pin "2" (uuid 4311d211-1c92-420a-8eff-6bd635d7be4e))
+    (pin "1" (uuid cba12490-344c-4f69-806c-e9f2a8c9ee1f))
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 74.93 102.87 0) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 102.87 27.94 0) (mirror y) (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)
+    (uuid 67e97af9-c8ad-4fb5-b14c-c53150dd6546)
+    (property "Reference" "C?" (id 0) (at 100.33 26.1238 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "MPN" "FSM8JH" (id 4) (at 74.93 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "10uF" (id 1) (at 100.33 28.6638 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (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)
-    (property "Reference" "FB?" (id 0) (at 55.8292 166.37 90))
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 55.88 166.8018 90)
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 102.87 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 55.88 173.228 90)
+    (property "Datasheet" "~" (id 3) (at 102.87 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 55.88 171.45 0)
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 102.87 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 55.88 171.45 90)
+    (property "Need_order" "" (id 5) (at 102.87 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 55.88 171.45 90)
+    (property "OriginalValue" "" (id 6) (at 102.87 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1e479946-8468-436a-9ce7-fc82d8f09fee))
-    (pin "2" (uuid 93c4c050-d373-4117-911d-7d3cab9af35f))
+    (pin "1" (uuid 17249725-7eb7-48db-8717-de720a141651))
+    (pin "2" (uuid 8ff82141-ee4d-4ba5-870a-9d35db6411df))
   )
 
   (symbol (lib_id "Device:R") (at 34.29 95.25 0) (unit 1)
@@ -5317,29 +4310,6 @@
     (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)
-    (property "Reference" "FB?" (id 0) (at 39.3192 181.61 90))
-    (property "Value" "BLM18BB221SN1D" (id 1) (at 39.37 171.8818 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 39.37 178.308 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 39.37 176.53 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "BLM18BB221SN1D" (id 4) (at 39.37 176.53 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 39.37 176.53 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 53c0be81-8909-458a-97f8-ea2146238ab7))
-    (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)
@@ -5358,18 +4328,18 @@
     (pin "2" (uuid 063987b5-d885-4669-8cdc-b26d5408f63d))
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 74.93 82.55 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 25.4 129.54 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)
+    (property "Reference" "SW?" (id 0) (at 25.4 121.92 0))
+    (property "Value" "B" (id 1) (at 25.4 124.46 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 25.4 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 74.93 77.47 0)
+    (property "Datasheet" "~" (id 3) (at 25.4 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "FSM8JH" (id 4) (at 74.93 82.55 0)
+    (property "MPN" "FSM8JH" (id 4) (at 25.4 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a0379bf2-25de-4a0c-9bfe-a22282bcef07))
@@ -5394,43 +4364,32 @@
     (pin "1" (uuid 4462b4d5-8a8a-4690-a98c-9de28d4cd161))
   )
 
-  (symbol (lib_id "power:GND") (at 48.26 118.11 270) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 128.27 27.94 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 8760b43f-eb45-4ac6-a7b1-63d847f10a11)
-    (property "Reference" "#PWR?" (id 0) (at 41.91 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 45.0088 118.237 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
+    (uuid 8d1e0b9e-0a17-470c-8a44-d5a4d7fffe77)
+    (property "Reference" "C?" (id 0) (at 131.191 26.7716 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 48.26 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "22uF" (id 1) (at 131.191 29.083 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Datasheet" "" (id 3) (at 48.26 118.11 0)
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 128.27 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 14dee165-b7b3-4696-9ff0-9e6be0bccec3))
-  )
-
-  (symbol (lib_id "Device:C") (at 64.77 171.45 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 8972c3f1-32c0-45aa-9d6b-6b61172087ca)
-    (property "Reference" "C?" (id 0) (at 64.77 163.83 90))
-    (property "Value" "1uF" (id 1) (at 64.77 166.37 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 60.96 172.4152 0)
+    (property "Datasheet" "~" (id 3) (at 128.27 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 64.77 171.45 0)
+    (property "MPN" "stash tantalum" (id 4) (at 128.27 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "08055C105JAT2A" (id 4) (at 64.77 171.45 0)
+    (property "Need_order" "" (id 5) (at 128.27 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 64.77 171.45 0)
+    (property "OriginalValue" "" (id 6) (at 128.27 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 93b30eac-9da2-49f9-ae0b-1fb651114e25))
-    (pin "2" (uuid 4c0fd16a-2a4f-4765-bfc7-201b2484e693))
+    (pin "1" (uuid cc28053c-e092-4930-b72a-ecedc1d3f01e))
+    (pin "2" (uuid f110ac7a-3b72-4b8c-8451-8cee1ab46eb2))
   )
 
   (symbol (lib_id "power:GND") (at 62.23 34.29 0) (unit 1)
@@ -5451,114 +4410,24 @@
     (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)
+  (symbol (lib_id "Switch:SW_Push") (at 25.4 139.7 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)
+    (property "Reference" "SW?" (id 0) (at 25.4 132.08 0))
+    (property "Value" "C" (id 1) (at 25.4 134.62 0))
+    (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" (id 2) (at 25.4 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 74.93 87.63 0)
+    (property "Datasheet" "~" (id 3) (at 25.4 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "FSM8JH" (id 4) (at 74.93 92.71 0)
+    (property "MPN" "FSM8JH" (id 4) (at 25.4 139.7 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)
-    (property "Reference" "C?" (id 0) (at 53.34 110.49 90))
-    (property "Value" "100pF" (id 1) (at 53.34 113.03 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 57.15 117.1448 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 53.34 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 53.34 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 53.34 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 53.34 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 3992e2dd-563f-4856-bd1d-07e35214038c))
-    (pin "2" (uuid 9b84d212-5ba1-4c93-929b-24d7b11c4430))
-  )
-
-  (symbol (lib_id "power:GND") (at 33.02 189.23 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid b92393ae-b788-4b8c-9976-058aa9d5f498)
-    (property "Reference" "#PWR?" (id 0) (at 33.02 195.58 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 33.147 192.4812 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "" (id 2) (at 33.02 189.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 33.02 189.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2f771e0f-7cf9-4151-9e94-9c915c6ada13))
-  )
-
-  (symbol (lib_id "Device:C") (at 33.02 185.42 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid c25a66f1-cf0e-4bc1-bf17-6fa9b219a472)
-    (property "Reference" "C?" (id 0) (at 35.56 182.88 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "100pF" (id 1) (at 35.56 185.42 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 33.9852 189.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 33.02 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 33.02 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 33.02 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 33.02 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ffcd0166-1e80-4f53-afa5-383875ab5861))
-    (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)
@@ -5581,98 +4450,37 @@
     (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)
-    (property "Reference" "C?" (id 0) (at 57.15 186.69 90))
-    (property "Value" "100pF" (id 1) (at 57.15 189.23 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 60.96 193.3448 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 57.15 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 57.15 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 57.15 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 57.15 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d5b82a7e-b28e-4f30-a233-9475569e47fb))
-    (pin "2" (uuid 9635e239-7242-4607-9758-d91796732143))
-  )
-
-  (symbol (lib_id "power:GND") (at 50.8 179.07 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid cd9e8219-cb54-4219-ab40-d9ffee2ebe26)
-    (property "Reference" "#PWR?" (id 0) (at 50.8 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 50.927 182.3212 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "" (id 2) (at 50.8 179.07 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 50.8 179.07 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (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)
+  (symbol (lib_id "Device:R") (at 38.1 139.7 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)
+    (property "Reference" "R?" (id 0) (at 38.1 142.621 90))
+    (property "Value" "5k1" (id 1) (at 38.1 144.9324 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 38.1 141.478 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 87.63 92.71 0)
+    (property "Datasheet" "~" (id 3) (at 38.1 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 87.63 92.71 0)
+    (property "Need_order" "" (id 4) (at 38.1 139.7 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)
+  (symbol (lib_id "power:GND") (at 20.32 149.86 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)
+    (property "Reference" "#PWR?" (id 0) (at 20.32 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 69.8501 106.68 90)
+    (property "Value" "GND" (id 1) (at 20.3201 153.67 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "" (id 2) (at 69.85 102.87 0)
+    (property "Footprint" "" (id 2) (at 20.32 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 69.85 102.87 0)
+    (property "Datasheet" "" (id 3) (at 20.32 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8524ee7d-4a2c-4a96-aae0-b4fb7560847a))
@@ -5696,58 +4504,34 @@
     (pin "1" (uuid eb1cd744-a17a-4035-9b5e-4437265c797f))
   )
 
-  (symbol (lib_id "power:GND") (at 60.96 153.67 90) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 137.16 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid dfa1a545-7068-432f-945a-840b274ad1fc)
-    (property "Reference" "#PWR?" (id 0) (at 67.31 153.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 64.2112 153.543 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 60.96 153.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 60.96 153.67 0)
+    (uuid deeba03d-8368-4433-899f-634416b6aa70)
+    (property "Reference" "#PWR?" (id 0) (at 137.16 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 71cb169b-3344-4d5d-8e99-d33f5babf7ad))
-  )
-
-  (symbol (lib_id "mpb:CUI-SJ-43515TS-SMT") (at 24.13 171.45 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid e0806eeb-4e96-42a3-933a-3a646a9c42fb)
-    (property "Reference" "J?" (id 0) (at 23.495 160.655 0))
-    (property "Value" "SJ-43515TS-SMT" (id 1) (at 23.495 163.195 0))
-    (property "Footprint" "mpb:Jack_3.5mm_CUI_SJ-43515TS-SMT" (id 2) (at 19.05 185.42 0)
+    (property "Value" "+3.3V" (id 1) (at 137.541 19.7358 0))
+    (property "Footprint" "" (id 2) (at 137.16 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.mouser.ch/datasheet/2/670/sj_4351x_smt-1779337.pdf" (id 3) (at 21.59 172.72 0)
+    (property "Datasheet" "" (id 3) (at 137.16 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "SJ-43515TS-SMT-TR" (id 4) (at 24.13 171.45 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "NC" (uuid a8a8204c-5290-4e12-a644-92a3e6d8b361))
-    (pin "R1" (uuid b9974f66-6588-41a0-a130-290fb464e72a))
-    (pin "R2" (uuid 05817e18-ba31-4cd4-ac43-2f65a06bbfac))
-    (pin "S" (uuid 78bee474-be06-4a4a-b87d-8d186b582a6e))
-    (pin "T" (uuid eac917d0-90a5-45b5-b174-b9be09aec334))
-    (pin "TN" (uuid f790fc32-86b9-4f1e-998f-ba7a64b6f0eb))
+    (pin "1" (uuid 20c610cb-1578-438f-9f27-2d1d450f9636))
   )
 
-  (symbol (lib_id "Device:R") (at 87.63 82.55 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 38.1 129.54 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)
+    (property "Reference" "R?" (id 0) (at 38.1 132.461 90))
+    (property "Value" "5k1" (id 1) (at 38.1 134.7724 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 38.1 131.318 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 87.63 82.55 0)
+    (property "Datasheet" "~" (id 3) (at 38.1 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 87.63 82.55 0)
+    (property "Need_order" "" (id 4) (at 38.1 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d0b35db3-4b74-4918-8c61-357755ac0ecf))
@@ -5771,54 +4555,4 @@
     (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)
-    (property "Reference" "R?" (id 0) (at 63.5 182.8799 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "47" (id 1) (at 63.5 185.4199 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 62.738 184.15 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 60.96 184.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 60.96 184.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 3ad16632-9bd0-4385-97b8-49cb0ae3e1a6))
-    (pin "2" (uuid 4bcfdb0e-55c4-4af9-a323-71f22a2ffd56))
-  )
-
-  (symbol (lib_id "Device:C") (at 49.53 149.86 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid fdbc0cfe-08f2-4482-b6c2-e79bdad08031)
-    (property "Reference" "C?" (id 0) (at 52.07 147.32 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "100pF" (id 1) (at 52.07 149.86 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 50.4952 153.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 49.53 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "VJ0805A101GXXCBC" (id 4) (at 49.53 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 49.53 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 49.53 149.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ccf089e1-e738-4b9a-aea2-8cd565e767eb))
-    (pin "2" (uuid 3e68e291-a4db-4b30-ac86-b65d3b424961))
-  )
 )
-- 
cgit v1.2.3