ESD, cleanup, buttons

audio.kicad_sch

@@ -204,6 +204,104 @@
         )
       )
     )
+    (symbol "Device:D_Dual_CommonAnode_KKA_Parallel" (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "D" (id 0) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "D_Dual_CommonAnode_KKA_Parallel" (id 1) (at 0 -5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at -1.27 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at -1.27 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "diode" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Dual diode, common anode on pin 1" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "D_Dual_CommonAnode_KKA_Parallel_0_0"
+        (polyline
+          (pts
+            (xy 2.54 -3.81)
+            (xy 2.54 -1.27)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 1.27)
+            (xy 2.54 3.81)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "D_Dual_CommonAnode_KKA_Parallel_0_1"
+        (circle (center -1.27 0) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (polyline
+          (pts
+            (xy -1.27 0)
+            (xy -2.54 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 2.54)
+            (xy -1.27 2.54)
+            (xy -1.27 -2.54)
+            (xy 2.54 -2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 -1.27)
+            (xy 2.54 -2.54)
+            (xy 0 -3.81)
+            (xy 0 -1.27)
+            (xy 0 -1.27)
+            (xy 0 -1.27)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 3.81)
+            (xy 2.54 2.54)
+            (xy 0 1.27)
+            (xy 0 3.81)
+            (xy 0 3.81)
+            (xy 0 3.81)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (pin passive line (at 5.08 2.54 180) (length 2.54)
+          (name "K" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 5.08 -2.54 180) (length 2.54)
+          (name "K" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:Ferrite_Bead_Small" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "FB" (id 0) (at 1.905 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1488,6 +1586,9 @@
   (junction (at 101.6 104.14) (diameter 0) (color 0 0 0 0)
     (uuid 5b5933c4-b9db-4d03-8c69-7a195558f8eb)
   )
+  (junction (at 241.935 82.55) (diameter 0) (color 0 0 0 0)
+    (uuid 5ef6fdab-76af-49f1-835c-550fbf8786ec)
+  )
   (junction (at 187.96 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 623bde36-1740-49b4-a814-893a84f95c8d)
   )
@@ -1548,6 +1649,9 @@
   (junction (at 136.525 155.575) (diameter 0) (color 0 0 0 0)
     (uuid c83e0c29-038f-46df-a3ee-92d9a3f7bd03)
   )
+  (junction (at 236.855 77.47) (diameter 0) (color 0 0 0 0)
+    (uuid cce521a9-35ea-47f8-b248-475b445e29f4)
+  )
   (junction (at 37.465 41.275) (diameter 0) (color 0 0 0 0)
     (uuid ce34605a-b244-417e-a2c2-c8804443a621)
   )
@@ -1763,6 +1867,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2f72ca83-4aa8-4640-80de-a7a35f417568)
   )
+  (wire (pts (xy 236.855 77.47) (xy 236.855 89.535))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3068d3f4-d1ae-47bf-86e3-8a693a63c68f)
+  )
   (wire (pts (xy 189.865 48.895) (xy 189.865 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30ee252a-da6f-401e-8101-4a62abcc1aae)
@@ -1978,6 +2086,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 775849cd-1577-45b3-af89-0e6859d04c85)
   )
+  (wire (pts (xy 236.855 77.47) (xy 251.46 77.47))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7b4d4573-1339-4551-a0b4-1fffd05b743c)
+  )
   (wire (pts (xy 55.88 51.435) (xy 55.88 48.895))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7d80d2a3-e67a-40aa-a029-3ca7bf174530)
@@ -1998,6 +2110,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 81add1b1-07c4-49f3-b507-4e3c61679371)
   )
+  (wire (pts (xy 239.395 100.965) (xy 239.395 99.695))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 82da7652-ca4c-4556-b1d7-961e1734db91)
+  )
   (wire (pts (xy 36.195 56.515) (xy 36.195 59.055))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83ffef6a-f066-4332-9ab9-d7b1607cf259)
@@ -2027,6 +2143,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8972c01d-0b16-456e-aaa5-5e09a8e0f162)
   )
+  (wire (pts (xy 241.935 82.55) (xy 241.935 89.535))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8ae2065d-f802-41b5-8528-a7e73154ada4)
+  )
   (wire (pts (xy 120.015 107.315) (xy 104.14 107.315))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8af68f51-34e0-4a67-a947-ab45e1721d56)
@@ -2091,7 +2211,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a1355148-e330-41f7-a329-f57936c7fa47)
   )
