EPS: fix label connections (E_PAD->GND, BAT->BAT+)

modules/EPS/ADC.kicad_sch

@@ -365,7 +365,7 @@
   (symbol (lib_id "power:GND") (at 146.05 110.49 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f89885ce-5e77-4f4d-82d8-84ddb73a6ccd)
-    (property "Reference" "#PWR0116" (id 0) (at 146.05 116.84 0)
+    (property "Reference" "#PWR017" (id 0) (at 146.05 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 146.05 115.0526 0)
@@ -383,7 +383,7 @@
   (symbol (lib_id "power:GND") (at 165.1 110.49 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ff47e31b-e0a5-42ed-bfd2-fefca04b7a0e)
-    (property "Reference" "#PWR0117" (id 0) (at 165.1 116.84 0)
+    (property "Reference" "#PWR018" (id 0) (at 165.1 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 165.1 115.0526 0)
@@ -401,7 +401,7 @@
   (symbol (lib_id "power:GND") (at 182.88 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6baefcca-a903-4dd5-a1d2-ecda75102832)
-    (property "Reference" "#PWR0118" (id 0) (at 182.88 63.5 0)
+    (property "Reference" "#PWR019" (id 0) (at 182.88 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 182.88 61.7126 0)
@@ -419,7 +419,7 @@
   (symbol (lib_id "power:GND") (at 193.04 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 62746ed8-4bff-4670-9665-8176ee6bb0fa)
-    (property "Reference" "#PWR0119" (id 0) (at 193.04 63.5 0)
+    (property "Reference" "#PWR020" (id 0) (at 193.04 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 193.04 61.7126 0)
@@ -443,7 +443,7 @@
     (property "Value" "1uF" (id 1) (at 168.0211 108.5466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 166.0652 110.49 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 166.0652 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 165.1 106.68 0)
@@ -462,7 +462,7 @@
     (property "Value" "1uF" (id 1) (at 185.8011 55.2066 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 183.8452 57.15 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 183.8452 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 182.88 53.34 0)
@@ -481,7 +481,7 @@
     (property "Value" "1uF" (id 1) (at 195.9611 55.2066 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 194.0052 57.15 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 194.0052 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 193.04 53.34 0)

modules/EPS/Activation_control.kicad_sch

@@ -233,22 +233,6 @@
           (name "D" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 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 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
       )
     )
   )
@@ -359,7 +343,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 109.22 100.33 0)
     (in_bom yes) (on_board yes)
     (uuid 54aff0a7-fa4b-48c1-b3d8-82349b8e510b)
-    (property "Reference" "TP20" (id 0) (at 110.6171 93.77 0)
+    (property "Reference" "TP6" (id 0) (at 110.6171 93.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SYS_OUT" (id 1) (at 110.6171 96.5451 0)
@@ -377,7 +361,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 146.05 100.33 0)
     (in_bom yes) (on_board yes)
     (uuid 81c9266f-b07c-48d1-abb1-c2a3e8bd91b7)
-    (property "Reference" "TP21" (id 0) (at 147.4471 93.77 0)
+    (property "Reference" "TP7" (id 0) (at 147.4471 93.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SEP_OUT" (id 1) (at 147.4471 96.5451 0)
@@ -395,7 +379,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 177.9026 100.33 0)
     (in_bom yes) (on_board yes)
     (uuid b663a1c4-3bc1-4a0a-8ff8-87ebfc635815)
-    (property "Reference" "TP22" (id 0) (at 179.2997 93.77 0)
+    (property "Reference" "TP8" (id 0) (at 179.2997 93.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "RBF_OUT" (id 1) (at 179.2997 96.5451 0)
@@ -413,13 +397,13 @@
   (symbol (lib_id "Device:Polyfuse") (at 91.44 90.17 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid dc7d5727-2626-49ff-82cc-4264075bd7c5)
-    (property "Reference" "F5" (id 0) (at 93.5991 89.2615 0)
+    (property "Reference" "F2" (id 0) (at 93.5991 89.2615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "200mA" (id 1) (at 93.5991 92.0366 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 92.71 95.25 0)
+    (property "Footprint" "Fuse:Fuse_0603_1608Metric" (id 2) (at 92.71 95.25 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
     (property "Datasheet" "~" (id 3) (at 91.44 90.17 0)
@@ -432,7 +416,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 129.54 100.33 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a13321a5-f2ea-4169-a91c-d7874035a4ea)
-    (property "Reference" "Q11" (id 0) (at 129.54 104.1166 90)
+    (property "Reference" "Q3" (id 0) (at 129.54 104.1166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 129.54 106.3556 90)
@@ -449,16 +433,12 @@
     (pin "3" (uuid e57c58e2-c80a-4363-8ee3-48720418e2c4))
     (pin "4" (uuid 423c9005-e4db-43c1-973c-570704bacd0a))
     (pin "5" (uuid 199056fb-98be-42e6-b6d8-08468a8bd17f))
-    (pin "6" (uuid 47196327-92de-4c17-8af8-962db153357a))
-    (pin "7" (uuid 52f00157-3957-4ee8-acba-42b1869bef4c))
-    (pin "8" (uuid f205b325-5371-44d0-a7ab-8e32f2c3aff2))
-    (pin "9" (uuid cd933a09-1494-4c41-adb2-13aa15199a15))
   )
 
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 163.83 100.33 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9d3eb49d-0b41-443c-8d33-9230199460c8)
-    (property "Reference" "Q12" (id 0) (at 163.83 104.1166 90)
+    (property "Reference" "Q4" (id 0) (at 163.83 104.1166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 163.83 106.3556 90)
@@ -475,10 +455,6 @@
     (pin "3" (uuid 06a439df-2542-4b0f-b654-7e2a8b46747a))
     (pin "4" (uuid 1f64321c-ce91-49fc-b790-88bd93534173))
     (pin "5" (uuid c3a6312f-e3ec-43bf-b091-664916f4ba34))
-    (pin "6" (uuid b4f2237a-63d6-42e7-bb06-2554fe69f4b8))
-    (pin "7" (uuid 48434d27-f228-4d5a-9d44-cd612ba406b9))
-    (pin "8" (uuid 1a5b2516-db12-4b34-aa2b-50c3fad83ba4))
-    (pin "9" (uuid 990b8aec-c561-4482-b780-4f01c5e4cbf9))
   )
 
   (sheet (at 96.52 52.07) (size 90.17 30.48)

modules/EPS/Activation_switches.kicad_sch

@@ -307,13 +307,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 63.5 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5103c2fe-be6a-4243-91e5-d95a4a167862)
-    (property "Reference" "JP5" (id 0) (at 162.4331 62.5915 90)
+    (property "Reference" "JP7" (id 0) (at 162.4331 62.5915 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "RBF_PIN" (id 1) (at 162.4331 65.3666 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 63.5 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 161.29 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 63.5 0)
@@ -326,13 +326,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 101.6 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9995899c-d098-41ea-941d-2ced1e95659d)
-    (property "Reference" "JP6" (id 0) (at 162.4331 100.6915 90)
+    (property "Reference" "JP8" (id 0) (at 162.4331 100.6915 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#1" (id 1) (at 162.4331 103.4666 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 101.6 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 161.29 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 101.6 0)
@@ -345,13 +345,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 115.57 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 45ee22f5-6769-4d18-85de-6b6f9e805564)
-    (property "Reference" "JP7" (id 0) (at 162.4331 114.6615 90)
+    (property "Reference" "JP9" (id 0) (at 162.4331 114.6615 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#2" (id 1) (at 162.4331 117.4366 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 115.57 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 161.29 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 115.57 0)
@@ -364,13 +364,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 25264e05-2861-4b06-846c-3a0d6f16b226)
-    (property "Reference" "JP8" (id 0) (at 162.4331 128.6315 90)
+    (property "Reference" "JP10" (id 0) (at 162.4331 128.6315 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#3" (id 1) (at 162.4331 131.4066 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 129.54 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 161.29 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 129.54 0)
@@ -383,13 +383,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 143.51 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e9fe78ae-ee81-47ce-ab90-493888d60f80)
-    (property "Reference" "JP9" (id 0) (at 162.4331 142.6015 90)
+    (property "Reference" "JP11" (id 0) (at 162.4331 142.6015 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#4" (id 1) (at 162.4331 145.3766 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 143.51 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 161.29 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 143.51 0)
@@ -674,7 +674,7 @@
     (uuid c83acea2-f61c-4f33-8239-0a67b4b73c6c)
     (property "Reference" "J25" (id 0) (at 148.082 64.6134 0))
     (property "Value" "RBF_PIN" (id 1) (at 146.812 57.2285 0))
-    (property "Footprint" "" (id 2) (at 144.78 59.69 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 144.78 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 59.69 0)
@@ -690,7 +690,7 @@
     (uuid e85114da-ff7c-4a82-91d7-a506749bada5)
     (property "Reference" "J26" (id 0) (at 148.082 102.7134 0))
     (property "Value" "SEP_SW_#1" (id 1) (at 146.812 95.3285 0))
-    (property "Footprint" "" (id 2) (at 144.78 97.79 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 144.78 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 97.79 0)
@@ -706,7 +706,7 @@
     (uuid c7b9175b-b6f9-4b66-9f01-6ad4be68afc1)
     (property "Reference" "J27" (id 0) (at 148.082 116.6834 0))
     (property "Value" "SEP_SW_#2" (id 1) (at 146.812 109.2985 0))
-    (property "Footprint" "" (id 2) (at 144.78 111.76 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 144.78 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 111.76 0)
@@ -722,7 +722,7 @@
     (uuid 4e747b55-6e10-4d87-a43e-85d325abe486)
     (property "Reference" "J28" (id 0) (at 148.082 130.6534 0))
     (property "Value" "SEP_SW_#3" (id 1) (at 146.812 123.2685 0))
-    (property "Footprint" "" (id 2) (at 144.78 125.73 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 144.78 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 125.73 0)
@@ -738,7 +738,7 @@
     (uuid 134203a7-de5b-4a21-91e3-a67a44463301)
     (property "Reference" "J29" (id 0) (at 148.082 144.6234 0))
     (property "Value" "SEP_SW_#4" (id 1) (at 146.812 137.2385 0))
-    (property "Footprint" "" (id 2) (at 144.78 139.7 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 144.78 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 139.7 0)

modules/EPS/Battery_pack.kicad_sch

@@ -456,22 +456,6 @@
           (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) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (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) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (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 "9" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
@@ -515,7 +499,7 @@
     )
   )
 
-  (junction (at 116.84 78.74) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 116.84 78.74) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 116.84 88.9) (diameter 1.016) (color 0 0 0 0))
   (junction (at 116.84 113.03) (diameter 1.016) (color 0 0 0 0))
   (junction (at 123.19 113.03) (diameter 1.016) (color 0 0 0 0))
@@ -528,6 +512,7 @@
   (junction (at 196.85 104.14) (diameter 1.016) (color 0 0 0 0))
   (junction (at 196.85 113.03) (diameter 1.016) (color 0 0 0 0))
   (junction (at 203.2 85.09) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 203.2 113.03) (diameter 0.9144) (color 0 0 0 0))
 
   (wire (pts (xy 107.95 78.74) (xy 116.84 78.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -539,7 +524,7 @@
   )
   (wire (pts (xy 116.84 78.74) (xy 168.91 78.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid fcdd65f9-1c95-41f7-ac1b-3bba0f13e54a)
+    (uuid 7259a383-28e6-4d0f-a76e-8f9430cd195a)
   )
   (wire (pts (xy 116.84 88.9) (xy 116.84 86.36))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -699,7 +684,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 133.35 113.03 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0631cc25-2ba3-4c27-bf77-4d69c7ae8634)
-    (property "Reference" "#FLG0108" (id 0) (at 133.35 111.125 0)
+    (property "Reference" "#FLG019" (id 0) (at 133.35 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 133.35 109.4254 0))
@@ -715,7 +700,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 168.91 78.74 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8b2d9cbc-26e3-4621-b9e4-851a2738fb70)
-    (property "Reference" "#FLG0106" (id 0) (at 168.91 76.835 0)
+    (property "Reference" "#FLG020" (id 0) (at 168.91 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 168.91 75.1354 0))
@@ -731,7 +716,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 168.91 113.03 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4a4fc04e-d521-4c35-aa9f-6a2b72e92bab)
-    (property "Reference" "#FLG0105" (id 0) (at 168.91 111.125 0)
+    (property "Reference" "#FLG021" (id 0) (at 168.91 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 168.91 109.4254 0))
@@ -747,10 +732,10 @@
   (symbol (lib_id "Connector:TestPoint") (at 203.2 85.09 0)
     (in_bom yes) (on_board yes)
     (uuid 99e44a44-a22b-450d-8b6b-53360d5399d2)
-    (property "Reference" "TP30" (id 0) (at 202.0571 75.99 0)
+    (property "Reference" "TP35" (id 0) (at 202.0571 75.99 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAT" (id 1) (at 202.0571 78.7651 0)
+    (property "Value" "BAT+" (id 1) (at 202.0571 78.7651 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 208.28 85.09 0)
@@ -762,16 +747,34 @@
     (pin "1" (uuid 7c793f9f-3059-40f8-bf63-86d1c3add06f))
   )
 
+  (symbol (lib_id "Connector:TestPoint") (at 203.2 113.03 270)
+    (in_bom yes) (on_board yes)
+    (uuid 8af352e4-b87a-48e7-ac60-3ac39a88d2ac)
+    (property "Reference" "TP36" (id 0) (at 208.49 110.6171 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "BAT-" (id 1) (at 208.2549 113.1571 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 203.2 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 203.2 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid cb477d54-4f3c-4042-8d22-70aebc6f9981))
+  )
+
   (symbol (lib_id "Device:R") (at 116.84 82.55 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 54ac00c5-8085-4a3c-885d-c574139f6a01)
-    (property "Reference" "R81" (id 0) (at 118.6181 81.6415 0)
+    (property "Reference" "R83" (id 0) (at 118.6181 81.6415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "330R" (id 1) (at 118.6181 84.4166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 115.062 82.55 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 115.062 82.55 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 116.84 82.55 0)
@@ -784,13 +787,13 @@
   (symbol (lib_id "Device:R") (at 123.19 104.14 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 02f0341e-54b7-46d0-84c1-b57ae6b2f234)
-    (property "Reference" "R82" (id 0) (at 124.9681 103.2315 0)
+    (property "Reference" "R84" (id 0) (at 124.9681 103.2315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "2.2k" (id 1) (at 124.9681 106.0066 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 121.412 104.14 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 121.412 104.14 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 123.19 104.14 0)
@@ -803,13 +806,13 @@
   (symbol (lib_id "Device:C") (at 116.84 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid 1b8352a6-950c-40a2-8cc5-44e898ebc8b3)
-    (property "Reference" "C94" (id 0) (at 109.6011 103.2315 0)
+    (property "Reference" "C93" (id 0) (at 109.6011 103.2315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 108.3311 106.0066 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 117.8052 107.95 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 117.8052 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 116.84 104.14 0)
@@ -822,7 +825,7 @@
   (symbol (lib_id "Device:Battery_Cell") (at 203.2 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 187169a6-ccff-4f29-8db9-3e89fd7b7827)
-    (property "Reference" "U32" (id 0) (at 206.1211 95.6115 0)
+    (property "Reference" "U29" (id 0) (at 206.1211 95.6115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Battery_holder_21700" (id 1) (at 206.1211 98.3866 0)
@@ -841,7 +844,7 @@
   (symbol (lib_id "TCY_transistors:SiSA96DDN") (at 146.05 110.49 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 55005da9-5415-42da-85a9-545ab80afb53)
-    (property "Reference" "Q19" (id 0) (at 146.05 116.8166 90)
+    (property "Reference" "Q17" (id 0) (at 146.05 116.8166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 146.05 119.0556 90)
@@ -858,16 +861,12 @@
     (pin "3" (uuid fa4fb598-d6a3-4b69-9d73-b152e0ebe1e0))
     (pin "4" (uuid 5606827f-1dd5-4d0c-b868-cb8cee24ef47))
     (pin "5" (uuid a32704a3-42cd-46c7-adf5-ae2f50076f9e))
-    (pin "6" (uuid f32787f1-758a-4386-9d58-6b70edef966d))
-    (pin "7" (uuid 005ccdcb-5506-4482-9489-0924b8d3e413))
-    (pin "8" (uuid 4fadbd3b-32a8-4f20-90d5-dae701d8addc))
-    (pin "9" (uuid af88cf38-b08f-4168-b0ec-d5816ef11823))
   )
 
   (symbol (lib_id "TCY_transistors:SiSA96DDN") (at 156.21 110.49 90) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1c154170-b720-43dd-a000-a3e4ad64480e)
-    (property "Reference" "Q20" (id 0) (at 156.21 116.8166 90)
+    (property "Reference" "Q18" (id 0) (at 156.21 116.8166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 156.21 119.0556 90)
@@ -884,16 +883,12 @@
     (pin "3" (uuid cf9e247e-0c36-40c1-9006-65edf9afe4c0))
     (pin "4" (uuid 0148d8c1-ca8e-4964-bf33-274afede2fad))
     (pin "5" (uuid 39e2e71f-b531-4232-b9c9-13478b46b0df))
-    (pin "6" (uuid 4c83c9c4-c81f-47bd-8513-3ce18fd800bf))
-    (pin "7" (uuid 83110dfd-ab60-45fc-bcff-a159a686e545))
-    (pin "8" (uuid bddb751f-6218-436f-bd8b-a71eba371869))
-    (pin "9" (uuid 91a4078b-bd47-4444-a10b-e9d11c514863))
   )
 
   (symbol (lib_id "Battery_Management:BQ297xy") (at 133.35 91.44 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 018b95b0-edac-4665-8dbf-3eaf6a917f38)
-    (property "Reference" "U30" (id 0) (at 133.35 82.3934 0))
+    (property "Reference" "U27" (id 0) (at 133.35 82.3934 0))
     (property "Value" "BQ29716" (id 1) (at 133.35 85.1685 0))
     (property "Footprint" "Package_SON:WSON-6_1.5x1.5mm_P0.5mm" (id 2) (at 133.35 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -912,7 +907,7 @@
   (symbol (lib_id "TCY_battery_management:MAX17048") (at 184.15 99.06 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 36130603-28fd-41cd-af25-6f9f1987af9c)
-    (property "Reference" "U31" (id 0) (at 184.15 115.4336 0))
+    (property "Reference" "U28" (id 0) (at 184.15 115.4336 0))
     (property "Value" "MAX17048" (id 1) (at 184.15 118.2087 0))
     (property "Footprint" "Package_DFN_QFN:DFN-8-1EP_2x2mm_P0.5mm_EP1.05x1.75mm" (id 2) (at 184.15 120.65 0)
       (effects (font (size 1.27 1.27)) hide)

modules/EPS/Battery_temp_control.kicad_sch

@@ -238,6 +238,7 @@
   (junction (at 88.9 59.69) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 95.25 54.61) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 95.25 59.69) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 110.49 130.81) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 116.84 130.81) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 120.65 59.69) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 127 54.61) (diameter 0.9144) (color 0 0 0 0))
@@ -278,11 +279,15 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ad5b3022-fd8c-4f9c-9ad6-aaa5d29af12c)
   )
-  (wire (pts (xy 113.03 116.84) (xy 116.84 116.84))
+  (wire (pts (xy 107.95 116.84) (xy 116.84 116.84))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 035bfa25-b406-401e-b1c6-7c7bddea5d59)
   )
-  (wire (pts (xy 113.03 130.81) (xy 116.84 130.81))
+  (wire (pts (xy 107.95 130.81) (xy 110.49 130.81))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 070a5af4-37f6-4028-b8dd-a3c9abdc34ea)
+  )
+  (wire (pts (xy 110.49 130.81) (xy 116.84 130.81))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 070a5af4-37f6-4028-b8dd-a3c9abdc34ea)
   )
@@ -379,11 +384,11 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid b6d83cca-1d77-4020-873b-3ebc992d1566)
   )
-  (hierarchical_label "NTC_REF" (shape input) (at 113.03 116.84 180)
+  (hierarchical_label "NTC_REF" (shape input) (at 107.95 116.84 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 821c8d05-b79e-4968-a10d-df14d6e626d7)
   )
-  (hierarchical_label "NTC_OUT" (shape input) (at 113.03 130.81 180)
+  (hierarchical_label "NTC_OUT" (shape input) (at 107.95 130.81 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4199be26-983d-41d1-b9ce-70f586de8280)
   )
@@ -395,7 +400,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 88.9 52.07 0)
     (in_bom yes) (on_board yes)
     (uuid 1d30cf72-f492-463f-807c-77e540b7672a)
-    (property "Reference" "TP25" (id 0) (at 86.4871 44.24 0)
+    (property "Reference" "TP30" (id 0) (at 86.4871 44.24 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "HEATER_EN" (id 1) (at 80.1371 47.0151 0)
@@ -413,7 +418,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 95.25 52.07 0)
     (in_bom yes) (on_board yes)
     (uuid a12c6724-4feb-40d2-b56a-68018c9a3f36)
-    (property "Reference" "TP26" (id 0) (at 95.3771 44.24 0)
+    (property "Reference" "TP31" (id 0) (at 95.3771 44.24 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "HEATER_IN" (id 1) (at 94.1071 47.0151 0)
@@ -428,10 +433,28 @@
     (pin "1" (uuid 38683908-143b-419b-ba00-97e5d9bdc52c))
   )
 
+  (symbol (lib_id "Connector:TestPoint") (at 110.49 130.81 0)
+    (in_bom yes) (on_board yes)
+    (uuid f890a6b3-31e6-4c4a-801f-01b93934ab12)
+    (property "Reference" "TP32" (id 0) (at 105.5371 124.25 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "NTC_OUT" (id 1) (at 99.1871 127.0251 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 115.57 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 115.57 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f71f745a-d8bc-4376-9dba-fff408db0e3f))
+  )
+
   (symbol (lib_id "Connector:TestPoint") (at 120.65 52.07 0)
     (in_bom yes) (on_board yes)
     (uuid df63c620-d7e8-45f4-8cae-d0a511ad8ded)
-    (property "Reference" "TP27" (id 0) (at 118.2371 44.24 0)
+    (property "Reference" "TP33" (id 0) (at 118.2371 44.24 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "HEATER_FAULT" (id 1) (at 111.8871 47.0151 0)
@@ -449,7 +472,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 127 52.07 0)
     (in_bom yes) (on_board yes)
     (uuid b0d568f6-61ea-403c-9abb-b09d9ef48f3f)
-    (property "Reference" "TP28" (id 0) (at 128.3971 44.24 0)
+    (property "Reference" "TP34" (id 0) (at 128.3971 44.24 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "HEATER_OUT" (id 1) (at 125.8571 47.0151 0)
@@ -593,13 +616,13 @@
   (symbol (lib_id "Device:R") (at 95.25 69.85 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 09435743-77e1-4c0c-aabe-52dabf3194b6)
-    (property "Reference" "R76" (id 0) (at 97.0281 68.9415 0)
+    (property "Reference" "R80" (id 0) (at 97.0281 68.9415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100k" (id 1) (at 97.0281 71.7166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 93.472 69.85 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 93.472 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 95.25 69.85 0)
@@ -612,13 +635,13 @@
   (symbol (lib_id "Device:R") (at 116.84 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aaad400f-5236-41fe-b9cf-b8dd3cb20734)
-    (property "Reference" "R77" (id 0) (at 118.6181 122.2815 0)
+    (property "Reference" "R81" (id 0) (at 118.6181 122.2815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10k" (id 1) (at 118.6181 125.0566 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 115.062 123.19 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 115.062 123.19 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 116.84 123.19 0)
@@ -631,13 +654,13 @@
   (symbol (lib_id "Device:R") (at 119.38 69.85 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ab8afabe-d8e9-44e5-baef-37763049e616)
-    (property "Reference" "R78" (id 0) (at 121.1581 68.9415 0)
+    (property "Reference" "R82" (id 0) (at 121.1581 68.9415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "R" (id 1) (at 121.1581 71.7166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 117.602 69.85 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 117.602 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 119.38 69.85 0)
@@ -656,7 +679,7 @@
     (property "Value" "BAT_TEMP" (id 1) (at 123.9521 142.3286 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 121.92 137.16 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114828-11102LF_1x02_P1.25mm_Vertical" (id 2) (at 121.92 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 121.92 137.16 0)
@@ -676,7 +699,7 @@
     (property "Value" "Heater" (id 1) (at 144.2721 59.7786 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 142.24 54.61 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114828-11102LF_1x02_P1.25mm_Vertical" (id 2) (at 142.24 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 142.24 54.61 0)

modules/EPS/Output_control.kicad_sch

@@ -13,6 +13,38 @@
   )
 
   (lib_symbols
+    (symbol "Connector:TestPoint" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "TestPoint" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "test point" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "TestPoint_0_1"
+        (circle (center 0 3.302) (radius 0.762) (stroke (width 0)) (fill (type none)))
+      )
+      (symbol "TestPoint_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
       (property "Reference" "C" (id 0) (at 0.635 2.54 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -675,22 +707,6 @@
           (name "D" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 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 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "TCY_transistors:SiSA96DDN" (pin_names hide) (in_bom yes) (on_board yes)
@@ -834,22 +850,6 @@
           (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) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (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) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (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 "9" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
@@ -954,6 +954,7 @@
   (junction (at 171.45 83.82) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 171.45 86.36) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 193.04 83.82) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 201.93 46.99) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 201.93 53.34) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 201.93 63.5) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 201.93 72.39) (diameter 0.9144) (color 0 0 0 0))
@@ -963,6 +964,7 @@
   (junction (at 215.9 83.82) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 231.14 83.82) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 234.95 83.82) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 243.84 83.82) (diameter 0.9144) (color 0 0 0 0))
 
   (wire (pts (xy 71.12 83.82) (xy 74.93 83.82))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -1180,10 +1182,18 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 56489846-4b95-483a-a3f5-46e7c472f44e)
   )
+  (wire (pts (xy 185.42 123.19) (xy 185.42 125.73))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 2ce411de-ffc4-42bd-9f29-426c2d7655dd)
+  )
   (wire (pts (xy 189.23 72.39) (xy 191.77 72.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 2ead65aa-aec9-4e76-851d-2c8de2f41943)
   )
+  (wire (pts (xy 189.23 123.19) (xy 189.23 125.73))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 2ec1ed72-79cb-45df-9c8a-6228a4d40438)
+  )
   (wire (pts (xy 193.04 83.82) (xy 203.2 83.82))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ff9a0eb9-4c09-44c7-9402-8d3d5d5b38b3)
@@ -1304,7 +1314,11 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f482ce6d-5cda-44c0-a247-c345b8f8ee91)
   )
-  (wire (pts (xy 234.95 83.82) (xy 237.49 83.82))
+  (wire (pts (xy 234.95 83.82) (xy 243.84 83.82))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 98cde120-e6af-4dba-9676-e1f74ef53611)
+  )
+  (wire (pts (xy 243.84 83.82) (xy 247.65 83.82))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 98cde120-e6af-4dba-9676-e1f74ef53611)
   )
@@ -1332,7 +1346,7 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 0357ef68-3e7c-4e12-9b19-4751a466a1a3)
   )
-  (hierarchical_label "PWR_OUT" (shape input) (at 237.49 83.82 0)
+  (hierarchical_label "PWR_OUT" (shape input) (at 247.65 83.82 0)
     (effects (font (size 1.27 1.27) (thickness 0.254)) (justify left))
     (uuid 4ad5d061-2539-4836-95eb-02f29be5ee40)
   )
@@ -1340,7 +1354,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 106.68 83.82 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 672f3a48-7f1a-49e2-9ecd-0c94f5637313)
-    (property "Reference" "#FLG010" (id 0) (at 106.68 81.915 0)
+    (property "Reference" "#FLG012" (id 0) (at 106.68 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 106.68 80.2154 0))
@@ -1356,7 +1370,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 153.67 83.82 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 348d4dc6-647c-4ca1-a2c3-aae604cf9f2d)
-    (property "Reference" "#FLG011" (id 0) (at 153.67 81.915 0)
+    (property "Reference" "#FLG013" (id 0) (at 153.67 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 153.67 80.2154 0))
@@ -1372,7 +1386,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 193.04 83.82 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9504bd17-e2f2-4cf7-94d5-be1ef5a4299b)
-    (property "Reference" "#FLG012" (id 0) (at 193.04 81.915 0)
+    (property "Reference" "#FLG014" (id 0) (at 193.04 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 193.04 80.2154 0))
@@ -1388,7 +1402,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 234.95 83.82 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid daf0328f-0a91-4487-bc78-2148725b11af)
-    (property "Reference" "#FLG013" (id 0) (at 234.95 81.915 0)
+    (property "Reference" "#FLG015" (id 0) (at 234.95 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 234.95 80.2154 0))
@@ -1401,6 +1415,42 @@
     (pin "1" (uuid dce67b89-a6ef-4217-b84e-a0615465fdb4))
   )
 
+  (symbol (lib_id "Connector:TestPoint") (at 201.93 46.99 0)
+    (in_bom yes) (on_board yes)
+    (uuid 043a26d0-03b4-491b-88a5-d1d7df9705b1)
+    (property "Reference" "TP26" (id 0) (at 203.3271 40.43 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "SYS_I" (id 1) (at 203.3271 43.2051 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 207.01 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 207.01 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid efe2e079-d518-4786-a44e-bdc1af69cf09))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 243.84 83.82 0)
+    (in_bom yes) (on_board yes)
+    (uuid 14cc1790-c870-47a9-9a24-ed92d3a0ea56)
+    (property "Reference" "TP27" (id 0) (at 245.2371 77.26 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "SYS_V" (id 1) (at 245.2371 80.0351 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 248.92 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 248.92 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a3b4aa32-6ba0-40c6-8f53-fd8015f2b9b3))
+  )
+
   (symbol (lib_id "power:GND") (at 74.93 102.87 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b7933d48-0da0-40fa-add8-8ea912a2dd50)
@@ -1509,37 +1559,37 @@
     (pin "1" (uuid e096eef6-0b7f-4f6d-af94-8986cf207974))
   )
 
-  (symbol (lib_id "power:GND") (at 185.42 123.19 0)
+  (symbol (lib_id "power:GND") (at 185.42 125.73 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bfe7ccce-845b-4a36-8ca2-eefe5a9b6211)
-    (property "Reference" "#PWR0158" (id 0) (at 185.42 129.54 0)
+    (property "Reference" "#PWR0158" (id 0) (at 185.42 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 185.42 127.7526 0)
+    (property "Value" "GND" (id 1) (at 185.42 130.2926 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 185.42 123.19 0)
+    (property "Footprint" "" (id 2) (at 185.42 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 185.42 123.19 0)
+    (property "Datasheet" "" (id 3) (at 185.42 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 225fb5cd-f0c3-40ae-9189-70f93d97cf31))
   )
 
-  (symbol (lib_id "power:GND") (at 189.23 123.19 0)
+  (symbol (lib_id "power:GND") (at 189.23 125.73 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1cc197f2-039b-4b4b-aae4-8f72529a265a)
-    (property "Reference" "#PWR0159" (id 0) (at 189.23 129.54 0)
+    (property "Reference" "#PWR0159" (id 0) (at 189.23 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 189.23 127.7526 0)
+    (property "Value" "GND" (id 1) (at 189.23 130.2926 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 189.23 123.19 0)
+    (property "Footprint" "" (id 2) (at 189.23 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 189.23 123.19 0)
+    (property "Datasheet" "" (id 3) (at 189.23 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2203c974-6107-4ca7-92a1-d1dd7cfdb15c))
@@ -1584,13 +1634,13 @@
   (symbol (lib_id "Device:R") (at 97.79 90.17 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c86948ea-f0aa-4782-a2ae-156c62e49f88)
-    (property "Reference" "R14" (id 0) (at 99.5681 89.2615 0)
+    (property "Reference" "R55" (id 0) (at 99.5681 89.2615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 99.5681 92.0366 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 96.012 90.17 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 96.012 90.17 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 97.79 90.17 0)
@@ -1603,13 +1653,13 @@
   (symbol (lib_id "Device:R") (at 123.19 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e50a69a7-5d81-4684-90be-9b90cbfa951b)
-    (property "Reference" "R15" (id 0) (at 124.9681 100.6915 0)
+    (property "Reference" "R56" (id 0) (at 124.9681 100.6915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 124.9681 103.4666 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 121.412 101.6 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 121.412 101.6 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 123.19 101.6 0)
@@ -1622,9 +1672,9 @@
   (symbol (lib_id "Device:R") (at 148.59 102.87 90)
     (in_bom yes) (on_board yes)
     (uuid 6df0c01d-97b5-4180-a4da-bbb0ebd6edf6)
-    (property "Reference" "R16" (id 0) (at 148.59 100.4274 90))
+    (property "Reference" "R57" (id 0) (at 148.59 100.4274 90))
     (property "Value" "1.45M" (id 1) (at 148.59 105.7425 90))
-    (property "Footprint" "" (id 2) (at 148.59 104.648 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 148.59 104.648 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 148.59 102.87 0)
@@ -1637,9 +1687,9 @@
   (symbol (lib_id "Device:R") (at 156.21 106.68 90)
     (in_bom yes) (on_board yes)
     (uuid 249de1af-fbbc-43fc-98ad-18432cf701ea)
-    (property "Reference" "R17" (id 0) (at 156.21 104.2374 90))
+    (property "Reference" "R58" (id 0) (at 156.21 104.2374 90))
     (property "Value" "18k" (id 1) (at 156.21 109.5525 90))
-    (property "Footprint" "" (id 2) (at 156.21 108.458 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 156.21 108.458 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 156.21 106.68 0)
@@ -1652,9 +1702,9 @@
   (symbol (lib_id "Device:R") (at 163.83 110.49 90)
     (in_bom yes) (on_board yes)
     (uuid ef60402b-3865-4583-b55e-47a28740c59c)
-    (property "Reference" "R18" (id 0) (at 163.83 108.0474 90))
+    (property "Reference" "R59" (id 0) (at 163.83 108.0474 90))
     (property "Value" "169k" (id 1) (at 163.83 113.3625 90))
-    (property "Footprint" "" (id 2) (at 163.83 112.268 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 163.83 112.268 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 163.83 110.49 0)
@@ -1667,9 +1717,9 @@
   (symbol (lib_id "Device:R") (at 167.64 81.28 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 05cf8373-2a83-4c9f-9c4b-799fe2da0a0c)
-    (property "Reference" "R19" (id 0) (at 167.64 76.2974 90))
+    (property "Reference" "R60" (id 0) (at 167.64 76.2974 90))
     (property "Value" "20mR" (id 1) (at 167.64 79.0725 90))
-    (property "Footprint" "" (id 2) (at 167.64 83.058 90)
+    (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 167.64 83.058 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 167.64 81.28 0)
@@ -1682,9 +1732,9 @@
   (symbol (lib_id "Device:R") (at 167.64 86.36 90)
     (in_bom yes) (on_board yes)
     (uuid d8bb5cfa-4c99-4061-ac7e-761c6ef34017)
-    (property "Reference" "R20" (id 0) (at 167.64 88.9974 90))
+    (property "Reference" "R61" (id 0) (at 167.64 88.9974 90))
     (property "Value" "20mR" (id 1) (at 167.64 91.7725 90))
-    (property "Footprint" "" (id 2) (at 167.64 88.138 90)
+    (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 167.64 88.138 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 167.64 86.36 0)
@@ -1697,9 +1747,9 @@
   (symbol (lib_id "Device:R") (at 171.45 114.3 90)
     (in_bom yes) (on_board yes)
     (uuid 150ee852-43e1-4873-be33-1f0fa9887faf)
-    (property "Reference" "R21" (id 0) (at 171.45 111.8574 90))
+    (property "Reference" "R62" (id 0) (at 171.45 111.8574 90))
     (property "Value" "361k" (id 1) (at 171.45 117.1725 90))
-    (property "Footprint" "" (id 2) (at 171.45 116.078 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 171.45 116.078 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 171.45 114.3 0)
@@ -1712,9 +1762,9 @@
   (symbol (lib_id "Device:R") (at 195.58 72.39 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3316e2ae-499a-4878-a3a3-39fbb809c686)
-    (property "Reference" "R22" (id 0) (at 195.58 67.4074 90))
+    (property "Reference" "R63" (id 0) (at 195.58 67.4074 90))
     (property "Value" "100k" (id 1) (at 195.58 70.1825 90))
-    (property "Footprint" "" (id 2) (at 195.58 74.168 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 195.58 74.168 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 195.58 72.39 0)
@@ -1727,9 +1777,9 @@
   (symbol (lib_id "Device:R") (at 208.28 72.39 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1eeb2ec8-5573-48f3-8edf-db067f82773a)
-    (property "Reference" "R23" (id 0) (at 208.28 67.4074 90))
+    (property "Reference" "R64" (id 0) (at 208.28 67.4074 90))
     (property "Value" "270k" (id 1) (at 208.28 70.1825 90))
-    (property "Footprint" "" (id 2) (at 208.28 74.168 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 208.28 74.168 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 72.39 0)
@@ -1742,13 +1792,13 @@
   (symbol (lib_id "Device:R") (at 231.14 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 07440c69-9ed8-4cd1-8b3f-30cd1be833b3)
-    (property "Reference" "R24" (id 0) (at 232.9181 94.3415 0)
+    (property "Reference" "R65" (id 0) (at 232.9181 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "20k" (id 1) (at 232.9181 97.1166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 229.362 95.25 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 229.362 95.25 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 231.14 95.25 0)
@@ -1761,13 +1811,13 @@
   (symbol (lib_id "Device:D_TVS") (at 138.43 92.71 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid afa7b511-6607-4999-85d4-65f661342542)
-    (property "Reference" "D2" (id 0) (at 140.4367 91.8015 90)
+    (property "Reference" "D8" (id 0) (at 140.4367 91.8015 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "5V" (id 1) (at 140.4367 94.5766 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 138.43 92.71 0)
+    (property "Footprint" "Diode_SMD:D_SMB" (id 2) (at 138.43 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 138.43 92.71 0)
@@ -1780,9 +1830,9 @@
   (symbol (lib_id "Device:D_Zener") (at 208.28 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ba125c2b-ebbf-4ca3-a0c8-a7ed64762b9e)
-    (property "Reference" "D3" (id 0) (at 208.28 48.1288 0))
+    (property "Reference" "D9" (id 0) (at 208.28 48.1288 0))
     (property "Value" "3V3" (id 1) (at 208.28 50.9039 0))
-    (property "Footprint" "" (id 2) (at 208.28 53.34 0)
+    (property "Footprint" "Diode_SMD:D_SOD-323F" (id 2) (at 208.28 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 53.34 0)
@@ -1795,13 +1845,13 @@
   (symbol (lib_id "Device:C") (at 74.93 95.25 0)
     (in_bom yes) (on_board yes)
     (uuid ecb72f44-6cbe-4fd2-889c-506cb18c99ca)
-    (property "Reference" "C28" (id 0) (at 67.6911 94.3415 0)
+    (property "Reference" "C74" (id 0) (at 67.6911 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 66.4211 97.1166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 75.8952 99.06 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 75.8952 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 74.93 95.25 0)
@@ -1814,13 +1864,13 @@
   (symbol (lib_id "Device:C") (at 200.66 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ad122e78-b77b-4b00-b288-9a430ba87967)
-    (property "Reference" "C29" (id 0) (at 203.5811 118.4715 0)
+    (property "Reference" "C75" (id 0) (at 203.5811 118.4715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "47nF" (id 1) (at 203.5811 121.2466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 201.6252 123.19 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 201.6252 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 200.66 119.38 0)
@@ -1833,9 +1883,9 @@
   (symbol (lib_id "Device:C") (at 208.28 63.5 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 696f97f5-7fe8-4b7c-9e7e-3f744c0a20fc)
-    (property "Reference" "C30" (id 0) (at 208.28 57.3744 90))
+    (property "Reference" "C76" (id 0) (at 208.28 57.3744 90))
     (property "Value" "10nF" (id 1) (at 208.28 60.1495 90))
-    (property "Footprint" "" (id 2) (at 212.09 62.5348 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 212.09 62.5348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 63.5 0)
@@ -1848,7 +1898,7 @@
   (symbol (lib_id "TCY_transistors:DMP21D6UFD") (at 114.3 90.17 0) (mirror x)
     (in_bom yes) (on_board yes)
     (uuid 4436aa72-c737-4eee-b3ec-910124af8d9f)
-    (property "Reference" "Q5" (id 0) (at 110.6171 94.3415 0)
+    (property "Reference" "Q13" (id 0) (at 110.6171 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "DMP21D6UFD" (id 1) (at 106.8071 98.3866 0)
@@ -1868,7 +1918,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 129.54 83.82 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6c3ffb0b-ec0a-4b80-b2d1-0efa37a1c543)
-    (property "Reference" "Q6" (id 0) (at 129.54 78.5488 90)
+    (property "Reference" "Q14" (id 0) (at 129.54 78.5488 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 129.54 80.7878 90)
@@ -1885,16 +1935,12 @@
     (pin "3" (uuid 17e9ce8d-c713-43d6-80ef-38e0e941259c))
     (pin "4" (uuid 7c97a2a5-7856-4e8d-8955-f4ee67e1844b))
     (pin "5" (uuid 82850d51-3acc-4e8c-a57f-e56ee4636b81))
-    (pin "6" (uuid 10d8d007-9bb2-4970-b5b8-909ed2ab6d1d))
-    (pin "7" (uuid 9f92aff8-3780-4ec4-951f-6ac9b6717ea3))
-    (pin "8" (uuid baefdfe5-741f-45c1-928d-0270064313d9))
-    (pin "9" (uuid 8bda6692-7c2c-4b69-bc2d-2241296bcae8))
   )
 
   (symbol (lib_id "TCY_transistors:SiSA96DDN") (at 208.28 86.36 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid af61e0e6-8971-4164-bc9f-2ea423a9f4cd)
-    (property "Reference" "Q7" (id 0) (at 208.28 78.5488 90)
+    (property "Reference" "Q15" (id 0) (at 208.28 78.5488 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 208.28 80.7878 90)
@@ -1911,16 +1957,12 @@
     (pin "3" (uuid b4268386-775c-4cb5-85ba-d42cb18dbdf5))
     (pin "4" (uuid a42d2476-9bd8-4e01-9f16-05eee056d484))
     (pin "5" (uuid 8d3ebd79-959c-4a6a-af20-1099ad7d6dd4))
-    (pin "6" (uuid a6ae923f-7cb7-4b80-9670-1ae8d320862f))
-    (pin "7" (uuid 5e74e4fa-2476-449f-817a-50cd218e6d61))
-    (pin "8" (uuid 7e22b061-2023-48f9-9501-429f9ea1402d))
-    (pin "9" (uuid 0b52ec21-7253-46c5-9196-fc2015f957eb))
   )
 
   (symbol (lib_id "TCY_transistors:SiSA96DDN") (at 223.52 86.36 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 09031a18-3d44-41b6-8838-4c9fa86fa436)
-    (property "Reference" "Q8" (id 0) (at 223.52 78.5488 90)
+    (property "Reference" "Q16" (id 0) (at 223.52 78.5488 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 223.52 80.7878 90)
@@ -1937,16 +1979,12 @@
     (pin "3" (uuid 7a0d3ef1-774e-4510-863c-d1b2240f2ae2))
     (pin "4" (uuid 8ba34019-2638-4019-9257-bd909537d692))
     (pin "5" (uuid 547894a2-2166-41b2-ba64-61d87a025ee6))
-    (pin "6" (uuid ab204c33-ff3f-460c-94c6-b7c551d89327))
-    (pin "7" (uuid e4bd21a9-7d98-4b8f-9cfc-49b0e08a5d73))
-    (pin "8" (uuid 7b402663-414c-430d-a7dc-4f7530f8549e))
-    (pin "9" (uuid 63fa80d7-99d5-40a4-8e18-ef1f950aabb6))
   )
 
   (symbol (lib_id "Power_Management:BD49xxFVE") (at 83.82 95.25 0)
     (in_bom yes) (on_board yes)
     (uuid 6de8822c-c6ea-495e-95e1-d8df9370c33b)
-    (property "Reference" "U3" (id 0) (at 95.7579 100.6915 0)
+    (property "Reference" "U16" (id 0) (at 95.7579 100.6915 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "BD49xxFVE" (id 1) (at 97.0279 103.4666 0)
@@ -1967,7 +2005,7 @@
   (symbol (lib_id "TCY_power_management:INA199") (at 181.61 72.39 0)
     (in_bom yes) (on_board yes)
     (uuid 80b279ee-9f1a-4bfe-b9b7-434efc346219)
-    (property "Reference" "U4" (id 0) (at 185.1661 77.8315 0)
+    (property "Reference" "U17" (id 0) (at 185.1661 77.8315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "INA199x1" (id 1) (at 185.1661 75.5266 0)
@@ -1992,7 +2030,7 @@
   (symbol (lib_id "TCY_power_management:LTC4231") (at 186.69 105.41 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 41c6c7f0-65e9-418c-9e52-ea431c581b1b)
-    (property "Reference" "U5" (id 0) (at 186.69 86.2034 0))
+    (property "Reference" "U18" (id 0) (at 186.69 86.2034 0))
     (property "Value" "LTC4231" (id 1) (at 186.69 88.9785 0))
     (property "Footprint" "Package_DFN_QFN:QFN-12-1EP_3x3mm_P0.5mm_EP1.65x1.65mm_ThermalVias" (id 2) (at 186.69 143.51 0)
       (effects (font (size 1.27 1.27)) hide)

modules/EPS/Power_VBAT.kicad_sch

@@ -447,22 +447,6 @@
           (name "D" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 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 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
@@ -716,7 +700,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 198.12 105.41 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c8253c12-cea3-490b-9399-c0ed3af2f13e)
-    (property "Reference" "#FLG0114" (id 0) (at 198.12 103.505 0)
+    (property "Reference" "#FLG032" (id 0) (at 198.12 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 198.12 101.8054 0))
@@ -732,7 +716,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 175.26 87.63 0)
     (in_bom yes) (on_board yes)
     (uuid 628aa029-6b78-45d8-869d-90b825a81328)
-    (property "Reference" "TP51" (id 0) (at 174.1171 81.07 0)
+    (property "Reference" "TP57" (id 0) (at 174.1171 81.07 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT_I" (id 1) (at 176.6571 83.8451 0)
@@ -750,7 +734,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 180.34 105.41 0)
     (in_bom yes) (on_board yes)
     (uuid 9b4ce1c8-3cae-46d6-ba61-5ac61f4a5a0d)
-    (property "Reference" "TP52" (id 0) (at 181.7371 100.12 0)
+    (property "Reference" "TP58" (id 0) (at 181.7371 100.12 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "VBAT_OUT" (id 1) (at 181.7371 102.8951 0)
@@ -894,9 +878,9 @@
   (symbol (lib_id "Device:R") (at 133.35 97.79 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d8168bbf-0fcb-4808-935a-c54dfa015fa5)
-    (property "Reference" "R130" (id 0) (at 133.35 92.8074 90))
+    (property "Reference" "R129" (id 0) (at 133.35 92.8074 90))
     (property "Value" "10mR" (id 1) (at 133.35 95.5825 90))
-    (property "Footprint" "" (id 2) (at 133.35 99.568 90)
+    (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 133.35 99.568 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 97.79 0)
@@ -909,9 +893,9 @@
   (symbol (lib_id "Device:R") (at 133.35 105.41 90)
     (in_bom yes) (on_board yes)
     (uuid ecf03018-8e68-41f8-a7bf-7006e1949849)
-    (property "Reference" "R131" (id 0) (at 133.35 100.4274 90))
+    (property "Reference" "R130" (id 0) (at 133.35 100.4274 90))
     (property "Value" "10mR" (id 1) (at 133.35 103.2025 90))
-    (property "Footprint" "" (id 2) (at 133.35 107.188 90)
+    (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 133.35 107.188 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 105.41 0)
@@ -924,13 +908,13 @@
   (symbol (lib_id "Device:R") (at 156.21 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 923f837d-d68b-481b-a676-fdf1f2a319f5)
-    (property "Reference" "R132" (id 0) (at 157.9881 118.4715 0)
+    (property "Reference" "R131" (id 0) (at 157.9881 118.4715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 157.9881 121.2466 0)
+    (property "Value" "1M" (id 1) (at 157.9881 121.2466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 154.432 119.38 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 154.432 119.38 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 156.21 119.38 0)
@@ -943,13 +927,13 @@
   (symbol (lib_id "Device:R") (at 157.48 82.55 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 39332c72-4269-44ab-a976-7666a5a07a01)
-    (property "Reference" "R133" (id 0) (at 159.2581 81.6415 0)
+    (property "Reference" "R132" (id 0) (at 159.2581 81.6415 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "100k" (id 1) (at 159.2581 84.4166 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 159.258 82.55 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 159.258 82.55 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 157.48 82.55 0)
@@ -962,13 +946,13 @@
   (symbol (lib_id "Device:R") (at 157.48 92.71 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 438130f6-c41c-4438-88d0-b194e1cd102f)
-    (property "Reference" "R134" (id 0) (at 159.2581 91.8015 0)
+    (property "Reference" "R133" (id 0) (at 159.2581 91.8015 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "270k" (id 1) (at 159.2581 94.5766 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 159.258 92.71 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 159.258 92.71 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 157.48 92.71 0)
@@ -981,13 +965,13 @@
   (symbol (lib_id "Device:D_Zener") (at 175.26 92.71 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9135e2df-d381-43ba-ab0c-de88b9a6488d)
-    (property "Reference" "D16" (id 0) (at 177.2667 91.8015 90)
+    (property "Reference" "D19" (id 0) (at 177.2667 91.8015 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "3V3" (id 1) (at 177.2667 94.5766 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 175.26 92.71 0)
+    (property "Footprint" "Diode_SMD:D_SOD-323F" (id 2) (at 175.26 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 92.71 0)
@@ -1000,9 +984,9 @@
   (symbol (lib_id "Device:Polyfuse") (at 171.45 105.41 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a0c9ea8e-9b88-427a-a621-b12ce23cd1f8)
-    (property "Reference" "F14" (id 0) (at 171.45 100.0464 90))
+    (property "Reference" "F13" (id 0) (at 171.45 100.0464 90))
     (property "Value" "5A" (id 1) (at 171.45 102.8215 90))
-    (property "Footprint" "" (id 2) (at 176.53 104.14 0)
+    (property "Footprint" "Fuse:Fuse_1210_3225Metric" (id 2) (at 176.53 104.14 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
     (property "Datasheet" "~" (id 3) (at 171.45 105.41 0)
@@ -1015,13 +999,13 @@
   (symbol (lib_id "Device:C") (at 121.92 76.2 0)
     (in_bom yes) (on_board yes)
     (uuid febe57fa-2c04-4758-af60-8ca1adc6be3e)
-    (property "Reference" "C127" (id 0) (at 115.9511 75.2915 0)
+    (property "Reference" "C125" (id 0) (at 113.4111 75.2915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 113.4111 78.0666 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 122.8852 80.01 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 122.8852 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 121.92 76.2 0)
@@ -1034,13 +1018,13 @@
   (symbol (lib_id "Device:C") (at 166.37 92.71 0)
     (in_bom yes) (on_board yes)
     (uuid 1930155e-e85f-47a6-bc9e-d5959778ba35)
-    (property "Reference" "C128" (id 0) (at 169.2911 91.8015 0)
+    (property "Reference" "C126" (id 0) (at 169.2911 91.8015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10nF" (id 1) (at 168.0211 94.5766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 167.3352 96.52 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 167.3352 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 166.37 92.71 0)
@@ -1053,7 +1037,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 156.21 105.41 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f984924-e775-4f93-861a-4954ba37a68e)
-    (property "Reference" "Q28" (id 0) (at 156.21 100.1388 90)
+    (property "Reference" "Q27" (id 0) (at 156.21 100.1388 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 156.21 102.3778 90)
@@ -1070,16 +1054,12 @@
     (pin "3" (uuid 17222c9f-bf6f-42e1-aed8-60071081ac8c))
     (pin "4" (uuid 9e9a0605-3c8f-48ab-91ec-67388a7693b3))
     (pin "5" (uuid e17b66f2-1a84-4aaf-9bb0-79acc95375b3))
-    (pin "6" (uuid dff7889b-31c2-4027-9c16-f93394bac691))
-    (pin "7" (uuid 319dbf00-2d4f-442a-82e9-41f403032ac2))
-    (pin "8" (uuid b3beb71a-2a1c-4873-9e5f-6ad90c8ebffe))
-    (pin "9" (uuid 8b772ed3-825c-4243-afd3-2469714eebde))
   )
 
   (symbol (lib_id "TCY_power_management:INA199") (at 146.05 78.74 0)
     (in_bom yes) (on_board yes)
     (uuid 4bc5bfce-3c4b-49ff-9663-b05430efc8b8)
-    (property "Reference" "U46" (id 0) (at 144.5261 66.4015 0)
+    (property "Reference" "U45" (id 0) (at 144.5261 66.4015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "INA199x2" (id 1) (at 141.9861 69.1766 0)

modules/EPS/Power_supplies.kicad_sch

@@ -121,7 +121,7 @@
     (uuid 333eb2cb-d65b-4e6a-845b-efb1efbc71c0)
   )
   (text "Each power supply has current monitoring stage.\nEach rail could be disabled by supervisor MCU.\nPower for supervisor MCU is handled by 3.3V power supply.\n"
-    (at 185.42 76.2 0)
+    (at 185.42 80.01 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b8b0e794-d0fa-46a0-82e4-45da8cc0114a)
   )

modules/EPS/Power_supply.kicad_sch

@@ -626,22 +626,6 @@
           (name "D" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 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 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 5.08 270) (length 2.54) hide
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
       )
     )
     (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
@@ -1076,7 +1060,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 111.76 99.06 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c29f3033-9219-4cc1-9291-3040b3e16811)
-    (property "Reference" "#FLG020" (id 0) (at 111.76 100.965 0)
+    (property "Reference" "#FLG030" (id 0) (at 111.76 100.965 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 111.76 103.6226 0))
@@ -1092,7 +1076,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 153.67 88.9 0)
     (in_bom yes) (on_board yes)
     (uuid bd290f96-4ed3-449c-a9a9-5e397d65f6c5)
-    (property "Reference" "TP31" (id 0) (at 152.5271 79.8 0)
+    (property "Reference" "TP51" (id 0) (at 152.5271 79.8 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOURCE_V" (id 1) (at 152.5271 82.5751 0)
@@ -1110,7 +1094,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 208.28 71.12 0)
     (in_bom yes) (on_board yes)
     (uuid 12219d6e-5aac-42c8-a90c-26e3f83d4257)
-    (property "Reference" "TP32" (id 0) (at 207.1371 62.02 0)
+    (property "Reference" "TP52" (id 0) (at 207.1371 62.02 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOURCE_I" (id 1) (at 207.1371 64.7951 0)
@@ -1128,7 +1112,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 228.6 88.9 0)
     (in_bom yes) (on_board yes)
     (uuid 8d6509b2-e2f4-43f1-82be-30ba7bf064fe)
-    (property "Reference" "TP33" (id 0) (at 227.4571 79.8 0)
+    (property "Reference" "TP53" (id 0) (at 227.4571 79.8 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOURCE_OUT" (id 1) (at 227.4571 82.5751 0)
@@ -1362,9 +1346,9 @@
   (symbol (lib_id "Device:L") (at 124.46 74.93 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c61284fb-b235-43b0-b218-8bc6019b60e1)
-    (property "Reference" "L3" (id 0) (at 124.46 70.4554 90))
+    (property "Reference" "L7" (id 0) (at 124.46 70.4554 90))
     (property "Value" "2.2uH" (id 1) (at 124.46 73.2305 90))
-    (property "Footprint" "" (id 2) (at 124.46 74.93 0)
+    (property "Footprint" "Inductor_SMD:L_Taiyo-Yuden_MD-5050" (id 2) (at 124.46 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 124.46 74.93 0)
@@ -1377,13 +1361,13 @@
   (symbol (lib_id "Device:R") (at 102.87 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3089d219-f91c-4780-bdaa-196ebbdedf87)
-    (property "Reference" "R83" (id 0) (at 104.6481 93.0715 0)
+    (property "Reference" "R115" (id 0) (at 104.6481 93.0715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100R" (id 1) (at 104.6481 95.8466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 101.092 93.98 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 101.092 93.98 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 102.87 93.98 0)
@@ -1396,13 +1380,13 @@
   (symbol (lib_id "Device:R") (at 143.51 93.98 0)
     (in_bom yes) (on_board yes)
     (uuid 9b169cde-1701-4a15-a018-14af55b54a2b)
-    (property "Reference" "R84" (id 0) (at 145.2881 94.3415 0)
+    (property "Reference" "R116" (id 0) (at 145.2881 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "520k/1.12M/1.8M" (id 1) (at 145.2881 92.0366 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 141.732 93.98 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 141.732 93.98 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 143.51 93.98 0)
@@ -1415,13 +1399,13 @@
   (symbol (lib_id "Device:R") (at 143.51 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid edb34068-00d6-4168-b744-075735693e81)
-    (property "Reference" "R85" (id 0) (at 145.2881 113.3915 0)
+    (property "Reference" "R117" (id 0) (at 145.2881 113.3915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "200k" (id 1) (at 145.2881 116.1666 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 141.732 114.3 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 141.732 114.3 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 143.51 114.3 0)
@@ -1434,9 +1418,9 @@
   (symbol (lib_id "Device:R") (at 176.53 88.9 90)
     (in_bom yes) (on_board yes)
     (uuid 57ee2ae8-39d7-4647-b4db-5919a1cac11f)
-    (property "Reference" "R86" (id 0) (at 176.53 83.9174 90))
+    (property "Reference" "R118" (id 0) (at 176.53 83.9174 90))
     (property "Value" "20mR" (id 1) (at 176.53 86.6925 90))
-    (property "Footprint" "" (id 2) (at 176.53 90.678 90)
+    (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 176.53 90.678 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 176.53 88.9 0)
@@ -1449,13 +1433,13 @@
   (symbol (lib_id "Device:R") (at 200.66 66.04 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4b5d3980-caa6-4341-a4be-95f6ac170448)
-    (property "Reference" "R87" (id 0) (at 202.4381 65.1315 0)
+    (property "Reference" "R119" (id 0) (at 202.4381 65.1315 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "100k" (id 1) (at 202.4381 67.9066 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 202.438 66.04 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 202.438 66.04 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 200.66 66.04 0)
@@ -1468,13 +1452,13 @@
   (symbol (lib_id "Device:R") (at 200.66 76.2 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0e8425b5-7118-43f0-9262-10ddb2e80139)
-    (property "Reference" "R88" (id 0) (at 202.4381 75.2915 0)
+    (property "Reference" "R120" (id 0) (at 202.4381 75.2915 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "270k" (id 1) (at 202.4381 78.0666 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 202.438 76.2 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 202.438 76.2 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 200.66 76.2 0)
@@ -1487,13 +1471,13 @@
   (symbol (lib_id "Device:R") (at 203.2 102.87 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 08f809c6-2d77-40c1-b3e6-711475598559)
-    (property "Reference" "R89" (id 0) (at 204.9781 101.9615 0)
+    (property "Reference" "R121" (id 0) (at 204.9781 101.9615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 204.9781 104.7366 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 201.422 102.87 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 201.422 102.87 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 203.2 102.87 0)
@@ -1506,13 +1490,13 @@
   (symbol (lib_id "Device:D_Zener") (at 208.28 76.2 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2c3e2eec-bef4-4877-be07-97d3b7318dc5)
-    (property "Reference" "D9" (id 0) (at 210.2867 75.2915 90)
+    (property "Reference" "D17" (id 0) (at 210.2867 75.2915 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "3V3" (id 1) (at 210.2867 78.0666 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 208.28 76.2 0)
+    (property "Footprint" "Diode_SMD:D_SOD-323F" (id 2) (at 208.28 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 76.2 0)
@@ -1525,9 +1509,9 @@
   (symbol (lib_id "Device:Polyfuse") (at 217.17 88.9 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8e4adf92-49ad-4b97-a921-787246d814f0)
-    (property "Reference" "F7" (id 0) (at 217.17 83.5364 90))
+    (property "Reference" "F11" (id 0) (at 217.17 83.5364 90))
     (property "Value" "2A" (id 1) (at 217.17 86.3115 90))
-    (property "Footprint" "" (id 2) (at 222.25 87.63 0)
+    (property "Footprint" "Fuse:Fuse_1206_3216Metric" (id 2) (at 222.25 87.63 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
     (property "Datasheet" "~" (id 3) (at 217.17 88.9 0)
@@ -1540,13 +1524,13 @@
   (symbol (lib_id "Device:C") (at 90.17 93.98 0)
     (in_bom yes) (on_board yes)
     (uuid bf00f5b7-4b03-4b9b-9beb-c16b5285f72d)
-    (property "Reference" "C95" (id 0) (at 93.0911 94.3415 0)
+    (property "Reference" "C115" (id 0) (at 93.0911 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF (X7R)" (id 1) (at 90.5511 97.1166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 91.1352 97.79 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 91.1352 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 90.17 93.98 0)
@@ -1559,13 +1543,13 @@
   (symbol (lib_id "Device:C") (at 102.87 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid 16350d36-21bf-4cb0-8481-d55787b39d40)
-    (property "Reference" "C96" (id 0) (at 94.3611 104.5015 0)
+    (property "Reference" "C116" (id 0) (at 94.3611 104.5015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF (X7R)" (id 1) (at 89.2811 107.2766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 103.8352 107.95 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 103.8352 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 102.87 104.14 0)
@@ -1578,13 +1562,13 @@
   (symbol (lib_id "Device:C") (at 156.21 97.79 0)
     (in_bom yes) (on_board yes)
     (uuid 8adec100-a1a6-41e4-b4a7-f3f3bc4b2ca1)
-    (property "Reference" "C97" (id 0) (at 159.1311 98.1515 0)
+    (property "Reference" "C117" (id 0) (at 159.1311 98.1515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF (X7R)" (id 1) (at 156.5911 100.9266 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 157.1752 101.6 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 157.1752 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 156.21 97.79 0)
@@ -1597,13 +1581,13 @@
   (symbol (lib_id "Device:C") (at 165.1 59.69 0)
     (in_bom yes) (on_board yes)
     (uuid 148c8ecd-04d2-4757-b5c0-9eee95504366)
-    (property "Reference" "C98" (id 0) (at 159.1311 58.7815 0)
+    (property "Reference" "C118" (id 0) (at 156.5911 58.7815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 156.5911 61.5566 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 166.0652 63.5 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 166.0652 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 165.1 59.69 0)
@@ -1616,13 +1600,13 @@
   (symbol (lib_id "Device:C") (at 167.64 97.79 0)
     (in_bom yes) (on_board yes)
     (uuid 73f3621e-3d60-498b-a529-65605fa975d8)
-    (property "Reference" "C99" (id 0) (at 170.5611 98.1515 0)
+    (property "Reference" "C119" (id 0) (at 170.5611 98.1515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF (X7R)" (id 1) (at 168.0211 100.9266 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 168.6052 101.6 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 168.6052 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 167.64 97.79 0)
@@ -1635,13 +1619,13 @@
   (symbol (lib_id "Device:R_POT") (at 143.51 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid a44da014-6bbf-4eff-aa85-6f77eb7124cc)
-    (property "Reference" "RV1" (id 0) (at 149.352 108.3115 0)
+    (property "Reference" "RV5" (id 0) (at 149.352 108.3115 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "100k" (id 1) (at 151.892 106.0066 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 143.51 104.14 0)
+    (property "Footprint" "TCY_passives:RV_3x3.6" (id 2) (at 143.51 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 143.51 104.14 0)
@@ -1655,7 +1639,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 203.2 88.9 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 86ba3151-bbed-4b81-b0fb-078cc537837a)
-    (property "Reference" "Q21" (id 0) (at 203.2 83.6288 90)
+    (property "Reference" "Q25" (id 0) (at 203.2 83.6288 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 203.2 85.8678 90)
@@ -1672,16 +1656,12 @@
     (pin "3" (uuid 6081f247-c7de-4ef4-8d85-cd289d727994))
     (pin "4" (uuid 4ed326c5-be34-4fff-913d-729a445d74d4))
     (pin "5" (uuid 4ddc5ee5-c01f-489f-ab09-816ed6e65f41))
-    (pin "6" (uuid 5c77a3df-449a-4faa-bd82-fcec777bf770))
-    (pin "7" (uuid 31c0a7de-ac60-418f-9895-6669c1b605ea))
-    (pin "8" (uuid a8297412-6fbb-4946-9d83-725519e36022))
-    (pin "9" (uuid 516c882a-071e-4f73-8bca-58bffeaa1bb2))
   )
 
   (symbol (lib_id "TCY_power_management:INA199") (at 189.23 62.23 0)
     (in_bom yes) (on_board yes)
     (uuid 4c2ff129-ffc8-4675-931e-6350c72d635e)
-    (property "Reference" "U34" (id 0) (at 186.4361 49.8915 0)
+    (property "Reference" "U42" (id 0) (at 186.4361 49.8915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "INA199x2" (id 1) (at 183.8961 52.6666 0)
@@ -1706,7 +1686,7 @@
   (symbol (lib_id "Regulator_Switching:TPS63000") (at 124.46 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 74694f0a-ece9-45a0-b17c-3004a870c052)
-    (property "Reference" "U33" (id 0) (at 124.46 77.3134 0))
+    (property "Reference" "U41" (id 0) (at 124.46 77.3134 0))
     (property "Value" "TPS63000" (id 1) (at 124.46 80.0885 0))
     (property "Footprint" "Package_SON:Texas_DRC0010J_ThermalVias" (id 2) (at 146.05 107.95 0)
       (effects (font (size 1.27 1.27)) hide)

modules/EPS/Solar_input.kicad_sch

@@ -233,7 +233,7 @@
     (uuid be22c9c2-8d74-4cbc-8ae7-40f988e15cf0)
   )
 
-  (text "Connection to nne half of every solar module.\nProtection agains reverse current flow\n	should be implented of panels."
+  (text "Connection to half of every solar module.\nProtection agains reverse current flow\n	should be implented of panels."
     (at 135.89 46.99 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 54263196-cae6-4b35-b11c-4925248adc36)
@@ -247,7 +247,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 102.87 49.53 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid afe2dd24-9acf-428c-8603-b260bc75b79c)
-    (property "Reference" "#FLG08" (id 0) (at 102.87 47.625 0)
+    (property "Reference" "#FLG010" (id 0) (at 102.87 47.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 102.87 45.9254 0))
@@ -479,7 +479,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 49.53 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 4c6d1bf1-6b05-46e1-bcde-fe7eaff4737b)
-    (property "Reference" "J13" (id 0) (at 89.662 43.0234 0))
+    (property "Reference" "J1" (id 0) (at 89.662 43.0234 0))
     (property "Value" "Solar_X1" (id 1) (at 89.662 45.7985 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -495,7 +495,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 68.58 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 126d2402-ba66-45fa-9faa-d3f2186094fc)
-    (property "Reference" "J14" (id 0) (at 89.662 62.0734 0))
+    (property "Reference" "J2" (id 0) (at 89.662 62.0734 0))
     (property "Value" "Solar_X2" (id 1) (at 89.662 64.8485 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -511,7 +511,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 87.63 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 0f33af7e-9621-4131-ada6-4e82b8efcc3d)
-    (property "Reference" "J15" (id 0) (at 89.662 81.1234 0))
+    (property "Reference" "J3" (id 0) (at 89.662 81.1234 0))
     (property "Value" "Solar_Y1" (id 1) (at 89.662 83.8985 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -527,7 +527,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 106.68 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid cb7ebcef-6b64-47cc-8b45-da62d01ccabe)
-    (property "Reference" "J16" (id 0) (at 89.662 100.1734 0))
+    (property "Reference" "J4" (id 0) (at 89.662 100.1734 0))
     (property "Value" "Solar_Y2" (id 1) (at 89.662 102.9485 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -543,7 +543,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 125.73 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid fc0f55cf-4820-4bbb-9d16-bdf2b58b514a)
-    (property "Reference" "J17" (id 0) (at 89.662 119.2234 0))
+    (property "Reference" "J5" (id 0) (at 89.662 119.2234 0))
     (property "Value" "Solar_Z1" (id 1) (at 89.662 121.9985 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -559,7 +559,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 144.78 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid e3bcf0a8-5a27-4bdf-a634-030a1252b6fd)
-    (property "Reference" "J18" (id 0) (at 89.662 138.2734 0))
+    (property "Reference" "J6" (id 0) (at 89.662 138.2734 0))
     (property "Value" "Solar_Z2" (id 1) (at 89.662 141.0485 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 144.78 0)
       (effects (font (size 1.27 1.27)) hide)

modules/EPS/USB_power.kicad_sch

@@ -210,6 +210,11 @@
     (uuid 8bf22bb7-fb45-45aa-a207-b549e0f937a7)
   )
 
+  (label "GND" (at 177.8 99.06 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid af384758-2600-45ae-80b0-bbd15d6dedbc)
+  )
+
   (hierarchical_label "USB_POWER" (shape input) (at 186.69 93.98 0)
     (effects (font (size 1.27 1.27) (thickness 0.254)) (justify left))
     (uuid d94df75d-11e8-4075-95d1-64fd8e96579c)
@@ -218,7 +223,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 182.88 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 23bac90a-67ec-4f39-afbb-36799cd25092)
-    (property "Reference" "#FLG021" (id 0) (at 182.88 92.075 0)
+    (property "Reference" "#FLG033" (id 0) (at 182.88 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 182.88 90.3754 0))
@@ -272,7 +277,7 @@
     (uuid 54e74f5e-f1ac-457c-a393-65946b8321d6)
     (property "Reference" "J24" (id 0) (at 172.212 88.7434 0))
     (property "Value" "USB_POWER" (id 1) (at 172.212 91.5185 0))
-    (property "Footprint" "" (id 2) (at 170.18 96.52 0)
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11103LF_1x04_P1.25mm_Horizontal" (id 2) (at 170.18 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 170.18 96.52 0)