- added fix for #96 and #97

- beefed up vias for new SMD barrel connector
- added PWR_EN pullup
- added PLUG_SENSE signal to GPIO12
- Regenerated BOM
- Added gerbers
- Added missing 3D files

bitaxeUltra.kicad_sch

@@ -11,11 +11,11 @@
   )
 
   (lib_symbols
-    (symbol "Connector:Barrel_Jack" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+    (symbol "Connector:Barrel_Jack_Switch" (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (at 0 5.334 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Barrel_Jack" (at 0 -5.08 0)
+      (property "Value" "Barrel_Jack_Switch" (at 0 -5.08 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (at 1.27 -1.016 0)
@@ -27,13 +27,13 @@
       (property "ki_keywords" "DC power barrel jack connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "DC Barrel Jack" (at 0 0 0)
+      (property "ki_description" "DC Barrel Jack with an internal switch" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "ki_fp_filters" "BarrelJack*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Barrel_Jack_0_1"
+      (symbol "Barrel_Jack_Switch_0_1"
         (rectangle (start -5.08 3.81) (end 5.08 -3.81)
           (stroke (width 0.254) (type default))
           (fill (type background))
@@ -46,6 +46,14 @@
           (stroke (width 0.254) (type default))
           (fill (type outline))
         )
+        (polyline
+          (pts
+            (xy 1.27 -2.286)
+            (xy 1.905 -1.651)
+          )
+          (stroke (width 0.254) (type default))
+          (fill (type none))
+        )
         (polyline
           (pts
             (xy 5.08 2.54)
@@ -54,6 +62,16 @@
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 5.08 0)
+            (xy 1.27 0)
+            (xy 1.27 -2.286)
+            (xy 0.635 -1.651)
+          )
+          (stroke (width 0.254) (type default))
+          (fill (type none))
+        )
         (polyline
           (pts
             (xy -3.81 -2.54)
@@ -71,7 +89,7 @@
           (fill (type outline))
         )
       )
-      (symbol "Barrel_Jack_1_1"
+      (symbol "Barrel_Jack_Switch_1_1"
         (pin passive line (at 7.62 2.54 180) (length 2.54)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
@@ -80,6 +98,10 @@
           (name "~" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at 7.62 0 180) (length 2.54)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
       )
     )
     (symbol "Mechanical:Fiducial" (in_bom yes) (on_board yes)
@@ -2083,7 +2105,7 @@
     )
   )
 
-  (junction (at 179.07 79.375) (diameter 0) (color 0 0 0 0)
+  (junction (at 208.915 69.85) (diameter 0) (color 0 0 0 0)
     (uuid 55033ea4-52b5-46f6-b909-193ee90f64f8)
   )
   (junction (at 34.925 179.07) (diameter 0) (color 0 0 0 0)
@@ -2092,114 +2114,78 @@
   (junction (at 34.925 171.45) (diameter 0) (color 0 0 0 0)
     (uuid c11d050d-beff-4ccc-8ae4-610e2d72500e)
   )
-  (junction (at 176.53 81.915) (diameter 0) (color 0 0 0 0)
+  (junction (at 206.375 72.39) (diameter 0) (color 0 0 0 0)
     (uuid c6d94326-b3b8-44e3-95be-698fd44134ef)
   )
   (junction (at 34.925 163.195) (diameter 0) (color 0 0 0 0)
     (uuid eef211f1-f5ae-4328-a58e-79df94f7ae76)
   )
 
-  (wire (pts (xy 135.89 101.6) (xy 144.78 101.6))
-    (stroke (width 0) (type default))
-    (uuid 09762f23-f2c0-45ff-bb76-a81e27e092a4)
-  )
-  (wire (pts (xy 100.33 96.52) (xy 121.285 96.52))
-    (stroke (width 0) (type default))
-    (uuid 0a3b442b-ad5e-4d8b-87fe-379b1a40dd66)
-  )
-  (wire (pts (xy 99.822 57.15) (xy 176.53 57.15))
+  (wire (pts (xy 129.54 46.99) (xy 206.375 46.99))
     (stroke (width 0) (type default))
     (uuid 1008bb02-8344-46f8-976d-62e4c3e2844c)
   )
-  (wire (pts (xy 163.195 125.095) (xy 179.07 125.095))
-    (stroke (width 0) (type default))
-    (uuid 1410ead3-2ed2-4ad2-b524-035e7f2de6b1)
-  )
-  (wire (pts (xy 166.37 81.915) (xy 176.53 81.915))
+  (wire (pts (xy 196.215 72.39) (xy 206.375 72.39))
     (stroke (width 0) (type default))
     (uuid 1a84495c-9130-4980-bd4e-b3e4294f8c4b)
   )
-  (wire (pts (xy 62.23 125.73) (xy 145.415 125.73))
-    (stroke (width 0) (type default))
-    (uuid 1cbc5be3-f13a-4445-a44b-574eb7168dec)
-  )
-  (wire (pts (xy 75.565 55.245) (xy 82.55 55.245))
+  (wire (pts (xy 105.41 45.72) (xy 112.395 45.72))
     (stroke (width 0) (type default))
     (uuid 225a355f-9821-47d7-9dad-704a4b7f2a87)
   )
-  (wire (pts (xy 100.33 81.915) (xy 144.78 81.915))
+  (wire (pts (xy 130.175 72.39) (xy 174.625 72.39))
     (stroke (width 0) (type default))
     (uuid 24774115-230a-4b7e-a58b-d217c1c1593b)
   )
-  (wire (pts (xy 144.78 76.835) (xy 120.015 76.835))
+  (wire (pts (xy 165.735 88.265) (xy 174.625 88.265))
     (stroke (width 0) (type default))
-    (uuid 2c7d698c-4232-4a90-8593-004e8bf82ca6)
+    (uuid 26396d33-8fe3-498b-bb53-9a3aeb514721)
   )
-  (wire (pts (xy 57.785 53.975) (xy 57.785 52.705))
-    (stroke (width 0) (type default))
-    (uuid 2c8046bb-552a-44c0-807c-875e96000b7a)
-  )
-  (wire (pts (xy 41.91 53.975) (xy 57.785 53.975))
+  (wire (pts (xy 72.39 43.18) (xy 112.395 43.18))
     (stroke (width 0) (type default))
     (uuid 2cbbeb4e-a1d6-41f9-b199-e873ba23902b)
   )
-  (wire (pts (xy 44.45 60.325) (xy 62.23 60.325))
+  (wire (pts (xy 72.39 48.26) (xy 80.645 48.26))
     (stroke (width 0) (type default))
     (uuid 301e5094-668a-44dd-a028-836f5d7dd8ab)
   )
-  (wire (pts (xy 122.428 64.008) (xy 122.428 74.422))
-    (stroke (width 0) (type default))
-    (uuid 3e2e7726-faab-4db4-a3a3-c845a3aafc61)
-  )
-  (wire (pts (xy 118.745 99.06) (xy 118.745 121.92))
-    (stroke (width 0) (type default))
-    (uuid 458cb2a8-17fe-43e5-a916-72f0662c2ab1)
-  )
-  (wire (pts (xy 138.43 132.08) (xy 145.415 132.08))
+  (wire (pts (xy 167.64 110.49) (xy 174.625 110.49))
     (stroke (width 0) (type default))
     (uuid 51ba9129-b1a0-4373-8692-8d984b02e6d9)
   )
-  (wire (pts (xy 122.428 74.422) (xy 144.78 74.422))
+  (wire (pts (xy 160.02 77.47) (xy 174.625 77.47))
     (stroke (width 0) (type default))
-    (uuid 55d2dc48-e0b5-4fea-8a14-9d8b481a4a3f)
+    (uuid 6141b714-6192-4e6a-91ce-bc42ed5eae64)
   )
-  (wire (pts (xy 120.015 76.835) (xy 120.015 66.294))
-    (stroke (width 0) (type default))
-    (uuid 59f49ed5-a0e0-448f-a4ea-82dd82ad6f30)
-  )
-  (wire (pts (xy 179.07 59.69) (xy 179.07 79.375))
+  (wire (pts (xy 208.915 49.53) (xy 208.915 69.85))
     (stroke (width 0) (type default))
     (uuid 67316bbe-4f68-40a1-a506-e3f919a61a4f)
   )
-  (wire (pts (xy 121.285 96.52) (xy 121.285 119.38))
-    (stroke (width 0) (type default))
-    (uuid 6b20707d-4249-4e9c-a672-134ccedf544f)
-  )
-  (wire (pts (xy 99.822 59.69) (xy 179.07 59.69))
+  (wire (pts (xy 129.54 49.53) (xy 208.915 49.53))
     (stroke (width 0) (type default))
     (uuid 709afa4e-d8c4-4691-895e-92848cbcc479)
   )
-  (wire (pts (xy 145.415 121.92) (xy 118.745 121.92))
+  (wire (pts (xy 72.39 45.72) (xy 90.805 45.72))
     (stroke (width 0) (type default))
-    (uuid 82778ad5-1157-4dca-8107-c0bb36091840)
+    (uuid 764fb54b-4db4-48a0-9651-742faf312287)
   )
-  (wire (pts (xy 57.785 52.705) (xy 82.55 52.705))
+  (wire (pts (xy 165.735 83.185) (xy 174.625 83.185))
     (stroke (width 0) (type default))
-    (uuid 840e7333-14f5-4127-af32-b058ec2d8d97)
+    (uuid 8478d7e2-a004-4534-a71e-7f784e900add)
   )
-  (wire (pts (xy 176.53 81.915) (xy 176.53 127.635))
+  (wire (pts (xy 206.375 72.39) (xy 206.375 106.045))
     (stroke (width 0) (type default))
     (uuid 870045dc-784f-4e4b-9bae-c25848ef142a)
   )
-  (wire (pts (xy 176.53 57.15) (xy 176.53 81.915))
+  (wire (pts (xy 206.375 46.99) (xy 206.375 72.39))
     (stroke (width 0) (type default))
     (uuid 8ace5b8b-7377-49c8-9eb1-d8a1aa7310cc)
   )
-  (wire (pts (xy 99.822 64.008) (xy 122.428 64.008))
+  (wire (pts (xy 129.54 55.245) (xy 174.625 55.245))
     (stroke (width 0) (type default))
     (uuid 8ce87036-b6af-4b41-ad65-33bb105dd054)
   )
-  (wire (pts (xy 166.37 79.375) (xy 179.07 79.375))
+  (wire (pts (xy 196.215 69.85) (xy 208.915 69.85))
     (stroke (width 0) (type default))
     (uuid 8e9e0a2a-432e-41bb-b56e-cc291b9327d8)
   )
@@ -2207,62 +2193,42 @@
     (stroke (width 0) (type default))
     (uuid 92d3f2a6-e57e-4969-84a1-e1ef1bfafe03)
   )
-  (wire (pts (xy 100.33 99.06) (xy 118.745 99.06))
-    (stroke (width 0) (type default))
-    (uuid 9320c52b-38bc-4d17-9202-b5c85f8e9e00)
-  )
-  (wire (pts (xy 145.415 119.38) (xy 121.285 119.38))
-    (stroke (width 0) (type default))
-    (uuid 941c5f0a-73e0-4b3e-9504-d24dc4a61fbe)
-  )
-  (wire (pts (xy 73.66 86.36) (xy 82.55 86.36))
+  (wire (pts (xy 103.505 76.835) (xy 112.395 76.835))
     (stroke (width 0) (type default))
     (uuid 95b86feb-5ede-40c6-a7f8-7f1c2f5a9e9e)
   )
-  (wire (pts (xy 135.89 104.14) (xy 144.78 104.14))
-    (stroke (width 0) (type default))
-    (uuid 964a6d8c-c9f6-48df-bcf2-533021e650e7)
-  )
-  (wire (pts (xy 100.33 79.375) (xy 144.78 79.375))
+  (wire (pts (xy 130.175 69.85) (xy 174.625 69.85))
     (stroke (width 0) (type default))
     (uuid 9f9d7ce5-9f64-46fa-83b5-378b1dc13925)
   )
-  (wire (pts (xy 163.195 127.635) (xy 176.53 127.635))
+  (wire (pts (xy 196.215 103.505) (xy 208.915 103.505))
     (stroke (width 0) (type default))
-    (uuid a3538981-46e4-46d6-bfa7-d05275975751)
+    (uuid a90c3150-3b08-4013-9223-de5bb8ffb554)
   )
-  (wire (pts (xy 62.23 60.325) (xy 62.23 125.73))
-    (stroke (width 0) (type default))
-    (uuid af9d515d-48ba-4a66-903f-e29c59908b4c)
-  )
-  (wire (pts (xy 73.66 81.28) (xy 73.66 60.325))
+  (wire (pts (xy 103.505 71.755) (xy 103.505 50.8))
     (stroke (width 0) (type default))
     (uuid b1b075a3-0171-47ef-a412-35416e4fb492)
   )
-  (wire (pts (xy 44.45 60.325) (xy 44.45 59.055))
+  (wire (pts (xy 196.215 106.045) (xy 206.375 106.045))
     (stroke (width 0) (type default))
-    (uuid be5fdf7f-097f-40ef-9534-b031703d5531)
+    (uuid b9c51a48-9b6c-4b66-94e7-cccd7d2cc314)
   )
-  (wire (pts (xy 73.66 83.82) (xy 82.55 83.82))
+  (wire (pts (xy 103.505 74.295) (xy 112.395 74.295))
     (stroke (width 0) (type default))
     (uuid c12365dd-1dcd-493f-bb53-77fba132d7a3)
   )
-  (wire (pts (xy 179.07 125.095) (xy 179.07 79.375))
+  (wire (pts (xy 208.915 103.505) (xy 208.915 69.85))
     (stroke (width 0) (type default))
     (uuid cb3abdec-846c-4b09-b862-6e75137c0314)
   )
-  (wire (pts (xy 120.015 66.294) (xy 99.822 66.294))
+  (wire (pts (xy 129.54 57.785) (xy 174.625 57.785))
     (stroke (width 0) (type default))
     (uuid d0e68719-f5d8-401d-8209-df1c86a78913)
   )
-  (wire (pts (xy 138.43 129.54) (xy 145.415 129.54))
+  (wire (pts (xy 167.64 107.95) (xy 174.625 107.95))
     (stroke (width 0) (type default))
     (uuid d59cfc6e-eb9c-4c36-a07b-735096332bb6)
   )
-  (wire (pts (xy 44.45 59.055) (xy 41.91 59.055))
-    (stroke (width 0) (type default))
-    (uuid de7655fa-47e4-45ab-a3be-50821e987212)
-  )
   (wire (pts (xy 34.925 179.07) (xy 34.925 193.04))
     (stroke (width 0) (type default))
     (uuid e0ea613a-e997-43bd-9471-603edb36cb68)
@@ -2271,27 +2237,27 @@
     (stroke (width 0) (type default))
     (uuid e1430a93-e01f-48ce-811b-02b46de76171)
   )
-  (wire (pts (xy 82.55 81.28) (xy 73.66 81.28))
+  (wire (pts (xy 165.735 85.725) (xy 174.625 85.725))
+    (stroke (width 0) (type default))
+    (uuid e88c5b1f-1a8b-45ce-9e00-392b37d411a9)
+  )
+  (wire (pts (xy 112.395 71.755) (xy 103.505 71.755))
     (stroke (width 0) (type default))
     (uuid eb81b6da-90c7-4ee9-8d6f-2e65a34573ed)
   )
-  (wire (pts (xy 73.66 60.325) (xy 82.55 60.325))
+  (wire (pts (xy 103.505 50.8) (xy 112.395 50.8))
     (stroke (width 0) (type default))
     (uuid ec422df9-5d35-4c80-bd6c-c8a8d2e434d7)
   )
-  (wire (pts (xy 100.33 84.455) (xy 144.78 84.455))
+  (wire (pts (xy 130.175 74.93) (xy 174.625 74.93))
     (stroke (width 0) (type default))
     (uuid ec5db6b3-7b11-4644-b373-bba02fc5eaa6)
   )
-  (wire (pts (xy 135.89 106.68) (xy 144.78 106.68))
-    (stroke (width 0) (type default))
-    (uuid ecd49ea2-7b38-492c-b887-7471fa3ecd56)
-  )
   (wire (pts (xy 34.925 171.45) (xy 34.925 179.07))
     (stroke (width 0) (type default))
     (uuid f0be466e-a2a7-4cf2-a261-1f0043c80e86)
   )
-  (wire (pts (xy 99.822 53.34) (xy 107.315 53.34))
+  (wire (pts (xy 129.54 43.815) (xy 137.16 43.815))
     (stroke (width 0) (type default))
     (uuid fb150e19-1ef3-4ea1-8a17-ed02fd7c8667)
   )
@@ -2301,35 +2267,35 @@
     (uuid 65740984-b4b1-4ee3-94a0-449abd771ae0)
   )
 
-  (label "VDD" (at 135.89 101.6 0) (fields_autoplaced)
+  (label "PLUG_SENSE" (at 90.805 45.72 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 07cdd847-41dc-4cd8-8003-1b7221fd9683)
+  )
+  (label "VDD" (at 165.735 83.185 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 28f0b9d1-0424-417d-841e-45c0f4485235)
   )
-  (label "TEMP_N" (at 102.87 99.06 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 2cdb83d4-8a5d-4ef2-8b91-650b1e8f27fe)
-  )
-  (label "3V3" (at 73.66 86.36 0) (fields_autoplaced)
+  (label "3V3" (at 103.505 76.835 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 30c533f9-11ff-4e26-9cd5-9ad060205a39)
   )
-  (label "RST" (at 135.89 84.455 0) (fields_autoplaced)
+  (label "RST" (at 165.735 74.93 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 31bace7a-59c6-47e2-8542-fcbbfc29ee60)
   )
-  (label "VDD" (at 78.74 81.28 0) (fields_autoplaced)
+  (label "VDD" (at 108.585 71.755 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 33c9c692-c27c-41eb-ae96-a441b5ef3c16)
   )
-  (label "5V" (at 75.565 55.245 0) (fields_autoplaced)
+  (label "5V" (at 105.41 45.72 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3b1dfdbd-5caf-4ec5-bad2-60a39cc5a4eb)
   )
-  (label "5V" (at 138.43 129.54 0) (fields_autoplaced)
+  (label "5V" (at 167.64 107.95 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4b6ce4ce-8ba9-4a8d-b875-358615c45dff)
   )
-  (label "SDA" (at 168.275 79.375 0) (fields_autoplaced)
+  (label "SDA" (at 198.12 69.85 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 64bb4b1d-9141-410f-bc37-011ad71f877f)
   )
@@ -2337,51 +2303,51 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7527c5d0-31df-462d-8082-afc2158be38d)
   )
-  (label "RX" (at 135.89 79.375 0) (fields_autoplaced)
+  (label "RX" (at 165.735 69.85 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 795c3981-9287-49b0-96d8-85ab23b8e5a9)
   )
-  (label "3V3" (at 103.505 53.34 0) (fields_autoplaced)
+  (label "3V3" (at 133.35 43.815 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a040410f-d8e9-47f1-ad67-5a0613e63ff4)
   )
-  (label "3V3" (at 135.89 104.14 0) (fields_autoplaced)
+  (label "3V3" (at 165.735 85.725 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a4505776-d22b-4583-9182-188a1cc83fe9)
   )
-  (label "SCL" (at 168.275 81.915 0) (fields_autoplaced)
+  (label "SCL" (at 198.12 72.39 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid ba1ec3a7-4074-422f-8d28-adb972612f48)
   )
-  (label "5V" (at 135.89 106.68 0) (fields_autoplaced)
+  (label "5V" (at 165.735 88.265 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bc1c8224-e1d4-4aa8-bcbe-fd0d35670ce3)
   )
-  (label "3V3" (at 138.43 132.08 0) (fields_autoplaced)
+  (label "3V3" (at 167.64 110.49 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid cbccfbf0-8a78-494d-9b09-00b438efe401)
   )
-  (label "5V" (at 73.66 83.82 0) (fields_autoplaced)
+  (label "5V" (at 103.505 74.295 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d16c2814-61c6-4689-a9db-6c7487b2c67a)
   )
-  (label "GND" (at 57.785 60.325 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (label "GND" (at 78.74 48.26 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid d1d5a32b-73a4-4bbc-a612-b8498e760989)
   )
-  (label "TEMP_P" (at 102.87 96.52 0) (fields_autoplaced)
+  (label "PLUG_SENSE" (at 160.02 77.47 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid d91d8d24-5e67-482b-808b-84a789c917e3)
+    (uuid f0a9aaba-6e8c-421e-a698-9f9a04138776)
   )
-  (label "TX" (at 135.89 81.915 0) (fields_autoplaced)
+  (label "TX" (at 165.735 72.39 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f2130992-1195-474b-9390-24cff316f1d1)
   )
 
-  (global_label "GND" (shape input) (at 62.23 60.325 0) (fields_autoplaced)
+  (global_label "GND" (shape input) (at 80.645 48.26 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 3a9ec3dc-e8de-49ee-9a6e-42a19fca3e49)
-    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 68.5136 60.2456 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 86.9286 48.1806 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -2482,29 +2448,30 @@
     )
   )
 
-  (symbol (lib_id "Connector:Barrel_Jack") (at 34.29 56.515 0) (unit 1)
+  (symbol (lib_id "Connector:Barrel_Jack_Switch") (at 64.77 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 5536283f-3eb9-4437-9f90-6ac7a73e160e)
-    (property "Reference" "J1" (at 34.29 47.625 0)
+    (property "Reference" "J1" (at 64.77 36.83 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "PJ-037AH" (at 34.29 50.165 0)
+    (property "Value" "54-00164" (at 64.77 39.37 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Connector_BarrelJack:BarrelJack_Wuerth_694106106102_2.0x5.5mm" (at 35.56 57.531 0)
+    (property "Footprint" "bitaxe:BarrelJack_Wuerth_694106106102_2.0x5.5mm" (at 66.04 46.736 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.cuidevices.com/product/resource/pj-037ah.pdf" (at 35.56 57.531 0)
+    (property "Datasheet" "https://tensility.s3.amazonaws.com/uploads/pdffiles/54-00164.pdf?X-Amz-Expires=600&X-Amz-Date=20231120T033415Z&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIS2S4WRDQDSWDRZQ%2F20231120%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature=0ec7ce6b9e4957ccc83a05eb1138fede41cc8592648d2aac3c65914c1c151ca7" (at 66.04 46.736 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "DK" "CP-037AH-ND" (at 34.29 56.515 0)
+    (property "DK" "839-54-00164CT-ND" (at 64.77 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PARTNO" "PJ-037AH" (at 34.29 56.515 0)
+    (property "PARTNO" "54-00164" (at 64.77 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 63c6cc28-5a02-46f6-8d52-ded931b97e35))
     (pin "2" (uuid 3c2fa763-5554-4196-b3de-6a0bdbbbd39e))
+    (pin "3" (uuid ee01e01f-0981-4424-9b9e-59c0ad16c239))
     (instances
       (project "bitaxeUltra"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
@@ -2806,45 +2773,37 @@
     )
   )
 
-  (sheet (at 82.55 74.93) (size 17.78 26.67) (fields_autoplaced)
+  (sheet (at 112.395 67.31) (size 17.78 15.875) (fields_autoplaced)
     (stroke (width 0.1524) (type solid))
     (fill (color 255 255 194 1.0000))
     (uuid 4cf9c075-d009-4c35-9949-adda70ae20c7)
-    (property "Sheetname" "BM1366" (at 82.55 74.2184 0)
+    (property "Sheetname" "BM1366" (at 112.395 66.5984 0)
       (effects (font (size 1.27 1.27)) (justify left bottom))
     )
-    (property "Sheetfile" "bm1366.kicad_sch" (at 82.55 102.1846 0)
+    (property "Sheetfile" "bm1366.kicad_sch" (at 112.395 83.7696 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "TX" input (at 100.33 81.915 0)
+    (pin "TX" input (at 130.175 72.39 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid c4c0b3b4-8a5c-486c-854d-ccc0b4925a60)
     )
-    (pin "RX" output (at 100.33 79.375 0)
+    (pin "RX" output (at 130.175 69.85 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 424bf359-e741-47f3-a9b9-1eb328cf8e88)
     )
-    (pin "RST" input (at 100.33 84.455 0)
+    (pin "RST" input (at 130.175 74.93 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid b0a69e87-cd6d-468b-83de-f06c2397a2f6)
     )
-    (pin "3V3" input (at 82.55 86.36 180)
+    (pin "3V3" input (at 112.395 76.835 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid b58395a3-a057-42c2-87c2-1df46dae093f)
     )
-    (pin "5V" input (at 82.55 83.82 180)
+    (pin "5V" input (at 112.395 74.295 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid c2df387e-48f1-45f7-8abb-b1cd47da5639)
     )
-    (pin "TEMP_P" output (at 100.33 96.52 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-      (uuid 7447e4a9-2654-4b7f-9580-26320fe3d87d)
-    )
-    (pin "TEMP_N" output (at 100.33 99.06 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-      (uuid 0d6e65a7-88c0-459c-93d5-ba321f5b90a4)
-    )
-    (pin "VDD" input (at 82.55 81.28 180)
+    (pin "VDD" input (at 112.395 71.755 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid fe07d78e-8200-43d1-ae9c-4d7599be57f0)
     )
@@ -2855,44 +2814,32 @@
     )
   )
 
-  (sheet (at 145.415 116.205) (size 17.78 18.415) (fields_autoplaced)
+  (sheet (at 174.625 99.06) (size 21.59 13.97) (fields_autoplaced)
     (stroke (width 0.1524) (type solid))
     (fill (color 255 255 194 1.0000))
     (uuid 8e8832ea-6bf1-49d2-b3a5-32a207f555d2)
-    (property "Sheetname" "Fan" (at 145.415 115.4934 0)
+    (property "Sheetname" "Fan" (at 174.625 98.3484 0)
       (effects (font (size 1.27 1.27)) (justify left bottom))
     )
-    (property "Sheetfile" "fan.kicad_sch" (at 145.415 135.2046 0)
+    (property "Sheetfile" "fan.kicad_sch" (at 174.625 113.6146 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "TEMP_N" input (at 145.415 121.92 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid f1509e48-a727-4cae-ae77-62bcb51e2e3e)
-    )
-    (pin "TEMP_P" input (at 145.415 119.38 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 70dddb56-4d5a-48ce-935c-1cba5754008c)
-    )
-    (pin "SDA" bidirectional (at 163.195 125.095 0)
+    (pin "SDA" bidirectional (at 196.215 103.505 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid ab8b3fae-a527-4a08-9cea-411ed3bb0262)
     )
-    (pin "SCL" input (at 163.195 127.635 0)
+    (pin "SCL" input (at 196.215 106.045 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 593c6788-903d-45a9-a8b1-c8e4219ea665)
     )
-    (pin "5V" input (at 145.415 129.54 180)
+    (pin "5V" input (at 174.625 107.95 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 7e7c7a5b-aad9-4414-9edb-66a478898245)
     )
-    (pin "3V3" input (at 145.415 132.08 180)
+    (pin "3V3" input (at 174.625 110.49 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 3bc71f2d-53ea-4dbd-b8fb-74681448b62d)
     )
-    (pin "GND" input (at 145.415 125.73 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 93183a25-9d66-4bf2-a2b2-870a1cc9e4e9)
-    )
     (instances
       (project "bitaxeUltra"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55" (page "5"))
@@ -2900,45 +2847,45 @@
     )
   )
 
-  (sheet (at 82.55 49.53) (size 17.272 19.05) (fields_autoplaced)
+  (sheet (at 112.395 40.005) (size 17.145 20.955) (fields_autoplaced)
     (stroke (width 0.1524) (type solid))
     (fill (color 255 255 194 1.0000))
     (uuid 8ec0a9c6-2b78-44ef-a83d-9047d2828409)
-    (property "Sheetname" "Power" (at 82.55 48.8184 0)
+    (property "Sheetname" "Power" (at 112.395 39.2934 0)
       (effects (font (size 1.27 1.27)) (justify left bottom))
     )
-    (property "Sheetfile" "power.kicad_sch" (at 82.55 69.1646 0)
+    (property "Sheetfile" "power.kicad_sch" (at 112.395 61.5446 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "VOUT" output (at 82.55 60.325 180)
+    (pin "VOUT" output (at 112.395 50.8 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid cabb89b1-9d2e-440d-94cb-0b6c3180648c)
     )
-    (pin "VIN" input (at 82.55 52.705 180)
+    (pin "VIN" input (at 112.395 43.18 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 75774a4c-884f-4fcc-ac43-7fce4365b895)
     )
-    (pin "SCL" input (at 99.822 57.15 0)
+    (pin "SCL" input (at 129.54 46.99 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 317fd698-be46-4f1b-843d-aa42118bd002)
     )
-    (pin "SDA" bidirectional (at 99.822 59.69 0)
+    (pin "SDA" bidirectional (at 129.54 49.53 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 782b8d76-867c-4d80-8cd1-603313eeff01)
     )
-    (pin "5V" output (at 82.55 55.245 180)
+    (pin "5V" output (at 112.395 45.72 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 0f51833d-c854-4c2c-b22b-12364713779b)
     )
-    (pin "3V3" input (at 99.822 53.34 0)
+    (pin "3V3" input (at 129.54 43.815 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 24f34f08-ba90-4da4-bb47-4712ca4c30ec)
     )
-    (pin "PGOOD" output (at 99.822 66.294 0)
+    (pin "PGOOD" output (at 129.54 57.785 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 31e2def0-a6e4-410f-9883-8adb3501ac6b)
     )
-    (pin "PWR_EN" input (at 99.822 64.008 0)
+    (pin "PWR_EN" input (at 129.54 55.245 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 029c510a-ae4a-4626-b80b-34f7d530870f)
     )
@@ -2949,56 +2896,60 @@
     )
   )
 
-  (sheet (at 144.78 71.882) (size 21.59 37.338) (fields_autoplaced)
+  (sheet (at 174.625 52.705) (size 21.59 38.1) (fields_autoplaced)
     (stroke (width 0.1524) (type solid))
     (fill (color 255 255 194 1.0000))
     (uuid ca857324-2ec8-447e-bd58-90d0c2e6b6d7)
-    (property "Sheetname" "ESP32" (at 144.78 71.1704 0)
+    (property "Sheetname" "ESP32" (at 174.625 51.9934 0)
       (effects (font (size 1.27 1.27)) (justify left bottom))
     )
-    (property "Sheetfile" "esp32.kicad_sch" (at 144.78 109.8046 0)
+    (property "Sheetfile" "esp32.kicad_sch" (at 174.625 91.3896 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "SDA" bidirectional (at 166.37 79.375 0)
+    (pin "SDA" bidirectional (at 196.215 69.85 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid bca82dc7-5a68-4d25-a4ac-0590b1e5b728)
     )
-    (pin "SCL" output (at 166.37 81.915 0)
+    (pin "SCL" output (at 196.215 72.39 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid af7e746f-b773-41bd-8409-c2c348914847)
     )
-    (pin "RX" input (at 144.78 79.375 180)
+    (pin "RX" input (at 174.625 69.85 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid d5c52adf-cf39-499a-9117-76036c9061a6)
     )
-    (pin "TX" output (at 144.78 81.915 180)
+    (pin "TX" output (at 174.625 72.39 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid e766071b-f627-4a97-baf6-ca7a79b67d46)
     )
-    (pin "RST" output (at 144.78 84.455 180)
+    (pin "RST" output (at 174.625 74.93 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid f0847ef2-1dee-43de-bba9-e14854885c19)
     )
-    (pin "5V" input (at 144.78 106.68 180)
+    (pin "5V" input (at 174.625 88.265 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 88a48359-3603-4fef-bd86-2f6ce91fbbd6)
     )
-    (pin "3V3" output (at 144.78 104.14 180)
+    (pin "3V3" output (at 174.625 85.725 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 248d2981-8692-4af8-8a07-e4ce4e8cdcf3)
     )
-    (pin "PGOOD" input (at 144.78 76.835 180)
+    (pin "PGOOD" input (at 174.625 57.785 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 3d6fe7ed-dd0f-45a1-b149-0ad54cb17ea7)
     )
-    (pin "VDD" input (at 144.78 101.6 180)
+    (pin "VDD" input (at 174.625 83.185 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 62229c31-0a19-4517-a39d-91313c1f1447)
     )
-    (pin "PWR_EN" output (at 144.78 74.422 180)
+    (pin "PWR_EN" output (at 174.625 55.245 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 1a2f37ca-553c-4963-bff4-ced19850eeb9)
     )
+    (pin "PLUG_SENSE" input (at 174.625 77.47 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid d1f8be99-dd1f-4f6b-9189-9ff99857aff0)
+    )
     (instances
       (project "bitaxeUltra"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55" (page "3"))