From 258806c58637249cfa08af901dd811d92dbdd0b6 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 22 Jan 2023 21:52:37 +0100
Subject: Add PA_70

---
 kicad-dart-70/baseband.kicad_sch | 1752 +++++---------------------------------
 1 file changed, 190 insertions(+), 1562 deletions(-)

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

diff --git a/kicad-dart-70/baseband.kicad_sch b/kicad-dart-70/baseband.kicad_sch
index 4100437..e4b1472 100644
--- a/kicad-dart-70/baseband.kicad_sch
+++ b/kicad-dart-70/baseband.kicad_sch
@@ -869,147 +869,6 @@
         )
       )
     )
-    (symbol "Device:L_Core_Ferrite" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "L" (id 0) (at -1.27 0 90)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Device_L_Core_Ferrite" (id 1) (at 2.794 0 90)
-        (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_fp_filters" "Choke_* *Coil* Inductor_* L_*" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "L_Core_Ferrite_0_1"
-        (arc (start 0 -2.54) (mid 0.635 -1.905) (end 0 -1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 0 -1.27) (mid 0.635 -0.635) (end 0 0)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.016 -2.794)
-            (xy 1.016 -2.286)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.016 -1.778)
-            (xy 1.016 -1.27)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.016 -0.762)
-            (xy 1.016 -0.254)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.016 0.254)
-            (xy 1.016 0.762)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.016 1.27)
-            (xy 1.016 1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.016 2.286)
-            (xy 1.016 2.794)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.524 -2.286)
-            (xy 1.524 -2.794)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.524 -1.27)
-            (xy 1.524 -1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.524 -0.254)
-            (xy 1.524 -0.762)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.524 0.762)
-            (xy 1.524 0.254)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.524 1.778)
-            (xy 1.524 1.27)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.524 2.794)
-            (xy 1.524 2.286)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 0 0) (mid 0.635 0.635) (end 0 1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 0 1.27) (mid 0.635 1.905) (end 0 2.54)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "L_Core_Ferrite_1_1"
-        (pin passive line (at 0 3.81 270) (length 1.27)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -3.81 90) (length 1.27)
-          (name "2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:L_Ferrite" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "L" (id 0) (at -1.27 0 90)
         (effects (font (size 1.27 1.27)))
@@ -1770,92 +1629,6 @@
         )
       )
     )