-  (wire (pts (xy 231.14 77.47) (xy 251.46 77.47))
+  (wire (pts (xy 231.14 77.47) (xy 236.855 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a330618d-c6dd-4be9-82c3-dd3e88c6a7b0)
   )
@@ -2990,6 +3110,22 @@
     (pin "1" (uuid 284319fd-c5f9-4496-bc4d-5461e847905a))
   )
 
+  (symbol (lib_id "power:GND") (at 239.395 100.965 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 65709d86-7fea-4044-8577-af2ab91339fc)
+    (property "Reference" "#PWR?" (id 0) (at 239.395 107.315 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 239.395 105.41 0))
+    (property "Footprint" "" (id 2) (at 239.395 100.965 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 239.395 100.965 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4ae710bf-d01b-48ff-94cc-b228ea9c295f))
+  )
+
   (symbol (lib_id "power:GND") (at 120.015 83.185 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 69b9be6e-0c10-41ac-88eb-a06818bf73a5)
@@ -3562,6 +3698,29 @@
     (pin "8" (uuid 33221745-eab6-411c-8f60-9c9b0305be9c))
   )
 
+  (symbol (lib_id "Device:D_Dual_CommonAnode_KKA_Parallel") (at 239.395 94.615 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e2e88276-3709-4182-a8ec-1d0f6254b923)
+    (property "Reference" "D?" (id 0) (at 245.11 93.2814 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "SP0502BAHTG " (id 1) (at 245.11 95.8214 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-523" (id 2) (at 239.395 95.885 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 239.395 95.885 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PN" "PESD2USB3UV-TR" (id 4) (at 239.395 94.615 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 419d89b4-24d5-4fa4-9b0e-1311989ccd7e))
+    (pin "2" (uuid 769b2eaf-58ca-46cc-9f84-d1033ee67fa4))
+    (pin "3" (uuid b2cba1c8-53a1-4b2a-a41a-2c08456882f3))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 189.865 46.355 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e6d549d5-e0a5-42fb-a353-07ac194c5021)

peripherals.kicad_sch

@@ -5,67 +5,6 @@
   (paper "A4")
 
   (lib_symbols
-    (symbol "Connector_Generic:Conn_01x04" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Conn_01x04" (id 1) (at 0 -7.62 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Conn_01x04_1_1"
-        (rectangle (start -1.27 -4.953) (end 0 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 2.667) (end 0 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 3.81) (end 1.27 -6.35)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-        (pin passive line (at -5.08 2.54 0) (length 3.81)
-          (name "Pin_1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 0 0) (length 3.81)
-          (name "Pin_2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
-          (name "Pin_3" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -5.08 0) (length 3.81)
-          (name "Pin_4" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector_Generic:Conn_01x12" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at 0 15.24 0)
         (effects (font (size 1.27 1.27)))
@@ -383,83 +322,6 @@
         )
       )
     )
-    (symbol "Device:Q_NPN_BCE" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "Q" (id 0) (at 5.08 1.27 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Value" "Q_NPN_BCE" (id 1) (at 5.08 -1.27 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "" (id 2) (at 5.08 2.54 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "transistor NPN" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "NPN transistor, base/collector/emitter" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Q_NPN_BCE_0_1"
-        (polyline
-          (pts
-            (xy 0.635 0.635)
-            (xy 2.54 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 -0.635)
-            (xy 2.54 -2.54)
-            (xy 2.54 -2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 1.905)
-            (xy 0.635 -1.905)
-            (xy 0.635 -1.905)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.27 -1.778)
-            (xy 1.778 -1.27)
-            (xy 2.286 -2.286)
-            (xy 1.27 -1.778)
-            (xy 1.27 -1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (circle (center 1.27 0) (radius 2.8194)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "Q_NPN_BCE_1_1"
-        (pin input line (at -5.08 0 0) (length 5.715)
-          (name "B" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 -5.08 90) (length 2.54)
-          (name "E" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:R_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
       (property "Reference" "R" (id 0) (at 0.762 0.508 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -679,6 +541,108 @@
         )
       )
     )
+    (symbol "Switch:SW_Push" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (id 0) (at 1.27 2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Value" "SW_Push" (id 1) (at 0 -1.524 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "switch normally-open pushbutton push-button" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Push button switch, generic, two pins" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SW_Push_0_1"
+        (circle (center -2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 1.27)
+            (xy 0 3.048)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 1.27)
+            (xy -2.54 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 5.08 0 180) (length 2.54)
+          (name "2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Switch:SW_SPST" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (id 0) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "SW_SPST" (id 1) (at 0 -2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "switch lever" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Single Pole Single Throw (SPST) switch" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SW_SPST_0_0"
+        (circle (center -2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.524 0.254)
+            (xy 1.524 1.778)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 2.032 0) (radius 0.508)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "SW_SPST_1_1"
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "A" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 5.08 0 180) (length 2.54)
+          (name "B" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Transistor_FET:DMC2053UVT" (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 3.175 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1023,8 +987,8 @@
   (junction (at 61.595 53.975) (diameter 0) (color 0 0 0 0)
     (uuid 5be31e61-be8c-4d93-a17d-6c48e6e14a5d)
   )
-  (junction (at 69.85 135.255) (diameter 0) (color 0 0 0 0)
+  (junction (at 240.665 88.9) (diameter 0) (color 0 0 0 0)
-    (uuid 7b4dc4cb-2a4c-4dbc-a76b-5e545f6a7463)
+    (uuid 5d9bc790-470c-43f9-8df4-654c9f260718)
   )
   (junction (at 117.475 25.4) (diameter 0) (color 0 0 0 0)
     (uuid 83e9f449-7e37-4a23-88ed-eb8443a28b82)
@@ -1035,11 +999,8 @@
   (junction (at 50.2099 47.625) (diameter 0) (color 0 0 0 0)
     (uuid 8a987a27-d43c-4686-8e62-bc1ffb423c03)
   )
-  (junction (at 61.595 141.605) (diameter 0) (color 0 0 0 0)
+  (junction (at 240.665 99.06) (diameter 0) (color 0 0 0 0)
-    (uuid a7aa38af-c3f3-428d-8a98-cce5b87bb8d9)
+    (uuid c3f1d5f5-3eab-49d1-bf14-9a23fcf016ad)
-  )
-  (junction (at 61.595 135.255) (diameter 0) (color 0 0 0 0)
-    (uuid b95fd6cb-94cb-4837-a734-03b49729d0e0)
   )
   (junction (at 33.655 135.255) (diameter 0) (color 0 0 0 0)
     (uuid c5998982-0bfc-4728-b2e0-cf290990ec32)
@@ -1084,6 +1045,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0bd9a66d-872a-4b39-a45d-7551a1a8a8df)
   )
+  (wire (pts (xy 237.49 78.105) (xy 240.665 78.105))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0da6e508-6ff5-432c-94b2-193fa931180e)
+  )
+  (wire (pts (xy 225.425 88.9) (xy 227.33 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0f5b77fc-026d-4956-bd56-6b3b531e6c24)
+  )
   (wire (pts (xy 49.53 135.255) (xy 50.2099 135.255))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 107c59d8-e629-4c7a-8cd5-437804c97cf1)
@@ -1108,18 +1077,26 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d9d2b10-d7ca-40d6-b6d8-e3b947998545)
   )
-  (wire (pts (xy 61.595 135.255) (xy 69.85 135.255))
+  (wire (pts (xy 218.44 78.105) (xy 220.345 78.105))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1f69cd74-4f94-488b-8e50-95e33db8233e)
+  )
+  (wire (pts (xy 50.2099 135.255) (xy 63.5 135.255))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 20d7120f-1cd7-4339-a07d-28fdc9a1d0b7)
   )
-  (wire (pts (xy 160.02 78.105) (xy 158.75 78.105))
+  (wire (pts (xy 237.49 88.9) (xy 240.665 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 232b7a43-ed60-4b78-b456-859f95589462)
+    (uuid 22fa3d93-c5ec-4db0-a807-0ef939fd25ca)
   )
   (wire (pts (xy 33.655 125.73) (xy 33.655 135.255))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 253e0b9c-0197-413d-a7e2-dab5bf833618)
   )
+  (wire (pts (xy 218.44 88.9) (xy 220.345 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2999fd48-f312-4008-87e6-6ac881481138)
+  )
   (wire (pts (xy 131.445 128.27) (xy 155.575 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3383fe99-7441-4017-a190-50154bbf0e51)
@@ -1132,18 +1109,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 36a13640-3114-4fa9-818e-74be0d20523d)
   )
-  (wire (pts (xy 50.2099 135.255) (xy 61.595 135.255))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 399f056b-0c79-4743-9cf1-087060ee948f)
-  )
   (wire (pts (xy 117.475 25.4) (xy 122.555 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3ced8304-68f4-4d26-9f15-a71718d6cbed)
   )
-  (wire (pts (xy 61.595 141.605) (xy 61.595 140.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3d27fff6-159d-4f1b-b332-6b189f7f48bd)
-  )
   (wire (pts (xy 44.45 117.475) (xy 44.45 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 418ab68a-0c5d-41d6-b0eb-e0657aef2016)
@@ -1164,6 +1133,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4cad7490-beec-4d3d-b887-383225438234)
   )
+  (wire (pts (xy 240.665 88.9) (xy 240.665 99.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4e2d61a1-5bf3-4249-90ff-b43e41a7511a)
+  )
   (wire (pts (xy 155.575 120.015) (xy 165.735 120.015))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4e890eac-f296-4df1-bcca-d7958969bc7c)
@@ -1176,6 +1149,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 581578e2-0a6f-458f-a228-9bd6ee40f81e)
   )
+  (wire (pts (xy 240.665 99.06) (xy 240.665 101.6))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5c66ae2c-a471-4ee3-bf9b-39dd49237a95)
+  )
   (wire (pts (xy 110.49 111.76) (xy 110.49 112.395))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5eb1e9f7-6b46-44c4-9858-0d889cee1988)
@@ -1204,22 +1181,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6de54242-6ae6-4d27-b039-5bf8de646fc6)
   )
-  (wire (pts (xy 69.85 135.255) (xy 73.025 135.255))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 71365baa-443d-431a-aa26-f8bf60c4a8b3)
-  )
-  (wire (pts (xy 61.595 135.89) (xy 61.595 135.255))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 735a04a5-ad9c-4a39-8c6c-76d24ee26061)
-  )
   (wire (pts (xy 69.85 47.625) (xy 73.025 47.625))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7538e24e-8c95-4827-996f-7c94b210695e)
   )
-  (wire (pts (xy 167.005 78.105) (xy 165.1 78.105))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7d1be6d3-4a84-4e47-9af7-4ee63470da21)
-  )
   (wire (pts (xy 149.225 121.92) (xy 149.225 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7dedb97e-6f49-4be6-b694-60ad6973b957)
@@ -1248,6 +1213,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93376b78-c123-4349-9970-f91c167b4073)
   )
+  (wire (pts (xy 225.425 78.105) (xy 227.33 78.105))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9a0ebe20-56e0-40aa-b1cf-04ffb9a2c94a)
+  )
   (wire (pts (xy 33.655 38.1) (xy 33.655 47.625))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f4d46d4-4fe7-43e9-9b54-aa77976e8f6e)
@@ -1276,9 +1245,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac5d1321-82b0-47eb-b428-9e9ce548a72f)
   )
-  (wire (pts (xy 149.225 83.185) (xy 151.13 83.185))
+  (wire (pts (xy 237.49 99.06) (xy 240.665 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid add009ef-0817-482a-ac50-58580886e9d9)
+    (uuid ac89df79-2993-48eb-b8dc-3cf758122b00)
   )
   (wire (pts (xy 44.45 29.845) (xy 44.45 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1300,10 +1269,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b814eb9c-9e7e-4ac6-8890-f0ada389b253)
   )
-  (wire (pts (xy 141.605 83.185) (xy 144.145 83.185))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b907019a-1e8c-4eea-880b-aa625beaf935)
-  )
   (wire (pts (xy 36.195 125.73) (xy 33.655 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bb0d92a0-488a-4c5b-9f87-4bbbb2f9345e)
@@ -1316,6 +1281,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bd2a82ad-02af-421e-8f50-52adff7b08aa)
   )
+  (wire (pts (xy 240.665 78.105) (xy 240.665 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c094aeb9-3c76-427f-a7ba-d25e7ed8c351)
+  )
   (wire (pts (xy 44.45 38.1) (xy 44.45 40.005))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c20ffab8-56ae-4449-a5a4-ffd4c0d4c736)
@@ -1328,22 +1297,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c43e92d5-0b29-422e-ad99-020da3942269)
   )
-  (wire (pts (xy 69.85 140.97) (xy 69.85 141.605))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c4c35bb5-8961-4e1a-b712-a4a0340a56d9)
-  )
   (wire (pts (xy 69.85 53.975) (xy 61.595 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca6fd8bd-09fe-4f09-ae29-da1f65c9d89a)
   )
+  (wire (pts (xy 225.425 99.06) (xy 227.33 99.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cb2ab2ef-74d9-4294-b773-04c3778f34a2)
+  )
   (wire (pts (xy 109.22 25.4) (xy 117.475 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc2b03da-b6e8-4010-9019-3eb2a9233cad)
   )
-  (wire (pts (xy 69.85 135.255) (xy 69.85 135.89))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cc436698-b464-46f9-a7d8-733db1552211)
-  )
   (wire (pts (xy 148.59 29.21) (xy 148.59 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d7ca8fa0-8c6a-4c4c-8443-e62a01886875)
@@ -1368,10 +1333,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e97f79fd-79c4-4f7d-8e29-e4fe53845d20)
   )
-  (wire (pts (xy 69.85 141.605) (xy 61.595 141.605))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ea109aa3-1518-4d8c-a742-19a010fe68a8)
-  )
   (wire (pts (xy 123.825 111.76) (xy 123.825 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid efd030ed-a07c-4a33-9250-bb5e916e96bf)
@@ -1380,22 +1341,29 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f59f0d9f-2518-4f7c-9798-2b56b95cbb0e)
   )
+  (wire (pts (xy 218.44 99.06) (xy 220.345 99.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f5d0879f-c60c-4ca7-82de-21f9830a81a0)
+  )
 
-  (text "TODO: design flex pcb for these??" (at 262.255 53.975 180)
+  (text "TODO: find a real distributor!!\nhttps://www.aliexpress.com/item/1005004267165249.html\n\nPinout looks standard. This store does a 0.5mm pitch\nFFC connector with a ST7735S."
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (at 174.625 35.56 0)
-    (uuid 61b6bcee-9e5c-46ab-9d1f-1072f1384628)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 6dc67eac-e543-4eb3-8934-12fd8e5a0167)
   )
   (text "TODO: check touchpad model w/daniel" (at 175.26 159.385 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 88b86dc2-edad-409c-bd74-52ce27fc1dfe)
   )
-  (text "TODO: pinout" (at 163.195 84.455 180)
+  (text "NOTE: DISPLAY_LED needs to\nbe able to sink a reasonable\namount of current, since it's\nLED_K."
+    (at 161.29 26.67 0)
     (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 8a2b7bfe-7338-44fb-bc66-178268b33296)
+    (uuid 9ea56e09-5c41-4ed8-9fe4-e212aae9c996)
   )
-  (text "JD-T1800" (at 152.4 21.59 0)
+  (text "https://www.molex.com/molex/products/part-detail/ffc_fpc_connectors/0781271128"
+    (at 132.715 151.765 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid e9fdffa3-0122-47cd-9002-7c13a1f42fdb)
+    (uuid f04e528e-46c2-49c5-8ce5-a816d6fd9aea)
   )
 
   (global_label "DISPLAY_EN" (shape input) (at 39.37 20.955 180) (fields_autoplaced)
@@ -1419,17 +1387,17 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "KEY_LOCK" (shape input) (at 252.73 43.18 180) (fields_autoplaced)
+  (global_label "KEY_LOCK" (shape input) (at 218.44 78.105 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 2cb0fba0-70fa-41b5-99be-27e1da45cfd2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 240.9431 43.1006 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 206.6531 78.0256 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "KEY_VOL_UP" (shape input) (at 252.73 38.1 180) (fields_autoplaced)
+  (global_label "KEY_VOL_UP" (shape input) (at 218.44 88.9 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 2d950f56-d8c4-427f-bd09-d3be7bc6c47a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 238.8264 38.0206 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 204.5364 88.8206 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
@@ -1454,10 +1422,10 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "TOUCH_VDD" (shape input) (at 73.025 135.255 0) (fields_autoplaced)
+  (global_label "TOUCH_VDD" (shape input) (at 63.5 135.255 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 4f31024d-6a6a-4f59-aba1-7ae89b34bcd7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 86.2633 135.1756 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 76.7383 135.1756 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -1468,10 +1436,10 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "KEY_VOL_DOWN" (shape input) (at 252.73 40.64 180) (fields_autoplaced)
+  (global_label "KEY_VOL_DOWN" (shape input) (at 218.44 99.06 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 5da1f9ef-1a2a-4f80-9267-180d0ffd3ae1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 236.0445 40.5606 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 201.7545 98.9806 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
@@ -1482,6 +1450,13 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
+  (global_label "DISPLAY_LED" (shape input) (at 165.735 31.75 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 6b40ed36-9f3f-4e9a-9fd1-7f4c206eab3e)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 151.3476 31.6706 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
   (global_label "ESP_SCLK" (shape input) (at 109.855 46.99 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 6bf505b7-14ea-44d0-a704-725db7e1544d)
@@ -1503,20 +1478,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DISPLAY_LED" (shape input) (at 141.605 83.185 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 8be02dab-053a-4319-a4fe-9045c2822a79)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 127.2176 83.1056 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "DISPLAY_LEDK" (shape input) (at 165.735 31.75 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 98cdcf13-9932-40d6-9564-44af082fc4a9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 150.0776 31.6706 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
   (global_label "DISPLAY_CS" (shape input) (at 165.735 54.61 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid a01c6103-0b56-4daf-9e00-ef4a2efab299)
@@ -1538,13 +1499,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DISPLAY_LEDK" (shape input) (at 167.005 78.105 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid b0883973-4370-4fee-bc0a-0cd6ae88df36)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 182.6624 78.1844 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "DISPLAY_DR" (shape input) (at 165.735 41.91 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid b2cc3c35-c110-4685-8b3f-84a0b7162b81)
@@ -1567,24 +1521,6 @@
     )
   )
 
-  (symbol (lib_id "Device:C_Small") (at 69.85 138.43 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00858602-bada-465a-83b2-58e5118e9db5)
-    (property "Reference" "C?" (id 0) (at 65.7225 137.4775 0))
-    (property "Value" "1uF" (id 1) (at 65.7225 139.3825 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 69.85 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 69.85 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 69.85 138.43 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 9be1f0d2-6dbb-4c17-b499-9489f93fb358))
-    (pin "2" (uuid 3a7f5444-1999-430c-ba3f-6c10ba418958))
-  )
-
   (symbol (lib_id "Device:R_Small") (at 38.735 38.1 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 01702983-5d60-4005-a563-85c713af264a)
@@ -1651,17 +1587,17 @@
     (pin "9" (uuid 1c2b6f6a-3056-4ca0-a61b-f1cfe51ade2e))
   )
 
-  (symbol (lib_id "power:GND") (at 252.73 45.72 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 240.665 101.6 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0ab130fa-21a4-4de5-b79d-9fc0d70fe917)
-    (property "Reference" "#PWR?" (id 0) (at 252.73 52.07 0)
+    (property "Reference" "#PWR?" (id 0) (at 240.665 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 252.73 50.165 0))
+    (property "Value" "GND" (id 1) (at 240.665 106.045 0))
-    (property "Footprint" "" (id 2) (at 252.73 45.72 0)
+    (property "Footprint" "" (id 2) (at 240.665 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 252.73 45.72 0)
+    (property "Datasheet" "" (id 3) (at 240.665 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 665a8bfe-5661-4ebc-ba78-9b8921c66bf6))
@@ -1720,30 +1656,6 @@
     (pin "9" (uuid c9e9b2e7-3119-4f8f-a005-772dd037bc31))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x04") (at 257.81 40.64 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 1fda0002-942b-4161-9fb6-446198af304e)
-    (property "Reference" "J?" (id 0) (at 255.27 32.385 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Keys" (id 1) (at 255.27 34.925 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 257.81 40.64 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 257.81 40.64 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "" (id 4) (at 257.81 40.64 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 45e56596-fe42-4fdd-b1c3-5ebc5060ac4e))
-    (pin "2" (uuid cbe6d247-3468-45bb-8442-dba407f63ad2))
-    (pin "3" (uuid fefbfff3-0669-42b4-983a-2435b23a4371))
-    (pin "4" (uuid c209c83f-4d2e-42be-b0be-f879b17abe4b))
-  )
-
   (symbol (lib_id "power:GND") (at 149.225 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2176d7e9-66ed-464e-bc54-b08868a27847)
@@ -1785,6 +1697,21 @@
     (pin "8" (uuid 083e8f3d-e881-4c03-aa5c-fa2140a94fa7))
   )
 
+  (symbol (lib_id "Switch:SW_Push") (at 232.41 88.9 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 22886503-0964-4c95-8895-35c124878972)
+    (property "Reference" "SW?" (id 0) (at 232.41 81.28 0))
+    (property "Value" "SW_Push" (id 1) (at 232.41 83.82 0))
+    (property "Footprint" "" (id 2) (at 232.41 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 232.41 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3a938add-c139-4107-a057-d6fbc1c3e7bc))
+    (pin "2" (uuid 3d943b83-5d2a-42bb-9101-7316f42d37c7))
+  )
+
   (symbol (lib_id "power:GND") (at 121.285 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2ae0bd41-a174-4267-a9c1-18a8f90f35e5)
@@ -1801,21 +1728,6 @@
     (pin "1" (uuid bb2185be-8399-4eac-9d95-616b89c2c106))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 162.56 78.105 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 3516e712-993f-4724-be40-695f2fec4bb6)
-    (property "Reference" "R?" (id 0) (at 162.56 72.39 90))
-    (property "Value" "22?" (id 1) (at 162.56 74.93 90))
-    (property "Footprint" "" (id 2) (at 162.56 78.105 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 162.56 78.105 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 78b25a8b-8327-4921-bda2-535cb6e34da3))
-    (pin "2" (uuid b4bb4f73-ecd2-4fd5-890f-4ebe17f1857a))
-  )
-
   (symbol (lib_id "power:GND") (at 109.22 31.115 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3858a083-eccb-47e4-9959-bf07430e0091)
@@ -1866,22 +1778,6 @@
     (pin "2" (uuid d6656aef-b1d3-4bc7-a7d4-474b62df5493))
   )
 
-  (symbol (lib_id "power:GND") (at 158.75 88.265 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 57ff17b9-114c-43a2-bf7f-6aacb7153990)
-    (property "Reference" "#PWR?" (id 0) (at 158.75 94.615 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 158.75 92.71 0))
-    (property "Footprint" "" (id 2) (at 158.75 88.265 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 158.75 88.265 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e8672611-76c5-4a4a-b333-f9e592f9d2ac))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 109.22 28.575 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 5cc16cd0-ede0-44b9-b012-fcf161aa7cd2)
@@ -1914,9 +1810,9 @@
     (pin "1" (uuid 695d0323-bedf-476a-b529-3c18cc0bcfb4))
     (pin "5" (uuid 645134ac-5e4e-47c5-ab6b-8b49475b5371))
     (pin "6" (uuid b5e2b812-800b-4c1c-843f-efaf60cba428))
-    (pin "2" (uuid 9477564f-0c8c-4b1a-8d25-e1d724a91242))
+    (pin "2" (uuid 9477564f-0c8c-4b1a-8d25-e1d724a91243))
-    (pin "3" (uuid 6df47873-308e-4141-a032-433ed0f69be0))
+    (pin "3" (uuid 6df47873-308e-4141-a032-433ed0f69be1))
-    (pin "4" (uuid 66f94ef0-2ef0-44f6-8d98-1f5bbaeceaf3))
+    (pin "4" (uuid 66f94ef0-2ef0-44f6-8d98-1f5bbaeceaf4))
   )
 
   (symbol (lib_id "power:GND") (at 110.49 117.475 0) (unit 1)
@@ -1970,22 +1866,6 @@
     (pin "4" (uuid cd47d3fd-ee8f-476b-9c55-c17c3f2e45a7))
   )
 
-  (symbol (lib_id "power:GND") (at 61.595 141.605 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6f5ba79d-1f7a-43b4-8184-0dc68405cbdb)
-    (property "Reference" "#PWR?" (id 0) (at 61.595 147.955 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 61.595 146.05 0))
-    (property "Footprint" "" (id 2) (at 61.595 141.605 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 61.595 141.605 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 31775eab-223e-4f6a-8922-1ffe856a1dbe))
-  )
-
   (symbol (lib_id "power:+3V3") (at 106.68 25.4 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 72698168-3aff-4719-8184-77f89019d042)
@@ -2020,19 +1900,34 @@
     (pin "2" (uuid d043308b-b1ba-4e32-bd90-75aaebeb932a))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 146.685 83.185 90) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 232.41 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 8929c87b-3d26-4e51-8446-bfd22fbc2867)
+    (uuid 8d83d919-09a3-4954-bbfa-8035927b9fa2)
-    (property "Reference" "R?" (id 0) (at 146.685 77.47 90))
+    (property "Reference" "SW?" (id 0) (at 232.41 91.44 0))
-    (property "Value" "1k?" (id 1) (at 146.685 80.01 90))
+    (property "Value" "SW_Push" (id 1) (at 232.41 93.98 0))
-    (property "Footprint" "" (id 2) (at 146.685 83.185 0)
+    (property "Footprint" "" (id 2) (at 232.41 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 146.685 83.185 0)
+    (property "Datasheet" "~" (id 3) (at 232.41 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid de78725d-b30b-47b5-8b32-e8a00bdc16c3))
+    (pin "1" (uuid 73347dde-4450-428a-8698-aa7cb1829d3e))
-    (pin "2" (uuid d5aba13a-7613-4ad9-837c-c4e35a5a8f15))
+    (pin "2" (uuid c4620162-3e78-458d-b729-29f234e0fa46))
+  )
+
+  (symbol (lib_id "Switch:SW_SPST") (at 232.41 78.105 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 8f2aedcb-7232-4ec5-937b-f25c7a913e31)
+    (property "Reference" "SW?" (id 0) (at 232.41 71.12 0))
+    (property "Value" "SW_SPST" (id 1) (at 232.41 73.66 0))
+    (property "Footprint" "" (id 2) (at 232.41 78.105 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 232.41 78.105 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 6a58f6fc-c33b-4c15-84af-fb70b5351b09))
+    (pin "2" (uuid 2cdcd61b-b434-4c4d-9964-5a12c90db641))
   )
 
   (symbol (lib_id "Device:C_Small") (at 69.85 50.8 0) (unit 1)
@@ -2069,24 +1964,6 @@
     (pin "1" (uuid cf355ff0-3ad6-4629-9dd4-4c2c98c585d2))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 61.595 138.43 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid a446215b-2b60-4281-9665-3939f4b543ba)
-    (property "Reference" "C?" (id 0) (at 57.4675 137.4775 0))
-    (property "Value" "10uF" (id 1) (at 57.4675 139.3825 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 61.595 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 61.595 138.43 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 61.595 138.43 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1d0c4802-f989-429b-9006-4d03c5946024))
-    (pin "2" (uuid 14be3912-df33-450c-b5e3-13c7b4d70230))
-  )
-
   (symbol (lib_id "power:+3V3") (at 107.95 111.76 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a9a2cc19-d8d4-4265-8a94-a003a129ea4d)
@@ -2128,6 +2005,24 @@
     (pin "8" (uuid aa1541d9-df74-4d89-a955-469a98fbc6f3))
   )
 
+  (symbol (lib_id "Device:R_Small") (at 222.885 78.105 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c3e5a258-925d-406d-a990-66db78a8922d)
+    (property "Reference" "R?" (id 0) (at 222.885 73.66 90))
+    (property "Value" "100k" (id 1) (at 222.885 75.565 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 222.885 78.105 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 222.885 78.105 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 222.885 78.105 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b3e8a637-58e5-4e17-ae5f-7b7bf7b6f329))
+    (pin "2" (uuid 7aa4552c-ecde-4723-9658-6d71bfbfe7bb))
+  )
+
   (symbol (lib_id "power:PWR_FLAG") (at 50.2099 47.625 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ce5e5d81-d23c-4f05-b2f4-bb0fdbe53033)
@@ -2146,6 +2041,24 @@
     (pin "1" (uuid cca2e4ba-faff-4176-8196-cb8eb880a669))
   )
 
+  (symbol (lib_id "Device:R_Small") (at 222.885 99.06 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid cf7fb88f-c4e2-45c4-829e-dcb9dece44b1)
+    (property "Reference" "R?" (id 0) (at 222.885 94.615 90))
+    (property "Value" "100k" (id 1) (at 222.885 96.52 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 222.885 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 222.885 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 222.885 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid afaabab2-9de4-43dc-b81c-eaa2ea465a6f))
+    (pin "2" (uuid b2338fcf-7603-4d1e-8fd5-887cdc7d9ee8))
+  )
+
   (symbol (lib_id "Device:R_Small") (at 38.735 125.73 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d4a87ce6-ebc2-4e10-a443-85c5ceb4cab9)
@@ -2227,32 +2140,30 @@
     (property "Datasheet" "" (id 3) (at 44.45 45.085 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0543bbaa-2c97-48e1-8f0d-e044d82dd48e))
+    (pin "1" (uuid 0543bbaa-2c97-48e1-8f0d-e044d82dd48f))
-    (pin "5" (uuid f4226ebf-4b4f-48b3-9ad0-ab3b1344d60e))
+    (pin "5" (uuid f4226ebf-4b4f-48b3-9ad0-ab3b1344d60f))
-    (pin "6" (uuid ca69b5a3-0ee3-4f14-a31d-73e860965962))
+    (pin "6" (uuid ca69b5a3-0ee3-4f14-a31d-73e860965963))
     (pin "2" (uuid 2d7b0d38-412d-4404-bdb1-1a785a345edd))
     (pin "3" (uuid a2745fde-14a6-4cf1-95a5-28592b766690))
     (pin "4" (uuid 4eff02b0-2cd6-41c2-bf78-57080e88c2ca))
   )
 
-  (symbol (lib_id "Device:Q_NPN_BCE") (at 156.21 83.185 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 222.885 88.9 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes)
-    (uuid eefd49ec-3de6-4e9b-87ce-9108f53fc28d)
+    (uuid eaeaa7d8-382f-41c0-8ea4-f2f58f735b56)
-    (property "Reference" "Q?" (id 0) (at 161.925 81.9149 0)
+    (property "Reference" "R?" (id 0) (at 222.885 84.455 90))
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "100k" (id 1) (at 222.885 86.36 90))
-    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 222.885 88.9 0)
-    (property "Value" "2N2222" (id 1) (at 161.925 84.4549 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 161.29 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 156.21 83.185 0)
+    (property "Datasheet" "~" (id 3) (at 222.885 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4f4d7be7-b6b8-4f74-b583-44612bc9f417))
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 222.885 88.9 0)
-    (pin "2" (uuid 3e2a00f8-50bf-491f-a395-a842147825ea))
+      (effects (font (size 1.27 1.27)) hide)
-    (pin "3" (uuid 2b8062a3-65e1-4c72-81c9-e775370220b8))
+    )
+    (pin "1" (uuid fee86974-e24a-4c7e-a753-749f3c64bb73))
+    (pin "2" (uuid 38330a8e-f7e1-4fd2-8cdc-264499190b2f))
   )
 
   (symbol (lib_id "power:GND") (at 31.115 29.845 0) (unit 1)

power.kicad_sch

@@ -715,9 +715,6 @@
   (junction (at 114.935 74.295) (diameter 0) (color 0 0 0 0)
     (uuid 40923f5b-752b-4e6e-b3fc-de5b06483a80)
   )
-  (junction (at 121.285 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid 4541922b-dbb9-4485-a42f-ba42ab16cc57)
-  )
   (junction (at 135.89 133.985) (diameter 0) (color 0 0 0 0)
     (uuid 48e301d5-c9eb-4d8d-93a0-73a91fbb0016)
   )
@@ -793,6 +790,9 @@
   (junction (at 115.57 133.985) (diameter 0) (color 0 0 0 0)
     (uuid c3fb0b48-c906-4300-aadb-b4a475dd6ad1)
   )
+  (junction (at 123.19 86.995) (diameter 0) (color 0 0 0 0)
+    (uuid c905e2ba-f649-4673-8c0f-6fa44d06421e)
+  )
   (junction (at 62.865 188.595) (diameter 0) (color 0 0 0 0)
     (uuid db60fb32-4603-4a98-841b-afc712d101c2)
   )
@@ -815,9 +815,6 @@
     (uuid f5b98cdd-8273-4ba9-8bff-01c298bda2bf)
   )
 
-  (no_connect (at 113.03 92.075) (uuid cb811f7c-4c38-45a5-bd18-dc49ceb1bfaf))
-  (no_connect (at 113.03 94.615) (uuid cb811f7c-4c38-45a5-bd18-dc49ceb1bfb0))
-
   (polyline (pts (xy 162.56 13.97) (xy 25.4 13.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 02a5a714-879d-47a4-9167-c3ffa8beb103)
@@ -860,6 +857,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09c709ad-88f2-488c-ae54-a725dbf78ef7)
   )
+  (wire (pts (xy 113.03 86.995) (xy 123.19 86.995))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0d7c4bf9-9ef1-45a1-88ea-5c52e6773bd1)
+  )
   (polyline (pts (xy 25.4 118.745) (xy 25.4 163.195))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 10183452-75d7-4196-aa96-716179ceda9d)
@@ -869,10 +870,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1175b482-426a-4374-974b-c708b995ccab)
   )
+  (wire (pts (xy 113.03 92.075) (xy 125.73 92.075))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 13bd5a88-c167-4556-86c0-14ad36d78872)
+  )
   (wire (pts (xy 55.245 133.985) (xy 69.85 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15085915-484b-4e67-85aa-dfab184e72c9)
   )
+  (wire (pts (xy 123.19 86.995) (xy 140.335 86.995))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 150f28e7-919d-4d5a-8754-493aab6c0e3d)
+  )
   (wire (pts (xy 81.28 57.785) (xy 95.25 57.785))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15580efa-a495-489c-8fef-5007c2095e59)
@@ -890,10 +899,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 18024f75-f01a-4136-8a82-d95c7952f83a)
   )
-  (wire (pts (xy 118.745 96.52) (xy 121.285 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 18381df8-a0af-4686-9eba-742cb4b15fc8)
-  )
   (wire (pts (xy 214.63 133.985) (xy 214.63 135.89))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1854027b-c955-479a-b47f-fdd6414e3e7b)
@@ -967,6 +972,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3fed74db-a4a6-43eb-8d14-b11840b65a4d)
   )
+  (wire (pts (xy 113.03 94.615) (xy 125.73 94.615))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4046cf5e-598e-4fec-82aa-46bd0c9c365a)
+  )
   (wire (pts (xy 254 143.51) (xy 245.745 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 41ba67b6-3027-4771-9a3a-a215623a9f47)
@@ -1099,10 +1108,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 781664df-04e1-4828-a4d1-f090930c504b)
   )
-  (wire (pts (xy 121.285 96.52) (xy 127 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 79eef780-7d74-4f40-9fc2-f9afbc29407c)
-  )
   (polyline (pts (xy 93.345 164.465) (xy 93.345 196.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b43ff59-6425-466a-9a6a-402d8c69a70b)
@@ -1128,10 +1133,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 817dd2c4-5af3-4b79-b35a-17ba8bd838a4)
   )
-  (wire (pts (xy 113.03 86.995) (xy 118.745 86.995))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 840acf9a-e483-4543-8c4d-e336194a63f0)
-  )
   (wire (pts (xy 98.425 133.985) (xy 97.155 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 84ea104a-f947-47e9-8bf6-14734bfdde4e)
@@ -1152,7 +1153,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d4b39a4-b45a-4462-ad6d-9a67f3718e20)
   )
-  (wire (pts (xy 118.745 86.995) (xy 118.745 96.52))
+  (wire (pts (xy 123.19 86.995) (xy 123.19 89.535))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d8275d0-efbe-40db-a0ce-42965cebb57c)
   )
@@ -1211,6 +1212,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a04c3a54-d22e-412a-a330-5670246172a0)
   )
+  (wire (pts (xy 123.19 89.535) (xy 125.73 89.535))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a187cf97-20b5-4592-a78d-c38737a80a3a)
+  )
   (wire (pts (xy 84.455 149.86) (xy 86.995 149.86))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a251c78d-aaec-4a58-8fb2-bd3ca1be9fcc)
@@ -1379,13 +1384,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dcb3bc29-16ee-4d1d-8ee1-df0e4508b104)
   )
-  (wire (pts (xy 121.285 90.17) (xy 142.24 90.17))
+  (wire (pts (xy 145.415 86.995) (xy 146.685 86.995))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dd3a265f-b406-4a80-befc-5c9697ff1008)
+    (uuid e18d553e-1b30-4a82-b96d-43f464829d88)
-  )
-  (wire (pts (xy 121.285 95.885) (xy 121.285 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid de50053f-f7c4-443a-b103-385c6e5d0045)
   )
   (wire (pts (xy 127 80.645) (xy 131.445 80.645))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1460,10 +1461,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc6f6380-0757-4808-99ca-99b57d4f35c9)
   )
-  (wire (pts (xy 121.285 90.17) (xy 121.285 90.805))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fd5bcfc7-0474-4e5c-ae55-dfae92606f47)
-  )
   (wire (pts (xy 52.07 133.985) (xy 55.245 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ff96671d-08b3-4088-83d4-76dc10257180)
@@ -1528,6 +1525,10 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid a5719467-e090-466c-a728-9cf9c51b3134)
   )
+  (text "Keep VBUS_SWITCHED + VBUS_RAW <= 100uF" (at 97.79 40.005 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid be7557e8-0e78-4bf6-a5df-dfdf165a6af5)
+  )
   (text "select based on\nspecific battery" (at 46.99 99.06 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c9c44ed2-df23-4da5-8a66-7e6b99f026eb)
@@ -1553,10 +1554,10 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "~{CHG_PWR_OK}" (shape input) (at 127 96.52 0) (fields_autoplaced)
+  (global_label "~{CHG_PWR_OK}" (shape input) (at 125.73 89.535 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 049a3b8a-bb0e-4cd0-b6eb-054bd3bd2d7a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 141.8107 96.4406 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 140.5407 89.4556 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -1581,6 +1582,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "CHG_STAT2" (shape input) (at 125.73 94.615 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 4229bce3-c83c-4616-847b-93935e2f6461)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 138.4241 94.5356 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "PROG3" (shape input) (at 77.47 81.915 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 449336a8-68fb-49bf-bf05-df630a7120ec)
@@ -1644,6 +1652,13 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
+  (global_label "CHG_STAT1" (shape input) (at 125.73 92.075 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid a9e1a8ab-8de0-42a1-a740-f52d64f7afe0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 138.4241 91.9956 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "BAT" (shape input) (at 142.24 74.295 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid b64f1102-8404-44ce-8143-a43815673492)
@@ -1872,18 +1887,18 @@
     (pin "1" (uuid bae197ed-598e-4c6e-822b-ffe0b17c6360))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 121.285 93.345 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 142.875 86.995 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 27c24449-693f-4cef-b28f-5ee51abb4ae6)
-    (property "Reference" "R207" (id 0) (at 125.095 92.71 0))
+    (property "Reference" "R207" (id 0) (at 142.875 83.185 90))
-    (property "Value" "100k" (id 1) (at 125.095 94.615 0))
+    (property "Value" "100k" (id 1) (at 142.875 85.09 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 121.285 93.345 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 142.875 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 121.285 93.345 0)
+    (property "Datasheet" "~" (id 3) (at 142.875 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 121.285 93.345 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 142.875 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a5f74dc2-ed04-42e8-930b-816d68796639))
@@ -2316,7 +2331,7 @@
     (property "Reference" "#PWR0203" (id 0) (at 131.445 88.265 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 131.445 86.36 0))
+    (property "Value" "GND" (id 1) (at 131.445 85.725 0))
     (property "Footprint" "" (id 2) (at 131.445 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -2513,19 +2528,19 @@
     (pin "2" (uuid d0963a8f-ae55-4d3e-aed7-8cf1dba1249a))
   )
 
-  (symbol (lib_id "power:+3V3") (at 142.24 90.17 270) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 146.685 86.995 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ec7e1e80-a526-43e5-860b-06afa4aa50cb)
-    (property "Reference" "#PWR0121" (id 0) (at 138.43 90.17 0)
+    (property "Reference" "#PWR0121" (id 0) (at 142.875 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 145.415 90.1699 90)
+    (property "Value" "+3V3" (id 1) (at 149.86 86.9949 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 142.24 90.17 0)
+    (property "Footprint" "" (id 2) (at 146.685 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 142.24 90.17 0)
+    (property "Datasheet" "" (id 3) (at 146.685 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 68428053-ecb9-472f-85d7-a311b13ca1f5))