Update schematic

1 files changed, 315 insertions, 371 deletions

diff --git a/kicad-dart-70/anglian.kicad_sch b/kicad-dart-70/anglian.kicad_sch
index be11bbb..1f8d98e 100644
--- a/kicad-dart-70/anglian.kicad_sch
+++ b/kicad-dart-70/anglian.kicad_sch
@@ -635,29 +635,29 @@
         )
       )
     )
-    (symbol "Transistor_FET:2N7002K" (pin_names hide) (in_bom yes) (on_board yes)
+    (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" "2N7002K" (id 1) (at 5.08 0 0)
+      (property "Value" "IRF7309IPBF" (id 1) (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 5.08 -1.905 0)
-        (effects (font (size 1.27 1.27) italic) (justify left) hide)
+      (property "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" "https://www.diodes.com/assets/Datasheets/ds30896.pdf" (id 3) (at 0 0 0)
+      (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" "N-Channel MOSFET" (id 4) (at 0 0 0)
+      (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" "0.38A Id, 60V Vds, N-Channel MOSFET, SOT-23" (id 5) (at 0 0 0)
+      (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" "SOT?23*" (id 6) (at 0 0 0)
+      (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 "2N7002K_0_1"
+      (symbol "IRF7309IPBF_0_1"
         (polyline
           (pts
             (xy 0.254 0)
@@ -725,6 +725,20 @@
           (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)
@@ -755,124 +769,24 @@
           (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))
+        (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))))
         )
-      )
-      (symbol "2N7002K_1_1"
         (pin input line (at -5.08 0 0) (length 2.54)
           (name "G" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 -5.08 90) (length 2.54)
-          (name "S" (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 "3" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
         )
       )
-    )
-    (symbol "Transistor_FET:FDN340P" (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" "FDN340P" (id 1) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 5.08 -1.905 0)
-        (effects (font (size 1.27 1.27) italic) (justify left) hide)
-      )
-      (property "Datasheet" "https://www.onsemi.com/pub/Collateral/FDN340P-D.PDF" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left) hide)
-      )
-      (property "ki_keywords" "P-Channel MOSFET" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "2A Id, 20V Vds, P-Channel MOSFET, 70mOhm Ron, SOT-23" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOT?23*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "FDN340P_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))
-        )
+      (symbol "IRF7309IPBF_2_1"
         (polyline
           (pts
             (xy 2.286 0)
@@ -903,31 +817,21 @@
           (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))
+        (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))))
         )
-      )
-      (symbol "FDN340P_1_1"
         (pin input line (at -5.08 0 0) (length 2.54)
           (name "G" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 2.54 -5.08 90) (length 2.54)
-          (name "S" (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 "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 "3" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
         )
       )
     )
@@ -1233,9 +1137,6 @@
     )
   )
 
-  (junction (at 118.11 186.69) (diameter 0) (color 0 0 0 0)
-    (uuid 00c33331-60f6-4379-9d2d-ef78832fa2d8)
-  )
   (junction (at 60.96 66.04) (diameter 0) (color 0 0 0 0)
     (uuid 02567b51-491d-42f4-88b0-cfe2c1fce044)
   )
@@ -1296,21 +1197,21 @@
   (junction (at 25.4 140.97) (diameter 0) (color 0 0 0 0)
     (uuid 352f28bf-b1c2-4de5-992d-e57cf2e8483f)
   )
+  (junction (at 121.92 173.99) (diameter 0) (color 0 0 0 0)
+    (uuid 3cdd29cd-f7d5-4f1f-90af-98c32e5adf8f)
+  )
   (junction (at 48.26 140.97) (diameter 0) (color 0 0 0 0)
     (uuid 3ff87719-b353-4efc-bf3c-dccf3c161a57)
   )
   (junction (at 52.07 187.96) (diameter 0) (color 0 0 0 0)
     (uuid 4650598b-8ec0-4a38-8b43-e41b603ff53c)
   )
-  (junction (at 127 194.31) (diameter 0) (color 0 0 0 0)
-    (uuid 4dc480f0-1a90-4541-b96f-0b2b3327acbd)
+  (junction (at 127 181.61) (diameter 0) (color 0 0 0 0)
+    (uuid 4a87f15b-276a-46e9-af2c-bd6c86b489d7)
   )
   (junction (at 62.23 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 54ce500e-2e6a-4454-858c-a16838109e49)
   )
-  (junction (at 119.38 173.99) (diameter 0) (color 0 0 0 0)
-    (uuid 55027aa1-d51f-47f6-9d95-2777680e47e2)
-  )
   (junction (at 215.9 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 6228b587-c759-4f5a-aee2-44d44c696a08)
   )
@@ -1323,8 +1224,8 @@
   (junction (at 233.68 77.47) (diameter 0) (color 0 0 0 0)
     (uuid 66615e91-3e7a-41a3-a5de-d8915c5cd486)
   )
-  (junction (at 109.22 78.74) (diameter 0) (color 0 0 0 0)
-    (uuid 717ae1df-ca35-43c4-858a-8a998842a6fa)
+  (junction (at 119.38 186.69) (diameter 0) (color 0 0 0 0)
+    (uuid 727193af-cefc-4d3d-971c-b8113d72e132)
   )
   (junction (at 44.45 40.64) (diameter 0) (color 0 0 0 0)
     (uuid 75f0fc0e-92ee-4d72-91b9-969bbdf6a516)
@@ -1335,15 +1236,9 @@
   (junction (at 233.68 69.85) (diameter 0) (color 0 0 0 0)
     (uuid 775b50f1-c021-45e5-b4f4-3da4bfa305be)
   )
-  (junction (at 163.83 181.61) (diameter 0) (color 0 0 0 0)
-    (uuid 7f13e04a-d2d1-49d6-be0b-2887ecf3934d)
-  )
   (junction (at 172.72 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 8106e159-fb99-406c-bc50-06500718779d)
   )
-  (junction (at 163.83 194.31) (diameter 0) (color 0 0 0 0)
-    (uuid 82d1457e-9320-48a5-9a8d-475a84812eb1)
-  )
   (junction (at 109.22 40.64) (diameter 0) (color 0 0 0 0)
     (uuid 85195ff4-4022-4363-b14b-87d01de5d306)
   )
@@ -1374,6 +1269,9 @@
   (junction (at 199.39 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 9bf41a0b-ea8e-4983-9913-df79ab0696ea)
   )
+  (junction (at 163.83 181.61) (diameter 0) (color 0 0 0 0)
+    (uuid 9cad06d9-c612-4d87-9aa9-f62f762df9f4)
+  )
   (junction (at 185.42 74.93) (diameter 0) (color 0 0 0 0)
     (uuid 9d460f71-ca89-4f90-b952-20c79bec7158)
   )
@@ -1389,21 +1287,21 @@
   (junction (at 67.31 50.8) (diameter 0) (color 0 0 0 0)
     (uuid a3acfd1c-df2f-4f66-b724-7f316f483950)
   )
+  (junction (at 127 194.31) (diameter 0) (color 0 0 0 0)
+    (uuid a491d734-79f9-4b48-a3fb-de0f1ca67066)
+  )
   (junction (at 21.59 81.28) (diameter 0) (color 0 0 0 0)
     (uuid a510e5e5-5ef7-4d6a-a501-65eee345df9c)
   )
+  (junction (at 163.83 194.31) (diameter 0) (color 0 0 0 0)
+    (uuid a7433e7f-b98c-4b31-ad66-13e099a2cdaf)
+  )
   (junction (at 95.25 81.28) (diameter 0) (color 0 0 0 0)
     (uuid aa939002-c65a-4bc5-8b33-1d5bc4c91f9d)
   )
   (junction (at 245.11 113.03) (diameter 0) (color 0 0 0 0)
     (uuid aba0b686-27a7-4612-9120-56df9850a0f3)
   )
-  (junction (at 154.94 186.69) (diameter 0) (color 0 0 0 0)
-    (uuid b171a9ac-179a-4baf-920d-1299b87d4c24)
-  )
-  (junction (at 127 181.61) (diameter 0) (color 0 0 0 0)
-    (uuid bedd4d71-5494-4d9a-8227-4431c8ef13d0)
-  )
   (junction (at 95.25 119.38) (diameter 0) (color 0 0 0 0)
     (uuid bf562497-0a71-4eb8-8045-49f675de552e)
   )
@@ -1422,8 +1320,8 @@
   (junction (at 160.02 88.9) (diameter 0) (color 0 0 0 0)
     (uuid cd5e5396-17e0-450e-8b9a-002266132cf2)
   )
-  (junction (at 106.68 88.9) (diameter 0) (color 0 0 0 0)
-    (uuid cfe52ce2-a516-4a66-b034-a2439b2ef04e)
+  (junction (at 156.21 186.69) (diameter 0) (color 0 0 0 0)
+    (uuid ce7f1bfd-1014-4f6f-b4f1-7de465512724)
   )
   (junction (at 234.95 113.03) (diameter 0) (color 0 0 0 0)
     (uuid d22d7732-de34-40be-871d-a04e8e3508dc)
@@ -1446,8 +1344,8 @@
   (junction (at 78.74 40.64) (diameter 0) (color 0 0 0 0)
     (uuid e17afcb0-49dd-4f12-a913-1d8e2e4c5b94)
   )
-  (junction (at 156.21 173.99) (diameter 0) (color 0 0 0 0)
-    (uuid e284b47c-e7a2-47fb-97fe-9da3f7b25604)
+  (junction (at 158.75 173.99) (diameter 0) (color 0 0 0 0)
+    (uuid e2405a6d-b5f1-4892-820c-4d347303f3e4)
   )
   (junction (at 86.36 119.38) (diameter 0) (color 0 0 0 0)
     (uuid e4e5efbf-5f6e-47bb-b454-0f7ee3ed75bc)
@@ -1490,14 +1388,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 024cc201-4a12-4ae8-bfab-38147f08c82b)
   )
-  (wire (pts (xy 156.21 181.61) (xy 163.83 181.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 02a60bb3-9873-41fd-924e-027c47874165)
-  )
-  (wire (pts (xy 127 194.31) (xy 127 191.77))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 02cebe24-90d5-4bad-bba2-45623133c8a8)
-  )
   (wire (pts (xy 41.91 81.28) (xy 43.18 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 035e0cf3-8ba7-4e18-8dd3-f8e636f1c886)
@@ -1506,10 +1396,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 03f16627-7ce3-4e9a-9706-778678e98c1c)
   )
-  (wire (pts (xy 158.75 173.99) (xy 156.21 173.99))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0511f577-fd64-48fb-9ff4-d106ae5f2af0)
-  )
   (wire (pts (xy 233.68 69.85) (xy 238.76 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 05b39569-aaa4-4273-9b2f-9e1c6ca4bf60)
@@ -1559,10 +1445,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 133e4738-5308-4c8f-a278-ff3a4b573a42)
   )
-  (wire (pts (xy 106.68 86.36) (xy 106.68 88.9))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 135735c6-9c20-4bf3-849f-8a3683d0618a)
-  )
   (wire (pts (xy 52.07 187.96) (xy 62.23 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1503d8f8-f748-488a-be6b-682a25f8122b)
@@ -1583,10 +1465,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1807c891-5ccf-491b-b7cb-6605d0030f30)
   )
-  (wire (pts (xy 152.4 186.69) (xy 154.94 186.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 192292f4-e782-4227-b2ba-5b15ad53a948)
-  )
   (wire (pts (xy 106.68 40.64) (xy 109.22 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1982601b-2a8e-40bd-a5af-aba91929618d)
@@ -1635,6 +1513,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2dd2edde-b79d-4ec7-87aa-5955ab5302f8)
   )
+  (wire (pts (xy 114.3 186.69) (xy 119.38 186.69))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 317b3327-81e5-42d8-ba53-a7623d7a8708)
+  )
   (wire (pts (xy 170.18 76.2) (xy 170.18 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 31fb150b-1634-44a3-bbf0-4f27407886b5)
@@ -1647,6 +1529,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 36e55dc7-b8dd-4b75-aa11-1a977430e4af)
   )
+  (wire (pts (xy 119.38 173.99) (xy 121.92 173.99))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 37230808-99dc-4179-b260-0a45169e8644)
+  )
   (wire (pts (xy 71.12 129.54) (xy 67.31 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 377e1abf-612a-4df5-b5eb-45b0a4ea0c9e)
@@ -1724,10 +1610,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4cd7fbd1-3778-4a48-ab60-c36eed16d8c5)
   )
-  (wire (pts (xy 118.11 194.31) (xy 127 194.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4eb478a7-cb42-4e9b-a391-850c2292f4e2)
-  )
   (wire (pts (xy 20.32 180.34) (xy 24.13 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4f1890ef-2953-4b44-b85e-7d86f5135aac)
@@ -1756,9 +1638,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 55b6b040-a746-4424-a5b4-1f45a1d15120)
   )
-  (wire (pts (xy 154.94 186.69) (xy 156.21 186.69))
+  (wire (pts (xy 127 194.31) (xy 119.38 194.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 55e14d32-176e-4ac2-98bb-d6f11341d8bb)
+    (uuid 57bc8c39-1c61-48a7-b2b9-e074f6a884b9)
   )
   (wire (pts (xy 60.96 55.88) (xy 95.25 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1796,10 +1678,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 638492c1-39c4-4e69-a3a1-232b324e5b21)
   )
-  (wire (pts (xy 119.38 181.61) (xy 127 181.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 650fc5ab-ac6f-4355-859d-e052b70c49f9)
-  )
   (wire (pts (xy 44.45 50.8) (xy 44.45 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 659d7e05-6d30-4048-9451-144bfa6ef129)
@@ -1817,10 +1695,6 @@
     (uuid 67f80db7-ac30-4dde-8bf8-915428d171ed)
   )
 
-  (wire (pts (xy 121.92 173.99) (xy 119.38 173.99))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6882129c-8e12-4f8b-8e90-d97f81b364c1)
-  )
   (wire (pts (xy 59.69 180.34) (xy 62.23 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a784a31-50b5-4176-9ee4-0ad6fc9a1083)
@@ -1845,6 +1719,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6d259b3b-196b-4e6b-acdf-fc3e09319776)
   )
+  (wire (pts (xy 163.83 194.31) (xy 156.21 194.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6f374e2b-ea34-4806-a08a-b249048582fa)
+  )
   (polyline (pts (xy 154.94 76.2) (xy 154.94 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7055685d-2e9b-46e1-bc20-a497c53cfccc)
@@ -1906,6 +1784,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7f180349-2cf1-4faf-8ede-f82101d0fa01)
   )
+  (wire (pts (xy 158.75 181.61) (xy 163.83 181.61))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7fba5bda-82b7-4610-b92b-36712e57b8ae)
+  )
   (wire (pts (xy 251.46 120.65) (xy 260.35 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 80acb5a1-638b-4285-857f-e2585dbcfd3f)
@@ -1926,17 +1808,21 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 84b3d674-c896-4b45-8754-206b7ffab72a)
   )
-  (wire (pts (xy 106.68 88.9) (xy 111.76 88.9))
+  (wire (pts (xy 152.4 186.69) (xy 156.21 186.69))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 85640014-c6d4-40af-af54-a03d32fa69d7)
+  )
+  (wire (pts (xy 87.63 88.9) (xy 95.25 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 88265af6-a1dd-44be-b62c-e05e7e0d7e0b)
+    (uuid 892ee75c-1313-4950-84c4-ad3932813816)
   )
   (wire (pts (xy 91.44 140.97) (xy 95.25 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8a80af2d-ce13-4b11-8a6d-9856813678bd)
   )
-  (wire (pts (xy 118.11 186.69) (xy 119.38 186.69))
+  (wire (pts (xy 121.92 181.61) (xy 127 181.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8b95ba54-c069-4a65-b9c2-99db26bb932f)
+    (uuid 8c64738e-4af4-4dd5-b6e1-157dcd3cd3b0)
   )
   (wire (pts (xy 41.91 81.28) (xy 40.64 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1954,6 +1840,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 91d49aaf-5758-42d3-9e51-e9b2b8cd5c5c)
   )
+  (wire (pts (xy 163.83 191.77) (xy 163.83 194.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 934f0ec0-9b4c-4bb5-87d9-4d3a01f53db8)
+  )
   (wire (pts (xy 41.91 82.55) (xy 41.91 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9396dbf5-aa3c-4ba1-a9ae-1945fbb2026c)
@@ -2018,10 +1908,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a345cb5a-bcc4-40ab-9689-42a3820311de)
   )
-  (wire (pts (xy 163.83 194.31) (xy 163.83 191.77))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a348990a-0ba9-40aa-9d6b-f25e202a557b)
-  )
   (wire (pts (xy 234.95 113.03) (xy 245.11 113.03))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a3dc8c92-2b4e-44e7-a99c-8e839fcdd93f)
@@ -2034,6 +1920,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a85ba885-21f0-4ec6-a484-69d88e0e6f44)
   )
+  (wire (pts (xy 127 191.77) (xy 127 194.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid aa330090-5e5b-4f6c-a3b1-6f788ab38f5c)
+  )
   (wire (pts (xy 21.59 90.17) (xy 31.75 90.17))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa8e79d5-4110-472a-8939-dffc4dee8b42)
@@ -2070,10 +1960,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b2cfdd1f-96b4-409d-be10-5274dc4a5d5c)
   )
-  (wire (pts (xy 114.3 186.69) (xy 118.11 186.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b34b00a6-cf47-4cbc-b4f1-b1acbc1edc3d)
-  )
   (wire (pts (xy 63.5 127) (xy 63.5 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b367d731-810d-4dbe-aa2e-ab2616fc23ec)
@@ -2155,7 +2041,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c8b3bfbd-79b7-4863-9ae7-79b3f077a5ad)
   )
-  (wire (pts (xy 95.25 88.9) (xy 106.68 88.9))
+  (wire (pts (xy 95.25 88.9) (xy 111.76 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c9a96d3d-0de1-42f4-91c4-77ed8c428365)
   )
@@ -2167,10 +2053,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cb6506b0-3912-438a-b6ea-123a23611666)
   )
-  (wire (pts (xy 109.22 78.74) (xy 111.76 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cdb51342-07be-44c9-aae9-c15b7e1e8215)
-  )
   (wire (pts (xy 106.68 101.6) (xy 106.68 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ce536418-0469-43d5-9a1a-c3f749bdbad3)
@@ -2195,6 +2077,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d72a8da5-7493-4947-860c-c7e42d565e6a)
   )
+  (wire (pts (xy 156.21 173.99) (xy 158.75 173.99))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d79d7246-289f-448d-b31a-72790dbc7f48)
+  )
   (wire (pts (xy 44.45 40.64) (xy 46.99 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d86ee7d3-b7d0-400c-a7d2-6d9a947e3d7b)
@@ -2219,10 +2105,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dd7274bb-36be-4baa-903e-939c1f1b99f6)
   )
-  (wire (pts (xy 106.68 78.74) (xy 109.22 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ddae4b2b-20d9-4a3e-92ee-cab9e27340aa)
-  )
   (wire (pts (xy 67.31 129.54) (xy 67.31 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e0513d50-b001-43f1-81c8-191e60f750b2)
@@ -2307,10 +2189,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fa96cd3f-f267-4e6d-9212-fd48f9f4aabe)
   )
-  (wire (pts (xy 154.94 194.31) (xy 163.83 194.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fbe3e599-6c15-4f45-b897-128d3cb05663)
-  )
   (wire (pts (xy 31.75 82.55) (xy 31.75 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc08e6b2-9093-4242-9028-d1ac105c2346)
@@ -2368,7 +2246,7 @@
     (effects (font (size 0.9906 0.9906)) (justify left bottom))
     (uuid acbae352-7edb-481c-9de1-1fbd99403011)
   )
-  (text "TODO\nRecalculate tunable narrow bandpass\nRecalculate mixer diplexer\n\nDONE\nRecalculate all filters but narrow bandpass\nUse 42MHz XTAL LO"
+  (text "TODO\nDon't use SPF5189Z\nBGA probably has too much gain\nRecalculate tunable bandpass\nRecalculate mixer diplexer\n\nDONE\nRecalculate all filters but narrow bandpass\nUse 42MHz XTAL LO"
     (at 8.89 -5.08 0)
     (effects (font (size 3 3) bold) (justify left bottom))
     (uuid c4b3cf44-c9d8-434c-b892-16ac2c3326f5)
@@ -2468,7 +2346,9 @@
     (property "Reference" "#PWR?" (id 0) (at 143.51 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 143.383 79.4258 0))
+    (property "Value" "GNDA" (id 1) (at 143.383 79.4258 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (property "Footprint" "" (id 2) (at 143.51 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -2917,69 +2797,65 @@
     (pin "2" (uuid b27f8f7b-acc6-43c4-9cdc-b03629a48e12))
   )
 
-  (symbol (lib_id "Device:L") (at 111.76 82.55 0) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:L") (at 83.82 88.9 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e4da101)
-    (property "Reference" "L?" (id 0) (at 113.1062 81.3816 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1uH" (id 1) (at 113.1062 83.693 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Inductor_SMD:L_1008_2520Metric" (id 2) (at 111.76 82.55 0)
+    (property "Reference" "L?" (id 0) (at 83.82 91.44 90))
+    (property "Value" "1uH" (id 1) (at 83.82 93.98 90))
+    (property "Footprint" "Inductor_SMD:L_1008_2520Metric" (id 2) (at 83.82 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 111.76 82.55 0)
+    (property "Datasheet" "~" (id 3) (at 83.82 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LQW2UAS1R0F0CL" (id 4) (at 111.76 82.55 0)
+    (property "MPN" "LQW2UAS1R0F0CL" (id 4) (at 83.82 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 111.76 82.55 0)
+    (property "Need_order" "" (id 5) (at 83.82 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e5e52ff9-e9eb-4da2-955d-dadd35157bb2))
     (pin "2" (uuid db6ff818-2773-4d38-88fc-acd9acb0468a))
   )
 
-  (symbol (lib_id "Device:C") (at 106.68 82.55 180) (unit 1)
+  (symbol (lib_id "Device:C") (at 111.76 82.55 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e4db208)
-    (property "Reference" "C?" (id 0) (at 103.7844 81.3816 0)
+    (property "Reference" "C?" (id 0) (at 108.8644 81.3816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "47pF" (id 1) (at 103.7844 83.693 0)
+    (property "Value" "47pF" (id 1) (at 108.8644 83.693 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 105.7148 78.74 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 110.7948 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 106.68 82.55 0)
+    (property "Datasheet" "~" (id 3) (at 111.76 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "CBR" (id 4) (at 106.68 82.55 0)
+    (property "MPN" "CBR" (id 4) (at 111.76 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 106.68 82.55 0)
+    (property "Need_order" "" (id 5) (at 111.76 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a4f13a8b-4472-4767-9d66-1f6e0676abe1))
     (pin "2" (uuid 4dddb409-ffd4-47ad-a1cf-bd138d8cecac))
   )
 
-  (symbol (lib_id "power:GNDA") (at 109.22 78.74 180) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 111.76 78.74 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e4dd1ca)
-    (property "Reference" "#PWR?" (id 0) (at 109.22 72.39 0)
+    (property "Reference" "#PWR?" (id 0) (at 111.76 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 109.093 74.3458 0)
+    (property "Value" "GNDA" (id 1) (at 111.633 74.3458 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 109.22 78.74 0)
+    (property "Footprint" "" (id 2) (at 111.76 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 109.22 78.74 0)
+    (property "Datasheet" "" (id 3) (at 111.76 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d18b40ba-97b7-41aa-b920-8af6fc63ded5))
@@ -4824,24 +4700,20 @@
     (pin "2" (uuid b07e5ecc-9018-4268-a931-67af65d130c0))
   )
 
-  (symbol (lib_id "Transistor_FET:2N7002K") (at 124.46 186.69 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 05728c99-578c-4db2-a3d1-2116b9e263b5)
-    (property "Reference" "Q?" (id 0) (at 130.81 185.4199 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "2N7002K" (id 1) (at 130.81 187.9599 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "power:+5VA") (at 156.21 173.99 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 066e1810-565c-4174-b22a-39831103d332)
+    (property "Reference" "#PWR?" (id 0) (at 156.21 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 129.54 188.595 0)
-      (effects (font (size 1.27 1.27) italic) (justify left) hide)
+    (property "Value" "+5VA" (id 1) (at 156.591 169.5958 0))
+    (property "Footprint" "" (id 2) (at 156.21 173.99 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds30896.pdf" (id 3) (at 124.46 186.69 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
+    (property "Datasheet" "" (id 3) (at 156.21 173.99 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid d5acb7e9-0f3e-40c1-977d-76f5e130e861))
-    (pin "2" (uuid fa1eab99-9e16-498f-bc3b-647a36267938))
-    (pin "3" (uuid 3263d1c4-2647-4a02-9d6c-37fc59fe1316))
+    (pin "1" (uuid db51cdd0-ed79-400e-b163-edcb210525a0))
   )
 
   (symbol (lib_id "power:PWR_FLAG") (at 38.1 179.07 0) (unit 1)
@@ -4860,6 +4732,24 @@
     (pin "1" (uuid 3ccef1d5-9ce9-4fdc-9457-d21f9c0b23d1))
   )
 
+  (symbol (lib_id "power:GNDA") (at 163.83 194.31 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 12dd6f1e-8210-4dfc-adb0-4ba6bc669821)
+    (property "Reference" "#PWR?" (id 0) (at 163.83 200.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 163.957 197.5358 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 163.83 194.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 163.83 194.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 30d60357-1665-484b-bea0-1efcd89ec7e6))
+  )
+
   (symbol (lib_id "power:GNDA") (at 52.07 187.96 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1be627e8-4dfb-4f4d-85ce-adb105e5da2e)
@@ -4876,26 +4766,26 @@
     (pin "1" (uuid 1daba739-d126-4107-8ab6-20f2aa1a8552))
   )
 
-  (symbol (lib_id "Device:R") (at 154.94 190.5 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 119.38 190.5 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 257fc85d-7d83-4fde-a02e-f6f76f9e6286)
-    (property "Reference" "R?" (id 0) (at 152.4 189.2299 0)
+    (uuid 1f56a582-eaa3-49df-a7a6-13bc88a86a65)
+    (property "Reference" "R?" (id 0) (at 116.84 189.2299 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 152.4 191.7699 0)
+    (property "Value" "10k" (id 1) (at 116.84 191.7699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 156.718 190.5 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 121.158 190.5 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 154.94 190.5 0)
+    (property "Datasheet" "~" (id 3) (at 119.38 190.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 154.94 190.5 0)
+    (property "Need_order" "" (id 4) (at 119.38 190.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e560870c-88ee-480e-a305-fd6e8dc1903e))
-    (pin "2" (uuid 84a3f8e7-d9c4-4dc3-b8f9-ef6b4d44df83))
+    (pin "1" (uuid c9aa4fb5-0fa9-4a9f-9837-642d37a024bb))
+    (pin "2" (uuid bc6493ff-299e-4286-85b0-7b89fc129207))
   )
 
   (symbol (lib_id "Regulator_Linear:LD1117S50TR_SOT223") (at 52.07 180.34 0) (unit 1)
@@ -4920,26 +4810,44 @@
     (pin "3" (uuid 00942662-ef33-4657-be31-0cb5d8d39546))
   )
 
-  (symbol (lib_id "Device:R") (at 118.11 190.5 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 156.21 190.5 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 3a0535ca-1e0c-40e1-93e3-3bb8e18e427e)
-    (property "Reference" "R?" (id 0) (at 115.57 189.2299 0)
+    (uuid 3d1a90c5-5a6d-45d0-a19e-ae9c6e20d67d)
+    (property "Reference" "R?" (id 0) (at 153.67 189.2299 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 115.57 191.7699 0)
+    (property "Value" "10k" (id 1) (at 153.67 191.7699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 119.888 190.5 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 157.988 190.5 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 118.11 190.5 0)
+    (property "Datasheet" "~" (id 3) (at 156.21 190.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 118.11 190.5 0)
+    (property "Need_order" "" (id 4) (at 156.21 190.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9619d14c-445c-4944-b8ce-0c41231263ed))
-    (pin "2" (uuid 9899e913-396b-475f-ab42-fafde1bc0d0c))
+    (pin "1" (uuid 40452a0d-dc40-41ea-a4a3-c43fe4791327))
+    (pin "2" (uuid 3e9d9015-a9b5-4435-b01b-58165838ac77))
+  )
+
+  (symbol (lib_id "power:GNDA") (at 80.01 88.9 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 40a7250f-1ecd-49c9-b71e-4a59ce1f3922)
+    (property "Reference" "#PWR?" (id 0) (at 73.66 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 75.6158 89.027 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 80.01 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 80.01 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d9e06877-b0dc-4557-b386-858bf93a9c86))
   )
 
   (symbol (lib_id "Device:CP1") (at 62.23 184.15 0) (unit 1)
@@ -4970,26 +4878,22 @@
     (pin "2" (uuid bb28c852-2948-464f-a879-5dc0afafbf55))
   )
 
-  (symbol (lib_id "Device:R") (at 156.21 177.8 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5862eb90-72a0-4e51-9fa6-ea45f6661508)
-    (property "Reference" "R?" (id 0) (at 153.67 176.5299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "12k" (id 1) (at 153.67 179.0699 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 154.432 177.8 90)
+  (symbol (lib_id "power:GNDA") (at 127 194.31 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 5c13c7ad-52d6-4ccf-84d7-87a45f6f0a07)
+    (property "Reference" "#PWR?" (id 0) (at 127 200.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 156.21 177.8 0)
+    (property "Value" "GNDA" (id 1) (at 127.127 197.5358 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 127 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 156.21 177.8 0)
+    (property "Datasheet" "" (id 3) (at 127 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a1667dbb-475a-47a3-b764-f46b0d9f81da))
-    (pin "2" (uuid 5b0a2a5f-c353-4f83-a2fb-a455f62ad308))
+    (pin "1" (uuid ed846677-6818-4596-affb-a535da9efb05))
   )
 
   (symbol (lib_id "power:GNDA") (at 127 194.31 0) (unit 1)
@@ -5029,26 +4933,31 @@
     (pin "6" (uuid f1153aee-3b57-4d30-bf89-9eb9dbf27b19))
   )
 
-  (symbol (lib_id "Device:R") (at 119.38 177.8 0) (unit 1)
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 163.83 176.53 270) (mirror x) (unit 2)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6b262009-5429-425b-91aa-332df5c0f50d)
-    (property "Reference" "R?" (id 0) (at 116.84 176.5299 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "12k" (id 1) (at 116.84 179.0699 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 681730d1-cd17-4a50-bd87-e9c09f35573a)
+    (property "Reference" "Q?" (id 0) (at 163.83 166.37 90))
+    (property "Value" "IRF7309" (id 1) (at 163.83 168.91 90))
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 161.925 171.45 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 117.602 177.8 90)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 163.83 173.99 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 119.38 177.8 0)
+    (property "MPN" "IRF7309IPBF" (id 5) (at 163.83 176.53 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 119.38 177.8 0)
+    (property "Need_order" "1" (id 4) (at 163.83 176.53 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ee83fd02-7fef-4972-a01f-133ea3ebefd3))
-    (pin "2" (uuid 08be73ba-e0e0-4b08-bfce-af06dcb83b19))
+    (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 a0a17a5c-08a3-4cff-a2d5-f2a34d32e315))
+    (pin "4" (uuid e18d1d36-6adb-4658-a8e9-9c8f1464235f))
+    (pin "5" (uuid e00248e8-02cd-4f07-bfc4-70884bca980f))
+    (pin "6" (uuid 459408e6-394f-4382-8ac2-cc9dc7a126ce))
   )
 
   (symbol (lib_id "power:+12V") (at 20.32 180.34 0) (unit 1)
@@ -5084,6 +4993,28 @@
     (pin "1" (uuid e9e55b7a-1b7d-4f3a-8f7b-1211878d67f0))
   )
 
+  (symbol (lib_id "Device:R") (at 158.75 177.8 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7d42f8c8-a5b2-4c81-b9b1-0fb254f29901)
+    (property "Reference" "R?" (id 0) (at 156.21 176.5299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "12k" (id 1) (at 156.21 179.0699 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 156.972 177.8 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 158.75 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 158.75 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0f1303ce-7a5d-4bf9-8cf8-43a4fbd36e33))
+    (pin "2" (uuid ee5caab4-0257-4d13-a4a0-5e7ca7087c15))
+  )
+
   (symbol (lib_id "Device:C") (at 260.35 73.66 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 82962ad1-55b3-4dc3-a777-b914084739e4)
@@ -5159,6 +5090,33 @@
     (pin "2" (uuid be802825-992e-4b63-94fb-9ccd51cdedb9))
   )
 
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 127 176.53 270) (mirror x) (unit 2)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9744e152-5871-4027-9ba5-7f8fed7af1ad)
+    (property "Reference" "Q?" (id 0) (at 127 166.37 90))
+    (property "Value" "IRF7309" (id 1) (at 127 168.91 90))
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 125.095 171.45 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 127 173.99 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "MPN" "IRF7309IPBF" (id 5) (at 127 176.53 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "1" (id 4) (at 127 176.53 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 9b925fef-487b-459e-9052-7ed52b246e00))
+    (pin "4" (uuid 4dd8d222-278c-4ba8-bb99-ec3b286ddab6))
+    (pin "5" (uuid aad8939c-a20d-4e45-a7dd-c89c64f6681f))
+    (pin "6" (uuid 3d88185c-1a11-4b4b-9e96-877278e46e24))
+  )
+
   (symbol (lib_id "Device:L") (at 50.8 40.64 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a106d720-f48d-4edc-923c-b4d6387dd7b0)
@@ -5180,22 +5138,29 @@
     (pin "2" (uuid 1f77eee8-4d97-427d-a550-9001f0f4784b))
   )
 
-  (symbol (lib_id "power:GNDA") (at 163.83 194.31 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid a3696430-7cd4-45b7-896d-7c6c1bd401a8)
-    (property "Reference" "#PWR?" (id 0) (at 163.83 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 124.46 186.69 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a91c1402-344a-4160-b2eb-1420676e5f09)
+    (property "Reference" "Q?" (id 0) (at 130.81 186.6899 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "GNDA" (id 1) (at 163.957 197.5358 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
+    (property "Value" "IRF7309IPBF" (id 1) (at 130.81 187.9599 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "" (id 2) (at 163.83 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 129.54 188.595 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "" (id 3) (at 163.83 194.31 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 127 186.69 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (pin "1" (uuid d6fd09d0-c235-49fc-a45a-4d0c26263c91))
+    (pin "1" (uuid 58fdd953-2810-47ea-8895-e028744a4e73))
+    (pin "2" (uuid 1508aded-fbeb-455f-b1b7-f3e171ee7792))
+    (pin "7" (uuid bf7a9aac-d013-403e-8586-80ebc859daae))
+    (pin "8" (uuid 6fca6db7-7084-4271-82e4-844910ce6348))
+    (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 "Device:L") (at 254 69.85 90) (unit 1)
@@ -5222,22 +5187,6 @@
     (pin "2" (uuid 78901371-87e9-4b00-9949-f2fb6264c1f7))
   )
 
-  (symbol (lib_id "power:+5VA") (at 156.21 173.99 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid ae3d518c-8d81-44be-b1ba-decc1608d14f)
-    (property "Reference" "#PWR?" (id 0) (at 156.21 177.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+5VA" (id 1) (at 156.591 169.5958 0))
-    (property "Footprint" "" (id 2) (at 156.21 173.99 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 156.21 173.99 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c98c5942-d959-4397-89e0-65737ce018e1))
-  )
-
   (symbol (lib_id "RF_Amplifier:BGA2869") (at 71.12 81.28 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid b4856f24-f7e0-4f85-b3c9-503bee0085b8)
@@ -5303,56 +5252,51 @@
     (pin "2" (uuid 2b7a8fd7-d46d-4dca-980e-e4246aea4d57))
   )
 
-  (symbol (lib_id "Transistor_FET:FDN340P") (at 127 176.53 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:R") (at 121.92 177.8 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c27fc4b8-696f-41a5-a771-da07f27e1667)
-    (property "Reference" "Q?" (id 0) (at 127 167.64 90))
-    (property "Value" "FDN360P" (id 1) (at 127 170.18 90))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 125.095 171.45 0)
-      (effects (font (size 1.27 1.27) italic) (justify left) hide)
+    (uuid c1e08b12-7b7a-44cf-9fcd-66a3082dc449)
+    (property "Reference" "R?" (id 0) (at 119.38 176.5299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/FDN360P_D.pdf" (id 3) (at 127 176.53 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
+    (property "Value" "12k" (id 1) (at 119.38 179.0699 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (pin "1" (uuid 45b1ec83-a887-4656-867a-460a3f4b06e2))
-    (pin "2" (uuid 89f038ca-bbb7-49a7-bf5a-ae0ffbcb9991))
-    (pin "3" (uuid c172fbb4-04f5-4c51-a01c-51adab7802a8))
-  )
-
-  (symbol (lib_id "Transistor_FET:FDN340P") (at 163.83 176.53 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid cb353e34-0063-485a-863e-71ae5f9207b3)
-    (property "Reference" "Q?" (id 0) (at 163.83 167.64 90))
-    (property "Value" "FDN360P" (id 1) (at 163.83 170.18 90))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 161.925 171.45 0)
-      (effects (font (size 1.27 1.27) italic) (justify left) hide)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 120.142 177.8 90)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/FDN360P_D.pdf" (id 3) (at 163.83 176.53 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
+    (property "Datasheet" "~" (id 3) (at 121.92 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8aba8877-cbd7-4fc0-b83e-e61d5a295e2d))
-    (pin "2" (uuid 682e150a-b197-45d3-a1dc-3b344019d56c))
-    (pin "3" (uuid 4369915e-fa5b-4bfc-857a-7f19680dcc8c))
+    (property "Need_order" "" (id 4) (at 121.92 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9b265ac0-2bd0-4193-8a1c-a89d517adf7b))
+    (pin "2" (uuid e233821c-8640-4d9a-94ff-df9e8ea9429e))
   )
 
-  (symbol (lib_id "Transistor_FET:2N7002K") (at 161.29 186.69 0) (unit 1)
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 161.29 186.69 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid d979870e-fa7b-42a8-9e77-ac497c7eed70)
-    (property "Reference" "Q?" (id 0) (at 167.64 185.4199 0)
+    (uuid c653ebf7-92fb-4975-a0dd-a2983228c224)
+    (property "Reference" "Q?" (id 0) (at 167.64 186.6899 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "2N7002K" (id 1) (at 167.64 187.9599 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "IRF7309IPBF" (id 1) (at 167.64 187.9599 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 166.37 188.595 0)
-      (effects (font (size 1.27 1.27) italic) (justify left) hide)
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 166.37 188.595 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds30896.pdf" (id 3) (at 161.29 186.69 0)
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 163.83 186.69 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (pin "1" (uuid fa5775df-501c-4573-8215-b8a70a5c700e))
-    (pin "2" (uuid 140a89f4-671c-418d-a01f-b4d4a2e9d8db))
-    (pin "3" (uuid 3d15156e-1f36-4f7a-b116-aea0360cc047))
+    (pin "1" (uuid c60fe9f5-cbe3-4490-bc33-5d4593ea2f07))
+    (pin "2" (uuid 5dabd4b7-2bde-4cfc-bcc3-4c5174956ab9))
+    (pin "7" (uuid 54769d81-8d4a-408c-8dbe-4eb9a520d457))
+    (pin "8" (uuid 003279c6-b168-48c8-a141-55ed3fc1441b))
+    (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 "RF_Amplifier:BGA2869") (at 55.88 140.97 0) (unit 1)