-    (symbol "Regulator_Linear:LD1117S50TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "LD1117S50TR_SOT223" (id 1) (at 0 3.175 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 2.54 -6.35 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "REGULATOR LDO 5.0V" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 5.0V, SOT-223" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "LD1117S50TR_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 "LD1117S50TR_SOT223_1_1"
-        (pin power_in line (at 0 -7.62 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_out line (at 7.62 0 180) (length 2.54)
-          (name "VO" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -7.62 0 0) (length 2.54)
-          (name "VI" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "Regulator_Linear:LM1117-ADJ" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "LM1117-ADJ" (id 1) (at 0 3.175 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm1117.pdf" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "linear regulator ldo adjustable positive" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "800mA Low-Dropout Linear Regulator, adjustable output, TO-220/TO-252/TO-263/SOT-223" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOT?223* TO?263* TO?252* TO?220*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "LM1117-ADJ_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 "LM1117-ADJ_1_1"
-        (pin input line (at 0 -7.62 90) (length 2.54)
-          (name "ADJ" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_out line (at 7.62 0 180) (length 2.54)
-          (name "VO" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -7.62 0 0) (length 2.54)
-          (name "VI" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Transformer:PT61017PEL" (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "TR" (id 0) (at 0 10.795 0)
         (effects (font (size 1.27 1.27)))
@@ -2447,206 +2220,6 @@
         )
       )
     )
-    (symbol "Transistor_FET:IRF7309IPBF" (pin_names 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" "IRF7309IPBF" (id 1) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 5.08 -1.905 0)
-        (effects (font (size 1.27 1.27)) (justify left) hide)
-      )
-      (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 2.54 0 0)
-        (effects (font (size 1.27 1.27)) (justify left) hide)
-      )
-      (property "ki_keywords" "Dual HEXFET N-Channel P-Channel MOSFET" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "3A Id, 30V Vds, Dual HEXFET MOSFET, SO-8" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOIC*3.9x4.9mm*P1.27mm*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "IRF7309IPBF_0_1"
-        (polyline
-          (pts
-            (xy 0.254 0)
-            (xy -2.54 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.254 1.905)
-            (xy 0.254 -1.905)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.762 -1.27)
-            (xy 0.762 -2.286)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.762 0.508)
-            (xy 0.762 -0.508)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.762 2.286)
-            (xy 0.762 1.27)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 2.54)
-            (xy 2.54 1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 -2.54)
-            (xy 2.54 0)
-            (xy 0.762 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.762 -1.778)
-            (xy 3.302 -1.778)
-            (xy 3.302 1.778)
-            (xy 0.762 1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 1.651 0) (radius 2.794)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 2.54 -1.778) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (circle (center 2.54 1.778) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-      )
-      (symbol "IRF7309IPBF_1_1"
-        (polyline
-          (pts
-            (xy 1.016 0)
-            (xy 2.032 0.381)
-            (xy 2.032 -0.381)
-            (xy 1.016 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 2.794 0.508)
-            (xy 2.921 0.381)
-            (xy 3.683 0.381)
-            (xy 3.81 0.254)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.302 0.381)
-            (xy 2.921 -0.254)
-            (xy 3.683 -0.254)
-            (xy 3.302 0.381)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (pin passive line (at 2.54 -5.08 90) (length 2.54)
-          (name "S" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -5.08 0 0) (length 2.54)
-          (name "G" (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) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-      )
-      (symbol "IRF7309IPBF_2_1"
-        (polyline
-          (pts
-            (xy 2.286 0)
-            (xy 1.27 0.381)
-            (xy 1.27 -0.381)
-            (xy 2.286 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 2.794 -0.508)
-            (xy 2.921 -0.381)
-            (xy 3.683 -0.381)
-            (xy 3.81 -0.254)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.302 -0.381)
-            (xy 2.921 0.254)
-            (xy 3.683 0.254)
-            (xy 3.302 -0.381)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (pin passive line (at 2.54 -5.08 90) (length 2.54)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -5.08 0 0) (length 2.54)
-          (name "G" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Transistor_FET:MMBFJ113" (pin_names 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))
@@ -3290,24 +2863,21 @@
   (junction (at 58.42 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 059f4155-bed3-4fb2-9baa-d569f31b7e5d)
   )
+  (junction (at 375.92 20.32) (diameter 0) (color 0 0 0 0)
+    (uuid 06129627-76da-431c-ac78-8a489cb0761d)
+  )
   (junction (at 220.98 124.46) (diameter 0) (color 0 0 0 0)
     (uuid 08e3fbcd-b24c-43b5-a2a5-3ed606084464)
   )
   (junction (at 95.25 245.11) (diameter 0) (color 0 0 0 0)
     (uuid 0964d962-846f-4609-b657-83d8fae25141)
   )
-  (junction (at 246.38 260.35) (diameter 0) (color 0 0 0 0)
-    (uuid 09793875-04e4-42e7-a807-bec9f1bbc62c)
-  )
   (junction (at 284.48 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 0e565d2a-00bb-4f20-8e2e-0f824e8d2762)
   )
   (junction (at 241.3 189.23) (diameter 0) (color 0 0 0 0)
     (uuid 0f8367d0-e4ea-40ae-8dac-4e16d60a532f)
   )
-  (junction (at 194.31 260.35) (diameter 0) (color 0 0 0 0)
-    (uuid 156e2b24-f0a1-4973-a068-7f546ffbe564)
-  )
   (junction (at 318.77 240.03) (diameter 0) (color 0 0 0 0)
     (uuid 173f5655-a774-48b9-985b-3b9523888334)
   )
@@ -3323,9 +2893,6 @@
   (junction (at 48.26 125.73) (diameter 0) (color 0 0 0 0)
     (uuid 1843d2c0-629c-44e7-8460-03ced60a2111)
   )
-  (junction (at 251.46 280.67) (diameter 0) (color 0 0 0 0)
-    (uuid 19f74eef-445e-4a84-994a-96eca02b0f00)
-  )
   (junction (at 295.91 177.8) (diameter 0) (color 0 0 0 0)
     (uuid 1a164a1f-45a6-43b7-9b64-349463c23d37)
   )
@@ -3344,12 +2911,9 @@
   (junction (at 194.31 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 222d63d3-68ff-4a04-b7c3-6efd5c4ab9e1)
   )
-  (junction (at 365.76 62.23) (diameter 0) (color 0 0 0 0)
+  (junction (at 379.73 62.23) (diameter 0) (color 0 0 0 0)
     (uuid 223b72c8-191b-4d26-8e73-2beb56cb0a2b)
   )
-  (junction (at 243.84 257.81) (diameter 0) (color 0 0 0 0)
-    (uuid 22999b9a-4a23-42e3-adce-20d0d27a4153)
-  )
   (junction (at 298.45 219.71) (diameter 0) (color 0 0 0 0)
     (uuid 22f086a0-4e36-4832-8e1e-3bdb65f5c3f2)
   )
@@ -3362,18 +2926,9 @@
   (junction (at 44.45 38.1) (diameter 0) (color 0 0 0 0)
     (uuid 2792ed93-89db-4e51-99ff-281323e776eb)
   )
-  (junction (at 215.9 267.97) (diameter 0) (color 0 0 0 0)
-    (uuid 2867345a-2f06-474b-a035-5c5ed9cef1f3)
-  )
   (junction (at 321.31 -54.61) (diameter 0) (color 0 0 0 0)
     (uuid 29679519-0074-4244-8bb1-857f21221a1a)
   )
-  (junction (at 361.95 35.56) (diameter 0) (color 0 0 0 0)
-    (uuid 2b774095-37fc-4b2e-8bac-c3e59696f7de)
-  )
-  (junction (at 153.67 -69.85) (diameter 0) (color 0 0 0 0)
-    (uuid 2c488362-c230-4f6d-82f9-a229b1171a23)
-  )
   (junction (at 158.75 43.18) (diameter 0) (color 0 0 0 0)
     (uuid 2cd3680a-9e9d-4c97-9125-39c64a75e644)
   )
@@ -3398,9 +2953,6 @@
   (junction (at 379.73 218.44) (diameter 0) (color 0 0 0 0)
     (uuid 3365c11b-b4a5-418d-85ee-41028926f18a)
   )
-  (junction (at 205.74 276.86) (diameter 0) (color 0 0 0 0)
-    (uuid 37d317e8-e78c-475a-81f1-fe8568d6df88)
-  )
   (junction (at 173.99 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 3bd6009a-f48b-4c66-92de-4d24549b4c7d)
   )
@@ -3425,9 +2977,6 @@
   (junction (at 220.98 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 460147d8-e4b6-4910-88e9-07d1ddd6c2df)
   )
-  (junction (at 205.74 267.97) (diameter 0) (color 0 0 0 0)
-    (uuid 47f9999a-c332-45e0-8094-3e1c321e7041)
-  )
   (junction (at 222.25 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 485f8372-6f58-431e-9419-bfc90ad67732)
   )
@@ -3452,18 +3001,9 @@
   (junction (at 267.97 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 5300cbfb-ca56-4130-b674-4fa230974789)
   )
-  (junction (at 373.38 35.56) (diameter 0) (color 0 0 0 0)
-    (uuid 55388068-757e-47cb-9af5-86c9f64c90c0)
-  )
-  (junction (at 349.25 35.56) (diameter 0) (color 0 0 0 0)
+  (junction (at 361.95 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 55c2ac3f-8f3b-4f78-9b14-388c97827d8c)
   )
-  (junction (at 190.5 -58.42) (diameter 0) (color 0 0 0 0)
-    (uuid 578f33ff-8d12-4136-bb61-e55b7655fa5b)
-  )
-  (junction (at 284.48 267.97) (diameter 0) (color 0 0 0 0)
-    (uuid 57f87f8b-2a84-4bc0-bc49-8f95c5b3f805)
-  )
   (junction (at 45.72 266.7) (diameter 0) (color 0 0 0 0)
     (uuid 583a623a-9287-46cf-a94a-71ec7c67c85f)
   )
@@ -3476,21 +3016,15 @@
   (junction (at 284.48 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 5dbda758-e74b-4ccf-ad68-495d537d68ba)
   )
-  (junction (at 199.39 -58.42) (diameter 0) (color 0 0 0 0)
-    (uuid 5ed637ac-40ac-434c-a406-609e25d3658d)
-  )
   (junction (at 297.18 124.46) (diameter 0) (color 0 0 0 0)
     (uuid 5fc44bfc-3a32-42f5-89ff-303d655beeb1)
   )
-  (junction (at 339.09 35.56) (diameter 0) (color 0 0 0 0)
+  (junction (at 351.79 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 5fe39347-c8a3-40ce-ace1-a055bc364f38)
   )
   (junction (at 198.12 223.52) (diameter 0) (color 0 0 0 0)
     (uuid 611c0051-64b3-4ff6-b51a-6ea814324060)
   )
-  (junction (at 276.86 273.05) (diameter 0) (color 0 0 0 0)
-    (uuid 6135248d-3e4b-4db3-9848-78637d8559e5)
-  )
   (junction (at 69.85 125.73) (diameter 0) (color 0 0 0 0)
     (uuid 62ed984b-c070-4de1-bd86-30aeb09fb9cd)
   )
@@ -3515,9 +3049,6 @@
   (junction (at 347.98 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 88658da7-484b-4fb1-bd87-cf0fe9fbbc98)
   )
-  (junction (at 172.72 273.05) (diameter 0) (color 0 0 0 0)
-    (uuid 89247f47-3cb7-4830-ae32-df6510d5ee3d)
-  )
   (junction (at 205.74 171.45) (diameter 0) (color 0 0 0 0)
     (uuid 89924c9d-894c-4783-bb98-91fe4fffc426)
   )
@@ -3527,6 +3058,9 @@
   (junction (at 358.14 111.76) (diameter 0) (color 0 0 0 0)
     (uuid 8a030abd-885a-4b15-b74a-b44dc2b6c7d7)
   )
+  (junction (at 375.92 35.56) (diameter 0) (color 0 0 0 0)
+    (uuid 8a0d9941-07e6-4643-8f6b-bd2fdd5d5ae4)
+  )
   (junction (at 92.71 255.27) (diameter 0) (color 0 0 0 0)
     (uuid 8d612602-5cc8-45dd-a943-2a29be4b9ede)
   )
@@ -3545,9 +3079,6 @@
   (junction (at 309.88 214.63) (diameter 0) (color 0 0 0 0)
     (uuid 9134413a-edf3-40ce-9ec2-93a536746842)
   )
-  (junction (at 279.4 260.35) (diameter 0) (color 0 0 0 0)
-    (uuid 91e8115a-7736-40ac-9e97-e04f02b557b4)
-  )
   (junction (at 205.74 189.23) (diameter 0) (color 0 0 0 0)
     (uuid 94a7e072-a853-4895-a974-0e863ac9edc2)
   )
@@ -3563,7 +3094,7 @@
   (junction (at 107.95 39.37) (diameter 0) (color 0 0 0 0)
     (uuid 983034d1-18ea-4dac-8753-9630cc5e0592)
   )
-  (junction (at 386.08 45.72) (diameter 0) (color 0 0 0 0)
+  (junction (at 386.08 20.32) (diameter 0) (color 0 0 0 0)
     (uuid 9873db56-1f37-4fe2-98ad-60e4c87af40c)
   )
   (junction (at 95.25 257.81) (diameter 0) (color 0 0 0 0)
@@ -3587,9 +3118,6 @@
   (junction (at 123.19 194.31) (diameter 0) (color 0 0 0 0)
     (uuid 9d1032f1-04b7-4a45-a406-c5f306a5a4a3)
   )
-  (junction (at 243.84 273.05) (diameter 0) (color 0 0 0 0)
-    (uuid 9d896c5e-b976-408e-b134-f2c82b8bc7d8)
-  )
   (junction (at 347.98 115.57) (diameter 0) (color 0 0 0 0)
     (uuid a4615cb6-40e1-4e6b-aa44-484a7357f4a4)
   )
@@ -3638,9 +3166,6 @@
   (junction (at 198.12 210.82) (diameter 0) (color 0 0 0 0)
     (uuid b0bd599f-5320-4de4-9844-b1248597f45d)
   )
-  (junction (at 162.56 265.43) (diameter 0) (color 0 0 0 0)
-    (uuid b281e7d4-7e97-4f4d-9e21-25051359c6dd)
-  )
   (junction (at 59.69 241.3) (diameter 0) (color 0 0 0 0)
     (uuid b2c93e47-1b35-4bce-b217-c95c59af9fea)
   )
@@ -3671,9 +3196,6 @@
   (junction (at 270.51 187.96) (diameter 0) (color 0 0 0 0)
     (uuid bdd38f4a-d1f5-49ea-86a0-7074369f7406)
   )
-  (junction (at 215.9 260.35) (diameter 0) (color 0 0 0 0)
-    (uuid be592d1e-8ffd-4836-a215-bf64f6c90c25)
-  )
   (junction (at 40.64 247.65) (diameter 0) (color 0 0 0 0)
     (uuid beaa9122-a0f4-4e99-96b3-048878d69672)
   )
@@ -3731,7 +3253,7 @@
   (junction (at 284.48 67.31) (diameter 0) (color 0 0 0 0)
     (uuid d964cb21-9482-4b14-9981-964030a476a5)
   )
-  (junction (at 381 62.23) (diameter 0) (color 0 0 0 0)
+  (junction (at 394.97 62.23) (diameter 0) (color 0 0 0 0)
     (uuid daa9b5c5-21a2-4482-b81a-69bb9f749fb7)
   )
   (junction (at 186.69 35.56) (diameter 0) (color 0 0 0 0)
@@ -3746,7 +3268,7 @@
   (junction (at 289.56 236.22) (diameter 0) (color 0 0 0 0)
     (uuid df231e82-dc0c-49c1-a01b-d2be84591ff3)
   )
-  (junction (at 396.24 45.72) (diameter 0) (color 0 0 0 0)
+  (junction (at 396.24 20.32) (diameter 0) (color 0 0 0 0)
     (uuid e2d27bd1-d4c5-4321-a13b-160cb2d6015d)
   )
   (junction (at 49.53 143.51) (diameter 0) (color 0 0 0 0)
@@ -3773,18 +3295,12 @@
   (junction (at 394.97 218.44) (diameter 0) (color 0 0 0 0)
     (uuid efac21da-3f93-4ae4-bab8-dbdec293c35e)
   )
-  (junction (at 284.48 280.67) (diameter 0) (color 0 0 0 0)
-    (uuid f0c9e29f-2093-40f8-ad83-65950690bff8)
-  )
   (junction (at 43.18 161.29) (diameter 0) (color 0 0 0 0)
     (uuid f0f3907b-44e3-4106-9f24-d8ce836b6bb0)
   )
   (junction (at 154.94 171.45) (diameter 0) (color 0 0 0 0)
     (uuid f1a9e2a2-6347-4852-b335-cf8402c433a4)
   )
-  (junction (at 251.46 267.97) (diameter 0) (color 0 0 0 0)
-    (uuid f2675a33-3eb0-43f0-a7ad-d9a72da20dfd)
-  )
   (junction (at 318.77 -83.82) (diameter 0) (color 0 0 0 0)
     (uuid f3285ed9-855d-4b3c-9145-ed9dbda7a1d9)
   )
@@ -3809,8 +3325,8 @@
 
   (no_connect (at 353.06 226.06) (uuid 112718f1-f222-4c50-a4f0-a42dabd066b7))
   (no_connect (at 257.81 96.52) (uuid 2b99a1e6-5f67-436f-9ed5-38e8bfd4c142))
-  (no_connect (at 339.09 69.85) (uuid 36cd8509-4b06-4001-aa2f-00b548cb4477))
-  (no_connect (at 339.09 59.69) (uuid 6226f2ac-b9bf-4733-a388-cd49aa6934ae))
+  (no_connect (at 353.06 69.85) (uuid 36cd8509-4b06-4001-aa2f-00b548cb4477))
+  (no_connect (at 353.06 59.69) (uuid 6226f2ac-b9bf-4733-a388-cd49aa6934ae))
   (no_connect (at 353.06 215.9) (uuid 69a2fbd1-0689-4722-b099-d7d4b3a2c805))
   (no_connect (at 228.6 194.31) (uuid afdb3662-3196-4d9d-b0e8-7f416bb5cd4f))
   (no_connect (at 260.35 96.52) (uuid ee08a6c2-528a-478b-9089-08fe9a37ec7e))
@@ -3851,10 +3367,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 027fc545-8a42-4646-8424-467711418116)
   )
-  (wire (pts (xy 194.31 260.35) (xy 194.31 261.62))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0296200c-3bc7-4fee-847e-68ee39738c3c)
-  )
   (wire (pts (xy 114.3 170.18) (xy 114.3 171.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0332aa97-cadc-4e7a-b8af-ca59e255597d)
@@ -3867,7 +3379,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 03b7756f-0559-43eb-b24d-3aefa5a15899)
   )
-  (wire (pts (xy 394.97 45.72) (xy 396.24 45.72))
+  (wire (pts (xy 394.97 20.32) (xy 396.24 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 03ce6745-00b2-4d2b-bad7-eb9745172859)
   )
@@ -3883,7 +3395,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0437af13-5b81-4e18-82d5-0ec28c5d895f)
   )
-  (wire (pts (xy 359.41 74.93) (xy 359.41 72.39))
+  (wire (pts (xy 373.38 74.93) (xy 373.38 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 047a18ce-9e77-4d7d-a9ce-60b21f671177)
   )
@@ -3895,7 +3407,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 049bc167-7861-4f83-a9e9-3c707dd00017)
   )
-  (wire (pts (xy 396.24 45.72) (xy 397.51 45.72))
+  (wire (pts (xy 396.24 20.32) (xy 397.51 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04ef368b-f4e9-48da-956c-ee93cb3d01e8)
   )
@@ -3915,10 +3427,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 08c8f1b4-737d-438b-967e-a77cce3833c0)
   )
-  (wire (pts (xy 243.84 257.81) (xy 243.84 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0910a9d6-8d2a-4d96-a8df-8a28ac240ef0)
-  )
   (wire (pts (xy 58.42 143.51) (xy 58.42 153.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09321bf4-1ea1-49b5-b1f9-ac29d6606a74)
@@ -3931,7 +3439,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09aa0d32-f4dc-42fd-a756-e1229737bd34)
   )
-  (wire (pts (xy 349.25 35.56) (xy 349.25 34.29))
+  (wire (pts (xy 361.95 35.56) (xy 361.95 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09f01836-52b7-4cc9-b245-1b1e36d31834)
   )
@@ -3983,7 +3491,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 12340fb8-cd9c-4069-beec-13d4d2ea0d99)
   )
-  (wire (pts (xy 349.25 36.83) (xy 349.25 35.56))
+  (wire (pts (xy 361.95 36.83) (xy 361.95 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 127f70da-b001-4621-a4ee-78ee7182bcde)
   )
@@ -3992,7 +3500,7 @@
     (uuid 1281d63b-9c8c-4454-9b2d-0bbbc27e2ae7)
   )
 
-  (wire (pts (xy 347.98 77.47) (xy 347.98 107.95))
+  (wire (pts (xy 347.98 67.31) (xy 347.98 107.95))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 12a6c47a-7412-4804-9a23-fab5a3f774ce)
   )
@@ -4000,14 +3508,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 12e17856-cd8c-41a8-bb2e-9faca10b0973)
   )
-  (wire (pts (xy 334.01 67.31) (xy 334.01 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1457fdf2-2b59-4945-9c3b-624091e7d5e3)
-  )
-  (wire (pts (xy 365.76 35.56) (xy 361.95 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 15226e8f-f1a6-41a7-9d82-3035af1a3dbb)
-  )
   (wire (pts (xy 43.18 234.95) (xy 43.18 236.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15e1025c-faeb-49ff-aaa3-6ba9acaabd98)
@@ -4016,7 +3516,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1606d99f-0508-4f2e-b63b-47e62c4312ee)
   )
-  (wire (pts (xy 386.08 46.99) (xy 386.08 45.72))
+  (wire (pts (xy 386.08 21.59) (xy 386.08 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 16070e3c-2cc9-4d09-bef3-8ceccb63947e)
   )
@@ -4032,10 +3532,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 18723066-b973-43bf-8bbf-4c210121a928)
   )
-  (wire (pts (xy 205.74 274.32) (xy 205.74 276.86))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 18c820d5-32a9-457f-9915-e42ed0717894)
-  )
   (wire (pts (xy 378.46 180.34) (xy 378.46 182.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 19028db1-670b-4d84-9d20-5aa2f8585dd7)
@@ -4056,10 +3552,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a9f0d73-6986-450b-8da5-dca8d718cd0d)
   )
-  (wire (pts (xy 194.31 266.7) (xy 194.31 276.86))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1c617e69-04d5-47df-9392-70db7da3169f)
-  )
   (wire (pts (xy 284.48 143.51) (xy 297.18 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d8cbdb8-b0d5-4f06-84c8-05770b7e9555)
@@ -4096,7 +3588,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2163a967-be2d-4344-a94d-f1b8da3dc3a3)
   )
-  (wire (pts (xy 381 57.15) (xy 381 62.23))
+  (wire (pts (xy 394.97 57.15) (xy 394.97 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2171e051-2b1c-4df3-9987-bb0d428437aa)
   )
@@ -4144,10 +3636,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 268a679e-e023-47f5-8a31-2516b1c23479)
   )
-  (wire (pts (xy 194.31 276.86) (xy 205.74 276.86))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2708eeeb-a398-40be-9450-48b9683d9993)
-  )
   (wire (pts (xy 214.63 67.31) (xy 222.25 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 275568d0-09db-49c2-9144-c338cf90d66a)
@@ -4226,15 +3714,7 @@
   )
   (wire (pts (xy 186.69 45.72) (xy 186.69 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 32d50c10-a20b-414f-afaf-7821cceaf33a)
-  )
-  (wire (pts (xy 246.38 267.97) (xy 251.46 267.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 33538216-f790-439e-9526-a87a1495da39)
-  )
-  (wire (pts (xy 162.56 265.43) (xy 165.1 265.43))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 335b7472-6447-4c02-836d-5fe60e9b7c96)
+    (uuid 32d50c10-a20b-414f-afaf-7821cceaf33a)
   )
   (wire (pts (xy 26.67 274.32) (xy 26.67 275.59))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -4408,17 +3888,13 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 437cfd94-f586-4649-a4a7-54b6265ccf76)
   )
-  (wire (pts (xy 276.86 257.81) (xy 243.84 257.81))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 43e3cf72-6616-4aee-b799-f1624c5c9d0b)
-  )
   (wire (pts (xy 347.98 107.95) (xy 349.25 107.95))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 444b90a0-e12f-4604-8031-264a2e3dcb20)
   )
-  (wire (pts (xy 279.4 267.97) (xy 284.48 267.97))
+  (wire (pts (xy 369.57 35.56) (xy 375.92 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 446ed599-1255-448b-8f5f-1d5167e0101e)
+    (uuid 446b42d3-2017-4098-9899-14a23b103535)
   )
   (wire (pts (xy 241.3 219.71) (xy 231.14 219.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -4436,6 +3912,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 45583653-c1b9-48b1-85eb-b50796173085)
   )
+  (polyline (pts (xy 346.71 16.51) (xy 346.71 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 461edb23-c1ec-4e0f-871a-a240c1cd3a36)
+  )
+
   (wire (pts (xy 271.78 138.43) (xy 271.78 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 462f8e7e-09c6-4676-ba4f-fd07b2868aa8)
@@ -4502,10 +3983,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d49a0aa-f132-4d9a-8008-eb3731d0492a)
   )
-  (wire (pts (xy 205.74 276.86) (xy 215.9 276.86))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4d8ec885-8c89-49c3-9ed8-3855ea185705)
-  )
   (wire (pts (xy 293.37 124.46) (xy 297.18 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4e43689e-9cf0-4146-b69d-54896ee090d3)
@@ -4534,7 +4011,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 50928973-c6f1-4b2b-a504-e4f02238a437)
   )
-  (wire (pts (xy 339.09 67.31) (xy 334.01 67.31))
+  (wire (pts (xy 353.06 67.31) (xy 347.98 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 50c93d3b-a94c-4345-b9de-1bc66acdfbe1)
   )
@@ -4542,10 +4019,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 51294bad-a7d2-4fff-a653-b88def9fe12f)
   )
-  (wire (pts (xy 162.56 271.78) (xy 162.56 273.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 51590549-759a-4651-9186-44083dde7bc5)
-  )
   (wire (pts (xy 387.35 231.14) (xy 373.38 231.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 524b0bbc-ded0-4ac4-9d45-7316ae611d2e)
@@ -4586,7 +4059,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 57017bb9-5d41-4b31-9172-29f647f38db6)
   )
-  (wire (pts (xy 339.09 34.29) (xy 339.09 35.56))
+  (wire (pts (xy 351.79 34.29) (xy 351.79 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 59352dbf-ed93-4a71-8e11-dafed012fa72)
   )
@@ -4684,10 +4157,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6284d8a0-1f58-40d1-8472-4260bed0c7f7)
   )
-  (wire (pts (xy 274.32 273.05) (xy 276.86 273.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 63c8dfdf-4f33-4313-848f-7145ef2a1b7b)
-  )
   (polyline (pts (xy 133.35 167.64) (xy 133.35 166.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6441305e-3590-44d5-9ead-1c464ec62f7b)
@@ -4709,10 +4178,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6586325d-a1b9-438e-b778-06845a1dc5e4)
   )
-  (wire (pts (xy 186.69 -58.42) (xy 190.5 -58.42))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 664ea685-f665-4315-aadf-581a656f41df)
-  )
   (wire (pts (xy 107.95 53.34) (xy 107.95 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6677ce38-207e-42ad-8da7-043e0734d9e1)
@@ -4763,10 +4228,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a3aff19-5e5c-466c-80b5-82ab994aaee1)
   )
-  (wire (pts (xy 205.74 267.97) (xy 205.74 269.24))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6b106e5c-70b7-4b68-995d-e382ed6fef7d)
-  )
   (wire (pts (xy 313.69 -59.69) (xy 303.53 -59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6c86afcb-7177-47f2-8064-ed3be1ff755e)
@@ -4816,7 +4277,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 70a4733d-cae1-49df-97e4-f4275675004d)
   )
-  (wire (pts (xy 381 62.23) (xy 381 69.85))
+  (wire (pts (xy 394.97 62.23) (xy 394.97 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 71112969-491c-4030-a62d-0099394e646b)
   )
@@ -4840,10 +4301,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 73b2d4b4-d67b-4a9a-a863-3e4af4b8fd5f)
   )
-  (wire (pts (xy 162.56 -69.85) (xy 153.67 -69.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 74096bdc-b668-408c-af3a-b048c20bd605)
-  )
   (wire (pts (xy 299.72 198.12) (xy 299.72 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 742d47be-db3c-4e05-9d4c-991a4295c5b5)
@@ -4864,10 +4321,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 76b488fa-e9f2-40f3-aa68-df8ee6acd181)
   )
-  (wire (pts (xy 190.5 -58.42) (xy 191.77 -58.42))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 771cb5c1-62ba-4cca-999e-cdcbe417213c)
-  )
   (polyline (pts (xy 209.55 90.17) (xy 209.55 149.86))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 77f63278-dd6a-44ad-be59-60e72c5a32f1)
@@ -4917,10 +4370,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b8d8ffb-581a-4bc6-a66a-cbb1fc19abb8)
   )
-  (wire (pts (xy 251.46 278.13) (xy 251.46 280.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7bedf657-1467-440c-87df-09869c6b93a5)
-  )
   (wire (pts (xy 39.37 171.45) (xy 39.37 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7c17edd0-6f2d-4f65-8125-a2702fda17e8)
@@ -4949,11 +4398,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 803e40ee-d597-4165-87e8-465bf011a20d)
   )
-  (wire (pts (xy 396.24 46.99) (xy 396.24 45.72))
+  (wire (pts (xy 396.24 21.59) (xy 396.24 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 804bda20-75d0-4292-80cc-32a55cc27457)
   )
-  (wire (pts (xy 340.36 36.83) (xy 339.09 36.83))
+  (wire (pts (xy 353.06 36.83) (xy 351.79 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 804f6e34-fd20-4ac3-a108-9649a90f2729)
   )
@@ -5018,9 +4467,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 894a8cae-6944-4565-b545-9036ece0c2e3)
   )
-  (wire (pts (xy 151.13 -69.85) (xy 153.67 -69.85))
+  (wire (pts (xy 375.92 33.02) (xy 375.92 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 89df70f4-3579-42b9-861e-6beb04a3b25e)
+    (uuid 8a19ead7-5ab4-4c3f-8cb9-0e8dbba703b4)
   )
   (wire (pts (xy 205.74 193.04) (xy 205.74 201.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5078,10 +4527,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92f30294-5e2b-4244-84a8-bfdd47e961c0)
   )
-  (wire (pts (xy 215.9 267.97) (xy 215.9 269.24))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 92f5db95-d96c-4b78-aca1-4f0d76b9eba9)
-  )
   (wire (pts (xy 347.98 134.62) (xy 347.98 137.16))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93765598-e150-43be-8754-9fff6d7779c4)
@@ -5123,9 +4568,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 96d42e3c-5260-4163-9ecf-dbe1aba9ed59)
   )
-  (wire (pts (xy 153.67 -53.34) (xy 157.48 -53.34))
+  (wire (pts (xy 375.92 20.32) (xy 373.38 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 971d1932-4a99-4265-9c76-26e554bde4fe)
+    (uuid 96f87c2b-4767-4230-807a-a6c719cc34b0)
   )
   (wire (pts (xy 190.5 224.79) (xy 190.5 223.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5199,7 +4644,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9e755e31-b4ad-4565-ac13-d8989759655c)
   )
-  (wire (pts (xy 365.76 62.23) (xy 365.76 69.85))
+  (wire (pts (xy 379.73 62.23) (xy 379.73 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9e9f0f01-39de-4ac4-9c6f-ecd6f7c36c8d)
   )
@@ -5245,7 +4690,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a1f11dd0-cbd6-4fdb-93a0-81b53efbe38f)
   )
-  (wire (pts (xy 361.95 59.69) (xy 359.41 59.69))
+  (wire (pts (xy 375.92 59.69) (xy 373.38 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a2ba49c0-d9aa-41ee-8039-3ef8047d8b1f)
   )
@@ -5269,15 +4714,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a3f168bf-fdef-4cd9-9a64-7266a3fb4fb1)
   )
-  (wire (pts (xy 215.9 257.81) (xy 215.9 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a41dda7b-b73f-4cbd-8925-77299e94d401)
-  )
   (wire (pts (xy 38.1 30.48) (xy 38.1 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a43f2e19-4e11-4e86-a12a-58a691d6df28)
   )
-  (wire (pts (xy 373.38 74.93) (xy 359.41 74.93))
+  (wire (pts (xy 387.35 74.93) (xy 373.38 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a4537c6b-69ec-436f-b1cc-fa5cbd0e82f7)
   )
@@ -5329,15 +4770,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a7631b54-fef7-4919-a0e4-55bd4ba043f4)
   )
-  (wire (pts (xy 213.36 260.35) (xy 215.9 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a8c256d8-505f-4ddb-9968-c2d0742bbcbe)
-  )
   (wire (pts (xy 68.58 38.1) (xy 68.58 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a8c43d49-ee8f-4f2f-9499-48275837544e)
   )
-  (wire (pts (xy 284.48 57.15) (xy 339.09 57.15))
+  (wire (pts (xy 284.48 57.15) (xy 353.06 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a91126c0-31fd-417f-be97-cf08f0a64f95)
   )
@@ -5374,9 +4811,9 @@
     (uuid ab8edd54-d96e-4f57-9eb9-c30071b28a90)
   )
 
-  (wire (pts (xy 200.66 -58.42) (xy 199.39 -58.42))
+  (wire (pts (xy 375.92 35.56) (xy 375.92 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid acb025c1-3784-47d1-b5e9-772bcda8c549)
+    (uuid abac37e5-1f99-47b5-8696-f1eb89ef0559)
   )
   (wire (pts (xy 353.06 194.31) (xy 355.6 194.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5423,10 +4860,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b378a2dc-2ed3-4598-ad14-af97f2918627)
   )
-  (wire (pts (xy 276.86 257.81) (xy 276.86 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b40641bd-5ffa-4b85-acd5-f26ee479a5f1)
-  )
   (wire (pts (xy 167.64 210.82) (xy 166.37 210.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b4539792-8a34-4396-bc51-71446ff68c05)
@@ -5443,7 +4876,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b632afec-1444-4246-8afb-cc14a57567e7)
   )
-  (wire (pts (xy 359.41 57.15) (xy 381 57.15))
+  (wire (pts (xy 373.38 57.15) (xy 394.97 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b64e3122-bfe1-4303-bded-f5f05ee7fa1a)
   )
@@ -5484,6 +4917,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b863cb16-8e12-4d98-a0ca-238a09c8da27)
   )
+  (polyline (pts (xy 346.71 44.45) (xy 379.73 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b8ab8324-d4cc-4364-b383-ddd6043628ec)
+  )
+
   (wire (pts (xy 149.86 50.8) (xy 149.86 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b8e6eb49-83e5-473d-bc54-730e78dd5555)
@@ -5524,6 +4962,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bca99a8e-598f-436a-9158-7a050d1f7ca4)
   )
+  (polyline (pts (xy 379.73 44.45) (xy 379.73 16.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bcdeb8cf-55eb-4020-a3d2-a39303a353bc)
+  )
+
   (wire (pts (xy 176.53 199.39) (xy 176.53 193.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bd7a60ba-7561-4c78-be84-2d31ea3c9a90)
@@ -5548,6 +4991,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid be5e7ff7-e109-4269-b1f2-5ea5b2205234)
   )
+  (polyline (pts (xy 379.73 16.51) (xy 346.71 16.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bf723b4d-3c4c-4195-b8bf-3bc4129dadee)
+  )
+
   (wire (pts (xy 318.77 -34.29) (xy 318.77 -39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bfeebcc7-cbd3-4df8-85ba-0ba757e2fcef)
@@ -5584,10 +5032,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c201acc2-4657-4953-8314-8005b01e8999)
   )
-  (wire (pts (xy 284.48 278.13) (xy 284.48 280.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c2d894c3-853c-4fd1-b569-a8d17341f4fe)
-  )
   (wire (pts (xy 27.94 228.6) (xy 27.94 232.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c4282597-7308-44c4-9c71-b2ec2bb5494a)
@@ -5641,18 +5085,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cbd2d886-7d6a-4106-8d7c-bd5e0ea5b990)
   )
-  (wire (pts (xy 162.56 265.43) (xy 162.56 266.7))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cc3b3f4d-2cd5-4f43-a16b-ec940014d256)
-  )
   (wire (pts (xy 35.56 281.94) (xy 35.56 280.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc5561df-9d20-4574-af60-64f10025a0ed)
   )
-  (wire (pts (xy 241.3 273.05) (xy 243.84 273.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cc785fcf-6a94-4b39-95cf-a3f48b9eb59d)
-  )
   (wire (pts (xy 29.21 55.88) (xy 29.21 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cce13a3b-854c-49ae-8b19-551eed5c4f96)
@@ -5694,10 +5130,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d08f7845-567e-4830-81c2-a7dd828ea649)
   )
-  (wire (pts (xy 205.74 267.97) (xy 215.9 267.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d0c48818-bcdc-4044-b83a-0739a9ebd1af)
-  )
   (wire (pts (xy 196.85 85.09) (xy 222.25 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d1015b8c-54c3-4cf9-a2d1-23b2038ae0aa)
@@ -5726,15 +5158,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3db736b-0e33-4126-b950-5488923df40e)
   )
-  (wire (pts (xy 276.86 260.35) (xy 279.4 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d3f6a643-8a49-4a41-acd6-9b731566ee83)
-  )
   (wire (pts (xy 166.37 213.36) (xy 166.37 210.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d4de6b21-c21c-4cfa-b455-c04fc313b3d7)
   )
-  (wire (pts (xy 386.08 45.72) (xy 387.35 45.72))
+  (wire (pts (xy 386.08 20.32) (xy 387.35 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d509f983-c1d5-446c-8a19-0b1eaeef3f50)
   )
@@ -5742,10 +5170,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d54fce64-01e8-4f5c-8f34-4e64d47e3402)
   )
-  (wire (pts (xy 347.98 77.47) (xy 334.01 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d5baf2c1-7d36-43c9-9e9d-c45e38d61ca4)
-  )
   (wire (pts (xy 233.68 187.96) (xy 233.68 204.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d6892143-e931-4761-a8f6-c00e31056a27)
@@ -5763,14 +5187,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d888ad9c-815d-4b52-9156-d6266aebe4bf)
   )
-  (wire (pts (xy 340.36 34.29) (xy 339.09 34.29))
+  (wire (pts (xy 353.06 34.29) (xy 351.79 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d8ffaca0-058a-4fb0-8d3b-29fc213c8339)
   )
-  (wire (pts (xy 162.56 273.05) (xy 172.72 273.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d91614f9-dcfa-46ef-b7e0-17f0e7b63757)
-  )
   (wire (pts (xy 69.85 260.35) (xy 77.47 260.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d9608da2-7b1f-4cc7-9967-bc764c4d1413)
@@ -5780,19 +5200,11 @@
     (uuid db6760ad-98b1-47c1-a6dc-53af1beea1f8)
   )
 
-  (wire (pts (xy 153.67 -69.85) (xy 153.67 -60.96))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dc628a9d-67e8-4a03-b99f-8cc7a42af6ef)
-  )
   (wire (pts (xy 365.76 180.34) (xy 365.76 179.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dde681de-40e0-4b21-8fc6-0c73fdee3c0f)
   )
-  (wire (pts (xy 284.48 280.67) (xy 276.86 280.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid de0ccdf1-0c92-4039-bbb9-5f5c4011e873)
-  )
-  (wire (pts (xy 347.98 34.29) (xy 349.25 34.29))
+  (wire (pts (xy 360.68 34.29) (xy 361.95 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid de519033-9f41-4d62-a85c-87437410f84f)
   )
@@ -5812,6 +5224,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e025178a-6897-4647-9c5b-528472a8f76e)
   )
+  (wire (pts (xy 375.92 20.32) (xy 386.08 20.32))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e0290073-4a8b-461f-a06d-d344ba3927c0)
+  )
   (wire (pts (xy 184.15 185.42) (xy 184.15 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e053d785-20a7-40a8-8d3a-996b9045335f)
@@ -5872,7 +5288,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e5f15ad7-1bce-41bc-8507-088ffe98cc75)
   )
-  (wire (pts (xy 347.98 36.83) (xy 349.25 36.83))
+  (wire (pts (xy 360.68 36.83) (xy 361.95 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e6342b84-9703-4b4f-8b68-7fa02d4ac053)
   )
@@ -5888,10 +5304,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e8e23712-f080-4685-ae22-9028780f7b13)
   )
-  (wire (pts (xy 243.84 257.81) (xy 215.9 257.81))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e95d2c3e-eb60-4348-a367-399438d2a3a3)
-  )
   (wire (pts (xy 318.77 -39.37) (xy 313.69 -39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e9b9f6ca-b237-4bc6-befc-b08e2e73e1cf)
@@ -5905,7 +5317,7 @@
     (uuid ec209dcc-10a3-48d4-89a8-89525669e3c2)
   )
 
-  (wire (pts (xy 339.09 36.83) (xy 339.09 35.56))
+  (wire (pts (xy 351.79 36.83) (xy 351.79 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ec302f96-ff3c-4532-a8bd-4267ff5af6aa)
   )
@@ -5913,10 +5325,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ec3c5ba0-0946-4b92-8364-887bc9db33b5)
   )
-  (wire (pts (xy 356.87 35.56) (xy 361.95 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ec799b57-7a79-4300-85f0-338e985efba9)
-  )
   (wire (pts (xy 347.98 149.86) (xy 347.98 151.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ec9fbb9f-76a6-4d37-ba09-df0d9f6e0b91)
@@ -5933,10 +5341,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ee4527a8-96f7-423b-b0eb-5c3b1bed75f9)
   )
-  (wire (pts (xy 190.5 -48.26) (xy 190.5 -58.42))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ee9a2826-2513-480e-a552-3d07af5bf8a5)
-  )
   (wire (pts (xy 102.87 88.9) (xy 104.14 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eef5827f-ea0c-4f19-b479-3a067321b742)
@@ -5949,18 +5353,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f0c5a65d-d21b-425f-80a7-3e008e043bda)
   )
-  (wire (pts (xy 373.38 45.72) (xy 386.08 45.72))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f1e66558-81d5-4d7a-bdf1-99450528b1d4)
-  )
   (wire (pts (xy 24.13 24.13) (xy 29.21 24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f2c43eeb-76da-49f4-b8e6-cd74ebb3190b)
   )
-  (wire (pts (xy 251.46 280.67) (xy 243.84 280.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f4ec20e2-4bad-4ce5-a96f-1d796ad3804a)
-  )
   (wire (pts (xy 34.29 63.5) (xy 29.21 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f5a54919-b960-48fc-8517-e9e32dce0bf0)
@@ -5969,15 +5365,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6b67fe8-cddc-463a-a9ee-225a85050a7f)
   )
-  (wire (pts (xy 198.12 260.35) (xy 194.31 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f78182c3-ea6c-4b31-a2d5-767a11aaabc9)
-  )
   (wire (pts (xy 355.6 190.5) (xy 355.6 194.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f7af03d3-e511-46bb-a87e-3f15adda81a7)
   )
-  (wire (pts (xy 373.38 67.31) (xy 359.41 67.31))
+  (wire (pts (xy 387.35 67.31) (xy 373.38 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f7db6e53-053f-4969-b290-ad660e0591e6)
   )
@@ -6006,14 +5398,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fb57d6ef-0554-4ce0-b3f0-a807b2bfd312)
   )
-  (wire (pts (xy 361.95 35.56) (xy 361.95 59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fb9c52bd-d067-4b8c-885b-92e529a4fcaa)
-  )
-  (wire (pts (xy 243.84 260.35) (xy 246.38 260.35))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fbbff3b4-9f25-4a3b-a8a8-5a9af7ce7714)
-  )
   (wire (pts (xy 284.48 46.99) (xy 284.48 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc7c47a1-d104-4a54-93ba-70bf8a5e10d0)
@@ -6022,7 +5406,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fcc1e432-b760-48b1-b658-79f6813147db)
   )
-  (wire (pts (xy 365.76 62.23) (xy 359.41 62.23))
+  (wire (pts (xy 379.73 62.23) (xy 373.38 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fcc855a4-38d0-46fd-a1eb-cd36756f19e3)
   )
@@ -6038,7 +5422,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fdb73e1a-49b3-437a-83c3-435e929a8401)
   )
-  (wire (pts (xy 373.38 35.56) (xy 373.38 45.72))
+  (wire (pts (xy 375.92 25.4) (xy 375.92 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fe0a7913-794e-46a4-b95b-ed34ac0e8a7f)
   )
@@ -6059,7 +5443,7 @@
     (uuid ffaf0ed9-3944-4c9c-928a-1a354995ddcd)
   )
 
-  (text "IF" (at 337.82 57.15 180)
+  (text "IF" (at 351.79 57.15 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0810db02-c536-4da4-8cb3-eb98acbf73f6)
   )
@@ -6075,7 +5459,7 @@
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 0e19beb0-71f5-4b11-b16f-58f80b7f3a28)
   )
-  (text "Diplexer" (at 356.87 34.29 0)
+  (text "Diplexer" (at 350.52 21.59 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 29dcba45-439b-4f41-aabb-51de21635866)
   )
@@ -6096,7 +5480,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3fdce84c-f89f-44da-ad99-8fe47fc4d746)
   )
-  (text "LO" (at 337.82 67.31 180)
+  (text "LO" (at 351.79 67.31 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5946ec6c-3260-4308-ab81-2e2e73710bba)
   )
@@ -6176,7 +5560,7 @@
     (effects (font (size 2 2)) (justify right bottom))
     (uuid db1f19e1-0aaf-414a-a702-5f0cb89a9ea1)
   )
-  (text "RF" (at 359.41 59.69 0)
+  (text "RF" (at 373.38 59.69 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dbdd92d0-0294-4e3f-9989-b72e577bd06f)
   )
@@ -6206,14 +5590,6 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3d8f631b-465f-4bf8-bace-c932576e1e42)
   )
-  (label "+9VA" (at 223.52 257.81 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 473257dd-231a-4c36-bf3d-e08cdead5ee6)
-  )
-  (label "+5VA" (at 180.34 265.43 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 73aa88f6-759d-4e4f-aec9-7db8ab3a547d)
-  )
   (label "+5VA" (at 22.86 247.65 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid b82ebf0f-f109-4c62-b80f-28a8b49d5ffc)
@@ -6223,13 +5599,6 @@
     (uuid f61adca3-c1e4-457e-8212-9dc978cabab5)
   )
 
-  (global_label "+8V" (shape input) (at 151.13 -69.85 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 25ca9482-069d-43de-b77e-6f2ad77fa017)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 144.8464 -69.9294 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
   (global_label "+VTX" (shape input) (at 222.25 44.45 90) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 36beb844-17a6-45b4-ae6f-6dbe3f2c22ca)
@@ -6258,13 +5627,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "+VTX" (shape output) (at 289.56 260.35 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 799485ec-781b-44d4-8de4-2ab569edbe93)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 296.8112 260.2706 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "+VTX" (shape input) (at 284.48 44.45 90) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 80547a92-9725-43bd-95ab-913b1ea92edf)
@@ -6279,20 +5641,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "+8V" (shape input) (at 200.66 -58.42 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 84e154cc-34e9-48ac-ab7e-fc52b3bc90d0)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 206.9436 -58.4994 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "+VRX" (shape output) (at 256.54 260.35 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 8ae8572e-43c9-4289-9ee2-4927f5ac45f2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 264.0936 260.2706 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "+VRX" (shape input) (at 220.98 171.45 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 95cc86a1-4e15-4231-b963-eac2c36fa688)
@@ -6349,15 +5697,11 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 51320c8c-9c4a-48b8-a7b8-e2c8d1f2e5ad)
   )
-  (hierarchical_label "EN_VTX" (shape input) (at 274.32 273.05 180)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 6eac4e27-ce42-4863-92ee-64c39c8490ac)
-  )
   (hierarchical_label "MUTE_SPKR" (shape input) (at 26.67 264.16 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7147b342-4ca8-4694-a1ec-b615c151a5d0)
   )
-  (hierarchical_label "VHF_OUT" (shape output) (at 397.51 45.72 0)
+  (hierarchical_label "VHF_OUT" (shape output) (at 397.51 20.32 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 8f2a00b4-9c23-4c95-887d-b98e36d46338)
   )
@@ -6369,97 +5713,11 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 9a88d63d-f7e5-416d-9807-a8e942aef287)
   )
-  (hierarchical_label "EN_VRX" (shape input) (at 241.3 273.05 180)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a3040a93-9886-4bcd-884d-844f3af2f21e)
-  )
   (hierarchical_label "CW_TONE" (shape input) (at 22.86 228.6 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid de91796c-56de-4405-8fcc-748bd6a08e86)
   )
 
-  (symbol (lib_id "Device:C_Small") (at 157.48 -50.8 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e3202cc)
-    (property "Reference" "C?" (id 0) (at 160.02 -52.0765 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "0.1uF" (id 1) (at 160.02 -49.5365 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 157.48 -50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 157.48 -50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 157.48 -50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 157.48 -50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0c31faf7-4d9d-4476-bcc3-86b2ae91d835))
-    (pin "2" (uuid b2c23c78-f75e-47da-933b-dab1c7d5fa3f))
-  )
-
-  (symbol (lib_id "power:GNDA") (at 157.48 -48.26 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e320c31)
-    (property "Reference" "#PWR?" (id 0) (at 157.48 -41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 157.48 -41.91 0))
-    (property "Footprint" "" (id 2) (at 157.48 -48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 157.48 -48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 90c0de34-ecb3-4176-b44a-3a123c1046e1))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 162.56 -67.31 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e3222cf)
-    (property "Reference" "C?" (id 0) (at 165.1 -68.5865 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "0.1uF" (id 1) (at 165.1 -66.0465 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 162.56 -67.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 162.56 -67.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 162.56 -67.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 162.56 -67.31 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid be5def30-441a-41dc-a04b-08375bb12fca))
-    (pin "2" (uuid ebf8619c-eaae-4a66-a855-aa621d3ba819))
-  )
-
-  (symbol (lib_id "power:GNDA") (at 162.56 -64.77 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e322b6e)
-    (property "Reference" "#PWR?" (id 0) (at 162.56 -58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 162.56 -58.42 0))
-    (property "Footprint" "" (id 2) (at 162.56 -64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 162.56 -64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a907c940-e329-41a7-a3b9-b2b6af3699f7))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 220.98 140.97 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e348fc2)
@@ -6635,142 +5893,6 @@
     (pin "1" (uuid 8c98fed0-59cf-439c-9da3-211c5b1353e2))
   )
 
-  (symbol (lib_id "mpb:L_tapped") (at 189.23 -69.85 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e3ac9c4)
-    (property "Reference" "L?" (id 0) (at 187.96 -71.1201 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "4.3uH" (id 1) (at 187.96 -68.5801 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37" (id 2) (at 189.23 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 189.23 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Description" "38 loops on T37-6, 244pF, 132 Ohm, 54cm, tap at 19th" (id 4) (at 189.23 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "T37-6" (id 5) (at 189.23 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 6) (at 189.23 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 7) (at 189.23 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 44542c12-5049-4f9c-9ea6-fc7bc3291298))
-    (pin "2" (uuid fa6a9b7d-4d37-434a-9988-51e7cbe6ce82))
-    (pin "3" (uuid c5f7546f-3d61-4fdc-89c5-626dc23e29a6))
-  )
-
-  (symbol (lib_id "Device:C_Trim_Small") (at 177.8 -69.85 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e3c1d83)
-    (property "Reference" "C?" (id 0) (at 175.26 -71.2471 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "60pF" (id 1) (at 175.26 -68.7071 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "picardy:C_trimmer_60pF" (id 2) (at 177.8 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 177.8 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 177.8 -69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 91f42828-e21b-4428-97b0-17adf0fb7834))
-    (pin "2" (uuid 9d8a1a98-caac-4a6c-b050-223399ba02d0))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 186.69 -55.88 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e406764)
-    (property "Reference" "C?" (id 0) (at 184.15 -57.1565 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "0.1uF" (id 1) (at 184.15 -54.6165 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 186.69 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 186.69 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 186.69 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 186.69 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 14358aec-6ce2-498c-8624-960171787e71))
-    (pin "2" (uuid fd8022fe-61e5-40b4-b49b-db3a715ba85a))
-  )
-
-  (symbol (lib_id "power:GNDA") (at 186.69 -53.34 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e40676e)
-    (property "Reference" "#PWR?" (id 0) (at 186.69 -46.99 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 186.69 -46.99 0))
-    (property "Footprint" "" (id 2) (at 186.69 -53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 186.69 -53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 8cb38116-c43d-42a9-b44a-52932123e352))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 199.39 -55.88 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e406785)
-    (property "Reference" "C?" (id 0) (at 196.85 -57.1565 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "0.1uF" (id 1) (at 196.85 -54.6165 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 199.39 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 199.39 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 199.39 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 199.39 -55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 112c5056-60ad-46c9-a6fe-80566e2ccd73))
-    (pin "2" (uuid 0626e939-11da-430e-80e9-53bd5e410fd1))
-  )
-
-  (symbol (lib_id "power:GNDA") (at 199.39 -53.34 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e40678f)
-    (property "Reference" "#PWR?" (id 0) (at 199.39 -46.99 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 199.39 -46.99 0))
-    (property "Footprint" "" (id 2) (at 199.39 -53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 199.39 -53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f7e12db2-4f87-4551-8013-7c24559bf25b))
-  )
-
   (symbol (lib_id "power:GNDA") (at 38.1 24.13 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e417a69)
@@ -7296,55 +6418,9 @@
     (property "Need_order" "" (id 5) (at 33.02 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 6eedc646-5cf2-4f0f-a4a6-cd420e94ce39))
-    (pin "2" (uuid d22ef839-55bd-4591-a145-cac96a6ce41d))
-    (pin "3" (uuid 4d613f14-0fe6-440c-a5dc-c11c7e01beed))
-  )
-
-  (symbol (lib_id "Device:L_Core_Ferrite") (at 153.67 -57.15 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e56ee9f)
-    (property "Reference" "L?" (id 0) (at 152.4 -58.4201 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "100uH" (id 1) (at 152.4 -55.8801 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Inductor_SMD:L_Wuerth_HCI-1030" (id 2) (at 153.67 -57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 153.67 -57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "stash" (id 4) (at 153.67 -57.15 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 153.67 -57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5e1cc128-e7d4-4be0-bb09-68ecbebcc85a))
-    (pin "2" (uuid 2b47e5ee-c95c-498a-a97d-19fbb2cc2449))
-  )
-
-  (symbol (lib_id "Device:L_Core_Ferrite") (at 195.58 -58.42 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 00000000-0000-0000-0000-00005e58690f)
-    (property "Reference" "L?" (id 0) (at 195.58 -63.5 90))
-    (property "Value" "100uH" (id 1) (at 195.58 -60.96 90))
-    (property "Footprint" "Inductor_SMD:L_Wuerth_HCI-1030" (id 2) (at 195.58 -58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 195.58 -58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "stash" (id 4) (at 195.58 -58.42 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 195.58 -58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ece65a2d-9ff9-4bec-bd83-f3d3a63d3aa0))
-    (pin "2" (uuid 6ae3c069-db23-44a7-b170-db6e4d41c3ca))
+    (pin "1" (uuid 6eedc646-5cf2-4f0f-a4a6-cd420e94ce39))
+    (pin "2" (uuid d22ef839-55bd-4591-a145-cac96a6ce41d))
+    (pin "3" (uuid 4d613f14-0fe6-440c-a5dc-c11c7e01beed))
   )
 
   (symbol (lib_id "power:GNDA") (at 35.56 281.94 0) (unit 1)
@@ -8203,22 +7279,6 @@
     (pin "2" (uuid cd6c3e51-786a-421c-9936-a4fe9d48d39d))
   )
 
-  (symbol (lib_id "power:+12V") (at 162.56 265.43 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 03272278-e3db-4be6-8479-99758255fb4d)
-    (property "Reference" "#PWR?" (id 0) (at 162.56 269.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+12V" (id 1) (at 162.56 260.35 0))
-    (property "Footprint" "" (id 2) (at 162.56 265.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 162.56 265.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7919cee0-9a57-4b8e-81ee-6213341be0ff))
-  )
-
   (symbol (lib_id "power:GNDA") (at 146.05 215.9 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 05290e23-4b5d-4968-ab99-eef25ec0f2e2)
@@ -8237,17 +7297,17 @@
     (pin "1" (uuid e9f0a9a9-2201-4e0e-a693-7e6449a121e4))
   )
 
-  (symbol (lib_id "mpb:BAT68-04W") (at 373.38 62.23 0) (unit 1)
+  (symbol (lib_id "mpb:BAT68-04W") (at 387.35 62.23 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 06d504ba-a9ba-486e-b9ca-ea875d98a852)
-    (property "Reference" "D?" (id 0) (at 370.84 64.77 0))
-    (property "Value" "BAT68-04W" (id 1) (at 373.38 58.42 0)
+    (property "Reference" "D?" (id 0) (at 384.81 64.77 0))
+    (property "Value" "BAT68-04W" (id 1) (at 387.35 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 375.285 59.055 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 389.255 59.055 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "" (id 3) (at 373.38 62.23 0)
+    (property "Datasheet" "" (id 3) (at 387.35 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 42db9867-651d-492b-8504-8f33de546940))
@@ -8357,31 +7417,6 @@
     (pin "2" (uuid 557bd209-66ef-4c38-a6df-0d57cd485c59))
   )
 
-  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 281.94 273.05 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 0af7ceb8-79f5-40d6-80a5-080f0b2b9e91)
-    (property "Reference" "Q?" (id 0) (at 288.29 273.0499 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "IRF7309IPBF" (id 1) (at 288.29 274.3199 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 287.02 274.955 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 284.48 273.05 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (pin "1" (uuid fa2c314d-b000-40a4-9210-b8c9ae296fd0))
-    (pin "2" (uuid 1d6c7775-5c7e-4aee-a347-054daeaff873))
-    (pin "7" (uuid 48281c26-0697-4656-b82e-809599b54164))
-    (pin "8" (uuid c19a46d2-e6db-4d0b-90a7-ffcc1da7234a))
-    (pin "3" (uuid ba8cc049-c105-4de1-878b-b1dbe6de7d57))
-    (pin "4" (uuid 4e37fb9e-80ab-4142-a214-915c8a797024))
-    (pin "5" (uuid d21acb24-22d5-4f00-99de-a550b2e303b5))
-    (pin "6" (uuid 97974bf9-8a18-4bae-af65-2a4432a530f7))
-  )
-
   (symbol (lib_id "mpb:BAT68-04W") (at 118.11 222.25 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0b722f0a-25c0-4795-800b-a097f194cba7)
@@ -8525,37 +7560,21 @@
     (pin "2" (uuid 833dbded-0b81-4655-9b7a-816815f21b74))
   )
 
-  (symbol (lib_id "power:+12V") (at 194.31 260.35 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 13f9cf6a-28ed-4a40-a578-742db0146f85)
-    (property "Reference" "#PWR?" (id 0) (at 194.31 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+12V" (id 1) (at 194.31 255.27 0))
-    (property "Footprint" "" (id 2) (at 194.31 260.35 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 194.31 260.35 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fd44b571-f1aa-49c4-a617-82f845041f9f))
-  )
-
-  (symbol (lib_id "Device:L") (at 344.17 34.29 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:L") (at 356.87 34.29 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1408f7bf-70f2-4343-ab61-d8ea398638a7)
-    (property "Reference" "L?" (id 0) (at 344.17 27.94 90))
-    (property "Value" "TBD" (id 1) (at 344.17 30.48 90))
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 344.17 34.29 0)
+    (property "Reference" "L?" (id 0) (at 356.87 27.94 90))
+    (property "Value" "TBD" (id 1) (at 356.87 30.48 90))
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 356.87 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 344.17 34.29 0)
+    (property "Datasheet" "~" (id 3) (at 356.87 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 344.17 34.29 0)
+    (property "MPN" "" (id 4) (at 356.87 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 344.17 34.29 0)
+    (property "Need_order" "" (id 5) (at 356.87 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0c7b592a-d909-4653-b131-5f90965893bc))
@@ -8621,28 +7640,6 @@
     (pin "2" (uuid 830030d8-ad0e-48c4-a35c-5fe14717a1ac))
   )
 
-  (symbol (lib_id "Device:R") (at 246.38 264.16 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 14b1e175-dc82-4d81-b685-f4322b88a4e2)
-    (property "Reference" "R?" (id 0) (at 243.84 262.8899 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "12k" (id 1) (at 243.84 265.4299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 244.602 264.16 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 246.38 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 246.38 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a64717d7-d313-4173-aa05-beac5b55153c))
-    (pin "2" (uuid c548c963-5c91-4a12-b65d-6aefe39a4422))
-  )
-
   (symbol (lib_id "Device:R") (at 217.17 171.45 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 158d9815-0e3d-4623-8a00-b0d0b263d33d)
@@ -9025,22 +8022,6 @@
     (pin "2" (uuid f775ec71-a649-473c-ba87-e1810d29acd8))
   )
 
-  (symbol (lib_id "power:GNDA") (at 205.74 276.86 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 24628b06-bcd7-4b16-a566-041852aee771)
-    (property "Reference" "#PWR?" (id 0) (at 205.74 283.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 205.74 281.94 0))
-    (property "Footprint" "" (id 2) (at 205.74 276.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 205.74 276.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 9807b2de-0f17-4a21-aeb1-91e78468899e))
-  )
-
   (symbol (lib_id "Device:R") (at 347.98 111.76 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2577ba78-e693-4876-8747-cb00a02a80fc)
@@ -9457,28 +8438,6 @@
     (pin "2" (uuid 1d5f472e-cf2c-4f93-b15b-6cab465768f8))
   )
 
-  (symbol (lib_id "Device:R") (at 279.4 264.16 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 3ab3dc5c-b7cb-4af0-8b30-4ec3f542819c)
-    (property "Reference" "R?" (id 0) (at 276.86 262.8899 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "12k" (id 1) (at 276.86 265.4299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 277.622 264.16 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 279.4 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 279.4 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ff93a658-99ef-48cc-897a-ee131c5ebf79))
-    (pin "2" (uuid be15e84c-ffaf-45fa-827d-76f1f1b82361))
-  )
-
   (symbol (lib_id "Device:Crystal_Small") (at 227.33 124.46 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3b9bbec7-5106-4cae-98f0-82135e1ca47d)
@@ -10361,19 +9320,19 @@
     (pin "1" (uuid c78cafe2-ac5f-4ebc-8dcf-88b2205fe806))
   )
 
-  (symbol (lib_id "power:GNDA") (at 339.09 72.39 270) (mirror x) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 353.06 72.39 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6b81fc3f-ba04-417b-89d5-6314276c95ce)
-    (property "Reference" "#PWR?" (id 0) (at 332.74 72.39 0)
+    (property "Reference" "#PWR?" (id 0) (at 346.71 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 334.01 72.39 0)
+    (property "Value" "GNDA" (id 1) (at 347.98 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 339.09 72.39 0)
+    (property "Footprint" "" (id 2) (at 353.06 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 339.09 72.39 0)
+    (property "Datasheet" "" (id 3) (at 353.06 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ae38b2ad-8b7f-4bc9-b8af-d864ed3e9784))
@@ -10492,34 +9451,6 @@
     (pin "1" (uuid 83e923cf-33bc-4b26-9c19-41c9244a5a01))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 162.56 269.24 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 7256d241-c551-4211-a37c-383301b27340)
-    (property "Reference" "C?" (id 0) (at 160.02 267.4238 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10uF" (id 1) (at 160.02 269.9638 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 162.56 269.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 162.56 269.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "TAJA106K016RNJ" (id 4) (at 162.56 269.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 162.56 269.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 162.56 269.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ee62c975-e076-40d3-bf99-cf8ed23ebd67))
-    (pin "2" (uuid ba1ed178-cfb5-484f-b005-71a9a437594d))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 314.96 204.47 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7266f3d7-99c1-41a2-afd6-517570504a61)
@@ -10677,22 +9608,22 @@
     (pin "2" (uuid 649457c0-913e-4333-bcf3-f851dcd0c02a))
   )
 
-  (symbol (lib_id "Device:R") (at 386.08 50.8 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 386.08 25.4 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7dbb2ad6-94ee-46bc-a086-9f1c6c141fc2)
-    (property "Reference" "R?" (id 0) (at 388.62 49.5299 0)
+    (property "Reference" "R?" (id 0) (at 388.62 24.1299 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 388.62 52.0699 0)
+    (property "Value" "DNF" (id 1) (at 388.62 26.6699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 384.302 50.8 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 384.302 25.4 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 386.08 50.8 0)
+    (property "Datasheet" "~" (id 3) (at 386.08 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 386.08 50.8 0)
+    (property "Need_order" "" (id 4) (at 386.08 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 44201d68-1268-4995-be60-923e6f8bdaa6))
@@ -10804,28 +9735,6 @@
     (pin "3" (uuid 39c68e69-14c4-4c10-8589-e43e6c7ac3d5))
   )
 
-  (symbol (lib_id "Device:R") (at 276.86 276.86 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 83ca7711-0d72-41d7-9213-756b7722072f)
-    (property "Reference" "R?" (id 0) (at 274.32 275.5899 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 274.32 278.1299 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 278.638 276.86 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 276.86 276.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 276.86 276.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5dd42fba-a5bf-41f7-9b97-b82ee4c5215d))
-    (pin "2" (uuid 88f3ce54-7bf3-46a8-8be1-9a2f2e7949c0))
-  )
-
   (symbol (lib_id "Device:L") (at 374.65 185.42 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8554cc98-0cbb-4f6a-b636-f2917076a214)
@@ -10847,19 +9756,19 @@
     (pin "2" (uuid 4a354fa1-d2b2-4da7-9f22-077eee24f03e))
   )
 
-  (symbol (lib_id "power:GNDA") (at 339.09 62.23 270) (mirror x) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 353.06 62.23 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 85bb27d5-4889-40d9-977f-794a0760e599)
-    (property "Reference" "#PWR?" (id 0) (at 332.74 62.23 0)
+    (property "Reference" "#PWR?" (id 0) (at 346.71 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 334.01 62.23 0)
+    (property "Value" "GNDA" (id 1) (at 347.98 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 339.09 62.23 0)
+    (property "Footprint" "" (id 2) (at 353.06 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 339.09 62.23 0)
+    (property "Datasheet" "" (id 3) (at 353.06 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 30f66e30-0827-491f-87cd-c4dba85c98ea))
@@ -10942,19 +9851,19 @@
     (pin "1" (uuid 1b21bb65-6d04-4d66-8c5f-d6905fe6b063))
   )
 
-  (symbol (lib_id "power:GNDA") (at 381 35.56 90) (mirror x) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 365.76 20.32 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 875ff648-5857-4668-acf4-896c854e9216)
-    (property "Reference" "#PWR?" (id 0) (at 387.35 35.56 0)
+    (property "Reference" "#PWR?" (id 0) (at 359.41 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 385.3942 35.687 0)
+    (property "Value" "GNDA" (id 1) (at 361.3658 20.193 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 381 35.56 0)
+    (property "Footprint" "" (id 2) (at 365.76 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 381 35.56 0)
+    (property "Datasheet" "" (id 3) (at 365.76 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e11319a8-f709-415c-9cfa-817680c9752c))
@@ -11090,31 +9999,6 @@
     (pin "2" (uuid 7a0bca56-ecd7-4bbb-901d-b86b219adc5d))
   )
 
-  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 248.92 273.05 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 89b16023-240b-46a9-aaf9-b94321e890ad)
-    (property "Reference" "Q?" (id 0) (at 255.27 273.0499 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "IRF7309IPBF" (id 1) (at 255.27 274.3199 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 254 274.955 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 251.46 273.05 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (pin "1" (uuid fed29336-9986-4886-89db-645f373b9277))
-    (pin "2" (uuid 956804b6-1992-4b3d-a661-0c461da0af84))
-    (pin "7" (uuid 8836ea3a-aeef-4943-aa33-9f7bd38aa027))
-    (pin "8" (uuid fed50820-75be-456b-8645-52e4bbc7890f))
-    (pin "3" (uuid ba8cc049-c105-4de1-878b-b1dbe6de7d58))
-    (pin "4" (uuid 4e37fb9e-80ab-4142-a214-915c8a797025))
-    (pin "5" (uuid d21acb24-22d5-4f00-99de-a550b2e303b6))
-    (pin "6" (uuid 97974bf9-8a18-4bae-af65-2a4432a530f8))
-  )
-
   (symbol (lib_id "power:GNDA") (at 137.16 210.82 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8ac4eb98-d055-4c3f-8f7a-7411f92ecc23)
@@ -11180,33 +10064,17 @@
     (pin "3" (uuid b6ff33f3-f641-450a-b1c7-7645f31bfcd2))
   )
 
-  (symbol (lib_id "Regulator_Linear:LM1117-ADJ") (at 205.74 260.35 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 8d6fba61-7575-4242-8f53-552540adc73f)
-    (property "Reference" "U?" (id 0) (at 205.74 252.73 0))
-    (property "Value" "LM1117-ADJ 9V" (id 1) (at 205.74 255.27 0))
-    (property "Footprint" "" (id 2) (at 205.74 260.35 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm1117.pdf" (id 3) (at 205.74 260.35 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 9499c3f5-7a1d-4b2e-9a56-b990293fc4af))
-    (pin "2" (uuid e80f8a44-b738-4c71-9293-bc2f4427a099))
-    (pin "3" (uuid ecd6a568-5f82-4270-b875-728f9d765255))
-  )
-
-  (symbol (lib_id "mpb:BAT68-04W") (at 373.38 69.85 0) (mirror y) (unit 1)
+  (symbol (lib_id "mpb:BAT68-04W") (at 387.35 69.85 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8e665418-aa3c-4deb-972e-e449d3453c26)
-    (property "Reference" "D?" (id 0) (at 370.84 72.39 0))
-    (property "Value" "BAT68-04W" (id 1) (at 373.38 63.5 0)
+    (property "Reference" "D?" (id 0) (at 384.81 72.39 0))
+    (property "Value" "BAT68-04W" (id 1) (at 387.35 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 371.475 66.675 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 385.445 66.675 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "" (id 3) (at 373.38 69.85 0)
+    (property "Datasheet" "" (id 3) (at 387.35 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2ad3bb84-fe44-4b54-b82c-6d45e67af163))
@@ -11405,19 +10273,19 @@
     (pin "1" (uuid f99a1883-c372-4924-a760-f3c8daa1ec3c))
   )
 
-  (symbol (lib_id "power:GNDA") (at 359.41 69.85 90) (mirror x) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 373.38 69.85 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9a964887-70a4-4778-aa87-b5fb118c059d)
-    (property "Reference" "#PWR?" (id 0) (at 365.76 69.85 0)
+    (property "Reference" "#PWR?" (id 0) (at 379.73 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 364.49 69.85 0)
+    (property "Value" "GNDA" (id 1) (at 378.46 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 359.41 69.85 0)
+    (property "Footprint" "" (id 2) (at 373.38 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 359.41 69.85 0)
+    (property "Datasheet" "" (id 3) (at 373.38 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5b4ea8ef-1b9d-4b90-aeff-063529541d76))
@@ -11616,42 +10484,42 @@
     (pin "2" (uuid 9fe5e4d2-326c-4c1e-bddd-39e6a4974ed5))
   )
 
-  (symbol (lib_id "Device:C") (at 377.19 35.56 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:C") (at 369.57 20.32 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a1d85b9a-d478-4ddf-b10d-3e565fcdc951)
-    (property "Reference" "C?" (id 0) (at 377.19 27.94 90))
-    (property "Value" "TBD" (id 1) (at 377.19 30.48 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 373.38 34.5948 0)
+    (property "Reference" "C?" (id 0) (at 369.57 27.94 90))
+    (property "Value" "TBD" (id 1) (at 369.57 25.4 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 373.38 21.2852 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 377.19 35.56 0)
+    (property "Datasheet" "~" (id 3) (at 369.57 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 377.19 35.56 0)
+    (property "MPN" "" (id 4) (at 369.57 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 377.19 35.56 0)
+    (property "Need_order" "" (id 5) (at 369.57 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5cce2c26-46c2-46bc-a6bd-87e81d3be368))
     (pin "2" (uuid 3b4ecb6f-a187-484d-93ea-dfeb1c3d841c))
   )
 
-  (symbol (lib_id "Transformer:PT61017PEL") (at 349.25 64.77 0) (mirror y) (unit 1)
+  (symbol (lib_id "Transformer:PT61017PEL") (at 363.22 64.77 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a348b283-ea0c-4872-8666-47d6a9dae010)
-    (property "Reference" "TR?" (id 0) (at 349.25 49.53 0))
-    (property "Value" "PT61017PEL or 10t tri on 5943004901" (id 1) (at 349.25 52.07 0))
-    (property "Footprint" "Transformer_SMD:Transformer_Ethernet_Bourns_PT61017PEL" (id 2) (at 349.25 77.47 0)
+    (property "Reference" "TR?" (id 0) (at 363.22 49.53 0))
+    (property "Value" "PT61017PEL or 10t tri on 5943004901" (id 1) (at 363.22 52.07 0))
+    (property "Footprint" "Transformer_SMD:Transformer_Ethernet_Bourns_PT61017PEL" (id 2) (at 363.22 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.bourns.com/docs/Product-Datasheets/PT61017PEL.pdf" (id 3) (at 349.25 80.01 0)
+    (property "Datasheet" "https://www.bourns.com/docs/Product-Datasheets/PT61017PEL.pdf" (id 3) (at 363.22 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "PT61017PEL" (id 4) (at 349.25 64.77 0)
+    (property "MPN" "PT61017PEL" (id 4) (at 363.22 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 349.25 64.77 0)
+    (property "Need_order" "1" (id 5) (at 363.22 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0b6bb2c7-9319-42cf-91b0-e0dd9c9cee7a))
@@ -11904,22 +10772,6 @@
     (pin "2" (uuid a62e8657-787d-49e5-bb38-c80d5e591836))
   )
 
-  (symbol (lib_id "power:GNDA") (at 172.72 273.05 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a8c9eac3-af1d-4c0f-9b95-28ebab57f749)
-    (property "Reference" "#PWR?" (id 0) (at 172.72 279.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 172.72 278.13 0))
-    (property "Footprint" "" (id 2) (at 172.72 273.05 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 172.72 273.05 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 91e7fb08-3b7b-4f51-b74a-a3b7b1b229f8))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 190.5 227.33 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a90f065c-1ce1-4ed6-8a4b-0296949390b6)
@@ -12002,40 +10854,40 @@
     (pin "3" (uuid 06dcbbfd-d009-4fdd-a0d8-1a94bb595121))
   )
 
-  (symbol (lib_id "Device:R") (at 391.16 45.72 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 391.16 20.32 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid abfefd86-e792-491d-b6e6-c540648c5b20)
-    (property "Reference" "R?" (id 0) (at 391.16 39.37 90))
-    (property "Value" "0" (id 1) (at 391.16 41.91 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 391.16 47.498 90)
+    (property "Reference" "R?" (id 0) (at 391.16 13.97 90))
+    (property "Value" "0" (id 1) (at 391.16 16.51 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 391.16 22.098 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 391.16 45.72 0)
+    (property "Datasheet" "~" (id 3) (at 391.16 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 391.16 45.72 0)
+    (property "Need_order" "" (id 4) (at 391.16 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 27615dab-5440-4f8f-97de-08e5cc54492f))
     (pin "2" (uuid 7e441d46-9537-460c-b481-2d5565ad1e6b))
   )
 
-  (symbol (lib_id "Device:R") (at 396.24 50.8 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 396.24 25.4 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid addf1739-82e5-4e6b-88fa-69c606b1a5a2)
-    (property "Reference" "R?" (id 0) (at 398.78 49.5299 0)
+    (property "Reference" "R?" (id 0) (at 398.78 24.1299 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 398.78 52.0699 0)
+    (property "Value" "DNF" (id 1) (at 398.78 26.6699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 394.462 50.8 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 394.462 25.4 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 396.24 50.8 0)
+    (property "Datasheet" "~" (id 3) (at 396.24 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 396.24 50.8 0)
+    (property "Need_order" "" (id 4) (at 396.24 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9f456e11-a7f0-4a6b-9ccb-4d5be2923c19))
@@ -12205,33 +11057,6 @@
     (pin "1" (uuid 63ee6559-8ea0-4fbd-bed2-14ed7722f66e))
   )
 
-  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 284.48 262.89 270) (mirror x) (unit 2)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b33779f2-9ef5-4a4b-b90d-f6a47f55c204)
-    (property "Reference" "Q?" (id 0) (at 284.48 252.73 90))
-    (property "Value" "IRF7309" (id 1) (at 284.48 255.27 90))
-    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 282.575 257.81 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 284.48 260.35 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "MPN" "IRF7309IPBF" (id 5) (at 284.48 262.89 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "1" (id 4) (at 284.48 262.89 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f191))
-    (pin "2" (uuid bdee35fb-588c-4510-94fc-9a9ca1702855))
-    (pin "7" (uuid 4c5df834-caa7-40ab-8e75-6d6bbfd257bb))
-    (pin "8" (uuid c1dec542-6b7e-4205-9ad8-759154cc29f3))
-    (pin "3" (uuid 02f3e511-7805-4e23-a074-6fe49bd1f506))
-    (pin "4" (uuid 662fe0e8-780b-42e3-a31d-e99cc4c5b321))
-    (pin "5" (uuid e6914438-3810-48dd-932d-81d4ab8c81df))
-    (pin "6" (uuid a1d56e9a-0f2a-402b-96d4-52b2cb93f3ed))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 162.56 55.88 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid b6005a4e-ea70-4cf0-8b85-6410af74ed94)
@@ -12300,28 +11125,6 @@
     (pin "2" (uuid 3ae5cef9-19f2-48aa-a2a7-422992386a6d))
   )
 
-  (symbol (lib_id "Device:R") (at 243.84 276.86 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b7841085-84fa-4fcb-9d23-eea011876c07)
-    (property "Reference" "R?" (id 0) (at 241.3 275.5899 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 241.3 278.1299 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 245.618 276.86 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 243.84 276.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 243.84 276.86 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid da12326f-ebff-4d32-a9f1-c446aa4659ad))
-    (pin "2" (uuid a0f1f7f3-7754-419e-8925-7e7ab980e365))
-  )
-
   (symbol (lib_id "Transistor_FET:MMBFJ113") (at 243.84 214.63 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b7f9f23f-60e3-4c4e-853f-947cb2a713bf)
@@ -12426,19 +11229,19 @@
     (pin "1" (uuid 34811645-95f7-4106-899f-7e00f520f4cc))
   )
 
-  (symbol (lib_id "power:GNDA") (at 339.09 35.56 270) (mirror x) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 351.79 35.56 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ba0f8620-397b-40ec-b03e-fef8bf57026b)
-    (property "Reference" "#PWR?" (id 0) (at 332.74 35.56 0)
+    (property "Reference" "#PWR?" (id 0) (at 345.44 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 334.6958 35.433 0)
+    (property "Value" "GNDA" (id 1) (at 347.3958 35.433 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 339.09 35.56 0)
+    (property "Footprint" "" (id 2) (at 351.79 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 339.09 35.56 0)
+    (property "Datasheet" "" (id 3) (at 351.79 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4e21e75b-f2be-4d97-8d6f-d180c4ab520c))
@@ -12521,28 +11324,6 @@
     (pin "3" (uuid 26a859f3-cc0c-4261-b97c-eaaad45bf88c))
   )
 
-  (symbol (lib_id "Device:R") (at 215.9 264.16 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid be3ff52f-2a1a-479d-b416-ff15318b7ee2)
-    (property "Reference" "R?" (id 0) (at 218.44 262.8899 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "1.2k" (id 1) (at 218.44 265.4299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 217.678 264.16 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 215.9 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 215.9 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d5f6d670-55a1-4256-a602-9a8db6641ac7))
-    (pin "2" (uuid 6c21aefc-e51d-4c41-9338-5d87f60cdb13))
-  )
-
   (symbol (lib_id "Device:R") (at 26.67 247.65 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bee5eed0-1297-4684-b7a0-ed7af5f2116c)
@@ -12561,24 +11342,6 @@
     (pin "2" (uuid 1b61ba61-46ad-4041-af32-45c276e5f07d))
   )
 
-  (symbol (lib_id "power:GNDA") (at 284.48 280.67 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid befa6780-5c05-4352-b06a-3531a39e8bf5)
-    (property "Reference" "#PWR?" (id 0) (at 284.48 287.02 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 284.607 283.8958 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "" (id 2) (at 284.48 280.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 284.48 280.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2570258a-b869-4c69-bd72-e3595702eeb9))
-  )
-
   (symbol (lib_id "Device:R") (at 158.75 39.37 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf141795-5440-4e86-b9aa-4eccd6a51b87)
@@ -12701,46 +11464,6 @@
     (pin "1" (uuid 2ca57911-bf02-4834-84bc-276666a12d4e))
   )
 
-  (symbol (lib_id "Device:R") (at 215.9 273.05 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c23d781c-363a-4d85-8171-fd97e7299b5c)
-    (property "Reference" "R?" (id 0) (at 218.44 271.7799 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "2.3k" (id 1) (at 218.44 274.3199 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 217.678 273.05 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 215.9 273.05 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 215.9 273.05 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fc73d9dd-844c-4a65-882e-b668ede5e780))
-    (pin "2" (uuid 3d713398-fd5e-45f4-8b22-088c8c7bfde9))
-  )
-
-  (symbol (lib_id "power:GNDA") (at 251.46 280.67 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c2df5cf9-b8d5-4372-a132-9c4be7ddf003)
-    (property "Reference" "#PWR?" (id 0) (at 251.46 287.02 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 251.587 283.8958 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "" (id 2) (at 251.46 280.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 251.46 280.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0de7877a-45de-4a42-9204-a4abc753abe7))
-  )
-
   (symbol (lib_id "Device:Transformer_1P_SS") (at 313.69 -73.66 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c36f262a-d5d7-4c06-9442-d6dd1470d26d)
@@ -12785,21 +11508,25 @@
     (pin "2" (uuid ef21c44e-2c9f-44f4-9bc0-01c895c955b0))
   )
 
-  (symbol (lib_id "Device:L") (at 369.57 35.56 90) (mirror x) (unit 1)
+  (symbol (lib_id "Device:L") (at 375.92 29.21 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c4c2b891-35df-418d-94f8-55f70462058e)
-    (property "Reference" "L?" (id 0) (at 369.57 30.48 90))
-    (property "Value" "TBD" (id 1) (at 369.57 33.02 90))
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 369.57 35.56 0)
+    (property "Reference" "L?" (id 0) (at 374.65 27.9399 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "TBD" (id 1) (at 374.65 30.4799 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 375.92 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 369.57 35.56 0)
+    (property "Datasheet" "~" (id 3) (at 375.92 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 369.57 35.56 0)
+    (property "MPN" "" (id 4) (at 375.92 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 369.57 35.56 0)
+    (property "Need_order" "" (id 5) (at 375.92 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ea997f69-1068-4bd3-b13c-1489245a7213))
@@ -12863,19 +11590,19 @@
     (pin "2" (uuid 853a03a5-c5a5-47fb-bcfd-81166d36b61a))
   )
 
-  (symbol (lib_id "power:GNDA") (at 396.24 54.61 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 396.24 29.21 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c5fd0ec6-12b4-457a-8f88-41424319676b)
-    (property "Reference" "#PWR?" (id 0) (at 396.24 60.96 0)
+    (property "Reference" "#PWR?" (id 0) (at 396.24 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 396.367 59.0042 0)
+    (property "Value" "GNDA" (id 1) (at 396.367 33.6042 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 396.24 54.61 0)
+    (property "Footprint" "" (id 2) (at 396.24 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 396.24 54.61 0)
+    (property "Datasheet" "" (id 3) (at 396.24 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cdbca9fe-e1f8-4d20-9e58-fd4e8a0a468a))
@@ -13118,21 +11845,21 @@
     (pin "2" (uuid df5c6a5c-1b9c-4aa6-86e4-a848358c56ac))
   )
 
-  (symbol (lib_id "Device:C") (at 353.06 35.56 90) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:C") (at 365.76 35.56 90) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid d0ce5d3b-40dc-47ba-bceb-ad34add046b2)
-    (property "Reference" "C?" (id 0) (at 353.06 27.94 90))
-    (property "Value" "TBD" (id 1) (at 353.06 30.48 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 356.87 36.5252 0)
+    (property "Reference" "C?" (id 0) (at 365.76 39.37 90))
+    (property "Value" "TBD" (id 1) (at 365.76 41.91 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 369.57 36.5252 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 353.06 35.56 0)
+    (property "Datasheet" "~" (id 3) (at 365.76 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 353.06 35.56 0)
+    (property "MPN" "" (id 4) (at 365.76 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 353.06 35.56 0)
+    (property "Need_order" "" (id 5) (at 365.76 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0780b825-122a-4c30-8d54-f82bf0485e75))
@@ -13162,33 +11889,6 @@
     (pin "2" (uuid d842820f-f948-4324-8594-30f4988f9279))
   )
 
-  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 251.46 262.89 270) (mirror x) (unit 2)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid d2fa343c-741f-409b-b691-e1583a96f0db)
-    (property "Reference" "Q?" (id 0) (at 251.46 252.73 90))
-    (property "Value" "IRF7309" (id 1) (at 251.46 255.27 90))
-    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 249.555 257.81 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 251.46 260.35 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "MPN" "IRF7309IPBF" (id 5) (at 251.46 262.89 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "1" (id 4) (at 251.46 262.89 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f192))
-    (pin "2" (uuid bdee35fb-588c-4510-94fc-9a9ca1702856))
-    (pin "7" (uuid 4c5df834-caa7-40ab-8e75-6d6bbfd257bc))
-    (pin "8" (uuid c1dec542-6b7e-4205-9ad8-759154cc29f4))
-    (pin "3" (uuid ccef1140-63db-473d-b50b-a8c6e3b77c1f))
-    (pin "4" (uuid 8e81dab4-867f-45db-b011-2c42b2a9b48e))
-    (pin "5" (uuid a3a640df-1d1e-4139-80ec-b731b60f37dc))
-    (pin "6" (uuid a03f530b-10a8-40e7-826b-46483661c416))
-  )
-
   (symbol (lib_id "Transistor_BJT:MMBT3904") (at 184.15 50.8 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d3db8efd-22e4-499e-a4b4-ccabfe8a199e)
@@ -13358,35 +12058,19 @@
     (pin "1" (uuid e99d6ed1-2f17-4f7f-a19d-2964c1ee0852))
   )
 
-  (symbol (lib_id "Regulator_Linear:LD1117S50TR_SOT223") (at 172.72 265.43 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid e34ad77f-821b-481e-89c5-cb7566a5eafd)
-    (property "Reference" "U?" (id 0) (at 172.72 257.81 0))
-    (property "Value" "LD1117S50" (id 1) (at 172.72 260.35 0))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 172.72 260.35 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 175.26 271.78 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a99fc694-939b-4f8f-8cd6-80809c8199a9))
-    (pin "2" (uuid da87c3e6-2d49-4cea-9c45-7de8bd1a1370))
-    (pin "3" (uuid ce0bd0eb-50de-4cf4-92d4-4543c548222e))
-  )
-
-  (symbol (lib_id "power:GNDA") (at 386.08 54.61 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 386.08 29.21 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e4c68cc0-9991-4dc2-9a89-f5d29d8eaaa0)
-    (property "Reference" "#PWR?" (id 0) (at 386.08 60.96 0)
+    (property "Reference" "#PWR?" (id 0) (at 386.08 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 386.207 59.0042 0)
+    (property "Value" "GNDA" (id 1) (at 386.207 33.6042 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 386.08 54.61 0)
+    (property "Footprint" "" (id 2) (at 386.08 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 386.08 54.61 0)
+    (property "Datasheet" "" (id 3) (at 386.08 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b66e2896-4fa2-46c3-bf90-9772c5e7be91))
@@ -13483,34 +12167,6 @@
     (pin "2" (uuid 42a066ac-bfed-4097-aa3f-86840514c6ac))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 194.31 264.16 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid e9497301-9b60-4bc7-94e0-5a0820a55a4c)
-    (property "Reference" "C?" (id 0) (at 191.77 262.3438 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10uF" (id 1) (at 191.77 264.8838 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 194.31 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 194.31 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "TAJA106K016RNJ" (id 4) (at 194.31 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 194.31 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 194.31 264.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 9ff2385e-7090-4fc9-82cb-47b38c884dc0))
-    (pin "2" (uuid 3acbcf3c-75f6-4b0b-8ac0-9b6c4fa9239a))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 289.56 222.25 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid eaa360cc-5535-41c1-a725-cf3f932d89aa)
@@ -13586,18 +12242,18 @@
     (pin "2" (uuid 683e0f5d-5082-4bf8-a437-952f8d863726))
   )
 
-  (symbol (lib_id "Device:R") (at 344.17 36.83 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:R") (at 356.87 36.83 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ec5214c1-0ae2-42b3-8bc8-6fa8ab10fe5e)
-    (property "Reference" "R?" (id 0) (at 344.17 40.64 90))
-    (property "Value" "47" (id 1) (at 344.17 43.18 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 344.17 38.608 90)
+    (property "Reference" "R?" (id 0) (at 356.87 40.64 90))
+    (property "Value" "47" (id 1) (at 356.87 43.18 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 356.87 38.608 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 344.17 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 356.87 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 344.17 36.83 0)
+    (property "Need_order" "" (id 4) (at 356.87 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b036a813-1868-4a9e-9cfa-83576467a2bc))
@@ -13629,34 +12285,6 @@
     (pin "2" (uuid b72e3b8e-ee01-43ce-8df3-720f51b50c1f))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 205.74 271.78 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid f192297e-69ff-4fa3-bd49-f6b30525fc4f)
-    (property "Reference" "C?" (id 0) (at 208.28 269.9638 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "10uF" (id 1) (at 208.28 272.5038 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 205.74 271.78 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 205.74 271.78 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "TAJA106K016RNJ" (id 4) (at 205.74 271.78 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 205.74 271.78 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 205.74 271.78 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 92048890-9e7a-4684-8236-f92731bed42c))
-    (pin "2" (uuid a63816d4-1435-4205-94b8-349143fa1330))
-  )
-
   (symbol (lib_id "power:GNDA") (at 71.12 270.51 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f35243ea-70a8-4861-b1e5-87022345fc08)
-- 
cgit v1.2.3