EPS: fix ERC errors due to missing power flags

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" "#PWR017" (id 0) (at 146.05 116.84 0)
+    (property "Reference" "#PWR0116" (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" "#PWR018" (id 0) (at 165.1 116.84 0)
+    (property "Reference" "#PWR0117" (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" "#PWR019" (id 0) (at 182.88 63.5 0)
+    (property "Reference" "#PWR0118" (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" "#PWR020" (id 0) (at 193.04 63.5 0)
+    (property "Reference" "#PWR0119" (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)

modules/EPS/Activation_control.kicad_sch

@@ -359,7 +359,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" "TP6" (id 0) (at 110.6171 93.77 0)
+    (property "Reference" "TP20" (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 +377,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" "TP7" (id 0) (at 147.4471 93.77 0)
+    (property "Reference" "TP21" (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 +395,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" "TP8" (id 0) (at 179.2997 93.77 0)
+    (property "Reference" "TP22" (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,7 +413,7 @@
   (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" "F2" (id 0) (at 93.5991 89.2615 0)
+    (property "Reference" "F5" (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)
@@ -432,7 +432,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" "Q3" (id 0) (at 129.54 104.1166 90)
+    (property "Reference" "Q11" (id 0) (at 129.54 104.1166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 129.54 106.3556 90)
@@ -458,7 +458,7 @@
   (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" "Q4" (id 0) (at 163.83 104.1166 90)
+    (property "Reference" "Q12" (id 0) (at 163.83 104.1166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 163.83 106.3556 90)

modules/EPS/Activation_logic.kicad_sch

@@ -631,6 +631,45 @@
         )
       )
     )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 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" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+      )
+    )
   )
 
   (junction (at 43.18 58.42) (diameter 0.9144) (color 0 0 0 0))
@@ -658,6 +697,7 @@
   (junction (at 96.52 119.38) (diameter 1.016) (color 0 0 0 0))
   (junction (at 121.92 172.72) (diameter 1.016) (color 0 0 0 0))
   (junction (at 124.46 39.37) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 128.27 39.37) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 133.35 39.37) (diameter 1.016) (color 0 0 0 0))
   (junction (at 146.05 39.37) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 147.32 121.92) (diameter 1.016) (color 0 0 0 0))
@@ -665,6 +705,7 @@
   (junction (at 167.64 39.37) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 172.72 144.78) (diameter 1.016) (color 0 0 0 0))
   (junction (at 176.53 39.37) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 182.88 39.37) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 189.23 39.37) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 191.77 147.32) (diameter 1.016) (color 0 0 0 0))
   (junction (at 213.36 147.32) (diameter 1.016) (color 0 0 0 0))
@@ -981,7 +1022,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 51877405-25d4-4060-b696-d81057f7fb97)
   )
-  (wire (pts (xy 124.46 39.37) (xy 133.35 39.37))
+  (wire (pts (xy 124.46 39.37) (xy 128.27 39.37))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid b9f48c6a-cb8b-4dd4-a821-95f9131ef2b3)
   )
@@ -993,6 +1034,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 06414c4d-125b-430f-827b-ed11cd66948e)
   )
+  (wire (pts (xy 128.27 39.37) (xy 133.35 39.37))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid b9f48c6a-cb8b-4dd4-a821-95f9131ef2b3)
+  )
   (wire (pts (xy 133.35 39.37) (xy 146.05 39.37))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d99769d3-e03f-4a53-8b39-c98705fce7f2)
@@ -1073,7 +1118,11 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 55227701-68d3-463c-bcdc-0494ed6bae12)
   )
-  (wire (pts (xy 176.53 39.37) (xy 189.23 39.37))
+  (wire (pts (xy 176.53 39.37) (xy 182.88 39.37))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 5e5dda31-b936-4577-ad6e-bd89deb9ac5c)
+  )
+  (wire (pts (xy 182.88 39.37) (xy 189.23 39.37))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 5e5dda31-b936-4577-ad6e-bd89deb9ac5c)
   )
@@ -1160,7 +1209,7 @@
     (uuid 20afcb37-8f1a-4d09-bad9-a097907f2ff8)
   )
   (text "Place filtering capacitor as close to\ntheir respective ICs power as possible."
-    (at 165.1 36.83 0)
+    (at 165.1 33.02 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d3bc1070-6064-4503-ae75-6bc565de6147)
   )
@@ -1241,10 +1290,42 @@
     (uuid 89927ab1-0fa5-4d44-ac2f-a1f339d087f4)
   )
 
+  (symbol (lib_id "power:PWR_FLAG") (at 182.88 39.37 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 0a5f2c89-efc8-4d07-8198-80095c08bde3)
+    (property "Reference" "#FLG0102" (id 0) (at 182.88 37.465 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 182.88 35.7654 0))
+    (property "Footprint" "" (id 2) (at 182.88 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 182.88 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ec5c4147-da54-4a69-97a5-cb28790daac5))
+  )
+
+  (symbol (lib_id "power:PWR_FLAG") (at 196.85 21.59 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7bc5ac8e-e3a7-4d2d-90a5-fe3a0f4563a0)
+    (property "Reference" "#FLG0116" (id 0) (at 196.85 19.685 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 196.85 17.9854 0))
+    (property "Footprint" "" (id 2) (at 196.85 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 196.85 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1f9c9502-6b4e-469a-8669-a485bdd661f5))
+  )
+
   (symbol (lib_id "Connector:TestPoint") (at 86.36 93.98 0)
     (in_bom yes) (on_board yes)
     (uuid 5abaf3d7-fa48-44b9-9254-e8f67cb05e18)
-    (property "Reference" "TP61" (id 0) (at 85.2171 86.15 0)
+    (property "Reference" "TP53" (id 0) (at 85.2171 86.15 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SW_#1" (id 1) (at 83.9471 88.9251 0)
@@ -1262,7 +1343,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 86.36 119.38 0)
     (in_bom yes) (on_board yes)
     (uuid 2757ae73-7b77-4603-baac-36291bc37744)
-    (property "Reference" "TP62" (id 0) (at 85.2171 111.55 0)
+    (property "Reference" "TP54" (id 0) (at 85.2171 111.55 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SW_#2" (id 1) (at 83.9471 114.3251 0)
@@ -1280,7 +1361,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 86.36 144.78 0)
     (in_bom yes) (on_board yes)
     (uuid f1a66b20-78d3-41ac-842f-5c404b2a3289)
-    (property "Reference" "TP63" (id 0) (at 83.9471 136.95 0)
+    (property "Reference" "TP55" (id 0) (at 83.9471 136.95 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SW_#3" (id 1) (at 82.6771 139.7251 0)
@@ -1298,7 +1379,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 86.36 170.18 0)
     (in_bom yes) (on_board yes)
     (uuid e74e6e2a-c8a9-4b9c-9a7d-0bef6506dcf3)
-    (property "Reference" "TP64" (id 0) (at 83.9471 162.35 0)
+    (property "Reference" "TP56" (id 0) (at 83.9471 162.35 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SW_#4" (id 1) (at 82.6771 165.1251 0)
@@ -1316,7 +1397,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 88.9 58.42 0)
     (in_bom yes) (on_board yes)
     (uuid 842095a8-dd42-48e3-b1c8-64c9e5100699)
-    (property "Reference" "TP65" (id 0) (at 87.7571 50.59 0)
+    (property "Reference" "TP57" (id 0) (at 87.7571 50.59 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SW_#1" (id 1) (at 86.4871 53.3651 0)
@@ -1331,19 +1412,19 @@
     (pin "1" (uuid ddbd5e6f-e7ba-4638-9264-368f3cd049fd))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 124.46 39.37 0)
+  (symbol (lib_id "Connector:TestPoint") (at 128.27 39.37 0)
     (in_bom yes) (on_board yes)
     (uuid 7e729e83-bee0-43bb-b901-910f22c4f7ab)
-    (property "Reference" "TP66" (id 0) (at 123.3171 32.81 0)
+    (property "Reference" "TP58" (id 0) (at 129.6671 32.81 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Logic_power" (id 1) (at 125.8571 35.5851 0)
+    (property "Value" "Logic_power" (id 1) (at 129.6671 35.5851 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 129.54 39.37 0)
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 133.35 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 129.54 39.37 0)
+    (property "Datasheet" "~" (id 3) (at 133.35 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ffc5985e-f4ad-41f6-90fe-b970c3906ddd))
@@ -1352,7 +1433,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 191.77 147.32 0)
     (in_bom yes) (on_board yes)
     (uuid d66aad6a-bcdf-413d-9179-e791befb603c)
-    (property "Reference" "TP67" (id 0) (at 190.6271 139.49 0)
+    (property "Reference" "TP59" (id 0) (at 190.6271 139.49 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SEP_LOG_OUT" (id 1) (at 186.8171 142.2651 0)
@@ -1370,7 +1451,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 213.36 147.32 0)
     (in_bom yes) (on_board yes)
     (uuid 972f5450-4560-4f4f-83c1-8ac5b5730b98)
-    (property "Reference" "TP68" (id 0) (at 212.2171 139.49 0)
+    (property "Reference" "TP60" (id 0) (at 212.2171 139.49 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SEP_LOG_EN" (id 1) (at 208.4071 142.2651 0)
@@ -1388,7 +1469,7 @@
   (symbol (lib_id "power:GND") (at 59.69 66.04 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7fa90094-277e-4ac3-b971-3aa5e11a5333)
-    (property "Reference" "#PWR0310" (id 0) (at 59.69 72.39 0)
+    (property "Reference" "#PWR0312" (id 0) (at 59.69 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 59.69 70.6026 0)
@@ -1406,7 +1487,7 @@
   (symbol (lib_id "power:GND") (at 62.23 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 15e8bca3-02c0-4fba-85a6-0002a8047eeb)
-    (property "Reference" "#PWR0311" (id 0) (at 62.23 107.95 0)
+    (property "Reference" "#PWR0313" (id 0) (at 62.23 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 62.23 106.1626 0)
@@ -1424,7 +1505,7 @@
   (symbol (lib_id "power:GND") (at 62.23 127 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1ffd975e-51de-48da-a405-b95bc28b10d6)
-    (property "Reference" "#PWR0312" (id 0) (at 62.23 133.35 0)
+    (property "Reference" "#PWR0314" (id 0) (at 62.23 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 62.23 131.5626 0)
@@ -1442,7 +1523,7 @@
   (symbol (lib_id "power:GND") (at 62.23 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6785db93-a746-435e-b83a-8e8b8db9f7fd)
-    (property "Reference" "#PWR0313" (id 0) (at 62.23 158.75 0)
+    (property "Reference" "#PWR0315" (id 0) (at 62.23 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 62.23 156.9626 0)
@@ -1460,7 +1541,7 @@
   (symbol (lib_id "power:GND") (at 62.23 177.8 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cfaee107-3f65-43c4-8528-756cb429fbe8)
-    (property "Reference" "#PWR0314" (id 0) (at 62.23 184.15 0)
+    (property "Reference" "#PWR0316" (id 0) (at 62.23 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 62.23 182.3626 0)
@@ -1478,7 +1559,7 @@
   (symbol (lib_id "power:GND") (at 124.46 66.04 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6af04981-d3bb-4da2-9c6f-098103fee99a)
-    (property "Reference" "#PWR0315" (id 0) (at 124.46 72.39 0)
+    (property "Reference" "#PWR0317" (id 0) (at 124.46 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 124.46 70.6026 0)
@@ -1496,7 +1577,7 @@
   (symbol (lib_id "power:GND") (at 133.35 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f0fd1951-021e-4453-9aff-2ac82b2aeab2)
-    (property "Reference" "#PWR0316" (id 0) (at 133.35 53.34 0)
+    (property "Reference" "#PWR0318" (id 0) (at 133.35 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 133.35 51.5526 0)
@@ -1514,7 +1595,7 @@
   (symbol (lib_id "power:GND") (at 146.05 66.04 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0e098b46-0ffb-4527-ad5d-259cd884d9ea)
-    (property "Reference" "#PWR0317" (id 0) (at 146.05 72.39 0)
+    (property "Reference" "#PWR0319" (id 0) (at 146.05 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 146.05 70.6026 0)
@@ -1532,7 +1613,7 @@
   (symbol (lib_id "power:GND") (at 154.94 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7e58a399-771e-4dfd-a8fb-b0b5f2893afb)
-    (property "Reference" "#PWR0318" (id 0) (at 154.94 53.34 0)
+    (property "Reference" "#PWR0320" (id 0) (at 154.94 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 154.94 51.5526 0)
@@ -1550,7 +1631,7 @@
   (symbol (lib_id "power:GND") (at 167.64 66.04 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid df798d82-2f3c-4dfb-aea6-d6cc60b19134)
-    (property "Reference" "#PWR0319" (id 0) (at 167.64 72.39 0)
+    (property "Reference" "#PWR0321" (id 0) (at 167.64 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 167.64 70.6026 0)
@@ -1568,7 +1649,7 @@
   (symbol (lib_id "power:GND") (at 176.53 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 49859834-77ba-4d2a-aedc-7002f2252039)
-    (property "Reference" "#PWR0320" (id 0) (at 176.53 53.34 0)
+    (property "Reference" "#PWR0322" (id 0) (at 176.53 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 176.53 51.5526 0)
@@ -1586,7 +1667,7 @@
   (symbol (lib_id "power:GND") (at 189.23 66.04 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f971ccb3-793f-44b3-b583-09df7c4e15d4)
-    (property "Reference" "#PWR0321" (id 0) (at 189.23 72.39 0)
+    (property "Reference" "#PWR0323" (id 0) (at 189.23 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 189.23 70.6026 0)
@@ -1601,10 +1682,28 @@
     (pin "1" (uuid 2a817632-787a-43b7-9fd2-4b507fe5e199))
   )
 
+  (symbol (lib_id "power:GND") (at 196.85 21.59 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 89c4bb06-efb4-4120-851a-202342e08589)
+    (property "Reference" "#PWR0327" (id 0) (at 196.85 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 196.85 26.1526 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 196.85 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 196.85 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 787d19f0-b116-4209-b3aa-c00ca07c7aec))
+  )
+
   (symbol (lib_id "power:GND") (at 196.85 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 72eb244b-1077-4e62-96d6-68423f908d76)
-    (property "Reference" "#PWR0322" (id 0) (at 196.85 53.34 0)
+    (property "Reference" "#PWR0324" (id 0) (at 196.85 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 196.85 51.5526 0)
@@ -1622,7 +1721,7 @@
   (symbol (lib_id "power:GND") (at 254 148.59 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b21a8832-1bc1-40ce-9097-33ecf26c90c9)
-    (property "Reference" "#PWR0323" (id 0) (at 254 154.94 0)
+    (property "Reference" "#PWR0325" (id 0) (at 254 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 254 153.1526 0)
@@ -1640,7 +1739,7 @@
   (symbol (lib_id "Device:R") (at 43.18 52.07 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 046a5d50-76f9-451d-a070-7a08da1f4fe9)
-    (property "Reference" "R145" (id 0) (at 44.9581 51.1615 0)
+    (property "Reference" "R135" (id 0) (at 44.9581 51.1615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 44.9581 53.9366 0)
@@ -1659,7 +1758,7 @@
   (symbol (lib_id "Device:R") (at 45.72 87.63 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 70d55800-0bef-4cfa-ad2f-feae0810f250)
-    (property "Reference" "R146" (id 0) (at 47.4981 86.7215 0)
+    (property "Reference" "R136" (id 0) (at 47.4981 86.7215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 47.4981 89.4966 0)
@@ -1678,7 +1777,7 @@
   (symbol (lib_id "Device:R") (at 45.72 113.03 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 60a83c79-7ad7-451f-83e1-42a524cbdd7c)
-    (property "Reference" "R147" (id 0) (at 47.4981 112.1215 0)
+    (property "Reference" "R137" (id 0) (at 47.4981 112.1215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 47.4981 114.8966 0)
@@ -1697,7 +1796,7 @@
   (symbol (lib_id "Device:R") (at 45.72 138.43 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9bd044e5-0267-4d7f-bf19-47397e17afe7)
-    (property "Reference" "R148" (id 0) (at 47.4981 137.5215 0)
+    (property "Reference" "R138" (id 0) (at 47.4981 137.5215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 47.4981 140.2966 0)
@@ -1716,7 +1815,7 @@
   (symbol (lib_id "Device:R") (at 45.72 163.83 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 397ff558-eb00-494b-8192-31162d254ac8)
-    (property "Reference" "R149" (id 0) (at 47.4981 162.9215 0)
+    (property "Reference" "R139" (id 0) (at 47.4981 162.9215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 47.4981 165.6966 0)
@@ -1735,7 +1834,7 @@
   (symbol (lib_id "Device:R") (at 53.34 58.42 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5b8917f6-415c-4e19-9fb5-473471613ebf)
-    (property "Reference" "R150" (id 0) (at 53.34 53.4374 90))
+    (property "Reference" "R140" (id 0) (at 53.34 53.4374 90))
     (property "Value" "100K" (id 1) (at 53.34 56.2125 90))
     (property "Footprint" "" (id 2) (at 53.34 60.198 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -1750,7 +1849,7 @@
   (symbol (lib_id "Device:R") (at 55.88 93.98 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 128225de-697c-4a97-9a37-e758fde44eed)
-    (property "Reference" "R151" (id 0) (at 55.88 88.9974 90))
+    (property "Reference" "R141" (id 0) (at 55.88 88.9974 90))
     (property "Value" "100K" (id 1) (at 55.88 91.7725 90))
     (property "Footprint" "" (id 2) (at 55.88 95.758 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -1765,7 +1864,7 @@
   (symbol (lib_id "Device:R") (at 55.88 119.38 90)
     (in_bom yes) (on_board yes)
     (uuid 136eb723-df73-49f1-a527-adb94675c4aa)
-    (property "Reference" "R152" (id 0) (at 55.88 114.3974 90))
+    (property "Reference" "R142" (id 0) (at 55.88 114.3974 90))
     (property "Value" "100K" (id 1) (at 55.88 117.1725 90))
     (property "Footprint" "" (id 2) (at 55.88 121.158 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -1780,7 +1879,7 @@
   (symbol (lib_id "Device:R") (at 55.88 144.78 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0b10c618-8767-4a3d-b85f-550342fdc849)
-    (property "Reference" "R153" (id 0) (at 55.88 139.7974 90))
+    (property "Reference" "R143" (id 0) (at 55.88 139.7974 90))
     (property "Value" "100K" (id 1) (at 55.88 142.5725 90))
     (property "Footprint" "" (id 2) (at 55.88 146.558 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -1795,7 +1894,7 @@
   (symbol (lib_id "Device:R") (at 55.88 170.18 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 700014a3-802f-4c0f-9298-68466aff9e83)
-    (property "Reference" "R154" (id 0) (at 55.88 165.1974 90))
+    (property "Reference" "R144" (id 0) (at 55.88 165.1974 90))
     (property "Value" "100K" (id 1) (at 55.88 167.9725 90))
     (property "Footprint" "" (id 2) (at 55.88 171.958 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -1810,7 +1909,7 @@
   (symbol (lib_id "Device:C") (at 59.69 62.23 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 55dbff3e-6e0b-43db-b698-69e56ed17386)
-    (property "Reference" "C138" (id 0) (at 62.6111 61.3215 0)
+    (property "Reference" "C129" (id 0) (at 62.6111 61.3215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 62.6111 64.0966 0)
@@ -1829,7 +1928,7 @@
   (symbol (lib_id "Device:C") (at 62.23 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e8bb51ab-d939-4784-a489-def2547bdb3d)
-    (property "Reference" "C139" (id 0) (at 65.1511 96.8815 0)
+    (property "Reference" "C130" (id 0) (at 65.1511 96.8815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 65.1511 99.6566 0)
@@ -1848,7 +1947,7 @@
   (symbol (lib_id "Device:C") (at 62.23 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0d0a3ab6-e040-4eb0-8db0-2ce1e1d2138b)
-    (property "Reference" "C140" (id 0) (at 65.1511 122.2815 0)
+    (property "Reference" "C131" (id 0) (at 65.1511 122.2815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 65.1511 125.0566 0)
@@ -1867,7 +1966,7 @@
   (symbol (lib_id "Device:C") (at 62.23 148.59 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f116f87-7f00-46a2-8c25-26e7005e06eb)
-    (property "Reference" "C141" (id 0) (at 65.1511 147.6815 0)
+    (property "Reference" "C132" (id 0) (at 65.1511 147.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 65.1511 150.4566 0)
@@ -1886,7 +1985,7 @@
   (symbol (lib_id "Device:C") (at 62.23 173.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f444c82e-bfd4-43c4-ad99-599ee10a62d3)
-    (property "Reference" "C142" (id 0) (at 65.1511 173.0815 0)
+    (property "Reference" "C133" (id 0) (at 65.1511 173.0815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 65.1511 175.8566 0)
@@ -1905,7 +2004,7 @@
   (symbol (lib_id "Device:C") (at 133.35 43.18 0)
     (in_bom yes) (on_board yes)
     (uuid 986dd63a-f3d2-4a54-9b53-5ab0c5aeec9a)
-    (property "Reference" "C143" (id 0) (at 133.7311 41.0015 0)
+    (property "Reference" "C134" (id 0) (at 133.7311 41.0015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 133.7311 46.3166 0)
@@ -1924,7 +2023,7 @@
   (symbol (lib_id "Device:C") (at 154.94 43.18 0)
     (in_bom yes) (on_board yes)
     (uuid fe5a6196-1aee-4c44-9a1f-f65fcb6d0230)
-    (property "Reference" "C144" (id 0) (at 155.3211 41.0015 0)
+    (property "Reference" "C135" (id 0) (at 155.3211 41.0015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 155.3211 46.3166 0)
@@ -1943,7 +2042,7 @@
   (symbol (lib_id "Device:C") (at 176.53 43.18 0)
     (in_bom yes) (on_board yes)
     (uuid cf6b7e71-1673-45ad-bd23-44be75ca0581)
-    (property "Reference" "C145" (id 0) (at 176.9111 41.0015 0)
+    (property "Reference" "C136" (id 0) (at 176.9111 41.0015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 176.9111 46.3166 0)
@@ -1962,7 +2061,7 @@
   (symbol (lib_id "Device:C") (at 196.85 43.18 0)
     (in_bom yes) (on_board yes)
     (uuid 3fac7229-4403-49cb-9986-819516ad2138)
-    (property "Reference" "C146" (id 0) (at 197.2311 41.0015 0)
+    (property "Reference" "C137" (id 0) (at 197.2311 41.0015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 197.2311 46.3166 0)
@@ -1981,7 +2080,7 @@
   (symbol (lib_id "74xx:74LV14") (at 76.2 58.42 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0b25e622-cea8-462d-a2cb-163ca209e2d5)
-    (property "Reference" "U51" (id 0) (at 76.2 50.6434 0))
+    (property "Reference" "U47" (id 0) (at 76.2 50.6434 0))
     (property "Value" "74LV14" (id 1) (at 76.2 53.4185 0))
     (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 76.2 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -1996,7 +2095,7 @@
   (symbol (lib_id "74xx:74LV14") (at 78.74 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2697c795-8760-462a-9510-4bfb06b1f2bb)
-    (property "Reference" "U51" (id 0) (at 78.74 86.2034 0))
+    (property "Reference" "U47" (id 0) (at 78.74 86.2034 0))
     (property "Value" "74LV14" (id 1) (at 78.74 88.9785 0))
     (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 78.74 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2004,14 +2103,14 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 81e57882-4c4d-4a87-a7c6-9144ba29e2c0))
+    (pin "3" (uuid f9529278-26a8-4f2e-bada-b773e52b032e))
-    (pin "2" (uuid 026b2d38-9d54-496f-b652-50d73d32c016))
+    (pin "4" (uuid 852e0fa5-6912-44b1-bb3b-ff77b79e0d09))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 78.74 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0c67428e-0801-492d-bac2-34c0732bbce0)
-    (property "Reference" "U51" (id 0) (at 78.74 111.6034 0))
+    (property "Reference" "U48" (id 0) (at 78.74 111.6034 0))
     (property "Value" "74LV14" (id 1) (at 78.74 114.3785 0))
     (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 78.74 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2019,14 +2118,14 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 43224930-e5e0-4540-a9a5-40c5612c7855))
+    (pin "5" (uuid d88ea0c5-333c-4c0c-b15e-d0104ed24008))
-    (pin "2" (uuid ede76b31-52ea-44c9-9d74-85c339022cb7))
+    (pin "6" (uuid 0284c29b-aa20-4026-b416-1640d3390f53))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 78.74 144.78 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4e3f9642-9228-4198-8f54-c28733122229)
-    (property "Reference" "U51" (id 0) (at 78.74 137.0034 0))
+    (property "Reference" "U49" (id 0) (at 78.74 137.0034 0))
     (property "Value" "74LV14" (id 1) (at 78.74 139.7785 0))
     (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 78.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2034,14 +2133,14 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1fa9f6b5-9420-46b2-b5f4-ade5b3ab4726))
+    (pin "8" (uuid ea7aeb66-b868-4339-87a1-44e8a9780fa4))
-    (pin "2" (uuid c03ba76e-b6a4-42a4-9cf4-c06a1971393f))
+    (pin "9" (uuid e5d24bd6-3180-45cf-b484-da8528e63396))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 78.74 170.18 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 64d36c30-5fea-4ce8-be57-fddc781af760)
-    (property "Reference" "U51" (id 0) (at 78.74 162.4034 0))
+    (property "Reference" "U50" (id 0) (at 78.74 162.4034 0))
     (property "Value" "74LV14" (id 1) (at 78.74 165.1785 0))
     (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 78.74 170.18 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2049,14 +2148,14 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 170.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 49bb392e-04e6-4431-a0b5-6329628ce9f5))
+    (pin "10" (uuid fca200d7-4ff5-4ceb-9b47-68f51865f514))
-    (pin "2" (uuid 62346fb6-693c-44bc-aab6-c4acf37109b8))
+    (pin "11" (uuid 7f8e875c-a287-459d-b8a9-4cfccce8ebf6))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 106.68 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2795c349-8351-4a1e-8acc-5a3ec2245e56)
-    (property "Reference" "U52" (id 0) (at 106.68 88.7434 0))
+    (property "Reference" "U51" (id 0) (at 106.68 88.7434 0))
     (property "Value" "74LS10" (id 1) (at 106.68 91.5185 0))
     (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 106.68 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2081,16 +2180,16 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 106.68 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4b5e1a1e-af25-49cc-9090-339b701e6590))
+    (pin "3" (uuid 4ec94b14-cb76-4dc5-8e80-26b2bbf2fe2a))
-    (pin "12" (uuid 565a562c-99c8-4078-aa98-01a188832ae3))
+    (pin "4" (uuid f89ee058-852d-4878-987c-0340a0cebd0c))
-    (pin "13" (uuid 467d3804-0c9c-441f-98ed-cc2c2443b3c2))
+    (pin "5" (uuid 3178e0f8-072b-4c38-9711-9ab216c9acd7))
-    (pin "2" (uuid 6f88a2ea-e0c6-415d-9e73-55d243f8ef6c))
+    (pin "6" (uuid 3c243eec-900e-4e75-bcc8-9ba907ba1f7c))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 106.68 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1edef99f-c233-47d2-8dc9-571edccc3ef4)
-    (property "Reference" "U52" (id 0) (at 106.68 139.5434 0))
+    (property "Reference" "U53" (id 0) (at 106.68 139.5434 0))
     (property "Value" "74LS10" (id 1) (at 106.68 142.3185 0))
     (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 106.68 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2098,16 +2197,16 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 106.68 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 993ef315-5d91-45b6-95eb-537582b031d1))
+    (pin "10" (uuid e98aaa9e-0d61-41de-b1e0-193f408063e9))
-    (pin "12" (uuid 73a9a44a-6c36-4997-9edf-f687ef396c07))
+    (pin "11" (uuid 1dc2901e-99ef-47a0-bbd0-a72e67563155))
-    (pin "13" (uuid d94941f2-929a-455b-beb8-7ede457f23c5))
+    (pin "8" (uuid 254a8ea1-a8fe-472b-b44b-66fb38383232))
-    (pin "2" (uuid b68c8c62-6334-4f19-aa02-70921073edc9))
+    (pin "9" (uuid f5d2326d-211a-4a1b-92a6-f092af3b9479))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 106.68 172.72 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 09c5052e-8b5d-46d4-a936-4be2cd981651)
-    (property "Reference" "U53" (id 0) (at 106.68 164.9434 0))
+    (property "Reference" "U54" (id 0) (at 106.68 164.9434 0))
     (property "Value" "74LS10" (id 1) (at 106.68 167.7185 0))
     (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 106.68 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2121,31 +2220,10 @@
     (pin "2" (uuid 207d8548-9d09-423e-b9b9-3f6a7d1efa7e))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 124.46 53.34 0)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 49ab0a9f-ad85-41d0-b5d5-8c42a8c9533c)
-    (property "Reference" "U52" (id 0) (at 130.3021 52.4315 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "74LS10" (id 1) (at 130.3021 55.2066 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 124.46 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 124.46 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 14449f6c-dea0-4bcd-a0b1-6d512371a2df))
-    (pin "12" (uuid 00f184cc-c2c2-4dcd-ac18-8c219e300b19))
-    (pin "13" (uuid 75a96461-e138-4785-95ea-9672dd50978f))
-    (pin "2" (uuid a4a2decc-5105-438f-a00b-d57ac55f1bd4))
-  )
-
   (symbol (lib_id "74xx:74LS10") (at 132.08 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2bc6da0b-00ba-4496-994f-2eec4522aaca)
-    (property "Reference" "U53" (id 0) (at 132.08 114.1434 0))
+    (property "Reference" "U55" (id 0) (at 132.08 114.1434 0))
     (property "Value" "74LS10" (id 1) (at 132.08 116.9185 0))
     (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 132.08 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2153,16 +2231,16 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 132.08 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8b4302d8-0c4c-4303-bbb2-634847e3836c))
+    (pin "10" (uuid 29c4322d-1247-4274-be1c-fdd875a9d761))
-    (pin "12" (uuid 671b9836-76fa-4737-9bab-cdb5d887ec57))
+    (pin "11" (uuid 1ac69515-b288-46ed-a8d5-b61eed048f90))
-    (pin "13" (uuid 6ae8a0e0-7eba-4cd3-96e8-9706ecda5c29))
+    (pin "8" (uuid 0bafa852-9d95-4bc2-a43a-94383f2e4426))
-    (pin "2" (uuid f4ac3a10-41bd-439e-918a-a06f55efbd3c))
+    (pin "9" (uuid 1f94de9e-b6de-4a91-974a-533fda039991))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 132.08 172.72 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 50eb89f5-20f4-430e-b4bf-f53713f472ae)
-    (property "Reference" "U54" (id 0) (at 132.08 164.9434 0))
+    (property "Reference" "U56" (id 0) (at 132.08 164.9434 0))
     (property "Value" "74LS10" (id 1) (at 132.08 167.7185 0))
     (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 132.08 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2176,130 +2254,145 @@
     (pin "2" (uuid ba23ba94-5da3-478f-aeb4-13fcca12886d))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 146.05 53.34 0)
+  (symbol (lib_id "74xx:74LS10") (at 157.48 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b1c72c90-812a-4325-a6a1-254ef840a29b)
+    (uuid ba8b9342-d3c9-495d-accb-7a347fd2e393)
-    (property "Reference" "U53" (id 0) (at 151.8921 52.4315 0)
+    (property "Reference" "U57" (id 0) (at 157.48 114.1434 0))
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "74LS10" (id 1) (at 157.48 116.9185 0))
-    )
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 157.48 121.92 0)
-    (property "Value" "74LS10" (id 1) (at 151.8921 55.2066 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 146.05 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 146.05 53.34 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 157.48 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 04635fdf-4213-4563-803e-426050e823db))
+    (pin "10" (uuid ae2cc51b-bb3e-4d6a-8744-7c5e0bd5df42))
-    (pin "12" (uuid ea4ae44a-af4e-48f5-9493-0eebcf78c7ad))
+    (pin "11" (uuid 0d636853-0a69-418f-9862-749f3a6ab1fd))
-    (pin "13" (uuid 0f18f53f-d037-4cc2-8e37-d87745d3bab1))
+    (pin "8" (uuid c4c51a84-ab79-4c38-b540-015f196b2cf3))
-    (pin "2" (uuid 1ef3fd6b-f68b-4d12-809d-525494ed8a5b))
+    (pin "9" (uuid 556234f3-7b1b-46fb-b977-64b31320b9e4))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 157.48 121.92 0)
+  (symbol (lib_id "74xx:74LS10") (at 182.88 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid ba8b9342-d3c9-495d-accb-7a347fd2e393)
+    (uuid fa390351-8684-4ce8-a39e-939d28570bd7)
-    (property "Reference" "U53" (id 0) (at 157.48 114.1434 0))
+    (property "Reference" "U59" (id 0) (at 182.88 139.5434 0))
-    (property "Value" "74LS10" (id 1) (at 157.48 116.9185 0))
+    (property "Value" "74LS10" (id 1) (at 182.88 142.3185 0))
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 157.48 121.92 0)
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 182.88 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 157.48 121.92 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 182.88 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7e014181-ecb4-47ff-b28d-a96da6a2058f))
+    (pin "3" (uuid e765c88e-0d8b-4a4d-8fbc-e96dc470e802))
-    (pin "12" (uuid 8b56b357-aca8-45c3-8611-d6fbb45d3e80))
+    (pin "4" (uuid 16694f27-021a-4493-abae-9f2e8396c28e))
-    (pin "13" (uuid 826b85fa-4829-44d7-98e2-207096e758df))
+    (pin "5" (uuid 76b7d3db-44dc-4164-8118-dd9e4555fd9c))
-    (pin "2" (uuid df5c5a37-2e9d-4ab9-a6bc-87d1b5c8af2e))
+    (pin "6" (uuid eb33c618-9ab3-4f7e-8d12-5f3c4b22089d))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 167.64 53.34 0)
+  (symbol (lib_id "74xx:74LV14") (at 201.93 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 1ba0e6d0-a614-4aa1-908a-41f744d16099)
+    (uuid dda1a0ce-6f87-43c7-81e6-260977e57b92)
-    (property "Reference" "U54" (id 0) (at 173.4821 52.4315 0)
+    (property "Reference" "U60" (id 0) (at 201.93 139.5434 0))
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "74LV14" (id 1) (at 201.93 142.3185 0))
+    (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 201.93 147.32 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "74LS10" (id 1) (at 173.4821 55.2066 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 201.93 147.32 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 167.64 53.34 0)
+    (pin "12" (uuid 20da73a5-b8fe-478d-a4db-d4fa56ccfc66))
+    (pin "13" (uuid 48f1efbf-b172-4a42-b7b8-697fdc09f256))
+  )
+
+  (symbol (lib_id "74xx:74LS10") (at 265.43 142.24 0)
+    (in_bom yes) (on_board yes)
+    (uuid ff26b4c7-18b2-48da-825e-c1ce7116106e)
+    (property "Reference" "U59" (id 0) (at 278.13 140.8134 0))
+    (property "Value" "74LS10" (id 1) (at 278.13 143.5885 0))
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 265.43 142.24 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 167.64 53.34 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 265.43 142.24 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0dbdfafc-7e5c-4753-a384-cae50286e642))
+    (pin "10" (uuid 6ed37d1d-b8b2-4c20-a5ec-4a0eb767f6e0))
-    (pin "12" (uuid 938ba05b-5183-496f-b5d4-def8c1b5007d))
+    (pin "11" (uuid fdb1d4bb-cf3a-43e7-91c0-22d6decdec6d))
-    (pin "13" (uuid f71a2da3-0183-4a3e-a980-62dfa8eb8cd3))
+    (pin "8" (uuid cb02ad1c-208d-47c9-9f9e-904121730f65))
-    (pin "2" (uuid 0af3a4a2-e7c2-4820-b8cb-50f29014a176))
+    (pin "9" (uuid d4e08a53-8760-4839-9ec5-190c42b9bdd2))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 182.88 147.32 0)
+  (symbol (lib_id "74xx:74LS10") (at 124.46 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid fa390351-8684-4ce8-a39e-939d28570bd7)
+    (uuid 49ab0a9f-ad85-41d0-b5d5-8c42a8c9533c)
-    (property "Reference" "U54" (id 0) (at 182.88 139.5434 0))
+    (property "Reference" "U53" (id 0) (at 130.3021 52.4315 0)
-    (property "Value" "74LS10" (id 1) (at 182.88 142.3185 0))
+      (effects (font (size 1.27 1.27)) (justify left))
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 182.88 147.32 0)
+    )
+    (property "Value" "74LS10" (id 1) (at 130.3021 55.2066 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 124.46 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 182.88 147.32 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 124.46 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 38c57494-904b-44a2-8329-34e6973839b8))
+    (pin "14" (uuid f6667b85-f3b6-4819-a038-a92ff57b214e))
-    (pin "12" (uuid 9c7b2884-1070-4f56-ba44-0fabff316286))
+    (pin "7" (uuid bc49d84d-b73a-4ab5-8d24-3ed8a08e2027))
-    (pin "13" (uuid d9ec6d4a-5673-49af-81c6-67388a9c3563))
-    (pin "2" (uuid b4d7a5be-d92a-41d7-b993-2bfccded25ba))
   )
 
-  (symbol (lib_id "74xx:74LV14") (at 189.23 53.34 0)
+  (symbol (lib_id "74xx:74LS10") (at 146.05 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b4b3d775-a7b0-4dd4-81d0-db6da292cf74)
+    (uuid b1c72c90-812a-4325-a6a1-254ef840a29b)
-    (property "Reference" "U51" (id 0) (at 195.0721 52.4315 0)
+    (property "Reference" "U57" (id 0) (at 151.8921 52.4315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "74LV14" (id 1) (at 195.0721 55.2066 0)
+    (property "Value" "74LS10" (id 1) (at 151.8921 55.2066 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 189.23 53.34 0)
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 146.05 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 189.23 53.34 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 146.05 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 37546978-deaf-4079-86bf-a0aed7a30bc3))
+    (pin "14" (uuid 53600d63-b123-44a0-adf2-be9e6c780d40))
-    (pin "2" (uuid 5533baca-edda-4108-8bbc-e4718eddc78d))
+    (pin "7" (uuid ad96f341-9574-4631-826f-0fac428eaa78))
   )
 
-  (symbol (lib_id "74xx:74LV14") (at 201.93 147.32 0)
+  (symbol (lib_id "74xx:74LS10") (at 167.64 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid dda1a0ce-6f87-43c7-81e6-260977e57b92)
+    (uuid 1ba0e6d0-a614-4aa1-908a-41f744d16099)
-    (property "Reference" "U51" (id 0) (at 201.93 139.5434 0))
+    (property "Reference" "U58" (id 0) (at 173.4821 52.4315 0)
-    (property "Value" "74LV14" (id 1) (at 201.93 142.3185 0))
+      (effects (font (size 1.27 1.27)) (justify left))
-    (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 201.93 147.32 0)
+    )
+    (property "Value" "74LS10" (id 1) (at 173.4821 55.2066 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 167.64 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 201.93 147.32 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 167.64 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid db20c646-752e-4b86-82cd-a7f93f9b822b))
+    (pin "14" (uuid 6838f421-535a-4da7-8848-5b3e69269d42))
-    (pin "2" (uuid 99508720-8b5f-4374-b0a0-aa6f113265ad))
+    (pin "7" (uuid 0a69700e-8a43-462a-89a9-08f67745d3ab))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 265.43 142.24 0)
+  (symbol (lib_id "74xx:74LV14") (at 189.23 53.34 0)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid ff26b4c7-18b2-48da-825e-c1ce7116106e)
+    (uuid b4b3d775-a7b0-4dd4-81d0-db6da292cf74)
-    (property "Reference" "U54" (id 0) (at 278.13 140.8134 0))
+    (property "Reference" "U50" (id 0) (at 195.0721 52.4315 0)
-    (property "Value" "74LS10" (id 1) (at 278.13 143.5885 0))
+      (effects (font (size 1.27 1.27)) (justify left))
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 265.43 142.24 0)
+    )
+    (property "Value" "74LV14" (id 1) (at 195.0721 55.2066 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 189.23 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 265.43 142.24 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 189.23 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 54a3c9e0-1348-4be2-8510-7ead521c2a40))
+    (pin "14" (uuid 90c27317-5d95-477c-8867-31fb1b9f1a9f))
-    (pin "12" (uuid 455c2acd-f7d1-4bff-a187-efd9204aa06b))
+    (pin "7" (uuid 42fba1c3-d758-4e66-8aca-f3811159cbb0))
-    (pin "13" (uuid 63c83b5f-8e26-4371-8333-879fd9214ed9))
-    (pin "2" (uuid acb255a1-4f15-4351-88a0-54f9fb1d6445))
   )
 )

modules/EPS/Activation_switches.kicad_sch

@@ -402,7 +402,7 @@
   (symbol (lib_id "power:GND") (at 144.78 67.31 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 77eb29f0-bed4-46e0-95a3-36bdb9cad131)
-    (property "Reference" "#PWR0281" (id 0) (at 144.78 73.66 0)
+    (property "Reference" "#PWR0283" (id 0) (at 144.78 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 71.8726 0)
@@ -420,7 +420,7 @@
   (symbol (lib_id "power:GND") (at 144.78 105.41 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0c57fa72-49ec-43d6-b4e7-242c4c54439b)
-    (property "Reference" "#PWR0282" (id 0) (at 144.78 111.76 0)
+    (property "Reference" "#PWR0284" (id 0) (at 144.78 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 109.9726 0)
@@ -438,7 +438,7 @@
   (symbol (lib_id "power:GND") (at 144.78 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6b8139c5-d41b-4ba2-b7c8-169b28aa4d68)
-    (property "Reference" "#PWR0283" (id 0) (at 144.78 125.73 0)
+    (property "Reference" "#PWR0285" (id 0) (at 144.78 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 123.9426 0)
@@ -456,7 +456,7 @@
   (symbol (lib_id "power:GND") (at 144.78 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e09d754f-057a-4dab-bebd-807e7d1aa0dd)
-    (property "Reference" "#PWR0284" (id 0) (at 144.78 139.7 0)
+    (property "Reference" "#PWR0286" (id 0) (at 144.78 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 137.9126 0)
@@ -474,7 +474,7 @@
   (symbol (lib_id "power:GND") (at 144.78 147.32 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b64d01b4-3a80-4505-97f2-91e5cad2581a)
-    (property "Reference" "#PWR0285" (id 0) (at 144.78 153.67 0)
+    (property "Reference" "#PWR0287" (id 0) (at 144.78 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 151.8826 0)
@@ -492,7 +492,7 @@
   (symbol (lib_id "power:GND") (at 152.4 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ca866f04-39e7-460b-b827-dba6be14a493)
-    (property "Reference" "#PWR0286" (id 0) (at 152.4 125.73 0)
+    (property "Reference" "#PWR0288" (id 0) (at 152.4 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 152.4 123.9426 0)
@@ -510,7 +510,7 @@
   (symbol (lib_id "power:GND") (at 152.4 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 67254609-b967-422c-bf5b-abcd9a5a95b3)
-    (property "Reference" "#PWR0287" (id 0) (at 152.4 139.7 0)
+    (property "Reference" "#PWR0289" (id 0) (at 152.4 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 152.4 137.9126 0)
@@ -528,7 +528,7 @@
   (symbol (lib_id "power:GND") (at 152.4 147.32 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 880984b6-aca8-4617-a1c7-10db3399ac78)
-    (property "Reference" "#PWR0288" (id 0) (at 152.4 153.67 0)
+    (property "Reference" "#PWR0290" (id 0) (at 152.4 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 152.4 151.8826 0)
@@ -546,7 +546,7 @@
   (symbol (lib_id "power:GND") (at 153.67 67.31 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d81c428e-dedf-4ec6-897e-055e91ababff)
-    (property "Reference" "#PWR0289" (id 0) (at 153.67 73.66 0)
+    (property "Reference" "#PWR0291" (id 0) (at 153.67 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 153.67 71.8726 0)
@@ -564,7 +564,7 @@
   (symbol (lib_id "power:GND") (at 153.67 105.41 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a2d5909c-5ae6-4b64-ae88-848fefe93c2d)
-    (property "Reference" "#PWR0290" (id 0) (at 153.67 111.76 0)
+    (property "Reference" "#PWR0292" (id 0) (at 153.67 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 153.67 109.9726 0)
@@ -582,7 +582,7 @@
   (symbol (lib_id "power:GND") (at 161.29 67.31 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 600aed8a-6304-434d-9035-d917bb64cc03)
-    (property "Reference" "#PWR0291" (id 0) (at 161.29 73.66 0)
+    (property "Reference" "#PWR0293" (id 0) (at 161.29 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 71.8726 0)
@@ -600,7 +600,7 @@
   (symbol (lib_id "power:GND") (at 161.29 105.41 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb0fbb8f-25f6-415d-ad97-dfdce3126a2f)
-    (property "Reference" "#PWR0292" (id 0) (at 161.29 111.76 0)
+    (property "Reference" "#PWR0294" (id 0) (at 161.29 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 109.9726 0)
@@ -618,7 +618,7 @@
   (symbol (lib_id "power:GND") (at 161.29 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fbdbd72d-733d-4f02-9e94-1f5354b90934)
-    (property "Reference" "#PWR0293" (id 0) (at 161.29 125.73 0)
+    (property "Reference" "#PWR0295" (id 0) (at 161.29 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 123.9426 0)
@@ -636,7 +636,7 @@
   (symbol (lib_id "power:GND") (at 161.29 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f1c3d5c7-ef98-44a6-b7b9-b510acd65da6)
-    (property "Reference" "#PWR0294" (id 0) (at 161.29 139.7 0)
+    (property "Reference" "#PWR0296" (id 0) (at 161.29 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 137.9126 0)
@@ -654,7 +654,7 @@
   (symbol (lib_id "power:GND") (at 161.29 147.32 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cae52fc4-2465-49a1-9a6f-2aa4f4752b33)
-    (property "Reference" "#PWR0295" (id 0) (at 161.29 153.67 0)
+    (property "Reference" "#PWR0297" (id 0) (at 161.29 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 151.8826 0)

modules/EPS/Battery_charger.kicad_sch

@@ -1502,7 +1502,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 134.62 57.15 0)
     (in_bom yes) (on_board yes)
     (uuid 9c326619-c343-4766-a7f6-3ed35882c088)
-    (property "Reference" "#FLG0103" (id 0) (at 134.62 55.245 0)
+    (property "Reference" "#FLG09" (id 0) (at 134.62 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 134.62 53.5454 0))
@@ -1518,7 +1518,7 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 121.92 139.7 0)
     (in_bom yes) (on_board yes)
     (uuid 302b0a3a-6663-4fcb-a993-6386a8185da7)
-    (property "Reference" "JP1" (id 0) (at 119.38 141.7024 0))
+    (property "Reference" "JP3" (id 0) (at 119.38 141.7024 0))
     (property "Value" "QON" (id 1) (at 124.46 141.9375 0))
     (property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (id 2) (at 121.92 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -1533,7 +1533,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 74.7583 46.99 0)
     (in_bom yes) (on_board yes)
     (uuid f3870e23-70be-4fb1-962f-2439754d8e15)
-    (property "Reference" "TP1" (id 0) (at 69.8054 40.43 0)
+    (property "Reference" "TP15" (id 0) (at 69.8054 40.43 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOLAR_IN" (id 1) (at 64.7254 43.2051 0)
@@ -1551,7 +1551,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 74.93 66.04 0)
     (in_bom yes) (on_board yes)
     (uuid 7ad36403-826c-4150-8554-23cd9d4f16a4)
-    (property "Reference" "TP2" (id 0) (at 69.9771 59.48 0)
+    (property "Reference" "TP16" (id 0) (at 69.9771 59.48 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "USB_IN" (id 1) (at 66.1671 62.2551 0)
@@ -1569,7 +1569,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 142.24 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f436ab07-8fe2-4a87-b53b-53d0c568f606)
-    (property "Reference" "TP3" (id 0) (at 143.6371 54.4 0)
+    (property "Reference" "TP17" (id 0) (at 143.6371 54.4 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "VBUS" (id 1) (at 143.6371 57.1751 0)
@@ -1587,7 +1587,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 193.04 138.43 0)
     (in_bom yes) (on_board yes)
     (uuid 7a7b078a-add2-434d-a399-aa6f1d9d2a98)
-    (property "Reference" "TP4" (id 0) (at 194.4371 133.14 0)
+    (property "Reference" "TP18" (id 0) (at 194.4371 133.14 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT_TEMP" (id 1) (at 194.4371 135.9151 0)
@@ -1605,7 +1605,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 276.86 31.75 0)
     (in_bom yes) (on_board yes)
     (uuid 61684f65-1611-4e59-becc-e1f3a82d243a)
-    (property "Reference" "TP5" (id 0) (at 278.2571 26.46 0)
+    (property "Reference" "TP19" (id 0) (at 278.2571 26.46 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "PMID" (id 1) (at 278.2571 29.2351 0)
@@ -1623,7 +1623,7 @@
   (symbol (lib_id "power:GND") (at 27.94 125.73 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 738f3116-98ad-4f96-9451-d5346c237321)
-    (property "Reference" "#PWR021" (id 0) (at 27.94 132.08 0)
+    (property "Reference" "#PWR0120" (id 0) (at 27.94 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 27.94 130.2926 0)
@@ -1641,7 +1641,7 @@
   (symbol (lib_id "power:GND") (at 36.83 125.73 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9f7ea414-8984-4f4e-aab7-aaa6b3e1d3eb)
-    (property "Reference" "#PWR022" (id 0) (at 36.83 132.08 0)
+    (property "Reference" "#PWR0121" (id 0) (at 36.83 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 36.83 130.2926 0)
@@ -1659,7 +1659,7 @@
   (symbol (lib_id "power:GND") (at 85.09 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c2b1bdea-bcf9-4445-9e85-c99dfe510a5c)
-    (property "Reference" "#PWR023" (id 0) (at 85.09 63.5 0)
+    (property "Reference" "#PWR0122" (id 0) (at 85.09 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 85.09 61.7126 0)
@@ -1677,7 +1677,7 @@
   (symbol (lib_id "power:GND") (at 85.09 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c640c6ef-15d4-451b-ba26-c8442b126f83)
-    (property "Reference" "#PWR024" (id 0) (at 85.09 82.55 0)
+    (property "Reference" "#PWR0123" (id 0) (at 85.09 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 85.09 80.7626 0)
@@ -1695,7 +1695,7 @@
   (symbol (lib_id "power:GND") (at 113.03 127 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5bb08088-e249-4ed5-9c4d-e3a5ceb19927)
-    (property "Reference" "#PWR025" (id 0) (at 113.03 133.35 0)
+    (property "Reference" "#PWR0124" (id 0) (at 113.03 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 113.03 131.5626 0)
@@ -1713,7 +1713,7 @@
   (symbol (lib_id "power:GND") (at 113.03 142.24 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e276e156-489c-4071-93c2-3eeb051ff642)
-    (property "Reference" "#PWR026" (id 0) (at 113.03 148.59 0)
+    (property "Reference" "#PWR0125" (id 0) (at 113.03 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 113.03 146.8026 0)
@@ -1731,7 +1731,7 @@
   (symbol (lib_id "power:GND") (at 142.24 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a1831df2-3281-4acc-9c2f-294c23b7e14f)
-    (property "Reference" "#PWR027" (id 0) (at 142.24 156.21 0)
+    (property "Reference" "#PWR0126" (id 0) (at 142.24 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 142.24 154.4226 0)
@@ -1749,7 +1749,7 @@
   (symbol (lib_id "power:GND") (at 162.56 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7132610b-dbcf-414d-b903-24d0015c36b7)
-    (property "Reference" "#PWR028" (id 0) (at 162.56 156.21 0)
+    (property "Reference" "#PWR0127" (id 0) (at 162.56 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 162.56 154.4226 0)
@@ -1767,7 +1767,7 @@
   (symbol (lib_id "power:GND") (at 171.45 110.49 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c8fb53a1-7fdb-4f48-ad81-f2721acd5bf8)
-    (property "Reference" "#PWR029" (id 0) (at 171.45 116.84 0)
+    (property "Reference" "#PWR0128" (id 0) (at 171.45 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 171.45 115.0526 0)
@@ -1785,7 +1785,7 @@
   (symbol (lib_id "power:GND") (at 172.72 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8653099a-f82b-47c6-b13c-9ec60a3811e3)
-    (property "Reference" "#PWR030" (id 0) (at 172.72 156.21 0)
+    (property "Reference" "#PWR0129" (id 0) (at 172.72 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 172.72 154.4226 0)
@@ -1803,7 +1803,7 @@
   (symbol (lib_id "power:GND") (at 184.15 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3c54bba4-5c89-4abc-9657-12b2f1715150)
-    (property "Reference" "#PWR031" (id 0) (at 184.15 156.21 0)
+    (property "Reference" "#PWR0130" (id 0) (at 184.15 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 184.15 154.4226 0)
@@ -1821,7 +1821,7 @@
   (symbol (lib_id "power:GND") (at 194.31 124.46 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 247451fa-910c-49f6-b7da-2aadc7b68c9b)
-    (property "Reference" "#PWR032" (id 0) (at 194.31 130.81 0)
+    (property "Reference" "#PWR0131" (id 0) (at 194.31 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 194.31 129.0226 0)
@@ -1839,7 +1839,7 @@
   (symbol (lib_id "power:GND") (at 198.12 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 464f8168-21c6-445f-bd5c-7757b322d9c8)
-    (property "Reference" "#PWR033" (id 0) (at 198.12 156.21 0)
+    (property "Reference" "#PWR0132" (id 0) (at 198.12 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 198.12 154.4226 0)
@@ -1857,7 +1857,7 @@
   (symbol (lib_id "power:GND") (at 232.41 25.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 828ad18c-11ca-417b-a62c-c54932bf800e)
-    (property "Reference" "#PWR034" (id 0) (at 232.41 31.75 0)
+    (property "Reference" "#PWR0133" (id 0) (at 232.41 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 29.9626 0)
@@ -1875,7 +1875,7 @@
   (symbol (lib_id "power:GND") (at 232.41 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 707419b7-8481-4073-8c56-c02576861d95)
-    (property "Reference" "#PWR035" (id 0) (at 232.41 45.72 0)
+    (property "Reference" "#PWR0134" (id 0) (at 232.41 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 43.9326 0)
@@ -1893,7 +1893,7 @@
   (symbol (lib_id "power:GND") (at 232.41 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b20aed0f-4c6d-4114-b874-8f48a80bd5f9)
-    (property "Reference" "#PWR036" (id 0) (at 232.41 59.69 0)
+    (property "Reference" "#PWR0135" (id 0) (at 232.41 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 57.9026 0)
@@ -1911,7 +1911,7 @@
   (symbol (lib_id "power:GND") (at 232.41 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c7722768-7dad-4038-9b23-0b95eece9c19)
-    (property "Reference" "#PWR037" (id 0) (at 232.41 73.66 0)
+    (property "Reference" "#PWR0136" (id 0) (at 232.41 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 71.8726 0)
@@ -1929,7 +1929,7 @@
   (symbol (lib_id "power:GND") (at 232.41 81.28 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 090afa8d-a4b0-4688-aa57-e0992ef93c63)
-    (property "Reference" "#PWR038" (id 0) (at 232.41 87.63 0)
+    (property "Reference" "#PWR0137" (id 0) (at 232.41 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 85.8426 0)
@@ -1947,7 +1947,7 @@
   (symbol (lib_id "power:GND") (at 241.3 25.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7111b9e1-c254-4e58-9894-81debb0aadae)
-    (property "Reference" "#PWR039" (id 0) (at 241.3 31.75 0)
+    (property "Reference" "#PWR0138" (id 0) (at 241.3 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 29.9626 0)
@@ -1965,7 +1965,7 @@
   (symbol (lib_id "power:GND") (at 241.3 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a22c66a1-4028-43f1-9e0d-b9ec07ad7526)
-    (property "Reference" "#PWR040" (id 0) (at 241.3 45.72 0)
+    (property "Reference" "#PWR0139" (id 0) (at 241.3 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 43.9326 0)
@@ -1983,7 +1983,7 @@
   (symbol (lib_id "power:GND") (at 241.3 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ea304d1c-c60d-43ea-b51e-3dc99a5f5529)
-    (property "Reference" "#PWR041" (id 0) (at 241.3 59.69 0)
+    (property "Reference" "#PWR0140" (id 0) (at 241.3 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 57.9026 0)
@@ -2001,7 +2001,7 @@
   (symbol (lib_id "power:GND") (at 241.3 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c66fc375-a821-4cfa-aca4-512ba9a7312f)
-    (property "Reference" "#PWR042" (id 0) (at 241.3 73.66 0)
+    (property "Reference" "#PWR0141" (id 0) (at 241.3 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 71.8726 0)
@@ -2019,7 +2019,7 @@
   (symbol (lib_id "power:GND") (at 250.19 25.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6d37f012-d963-47f9-b4aa-198122a4c2f4)
-    (property "Reference" "#PWR043" (id 0) (at 250.19 31.75 0)
+    (property "Reference" "#PWR0142" (id 0) (at 250.19 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 29.9626 0)
@@ -2037,7 +2037,7 @@
   (symbol (lib_id "power:GND") (at 250.19 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 21cfd915-a5bc-41e0-bbc6-e0c0a9311aa1)
-    (property "Reference" "#PWR044" (id 0) (at 250.19 45.72 0)
+    (property "Reference" "#PWR0143" (id 0) (at 250.19 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 43.9326 0)
@@ -2055,7 +2055,7 @@
   (symbol (lib_id "power:GND") (at 250.19 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 398b6b0a-eb96-4c7b-9334-ea689b98fcf0)
-    (property "Reference" "#PWR045" (id 0) (at 250.19 59.69 0)
+    (property "Reference" "#PWR0144" (id 0) (at 250.19 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 57.9026 0)
@@ -2073,7 +2073,7 @@
   (symbol (lib_id "power:GND") (at 250.19 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0f3e7457-9ac3-4d4f-90cd-28211af3faed)
-    (property "Reference" "#PWR046" (id 0) (at 250.19 73.66 0)
+    (property "Reference" "#PWR0145" (id 0) (at 250.19 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 71.8726 0)
@@ -2091,7 +2091,7 @@
   (symbol (lib_id "power:GND") (at 259.08 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b42ba4dc-3800-4425-a866-c110d94ada2f)
-    (property "Reference" "#PWR047" (id 0) (at 259.08 45.72 0)
+    (property "Reference" "#PWR0146" (id 0) (at 259.08 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 259.08 43.9326 0)
@@ -2109,7 +2109,7 @@
   (symbol (lib_id "power:GND") (at 259.08 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f3bec9fa-ce26-4484-9223-61ef902325da)
-    (property "Reference" "#PWR048" (id 0) (at 259.08 59.69 0)
+    (property "Reference" "#PWR0147" (id 0) (at 259.08 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 259.08 57.9026 0)
@@ -2127,7 +2127,7 @@
   (symbol (lib_id "power:GND") (at 267.97 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2ab523d5-3257-4b77-8cc7-8d4e4ae96fa9)
-    (property "Reference" "#PWR049" (id 0) (at 267.97 45.72 0)
+    (property "Reference" "#PWR0148" (id 0) (at 267.97 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 267.97 43.9326 0)
@@ -2145,7 +2145,7 @@
   (symbol (lib_id "power:GND") (at 267.97 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid addf0110-7d89-4734-821e-2aa37e221d54)
-    (property "Reference" "#PWR050" (id 0) (at 267.97 59.69 0)
+    (property "Reference" "#PWR0149" (id 0) (at 267.97 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 267.97 57.9026 0)
@@ -2163,7 +2163,7 @@
   (symbol (lib_id "power:GND") (at 276.86 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a2823f81-df1d-4a47-9df9-d3656c9dd195)
-    (property "Reference" "#PWR051" (id 0) (at 276.86 45.72 0)
+    (property "Reference" "#PWR0150" (id 0) (at 276.86 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 276.86 43.9326 0)
@@ -2181,7 +2181,7 @@
   (symbol (lib_id "power:GND") (at 276.86 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5aed38f5-eb70-425e-b42b-6234283ab34a)
-    (property "Reference" "#PWR052" (id 0) (at 276.86 59.69 0)
+    (property "Reference" "#PWR0151" (id 0) (at 276.86 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 276.86 57.9026 0)
@@ -2199,7 +2199,7 @@
   (symbol (lib_id "Device:L") (at 111.76 109.22 180)
     (in_bom yes) (on_board yes)
     (uuid ed7f685c-eb7c-49a2-b919-90c91546a80d)
-    (property "Reference" "L1" (id 0) (at 106.4261 107.0415 0)
+    (property "Reference" "L2" (id 0) (at 106.4261 107.0415 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "2.2uH" (id 1) (at 103.8861 111.0866 0)
@@ -2218,7 +2218,7 @@
   (symbol (lib_id "Device:Fuse") (at 168.91 92.71 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 79ded3a0-7353-4e96-a9b4-096f2f4cc987)
-    (property "Reference" "F1" (id 0) (at 168.91 87.9814 90))
+    (property "Reference" "F4" (id 0) (at 168.91 87.9814 90))
     (property "Value" "10A" (id 1) (at 168.91 90.7565 90))
     (property "Footprint" "" (id 2) (at 168.91 94.488 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2233,7 +2233,7 @@
   (symbol (lib_id "Device:R") (at 27.94 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e94a69a1-0efb-4192-86ff-8fae8a732a82)
-    (property "Reference" "R1" (id 0) (at 29.7181 110.8515 0)
+    (property "Reference" "R40" (id 0) (at 29.7181 110.8515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10k" (id 1) (at 29.7181 113.6266 0)
@@ -2252,7 +2252,7 @@
   (symbol (lib_id "Device:R") (at 27.94 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8dcffa42-abb0-4b96-a9e1-3a4ee9a1b1e5)
-    (property "Reference" "R2" (id 0) (at 29.7181 121.0115 0)
+    (property "Reference" "R41" (id 0) (at 29.7181 121.0115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "6.8k" (id 1) (at 29.7181 123.7866 0)
@@ -2271,7 +2271,7 @@
   (symbol (lib_id "Device:R") (at 36.83 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3d428954-cf73-4b86-8791-7ebdb978d293)
-    (property "Reference" "R3" (id 0) (at 38.6081 110.8515 0)
+    (property "Reference" "R42" (id 0) (at 38.6081 110.8515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10k" (id 1) (at 38.6081 113.6266 0)
@@ -2290,7 +2290,7 @@
   (symbol (lib_id "Device:R") (at 36.83 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 093ea0d8-447c-4717-9b2d-5680672cc539)
-    (property "Reference" "R4" (id 0) (at 38.6081 121.0115 0)
+    (property "Reference" "R43" (id 0) (at 38.6081 121.0115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "12.7k" (id 1) (at 38.6081 123.7866 0)
@@ -2309,7 +2309,7 @@
   (symbol (lib_id "Device:R") (at 118.11 76.2 90)
     (in_bom yes) (on_board yes)
     (uuid c688cde1-64a1-4d3d-a308-8146ecc7110e)
-    (property "Reference" "R5" (id 0) (at 115.57 73.7574 90))
+    (property "Reference" "R44" (id 0) (at 115.57 73.7574 90))
     (property "Value" "280R" (id 1) (at 120.65 73.9925 90))
     (property "Footprint" "" (id 2) (at 118.11 77.978 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2324,7 +2324,7 @@
   (symbol (lib_id "Device:R") (at 118.11 80.01 90)
     (in_bom yes) (on_board yes)
     (uuid 535ee410-d1b4-4bfe-8fb7-e2336dbd7de8)
-    (property "Reference" "R6" (id 0) (at 115.57 82.6474 90))
+    (property "Reference" "R45" (id 0) (at 115.57 82.6474 90))
     (property "Value" "280R" (id 1) (at 120.65 82.8825 90))
     (property "Footprint" "" (id 2) (at 118.11 81.788 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2339,7 +2339,7 @@
   (symbol (lib_id "Device:R") (at 162.56 143.51 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a43c3f0f-1118-486d-8166-db9bca04c0f8)
-    (property "Reference" "R7" (id 0) (at 164.3381 142.6015 0)
+    (property "Reference" "R46" (id 0) (at 164.3381 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4.7k" (id 1) (at 164.3381 145.3766 0)
@@ -2358,7 +2358,7 @@
   (symbol (lib_id "Device:R") (at 172.72 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d5e402f1-932e-420f-9774-0822b30b2f0e)
-    (property "Reference" "R8" (id 0) (at 174.4981 132.4415 0)
+    (property "Reference" "R47" (id 0) (at 174.4981 132.4415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100k" (id 1) (at 174.4981 135.2166 0)
@@ -2377,7 +2377,7 @@
   (symbol (lib_id "Device:R") (at 172.72 143.51 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ecc4fa6d-c4c4-44d4-b891-141906df0a0c)
-    (property "Reference" "R9" (id 0) (at 174.4981 142.6015 0)
+    (property "Reference" "R48" (id 0) (at 174.4981 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "57k" (id 1) (at 174.4981 145.3766 0)
@@ -2396,7 +2396,7 @@
   (symbol (lib_id "Device:R") (at 176.53 73.66 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f4d6f4ef-0256-473f-8b46-ec4d4f232e95)
-    (property "Reference" "R10" (id 0) (at 176.53 68.6774 90))
+    (property "Reference" "R49" (id 0) (at 176.53 68.6774 90))
     (property "Value" "2.2k" (id 1) (at 176.53 71.4525 90))
     (property "Footprint" "" (id 2) (at 176.53 75.438 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2411,7 +2411,7 @@
   (symbol (lib_id "Device:R") (at 177.8 115.57 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d45b4f05-d8e9-4eba-9eb3-ce065b686501)
-    (property "Reference" "R11" (id 0) (at 177.8 110.5874 90))
+    (property "Reference" "R50" (id 0) (at 177.8 110.5874 90))
     (property "Value" "100R" (id 1) (at 177.8 113.3625 90))
     (property "Footprint" "" (id 2) (at 177.8 117.348 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2426,7 +2426,7 @@
   (symbol (lib_id "Device:R") (at 184.15 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 19eea21e-498a-433a-8362-31b6cf803066)
-    (property "Reference" "R12" (id 0) (at 185.9281 132.4415 0)
+    (property "Reference" "R51" (id 0) (at 185.9281 132.4415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "5.02k" (id 1) (at 185.9281 135.2166 0)
@@ -2445,7 +2445,7 @@
   (symbol (lib_id "Device:R") (at 184.15 143.51 0)
     (in_bom yes) (on_board yes)
     (uuid 93ae52de-82a7-47e0-b9e7-c5135decc743)
-    (property "Reference" "R13" (id 0) (at 185.9281 142.6015 0)
+    (property "Reference" "R52" (id 0) (at 185.9281 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "26.07k" (id 1) (at 185.9281 145.3766 0)
@@ -2464,7 +2464,7 @@
   (symbol (lib_id "Device:LED") (at 166.37 73.66 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8e26cb3e-a2da-4523-b59f-85315bbbed25)
-    (property "Reference" "D1" (id 0) (at 166.1795 68.4488 0))
+    (property "Reference" "D5" (id 0) (at 166.1795 68.4488 0))
     (property "Value" "LED" (id 1) (at 166.1795 71.2239 0))
     (property "Footprint" "" (id 2) (at 166.37 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2479,7 +2479,7 @@
   (symbol (lib_id "Device:C") (at 85.09 53.34 0)
     (in_bom yes) (on_board yes)
     (uuid 7a02180a-8e86-455c-b20a-dac1a53d9390)
-    (property "Reference" "C4" (id 0) (at 88.0111 52.4315 0)
+    (property "Reference" "C50" (id 0) (at 88.0111 52.4315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 86.7411 56.4766 0)
@@ -2498,7 +2498,7 @@
   (symbol (lib_id "Device:C") (at 85.09 72.39 0)
     (in_bom yes) (on_board yes)
     (uuid 3fe38c74-c4d8-4449-acb3-7ccb7e8784b3)
-    (property "Reference" "C5" (id 0) (at 88.0111 71.4815 0)
+    (property "Reference" "C51" (id 0) (at 88.0111 71.4815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 86.7411 75.5266 0)
@@ -2517,7 +2517,7 @@
   (symbol (lib_id "Device:C") (at 111.76 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 995e37af-02ee-439b-a170-d5d24974d185)
-    (property "Reference" "C6" (id 0) (at 114.6811 100.6915 0)
+    (property "Reference" "C52" (id 0) (at 114.6811 100.6915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "47nF" (id 1) (at 114.6811 103.4666 0)
@@ -2536,7 +2536,7 @@
   (symbol (lib_id "Device:C") (at 111.76 116.84 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3c513c33-a524-419b-a1b9-2b0242ddcce5)
-    (property "Reference" "C7" (id 0) (at 114.6811 115.9315 0)
+    (property "Reference" "C53" (id 0) (at 114.6811 115.9315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "47nF" (id 1) (at 114.6811 118.7066 0)
@@ -2555,7 +2555,7 @@
   (symbol (lib_id "Device:C") (at 166.37 109.22 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid edfca363-e948-4fa4-9399-9601cea1a08c)
-    (property "Reference" "C8" (id 0) (at 166.37 103.0944 90))
+    (property "Reference" "C54" (id 0) (at 166.37 103.0944 90))
     (property "Value" "1nF" (id 1) (at 166.37 105.8695 90))
     (property "Footprint" "" (id 2) (at 170.18 108.2548 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2570,7 +2570,7 @@
   (symbol (lib_id "Device:C") (at 232.41 21.59 0)
     (in_bom yes) (on_board yes)
     (uuid 8625cca4-215d-4b94-b4af-4c9b8e0f92d0)
-    (property "Reference" "C9" (id 0) (at 235.3311 20.6815 0)
+    (property "Reference" "C55" (id 0) (at 235.3311 20.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 24.7266 0)
@@ -2589,7 +2589,7 @@
   (symbol (lib_id "Device:C") (at 232.41 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid becaa33a-fb73-43a0-8f59-007f60952743)
-    (property "Reference" "C10" (id 0) (at 235.3311 34.6515 0)
+    (property "Reference" "C56" (id 0) (at 235.3311 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 38.6966 0)
@@ -2608,7 +2608,7 @@
   (symbol (lib_id "Device:C") (at 232.41 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid 2419ac2b-38f2-48a3-a3fb-d064a81b0a9f)
-    (property "Reference" "C11" (id 0) (at 235.3311 48.6215 0)
+    (property "Reference" "C57" (id 0) (at 235.3311 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 52.6666 0)
@@ -2627,7 +2627,7 @@
   (symbol (lib_id "Device:C") (at 232.41 63.5 0)
     (in_bom yes) (on_board yes)
     (uuid b7a2c962-35f9-47a1-84fd-7eac94185fae)
-    (property "Reference" "C12" (id 0) (at 235.3311 62.5915 0)
+    (property "Reference" "C58" (id 0) (at 235.3311 62.5915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 66.6366 0)
@@ -2646,7 +2646,7 @@
   (symbol (lib_id "Device:C") (at 232.41 77.47 0)
     (in_bom yes) (on_board yes)
     (uuid 8c38b1c0-fbad-468f-99e4-01985190b173)
-    (property "Reference" "C13" (id 0) (at 235.3311 76.5615 0)
+    (property "Reference" "C59" (id 0) (at 235.3311 76.5615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4.7uF" (id 1) (at 234.0611 80.6066 0)
@@ -2665,7 +2665,7 @@
   (symbol (lib_id "Device:C") (at 241.3 21.59 0)
     (in_bom yes) (on_board yes)
     (uuid 5953e159-b5a7-4b55-99f2-fda012d0384c)
-    (property "Reference" "C14" (id 0) (at 244.2211 20.6815 0)
+    (property "Reference" "C60" (id 0) (at 244.2211 20.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 24.7266 0)
@@ -2684,7 +2684,7 @@
   (symbol (lib_id "Device:C") (at 241.3 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 979d7e34-72d9-450b-a07f-f6fa33cf161e)
-    (property "Reference" "C15" (id 0) (at 244.2211 34.6515 0)
+    (property "Reference" "C61" (id 0) (at 244.2211 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 38.6966 0)
@@ -2703,7 +2703,7 @@
   (symbol (lib_id "Device:C") (at 241.3 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid ac59a9a6-1736-41b1-9b08-841456a81725)
-    (property "Reference" "C16" (id 0) (at 244.2211 48.6215 0)
+    (property "Reference" "C62" (id 0) (at 244.2211 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 52.6666 0)
@@ -2722,7 +2722,7 @@
   (symbol (lib_id "Device:C") (at 241.3 63.5 0)
     (in_bom yes) (on_board yes)
     (uuid 5f1b55eb-9c0c-4022-b7a4-23c5358363c9)
-    (property "Reference" "C17" (id 0) (at 244.2211 62.5915 0)
+    (property "Reference" "C63" (id 0) (at 244.2211 62.5915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 66.6366 0)
@@ -2741,7 +2741,7 @@
   (symbol (lib_id "Device:C") (at 250.19 21.59 0)
     (in_bom yes) (on_board yes)
     (uuid 19689cbf-511d-4423-bdcb-e53a00afaa95)
-    (property "Reference" "C18" (id 0) (at 253.1111 20.6815 0)
+    (property "Reference" "C64" (id 0) (at 253.1111 20.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 24.7266 0)
@@ -2760,7 +2760,7 @@
   (symbol (lib_id "Device:C") (at 250.19 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid f0da81f1-5f92-42d2-b81b-b77ec983a2c2)
-    (property "Reference" "C19" (id 0) (at 253.1111 34.6515 0)
+    (property "Reference" "C65" (id 0) (at 253.1111 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 38.6966 0)
@@ -2779,7 +2779,7 @@
   (symbol (lib_id "Device:C") (at 250.19 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid ba278ad7-c8e4-43da-92fe-e0849cea1ee6)
-    (property "Reference" "C20" (id 0) (at 253.1111 48.6215 0)
+    (property "Reference" "C66" (id 0) (at 253.1111 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 52.6666 0)
@@ -2798,7 +2798,7 @@
   (symbol (lib_id "Device:C") (at 250.19 63.5 0)
     (in_bom yes) (on_board yes)
     (uuid b82d4bb6-bfca-40cb-a30b-52bc6ee23da8)
-    (property "Reference" "C21" (id 0) (at 253.1111 62.5915 0)
+    (property "Reference" "C67" (id 0) (at 253.1111 62.5915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 66.6366 0)
@@ -2817,7 +2817,7 @@
   (symbol (lib_id "Device:C") (at 259.08 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 9155eb60-9132-4e1d-9ae4-d139278681e4)
-    (property "Reference" "C22" (id 0) (at 262.0011 34.6515 0)
+    (property "Reference" "C68" (id 0) (at 262.0011 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "33uF" (id 1) (at 260.7311 38.6966 0)
@@ -2836,7 +2836,7 @@
   (symbol (lib_id "Device:C") (at 259.08 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid 3906c072-6efd-4ba5-b04f-a1fc530d3116)
-    (property "Reference" "C23" (id 0) (at 262.0011 48.6215 0)
+    (property "Reference" "C69" (id 0) (at 262.0011 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 260.7311 52.6666 0)
@@ -2855,7 +2855,7 @@
   (symbol (lib_id "Device:C") (at 267.97 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 8d29c794-1929-4550-854c-1e3b715a6949)
-    (property "Reference" "C24" (id 0) (at 270.8911 34.6515 0)
+    (property "Reference" "C70" (id 0) (at 270.8911 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "33uF" (id 1) (at 269.6211 38.6966 0)
@@ -2874,7 +2874,7 @@
   (symbol (lib_id "Device:C") (at 267.97 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid 18ce107d-5e3f-48e2-bbf3-61d4d2156c26)
-    (property "Reference" "C25" (id 0) (at 270.8911 48.6215 0)
+    (property "Reference" "C71" (id 0) (at 270.8911 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 269.6211 52.6666 0)
@@ -2893,7 +2893,7 @@
   (symbol (lib_id "Device:C") (at 276.86 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 6bc7c2f3-4ec5-4076-b0ce-7f03ca76ffce)
-    (property "Reference" "C26" (id 0) (at 279.7811 34.6515 0)
+    (property "Reference" "C72" (id 0) (at 279.7811 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "33uF" (id 1) (at 278.5111 38.6966 0)
@@ -2912,7 +2912,7 @@
   (symbol (lib_id "Device:C") (at 276.86 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid f0825abb-62c4-4d28-8ebc-40cab9db266b)
-    (property "Reference" "C27" (id 0) (at 279.7811 48.6215 0)
+    (property "Reference" "C73" (id 0) (at 279.7811 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 278.5111 52.6666 0)
@@ -2931,7 +2931,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 198.12 142.24 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d8aa6b3c-69e3-4d30-87a8-0c78bb6f19db)
-    (property "Reference" "J7" (id 0) (at 200.1521 144.6335 0)
+    (property "Reference" "J19" (id 0) (at 200.1521 144.6335 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT_TEMP_MCU" (id 1) (at 200.1521 147.4086 0)
@@ -2951,7 +2951,7 @@
   (symbol (lib_id "TCY_transistors:AON7804") (at 97.79 49.53 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3d6bb6ee-61fd-4eed-b7e2-21a0198c8ad6)
-    (property "Reference" "Q1" (id 0) (at 97.79 41.7188 90)
+    (property "Reference" "Q9" (id 0) (at 97.79 41.7188 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "AON7804" (id 1) (at 97.79 43.9578 90)
@@ -2972,7 +2972,7 @@
   (symbol (lib_id "TCY_transistors:AON7804") (at 97.79 68.58 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 50c869d9-cab9-44e2-bc93-e24d9d84d802)
-    (property "Reference" "Q2" (id 0) (at 97.79 62.2534 90)
+    (property "Reference" "Q10" (id 0) (at 97.79 62.2534 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "AON7804" (id 1) (at 97.79 60.0144 90)
@@ -2993,7 +2993,7 @@
   (symbol (lib_id "TCY_transistors:AON7804") (at 113.03 49.53 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d2091f62-aa6c-4e36-b723-ac143988d4fb)
-    (property "Reference" "Q1" (id 0) (at 113.03 41.7188 90)
+    (property "Reference" "Q9" (id 0) (at 113.03 41.7188 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "AON7804" (id 1) (at 113.03 43.9578 90)
@@ -3014,7 +3014,7 @@
   (symbol (lib_id "TCY_transistors:AON7804") (at 113.03 68.58 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0e6e745e-2b85-4f0e-91d8-7e91ca75dda4)
-    (property "Reference" "Q2" (id 0) (at 113.03 62.2534 90)
+    (property "Reference" "Q10" (id 0) (at 113.03 62.2534 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "AON7804" (id 1) (at 113.03 60.0144 90)
@@ -3035,7 +3035,7 @@
   (symbol (lib_id "TCY_battery_management:BQ25798") (at 142.24 105.41 0)
     (in_bom yes) (on_board yes)
     (uuid 78318f1b-7631-47e2-afea-cbb78b37ad53)
-    (property "Reference" "U2" (id 0) (at 149.86 63.0894 0))
+    (property "Reference" "U15" (id 0) (at 149.86 63.0894 0))
     (property "Value" "BQ25798" (id 1) (at 149.86 65.8645 0))
     (property "Footprint" "TCY_IC:VQFN-HR_29(34)_4x4mm_P0.4mm" (id 2) (at 142.24 158.75 0)
       (effects (font (size 1.27 1.27)) hide)

modules/EPS/Battery_pack.kicad_sch

@@ -474,13 +474,55 @@
         )
       )
     )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 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" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+      )
+    )
   )
 
   (junction (at 116.84 78.74) (diameter 1.016) (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))
+  (junction (at 133.35 113.03) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 162.56 113.03) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 168.91 78.74) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 168.91 113.03) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 184.15 113.03) (diameter 1.016) (color 0 0 0 0))
   (junction (at 187.96 85.09) (diameter 1.016) (color 0 0 0 0))
   (junction (at 196.85 104.14) (diameter 1.016) (color 0 0 0 0))
@@ -495,7 +537,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid dddcce6c-62d9-44d7-adbb-2face81edc86)
   )
-  (wire (pts (xy 116.84 78.74) (xy 187.96 78.74))
+  (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)
   )
@@ -527,7 +569,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 40855dd4-c371-45f7-96ad-42c500d00c20)
   )
-  (wire (pts (xy 123.19 113.03) (xy 140.97 113.03))
+  (wire (pts (xy 123.19 113.03) (xy 133.35 113.03))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 40855dd4-c371-45f7-96ad-42c500d00c20)
   )
@@ -539,6 +581,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 1792177f-5f01-4a49-acbc-238a888b9a44)
   )
+  (wire (pts (xy 133.35 113.03) (xy 140.97 113.03))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 40855dd4-c371-45f7-96ad-42c500d00c20)
+  )
   (wire (pts (xy 146.05 88.9) (xy 143.51 88.9))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 743562db-5dac-4a13-a5c0-4501d33d1683)
@@ -563,7 +609,15 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 1792177f-5f01-4a49-acbc-238a888b9a44)
   )
-  (wire (pts (xy 162.56 113.03) (xy 184.15 113.03))
+  (wire (pts (xy 162.56 113.03) (xy 168.91 113.03))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 7a3084e1-cc7a-4d55-921a-b8e766bd475a)
+  )
+  (wire (pts (xy 168.91 78.74) (xy 187.96 78.74))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid fcdd65f9-1c95-41f7-ac1b-3bba0f13e54a)
+  )
+  (wire (pts (xy 168.91 113.03) (xy 184.15 113.03))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 7a3084e1-cc7a-4d55-921a-b8e766bd475a)
   )
@@ -642,10 +696,58 @@
     (uuid 1eed25eb-1bde-4337-b646-fada95325c24)
   )
 
+  (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)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 133.35 109.4254 0))
+    (property "Footprint" "" (id 2) (at 133.35 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 133.35 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 44f859bb-e2a1-49ef-8003-639d18a4e924))
+  )
+
+  (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)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 168.91 75.1354 0))
+    (property "Footprint" "" (id 2) (at 168.91 78.74 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 168.91 78.74 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d34e8c78-f8e6-4fa7-bf43-a3ae4569012f))
+  )
+
+  (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)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 168.91 109.4254 0))
+    (property "Footprint" "" (id 2) (at 168.91 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 168.91 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid fa01574e-b5f4-4705-b412-4ca2c68a9518))
+  )
+
   (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" "TP29" (id 0) (at 202.0571 75.99 0)
+    (property "Reference" "TP30" (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)
@@ -663,7 +765,7 @@
   (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" "R79" (id 0) (at 118.6181 81.6415 0)
+    (property "Reference" "R81" (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)
@@ -682,7 +784,7 @@
   (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" "R80" (id 0) (at 124.9681 103.2315 0)
+    (property "Reference" "R82" (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)
@@ -701,7 +803,7 @@
   (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" "C93" (id 0) (at 109.6011 103.2315 0)
+    (property "Reference" "C94" (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)
@@ -720,7 +822,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" "U29" (id 0) (at 206.1211 95.6115 0)
+    (property "Reference" "U32" (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)
@@ -739,7 +841,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" "Q17" (id 0) (at 146.05 116.8166 90)
+    (property "Reference" "Q19" (id 0) (at 146.05 116.8166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 146.05 119.0556 90)
@@ -765,7 +867,7 @@
   (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" "Q18" (id 0) (at 156.21 116.8166 90)
+    (property "Reference" "Q20" (id 0) (at 156.21 116.8166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 156.21 119.0556 90)
@@ -791,7 +893,7 @@
   (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" "U27" (id 0) (at 133.35 82.3934 0))
+    (property "Reference" "U30" (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)
@@ -810,7 +912,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" "U28" (id 0) (at 184.15 115.4336 0))
+    (property "Reference" "U31" (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

@@ -395,7 +395,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" "TP11" (id 0) (at 86.4871 44.24 0)
+    (property "Reference" "TP25" (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 +413,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" "TP12" (id 0) (at 95.3771 44.24 0)
+    (property "Reference" "TP26" (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)
@@ -431,7 +431,7 @@
   (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" "TP13" (id 0) (at 118.2371 44.24 0)
+    (property "Reference" "TP27" (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 +449,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" "TP14" (id 0) (at 128.3971 44.24 0)
+    (property "Reference" "TP28" (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)
@@ -467,7 +467,7 @@
   (symbol (lib_id "power:GND") (at 95.25 73.66 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7d40222e-08f4-4348-a31c-c378475abde5)
-    (property "Reference" "#PWR089" (id 0) (at 95.25 80.01 0)
+    (property "Reference" "#PWR0188" (id 0) (at 95.25 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 95.25 78.2226 0)
@@ -485,7 +485,7 @@
   (symbol (lib_id "power:GND") (at 107.95 73.66 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7da199c3-09e1-40ee-86b7-775a15dcac40)
-    (property "Reference" "#PWR0324" (id 0) (at 107.95 80.01 0)
+    (property "Reference" "#PWR0189" (id 0) (at 107.95 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 107.95 78.2226 0)
@@ -503,7 +503,7 @@
   (symbol (lib_id "power:GND") (at 116.84 144.78 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7b56fce6-edae-4ce8-bc78-f671be7e8230)
-    (property "Reference" "#PWR090" (id 0) (at 116.84 151.13 0)
+    (property "Reference" "#PWR0190" (id 0) (at 116.84 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 116.84 149.3426 0)
@@ -521,7 +521,7 @@
   (symbol (lib_id "power:GND") (at 119.38 73.66 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65ceab0c-73dc-42b2-8e9c-7ddf3b9468ab)
-    (property "Reference" "#PWR091" (id 0) (at 119.38 80.01 0)
+    (property "Reference" "#PWR0191" (id 0) (at 119.38 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 119.38 78.2226 0)
@@ -539,7 +539,7 @@
   (symbol (lib_id "power:GND") (at 121.92 144.78 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8bc74eb3-b563-46ba-9ae1-b098c5ef95df)
-    (property "Reference" "#PWR092" (id 0) (at 121.92 151.13 0)
+    (property "Reference" "#PWR0192" (id 0) (at 121.92 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 121.92 149.3426 0)
@@ -557,7 +557,7 @@
   (symbol (lib_id "power:GND") (at 134.62 62.23 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6265d34f-f183-45ec-8920-cd1a73ccd869)
-    (property "Reference" "#PWR093" (id 0) (at 134.62 68.58 0)
+    (property "Reference" "#PWR0193" (id 0) (at 134.62 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 134.62 66.7926 0)
@@ -575,7 +575,7 @@
   (symbol (lib_id "power:GND") (at 142.24 62.23 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d9b898b9-0920-4a60-8f8c-87e383509067)
-    (property "Reference" "#PWR094" (id 0) (at 142.24 68.58 0)
+    (property "Reference" "#PWR0194" (id 0) (at 142.24 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 142.24 66.7926 0)
@@ -593,7 +593,7 @@
   (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" "R37" (id 0) (at 97.0281 68.9415 0)
+    (property "Reference" "R76" (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)
@@ -612,7 +612,7 @@
   (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" "R38" (id 0) (at 118.6181 122.2815 0)
+    (property "Reference" "R77" (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)
@@ -631,7 +631,7 @@
   (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" "R39" (id 0) (at 121.1581 68.9415 0)
+    (property "Reference" "R78" (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)
@@ -650,7 +650,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 121.92 137.16 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d9bf190e-1056-4821-b336-4ea19f0ba575)
-    (property "Reference" "J10" (id 0) (at 123.9521 139.5535 0)
+    (property "Reference" "J22" (id 0) (at 123.9521 139.5535 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT_TEMP" (id 1) (at 123.9521 142.3286 0)
@@ -670,7 +670,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 142.24 54.61 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 166953c9-496d-47cb-85e2-a32b04732b62)
-    (property "Reference" "J11" (id 0) (at 144.2721 57.0035 0)
+    (property "Reference" "J23" (id 0) (at 144.2721 57.0035 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Heater" (id 1) (at 144.2721 59.7786 0)
@@ -690,7 +690,7 @@
   (symbol (lib_id "TCY_power_management:AP22653") (at 107.95 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c04c4a54-42a5-4b1d-a586-dcc34aab7e56)
-    (property "Reference" "U13" (id 0) (at 107.95 48.1034 0))
+    (property "Reference" "U26" (id 0) (at 107.95 48.1034 0))
     (property "Value" "AP22653" (id 1) (at 107.95 50.8785 0))
     (property "Footprint" "Package_DFN_QFN:DFN-6-1EP_2x2mm_P0.65mm_EP1x1.6mm" (id 2) (at 105.41 81.28 0)
       (effects (font (size 1.27 1.27)) hide)

modules/EPS/MCU.kicad_sch

@@ -1793,10 +1793,18 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid a0774471-bd24-4313-b0c4-f92e68a723f4)
   )
+  (wire (pts (xy 160.02 64.77) (xy 160.02 71.12))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid e8058926-46cd-48b1-83d3-4f7461e2f70c)
+  )
   (wire (pts (xy 163.83 186.69) (xy 171.45 186.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 40e20984-7a00-447e-ba03-955a63dac7f0)
   )
+  (wire (pts (xy 171.45 64.77) (xy 171.45 71.12))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 9af23242-2521-4af0-b668-d7ab2de9d1ef)
+  )
   (wire (pts (xy 191.77 137.16) (xy 191.77 139.7))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ce4672f5-56d0-48f9-9dcc-3d8f55f194bd)
@@ -2451,6 +2459,14 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 2cf69dd0-02c1-40e4-8869-d22beb023466)
   )
+  (label "VDDUSB" (at 160.02 71.12 90)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 3be93797-92d3-4a98-9ff6-41496ff67fbc)
+  )
+  (label "VBAT" (at 171.45 71.12 90)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 3f3567d5-e99e-4785-865e-15472aa12ef1)
+  )
   (label "LSE" (at 171.45 186.69 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c9a00026-cb27-4860-b04e-df906db0ab60)
@@ -2616,7 +2632,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 111.76 26.67 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 94dc2b0f-6d71-4b82-a882-ea0e15d96886)
-    (property "Reference" "#FLG0101" (id 0) (at 111.76 24.765 0)
+    (property "Reference" "#FLG014" (id 0) (at 111.76 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 111.76 23.0654 0))
@@ -2629,6 +2645,38 @@
     (pin "1" (uuid 88b2a8fb-be9e-4345-b525-4259acac7f75))
   )
 
+  (symbol (lib_id "power:PWR_FLAG") (at 160.02 64.77 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 3bc30c7d-d37b-4d7f-ba16-87d0b2e45d34)
+    (property "Reference" "#FLG0111" (id 0) (at 160.02 62.865 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 160.02 61.1654 0))
+    (property "Footprint" "" (id 2) (at 160.02 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 160.02 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8f66bdfa-898b-40d3-a650-cb4549c3a38b))
+  )
+
+  (symbol (lib_id "power:PWR_FLAG") (at 171.45 64.77 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid be137e6a-bb95-4ce2-8f05-b4da9899ec86)
+    (property "Reference" "#FLG0112" (id 0) (at 171.45 62.865 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 171.45 61.1654 0))
+    (property "Footprint" "" (id 2) (at 171.45 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 171.45 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c8b790fa-1d8f-4527-85e1-2fed1aa02d74))
+  )
+
   (symbol (lib_id "Connector:TestPoint") (at 55.88 41.91 0)
     (in_bom yes) (on_board yes)
     (uuid c4d3dddd-990b-47f0-8070-d59851a46543)
@@ -2668,7 +2716,7 @@
   (symbol (lib_id "power:GND") (at 22.86 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e30118b9-cb9f-4762-9c0b-5aafb2a5a0be)
-    (property "Reference" "#PWR063" (id 0) (at 22.86 153.67 0)
+    (property "Reference" "#PWR0162" (id 0) (at 22.86 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 22.86 151.8826 0)
@@ -2686,7 +2734,7 @@
   (symbol (lib_id "power:GND") (at 33.02 177.8 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8cb2b1f3-4eee-491f-86e2-6920dcbdbb6c)
-    (property "Reference" "#PWR064" (id 0) (at 26.67 177.8 0)
+    (property "Reference" "#PWR0163" (id 0) (at 26.67 177.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 28.4574 177.8 0)
@@ -2704,7 +2752,7 @@
   (symbol (lib_id "power:GND") (at 38.1 187.96 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f50335c-8075-4108-81ba-fda70ca398a7)
-    (property "Reference" "#PWR065" (id 0) (at 38.1 194.31 0)
+    (property "Reference" "#PWR0164" (id 0) (at 38.1 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 38.1 192.5226 0)
@@ -2722,7 +2770,7 @@
   (symbol (lib_id "power:GND") (at 41.91 109.22 0)
     (in_bom yes) (on_board yes)
     (uuid f041f263-677d-473d-8af6-90312cd1db07)
-    (property "Reference" "#PWR066" (id 0) (at 41.91 115.57 0)
+    (property "Reference" "#PWR0165" (id 0) (at 41.91 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 41.91 113.03 0)
@@ -2740,7 +2788,7 @@
   (symbol (lib_id "power:GND") (at 43.18 50.8 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fd35fc8e-7ea7-4219-a0a1-41663381ce6b)
-    (property "Reference" "#PWR067" (id 0) (at 43.18 57.15 0)
+    (property "Reference" "#PWR0166" (id 0) (at 43.18 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 43.18 55.3626 0)
@@ -2758,7 +2806,7 @@
   (symbol (lib_id "power:GND") (at 48.26 109.22 0)
     (in_bom yes) (on_board yes)
     (uuid c6ff8494-ff2e-40a3-87fe-d42c4ee7ad70)
-    (property "Reference" "#PWR068" (id 0) (at 48.26 115.57 0)
+    (property "Reference" "#PWR0167" (id 0) (at 48.26 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 48.26 113.03 0)
@@ -2776,7 +2824,7 @@
   (symbol (lib_id "power:GND") (at 52.07 156.21 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ba3f5c5e-c094-406a-9d43-1bca558a54d3)
-    (property "Reference" "#PWR069" (id 0) (at 52.07 162.56 0)
+    (property "Reference" "#PWR0168" (id 0) (at 52.07 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 52.07 160.7726 0)
@@ -2794,7 +2842,7 @@
   (symbol (lib_id "power:GND") (at 60.96 177.8 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fcf17e0b-e633-4ea2-acee-ebf56c79748a)
-    (property "Reference" "#PWR070" (id 0) (at 54.61 177.8 0)
+    (property "Reference" "#PWR0169" (id 0) (at 54.61 177.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 56.3974 177.8 0)
@@ -2812,7 +2860,7 @@
   (symbol (lib_id "power:GND") (at 63.5 30.48 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 66dfea64-a568-4e6f-8a42-aed0b9f20176)
-    (property "Reference" "#PWR071" (id 0) (at 63.5 36.83 0)
+    (property "Reference" "#PWR0170" (id 0) (at 63.5 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 63.5 35.0426 0)
@@ -2830,7 +2878,7 @@
   (symbol (lib_id "power:GND") (at 66.04 187.96 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5f779ddd-f24f-4ede-9d83-2aa511098e7d)
-    (property "Reference" "#PWR072" (id 0) (at 66.04 194.31 0)
+    (property "Reference" "#PWR0171" (id 0) (at 66.04 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 66.04 192.5226 0)
@@ -2848,7 +2896,7 @@
   (symbol (lib_id "power:GND") (at 91.44 186.69 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b756cc5b-63f0-4538-a6fe-95b109d06c21)
-    (property "Reference" "#PWR073" (id 0) (at 91.44 193.04 0)
+    (property "Reference" "#PWR0172" (id 0) (at 91.44 193.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 91.44 191.2526 0)
@@ -2866,7 +2914,7 @@
   (symbol (lib_id "power:GND") (at 106.68 49.53 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d6e4c24e-c0ae-4abc-83a2-2fc8d4c66fbf)
-    (property "Reference" "#PWR074" (id 0) (at 106.68 55.88 0)
+    (property "Reference" "#PWR0173" (id 0) (at 106.68 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 106.68 54.0926 0)
@@ -2884,7 +2932,7 @@
   (symbol (lib_id "power:GND") (at 106.68 194.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 94d93049-095e-4b25-9bd6-6513b9d4d1b5)
-    (property "Reference" "#PWR075" (id 0) (at 106.68 200.66 0)
+    (property "Reference" "#PWR0174" (id 0) (at 106.68 200.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 106.68 198.8726 0)
@@ -2902,7 +2950,7 @@
   (symbol (lib_id "power:GND") (at 128.27 158.75 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d0b75ad2-1cd8-47b0-92a5-ee3a4a9ceb88)
-    (property "Reference" "#PWR076" (id 0) (at 128.27 165.1 0)
+    (property "Reference" "#PWR0175" (id 0) (at 128.27 165.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 128.27 163.3126 0)
@@ -2920,7 +2968,7 @@
   (symbol (lib_id "power:GND") (at 139.7 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d4034035-92b1-4edc-9ffb-5f8793d0ba25)
-    (property "Reference" "#PWR077" (id 0) (at 139.7 53.34 0)
+    (property "Reference" "#PWR0176" (id 0) (at 139.7 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 139.7 51.5526 0)
@@ -2938,7 +2986,7 @@
   (symbol (lib_id "power:GND") (at 140.97 186.69 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5135c94e-001f-46d0-aef3-15fd11d83aeb)
-    (property "Reference" "#PWR078" (id 0) (at 140.97 193.04 0)
+    (property "Reference" "#PWR0177" (id 0) (at 140.97 193.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 140.97 191.2526 0)
@@ -2956,7 +3004,7 @@
   (symbol (lib_id "power:GND") (at 151.13 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 360e8ff3-e700-4d4b-b37f-8a71c6bfe5b4)
-    (property "Reference" "#PWR079" (id 0) (at 151.13 53.34 0)
+    (property "Reference" "#PWR0178" (id 0) (at 151.13 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 151.13 51.5526 0)
@@ -2974,7 +3022,7 @@
   (symbol (lib_id "power:GND") (at 156.21 194.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 519f7b3a-99eb-4821-9627-9eb7713fba31)
-    (property "Reference" "#PWR080" (id 0) (at 156.21 200.66 0)
+    (property "Reference" "#PWR0179" (id 0) (at 156.21 200.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 156.21 198.8726 0)
@@ -2992,7 +3040,7 @@
   (symbol (lib_id "power:GND") (at 191.77 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9fe4c16e-72fc-4797-80d3-134be605d0bd)
-    (property "Reference" "#PWR081" (id 0) (at 191.77 153.67 0)
+    (property "Reference" "#PWR0180" (id 0) (at 191.77 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 191.77 151.8826 0)
@@ -3010,7 +3058,7 @@
   (symbol (lib_id "power:GND") (at 199.39 161.29 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 97afb644-b320-445b-a03f-5ac752e694df)
-    (property "Reference" "#PWR082" (id 0) (at 199.39 167.64 0)
+    (property "Reference" "#PWR0181" (id 0) (at 199.39 167.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 199.39 165.8526 0)
@@ -3028,7 +3076,7 @@
   (symbol (lib_id "power:GND") (at 213.36 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6f065482-2131-4171-9165-7d9d537484a5)
-    (property "Reference" "#PWR083" (id 0) (at 213.36 125.73 0)
+    (property "Reference" "#PWR0182" (id 0) (at 213.36 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 213.36 123.9426 0)
@@ -3046,7 +3094,7 @@
   (symbol (lib_id "power:GND") (at 219.71 158.75 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a0b8b1fb-f3a3-4b87-873e-a40096b7057d)
-    (property "Reference" "#PWR084" (id 0) (at 219.71 165.1 0)
+    (property "Reference" "#PWR0183" (id 0) (at 219.71 165.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 219.71 163.3126 0)
@@ -3064,7 +3112,7 @@
   (symbol (lib_id "power:GND") (at 220.98 83.82 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fc21e199-bc0f-4656-b0d8-7ce45aad41c2)
-    (property "Reference" "#PWR085" (id 0) (at 220.98 90.17 0)
+    (property "Reference" "#PWR0184" (id 0) (at 220.98 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 220.98 88.3826 0)
@@ -3082,7 +3130,7 @@
   (symbol (lib_id "power:GND") (at 241.3 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aa07dc01-aa29-4793-b151-6c7126a4b61c)
-    (property "Reference" "#PWR086" (id 0) (at 241.3 125.73 0)
+    (property "Reference" "#PWR0185" (id 0) (at 241.3 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 123.9426 0)
@@ -3100,7 +3148,7 @@
   (symbol (lib_id "power:GND") (at 251.46 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aba575fa-e1a0-40e7-b97a-10ecdc2c1748)
-    (property "Reference" "#PWR087" (id 0) (at 251.46 158.75 0)
+    (property "Reference" "#PWR0186" (id 0) (at 251.46 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 251.46 156.9626 0)
@@ -3118,7 +3166,7 @@
   (symbol (lib_id "power:GND") (at 261.62 41.91 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c7e3a7f7-4a20-445c-8754-8d10c1b36f33)
-    (property "Reference" "#PWR088" (id 0) (at 261.62 48.26 0)
+    (property "Reference" "#PWR0187" (id 0) (at 261.62 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 261.62 46.4726 0)

modules/EPS/Output_control.kicad_sch

@@ -1340,7 +1340,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" "#FLG02" (id 0) (at 106.68 81.915 0)
+    (property "Reference" "#FLG010" (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 +1356,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" "#FLG03" (id 0) (at 153.67 81.915 0)
+    (property "Reference" "#FLG011" (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 +1372,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" "#FLG04" (id 0) (at 193.04 81.915 0)
+    (property "Reference" "#FLG012" (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 +1388,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" "#FLG05" (id 0) (at 234.95 81.915 0)
+    (property "Reference" "#FLG013" (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))
@@ -1404,7 +1404,7 @@
   (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)
-    (property "Reference" "#PWR053" (id 0) (at 74.93 109.22 0)
+    (property "Reference" "#PWR0152" (id 0) (at 74.93 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 74.93 107.4326 0)
@@ -1422,7 +1422,7 @@
   (symbol (lib_id "power:GND") (at 83.82 102.87 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1d025b1e-3f26-4ccc-8f66-e711501a4a4e)
-    (property "Reference" "#PWR054" (id 0) (at 83.82 109.22 0)
+    (property "Reference" "#PWR0153" (id 0) (at 83.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 83.82 107.4326 0)
@@ -1440,7 +1440,7 @@
   (symbol (lib_id "power:GND") (at 123.19 105.41 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9b880113-6c29-43d4-8b29-f279bec5a40c)
-    (property "Reference" "#PWR055" (id 0) (at 123.19 111.76 0)
+    (property "Reference" "#PWR0154" (id 0) (at 123.19 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 123.19 109.9726 0)
@@ -1458,7 +1458,7 @@
   (symbol (lib_id "power:GND") (at 138.43 105.41 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a3ba886c-c63b-49e0-9eab-e7b978d5a054)
-    (property "Reference" "#PWR056" (id 0) (at 138.43 111.76 0)
+    (property "Reference" "#PWR0155" (id 0) (at 138.43 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 138.43 109.9726 0)
@@ -1476,7 +1476,7 @@
   (symbol (lib_id "power:GND") (at 179.07 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 992969a7-0484-4581-b76d-d87466037767)
-    (property "Reference" "#PWR057" (id 0) (at 179.07 86.36 0)
+    (property "Reference" "#PWR0156" (id 0) (at 179.07 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 179.07 84.5726 0)
@@ -1494,7 +1494,7 @@
   (symbol (lib_id "power:GND") (at 184.15 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cc868e24-ef6a-458c-8b2c-f627d0a7263f)
-    (property "Reference" "#PWR058" (id 0) (at 184.15 73.66 0)
+    (property "Reference" "#PWR0157" (id 0) (at 184.15 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 184.15 71.8726 0)
@@ -1512,7 +1512,7 @@
   (symbol (lib_id "power:GND") (at 185.42 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bfe7ccce-845b-4a36-8ca2-eefe5a9b6211)
-    (property "Reference" "#PWR059" (id 0) (at 185.42 129.54 0)
+    (property "Reference" "#PWR0158" (id 0) (at 185.42 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 185.42 127.7526 0)
@@ -1530,7 +1530,7 @@
   (symbol (lib_id "power:GND") (at 189.23 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1cc197f2-039b-4b4b-aae4-8f72529a265a)
-    (property "Reference" "#PWR060" (id 0) (at 189.23 129.54 0)
+    (property "Reference" "#PWR0159" (id 0) (at 189.23 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 189.23 127.7526 0)
@@ -1548,7 +1548,7 @@
   (symbol (lib_id "power:GND") (at 200.66 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 27c71f86-23d0-4bf2-9ffc-d740271a6344)
-    (property "Reference" "#PWR061" (id 0) (at 200.66 129.54 0)
+    (property "Reference" "#PWR0160" (id 0) (at 200.66 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 200.66 127.7526 0)
@@ -1566,7 +1566,7 @@
   (symbol (lib_id "power:GND") (at 214.63 74.93 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00f581de-2b04-42fd-b4a3-62d3dda6baf0)
-    (property "Reference" "#PWR062" (id 0) (at 214.63 81.28 0)
+    (property "Reference" "#PWR0161" (id 0) (at 214.63 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 214.63 79.4926 0)

modules/EPS/Power_VBAT.kicad_sch

@@ -504,6 +504,45 @@
         )
       )
     )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 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" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+      )
+    )
   )
 
   (junction (at 128.27 71.12) (diameter 0.9144) (color 0 0 0 0))
@@ -517,6 +556,7 @@
   (junction (at 166.37 87.63) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 175.26 87.63) (diameter 1.016) (color 0 0 0 0))
   (junction (at 180.34 105.41) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 198.12 105.41) (diameter 0.9144) (color 0 0 0 0))
 
   (wire (pts (xy 121.92 71.12) (xy 121.92 72.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -642,10 +682,14 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 9d2eb440-7e23-49ea-87cd-95b5fa382ab1)
   )
-  (wire (pts (xy 180.34 105.41) (xy 182.88 105.41))
+  (wire (pts (xy 180.34 105.41) (xy 198.12 105.41))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 44661465-2a62-44bc-928a-7c974020cdef)
   )
+  (wire (pts (xy 198.12 105.41) (xy 203.2 105.41))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 5e2bfde0-c102-4109-93be-fc3edad56816)
+  )
 
   (text "Sense resistor \npackage: 1206" (at 113.03 101.6 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -664,15 +708,31 @@
     (effects (font (size 1.27 1.27) (thickness 0.254)) (justify left))
     (uuid 25f8c879-9fcd-4180-8b2f-64d7a18a6ab6)
   )
-  (hierarchical_label "OUT" (shape input) (at 182.88 105.41 0)
+  (hierarchical_label "OUT" (shape input) (at 203.2 105.41 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 0334e802-832a-450f-a0e6-1605dc457d0c)
   )
 
+  (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)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 198.12 101.8054 0))
+    (property "Footprint" "" (id 2) (at 198.12 105.41 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 198.12 105.41 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8c796e7b-bfa9-4abc-ba62-2188552b2400))
+  )
+
   (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" "TP49" (id 0) (at 174.1171 81.07 0)
+    (property "Reference" "TP51" (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)
@@ -690,7 +750,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" "TP50" (id 0) (at 181.7371 100.12 0)
+    (property "Reference" "TP52" (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)
@@ -708,7 +768,7 @@
   (symbol (lib_id "power:GND") (at 121.92 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ee475694-3da4-4ade-9d58-3b473d12d511)
-    (property "Reference" "#PWR0265" (id 0) (at 121.92 86.36 0)
+    (property "Reference" "#PWR0274" (id 0) (at 121.92 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 121.92 84.5726 0)
@@ -726,7 +786,7 @@
   (symbol (lib_id "power:GND") (at 143.51 86.36 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4373c2a8-a1ca-4c96-9e11-fbb53bbc7fba)
-    (property "Reference" "#PWR0266" (id 0) (at 143.51 92.71 0)
+    (property "Reference" "#PWR0275" (id 0) (at 143.51 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 143.51 90.9226 0)
@@ -744,7 +804,7 @@
   (symbol (lib_id "power:GND") (at 148.59 72.39 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 29977e9b-4a0d-4a9f-9cc6-fb5f61fe96ef)
-    (property "Reference" "#PWR0267" (id 0) (at 148.59 78.74 0)
+    (property "Reference" "#PWR0276" (id 0) (at 148.59 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 148.59 76.9526 0)
@@ -762,7 +822,7 @@
   (symbol (lib_id "power:GND") (at 156.21 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 22c15bb5-f31e-4dea-aea6-ae0d3261e290)
-    (property "Reference" "#PWR0268" (id 0) (at 156.21 129.54 0)
+    (property "Reference" "#PWR0277" (id 0) (at 156.21 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 156.21 127.7526 0)
@@ -780,7 +840,7 @@
   (symbol (lib_id "power:GND") (at 157.48 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 46ae66f1-57f5-45d5-838f-3766d3ccf8f6)
-    (property "Reference" "#PWR0269" (id 0) (at 157.48 102.87 0)
+    (property "Reference" "#PWR0278" (id 0) (at 157.48 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 157.48 101.0826 0)
@@ -798,7 +858,7 @@
   (symbol (lib_id "power:GND") (at 166.37 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 737db744-b62d-49f0-8401-672c12195c89)
-    (property "Reference" "#PWR0270" (id 0) (at 166.37 102.87 0)
+    (property "Reference" "#PWR0279" (id 0) (at 166.37 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 166.37 101.0826 0)
@@ -816,7 +876,7 @@
   (symbol (lib_id "power:GND") (at 175.26 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0ea567c7-6e39-4188-9b81-5675115b0a6b)
-    (property "Reference" "#PWR0271" (id 0) (at 175.26 102.87 0)
+    (property "Reference" "#PWR0280" (id 0) (at 175.26 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 175.26 101.0826 0)
@@ -834,7 +894,7 @@
   (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" "R125" (id 0) (at 133.35 92.8074 90))
+    (property "Reference" "R130" (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)
       (effects (font (size 1.27 1.27)) hide)
@@ -849,7 +909,7 @@
   (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" "R126" (id 0) (at 133.35 100.4274 90))
+    (property "Reference" "R131" (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)
       (effects (font (size 1.27 1.27)) hide)
@@ -864,7 +924,7 @@
   (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" "R127" (id 0) (at 157.9881 118.4715 0)
+    (property "Reference" "R132" (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)
@@ -883,7 +943,7 @@
   (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" "R128" (id 0) (at 159.2581 81.6415 0)
+    (property "Reference" "R133" (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)
@@ -902,7 +962,7 @@
   (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" "R129" (id 0) (at 159.2581 91.8015 0)
+    (property "Reference" "R134" (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)
@@ -921,7 +981,7 @@
   (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" "D15" (id 0) (at 177.2667 91.8015 90)
+    (property "Reference" "D16" (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)
@@ -940,7 +1000,7 @@
   (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" "F13" (id 0) (at 171.45 100.0464 90))
+    (property "Reference" "F14" (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)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -955,7 +1015,7 @@
   (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" "C125" (id 0) (at 115.9511 75.2915 0)
+    (property "Reference" "C127" (id 0) (at 115.9511 75.2915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 113.4111 78.0666 0)
@@ -974,7 +1034,7 @@
   (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" "C126" (id 0) (at 169.2911 91.8015 0)
+    (property "Reference" "C128" (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)
@@ -993,7 +1053,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" "Q27" (id 0) (at 156.21 100.1388 90)
+    (property "Reference" "Q28" (id 0) (at 156.21 100.1388 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 156.21 102.3778 90)
@@ -1019,7 +1079,7 @@
   (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" "U45" (id 0) (at 144.5261 66.4015 0)
+    (property "Reference" "U46" (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_supply.kicad_sch

@@ -1076,7 +1076,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" "#FLG015" (id 0) (at 111.76 100.965 0)
+    (property "Reference" "#FLG020" (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 +1092,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" "TP43" (id 0) (at 152.5271 79.8 0)
+    (property "Reference" "TP31" (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 +1110,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" "TP44" (id 0) (at 207.1371 62.02 0)
+    (property "Reference" "TP32" (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 +1128,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" "TP45" (id 0) (at 227.4571 79.8 0)
+    (property "Reference" "TP33" (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)
@@ -1146,7 +1146,7 @@
   (symbol (lib_id "power:GND") (at 90.17 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ae27e7fe-5c1f-47bc-8e18-5d996ea250c5)
-    (property "Reference" "#PWR0241" (id 0) (at 90.17 104.14 0)
+    (property "Reference" "#PWR0255" (id 0) (at 90.17 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 90.17 102.3526 0)
@@ -1164,7 +1164,7 @@
   (symbol (lib_id "power:GND") (at 102.87 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 13176dad-8f8f-4026-81a4-edf966731f8f)
-    (property "Reference" "#PWR0242" (id 0) (at 102.87 118.11 0)
+    (property "Reference" "#PWR0256" (id 0) (at 102.87 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 102.87 116.3226 0)
@@ -1182,7 +1182,7 @@
   (symbol (lib_id "power:GND") (at 123.19 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c8dfc5fc-322b-4374-9a81-0adf6c5f49db)
-    (property "Reference" "#PWR0243" (id 0) (at 123.19 118.11 0)
+    (property "Reference" "#PWR0257" (id 0) (at 123.19 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 123.19 116.3226 0)
@@ -1200,7 +1200,7 @@
   (symbol (lib_id "power:GND") (at 143.51 118.11 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 03c6fd6d-e0b6-41c3-84fd-b262841cf470)
-    (property "Reference" "#PWR0244" (id 0) (at 143.51 124.46 0)
+    (property "Reference" "#PWR0258" (id 0) (at 143.51 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 143.51 122.6726 0)
@@ -1218,7 +1218,7 @@
   (symbol (lib_id "power:GND") (at 156.21 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 168b2538-a559-4d61-b520-6227a896aa71)
-    (property "Reference" "#PWR0245" (id 0) (at 156.21 107.95 0)
+    (property "Reference" "#PWR0259" (id 0) (at 156.21 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 156.21 106.1626 0)
@@ -1236,7 +1236,7 @@
   (symbol (lib_id "power:GND") (at 165.1 63.5 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5857ebf9-0972-4cec-b1a7-c3422dd19fae)
-    (property "Reference" "#PWR0246" (id 0) (at 165.1 69.85 0)
+    (property "Reference" "#PWR0260" (id 0) (at 165.1 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 165.1 68.0626 0)
@@ -1254,7 +1254,7 @@
   (symbol (lib_id "power:GND") (at 167.64 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4029a05d-d81f-4e7a-a718-eef6a006aa1b)
-    (property "Reference" "#PWR0247" (id 0) (at 167.64 107.95 0)
+    (property "Reference" "#PWR0261" (id 0) (at 167.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 167.64 106.1626 0)
@@ -1272,7 +1272,7 @@
   (symbol (lib_id "power:GND") (at 186.69 69.85 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b5e54bb2-fa3d-435a-bcc3-76ad9126fc58)
-    (property "Reference" "#PWR0248" (id 0) (at 186.69 76.2 0)
+    (property "Reference" "#PWR0262" (id 0) (at 186.69 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 186.69 74.4126 0)
@@ -1290,7 +1290,7 @@
   (symbol (lib_id "power:GND") (at 191.77 55.88 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b42b9f2e-10a1-43f0-9fd7-76f7eb60772f)
-    (property "Reference" "#PWR0249" (id 0) (at 191.77 62.23 0)
+    (property "Reference" "#PWR0263" (id 0) (at 191.77 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 191.77 60.4426 0)
@@ -1308,7 +1308,7 @@
   (symbol (lib_id "power:GND") (at 200.66 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 10dc8f48-b5c6-45d8-b350-02acec8a8064)
-    (property "Reference" "#PWR0250" (id 0) (at 200.66 86.36 0)
+    (property "Reference" "#PWR0264" (id 0) (at 200.66 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 200.66 84.5726 0)
@@ -1326,7 +1326,7 @@
   (symbol (lib_id "power:GND") (at 203.2 106.68 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e8ccc65e-c88e-4cb7-830d-b0bbce06b85e)
-    (property "Reference" "#PWR0251" (id 0) (at 203.2 113.03 0)
+    (property "Reference" "#PWR0265" (id 0) (at 203.2 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 203.2 111.2426 0)
@@ -1344,7 +1344,7 @@
   (symbol (lib_id "power:GND") (at 208.28 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb832e1c-8fc8-41fa-b2b1-089722e2d582)
-    (property "Reference" "#PWR0252" (id 0) (at 208.28 86.36 0)
+    (property "Reference" "#PWR0266" (id 0) (at 208.28 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 208.28 84.5726 0)
@@ -1362,7 +1362,7 @@
   (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" "L7" (id 0) (at 124.46 70.4554 90))
+    (property "Reference" "L3" (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)
       (effects (font (size 1.27 1.27)) hide)
@@ -1377,7 +1377,7 @@
   (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" "R111" (id 0) (at 104.6481 93.0715 0)
+    (property "Reference" "R83" (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)
@@ -1396,7 +1396,7 @@
   (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" "R112" (id 0) (at 145.2881 94.3415 0)
+    (property "Reference" "R84" (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)
@@ -1415,7 +1415,7 @@
   (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" "R113" (id 0) (at 145.2881 113.3915 0)
+    (property "Reference" "R85" (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)
@@ -1434,7 +1434,7 @@
   (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" "R114" (id 0) (at 176.53 83.9174 90))
+    (property "Reference" "R86" (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)
       (effects (font (size 1.27 1.27)) hide)
@@ -1449,7 +1449,7 @@
   (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" "R115" (id 0) (at 202.4381 65.1315 0)
+    (property "Reference" "R87" (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)
@@ -1468,7 +1468,7 @@
   (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" "R116" (id 0) (at 202.4381 75.2915 0)
+    (property "Reference" "R88" (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)
@@ -1487,7 +1487,7 @@
   (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" "R117" (id 0) (at 204.9781 101.9615 0)
+    (property "Reference" "R89" (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)
@@ -1506,7 +1506,7 @@
   (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" "D13" (id 0) (at 210.2867 75.2915 90)
+    (property "Reference" "D9" (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)
@@ -1525,7 +1525,7 @@
   (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" "F11" (id 0) (at 217.17 83.5364 90))
+    (property "Reference" "F7" (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)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -1540,7 +1540,7 @@
   (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" "C115" (id 0) (at 93.0911 94.3415 0)
+    (property "Reference" "C95" (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)
@@ -1559,7 +1559,7 @@
   (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" "C116" (id 0) (at 94.3611 104.5015 0)
+    (property "Reference" "C96" (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)
@@ -1578,7 +1578,7 @@
   (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" "C117" (id 0) (at 159.1311 98.1515 0)
+    (property "Reference" "C97" (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)
@@ -1597,7 +1597,7 @@
   (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" "C118" (id 0) (at 159.1311 58.7815 0)
+    (property "Reference" "C98" (id 0) (at 159.1311 58.7815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 156.5911 61.5566 0)
@@ -1616,7 +1616,7 @@
   (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" "C119" (id 0) (at 170.5611 98.1515 0)
+    (property "Reference" "C99" (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)
@@ -1635,7 +1635,7 @@
   (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" "RV5" (id 0) (at 149.352 108.3115 0)
+    (property "Reference" "RV1" (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)
@@ -1655,7 +1655,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" "Q25" (id 0) (at 203.2 83.6288 90)
+    (property "Reference" "Q21" (id 0) (at 203.2 83.6288 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 203.2 85.8678 90)
@@ -1681,7 +1681,7 @@
   (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" "U42" (id 0) (at 186.4361 49.8915 0)
+    (property "Reference" "U34" (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 +1706,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" "U41" (id 0) (at 124.46 77.3134 0))
+    (property "Reference" "U33" (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

@@ -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" "#FLG01" (id 0) (at 102.87 47.625 0)
+    (property "Reference" "#FLG08" (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))
@@ -263,7 +263,7 @@
   (symbol (lib_id "power:GND") (at 88.9 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6ebe803f-5eb6-49de-94b4-9951fce61f79)
-    (property "Reference" "#PWR05" (id 0) (at 88.9 63.5 0)
+    (property "Reference" "#PWR0104" (id 0) (at 88.9 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 61.7126 0)
@@ -281,7 +281,7 @@
   (symbol (lib_id "power:GND") (at 88.9 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 383420f2-56fd-4a2d-bbf3-76ceb60f62a6)
-    (property "Reference" "#PWR06" (id 0) (at 88.9 82.55 0)
+    (property "Reference" "#PWR0105" (id 0) (at 88.9 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 80.7626 0)
@@ -299,7 +299,7 @@
   (symbol (lib_id "power:GND") (at 88.9 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65420468-2b5a-4e8d-8139-4ff930ea4cb4)
-    (property "Reference" "#PWR07" (id 0) (at 88.9 101.6 0)
+    (property "Reference" "#PWR0106" (id 0) (at 88.9 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 99.8126 0)
@@ -317,7 +317,7 @@
   (symbol (lib_id "power:GND") (at 88.9 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65a61411-1205-40aa-902e-07e546492efb)
-    (property "Reference" "#PWR08" (id 0) (at 88.9 120.65 0)
+    (property "Reference" "#PWR0107" (id 0) (at 88.9 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 118.8626 0)
@@ -335,7 +335,7 @@
   (symbol (lib_id "power:GND") (at 88.9 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e4ccc808-02ca-4386-b889-ffcb5a12309f)
-    (property "Reference" "#PWR09" (id 0) (at 88.9 139.7 0)
+    (property "Reference" "#PWR0108" (id 0) (at 88.9 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 137.9126 0)
@@ -353,7 +353,7 @@
   (symbol (lib_id "power:GND") (at 88.9 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf5a0034-d362-42b0-a742-3b6168bd38d9)
-    (property "Reference" "#PWR010" (id 0) (at 88.9 158.75 0)
+    (property "Reference" "#PWR0109" (id 0) (at 88.9 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 156.9626 0)
@@ -371,7 +371,7 @@
   (symbol (lib_id "power:GND") (at 93.98 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a6eb18b5-181c-4f39-88f4-53201523a268)
-    (property "Reference" "#PWR011" (id 0) (at 93.98 63.5 0)
+    (property "Reference" "#PWR0110" (id 0) (at 93.98 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 61.7126 0)
@@ -389,7 +389,7 @@
   (symbol (lib_id "power:GND") (at 93.98 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 131ee275-1b63-49a5-9072-f19d2aa24ff9)
-    (property "Reference" "#PWR012" (id 0) (at 93.98 82.55 0)
+    (property "Reference" "#PWR0111" (id 0) (at 93.98 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 80.7626 0)
@@ -407,7 +407,7 @@
   (symbol (lib_id "power:GND") (at 93.98 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8a2183dc-0a0d-4feb-8c29-bd745679d7b8)
-    (property "Reference" "#PWR013" (id 0) (at 93.98 101.6 0)
+    (property "Reference" "#PWR0112" (id 0) (at 93.98 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 99.8126 0)
@@ -425,7 +425,7 @@
   (symbol (lib_id "power:GND") (at 93.98 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c32eb7e5-57fe-4d8a-ba99-96b946d7b6e7)
-    (property "Reference" "#PWR014" (id 0) (at 93.98 120.65 0)
+    (property "Reference" "#PWR0113" (id 0) (at 93.98 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 118.8626 0)
@@ -443,7 +443,7 @@
   (symbol (lib_id "power:GND") (at 93.98 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 42fadd57-ec9b-41c1-b934-01ce21b42ca6)
-    (property "Reference" "#PWR015" (id 0) (at 93.98 139.7 0)
+    (property "Reference" "#PWR0114" (id 0) (at 93.98 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 137.9126 0)
@@ -461,7 +461,7 @@
   (symbol (lib_id "power:GND") (at 93.98 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 77e17651-ed39-4d52-85b9-a3878d64988a)
-    (property "Reference" "#PWR016" (id 0) (at 93.98 158.75 0)
+    (property "Reference" "#PWR0115" (id 0) (at 93.98 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 156.9626 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" "J1" (id 0) (at 89.662 43.0234 0))
+    (property "Reference" "J13" (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" "J2" (id 0) (at 89.662 62.0734 0))
+    (property "Reference" "J14" (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" "J3" (id 0) (at 89.662 81.1234 0))
+    (property "Reference" "J15" (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" "J4" (id 0) (at 89.662 100.1734 0))
+    (property "Reference" "J16" (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" "J5" (id 0) (at 89.662 119.2234 0))
+    (property "Reference" "J17" (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" "J6" (id 0) (at 89.662 138.2734 0))
+    (property "Reference" "J18" (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/Stack_connector.kicad_sch

@@ -497,7 +497,7 @@
   (symbol (lib_id "power:GND") (at 138.43 66.04 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 33321891-4989-49c4-9d4f-783e71a924db)
-    (property "Reference" "#PWR095" (id 0) (at 138.43 59.69 0)
+    (property "Reference" "#PWR096" (id 0) (at 138.43 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 138.43 61.4774 0)
@@ -515,7 +515,7 @@
   (symbol (lib_id "power:GND") (at 138.43 77.47 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4eccaec0-e5a6-4b14-ad5b-878ef640942c)
-    (property "Reference" "#PWR096" (id 0) (at 132.08 77.47 0)
+    (property "Reference" "#PWR097" (id 0) (at 132.08 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 133.8674 77.47 0)
@@ -533,7 +533,7 @@
   (symbol (lib_id "power:GND") (at 138.43 105.41 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 50fd1489-5d05-49a2-b688-bd7294eb51c9)
-    (property "Reference" "#PWR097" (id 0) (at 132.08 105.41 0)
+    (property "Reference" "#PWR098" (id 0) (at 132.08 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 133.8674 105.41 0)
@@ -551,7 +551,7 @@
   (symbol (lib_id "power:GND") (at 138.43 116.84 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 19a01539-82c1-4274-9f16-40b7dbe72f98)
-    (property "Reference" "#PWR098" (id 0) (at 138.43 123.19 0)
+    (property "Reference" "#PWR099" (id 0) (at 138.43 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 138.43 121.4026 0)
@@ -569,7 +569,7 @@
   (symbol (lib_id "power:GND") (at 153.67 66.04 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid acdaafeb-2007-4e75-a65f-938e5632f3c5)
-    (property "Reference" "#PWR099" (id 0) (at 153.67 59.69 0)
+    (property "Reference" "#PWR0100" (id 0) (at 153.67 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 153.67 61.4774 0)
@@ -587,7 +587,7 @@
   (symbol (lib_id "power:GND") (at 153.67 77.47 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4758c7ae-5320-47ee-98f7-5212f39e8ce7)
-    (property "Reference" "#PWR0100" (id 0) (at 160.02 77.47 0)
+    (property "Reference" "#PWR0101" (id 0) (at 160.02 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 158.2326 77.47 0)
@@ -605,7 +605,7 @@
   (symbol (lib_id "power:GND") (at 153.67 105.41 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid dec30d13-ba25-4850-ad57-cc6722a9925a)
-    (property "Reference" "#PWR0101" (id 0) (at 160.02 105.41 0)
+    (property "Reference" "#PWR0102" (id 0) (at 160.02 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 158.2326 105.41 0)
@@ -623,7 +623,7 @@
   (symbol (lib_id "power:GND") (at 153.67 116.84 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9c764d20-65f3-4406-bd29-9894c9ffd4fe)
-    (property "Reference" "#PWR0102" (id 0) (at 153.67 123.19 0)
+    (property "Reference" "#PWR0103" (id 0) (at 153.67 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 153.67 121.4026 0)

modules/EPS/USB_power.kicad_sch

@@ -218,7 +218,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" "#FLG017" (id 0) (at 182.88 92.075 0)
+    (property "Reference" "#FLG021" (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))
@@ -234,7 +234,7 @@
   (symbol (lib_id "power:GND") (at 170.18 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f3179a51-ce67-4f96-9a0f-40ef7668e229)
-    (property "Reference" "#PWR0279" (id 0) (at 170.18 113.03 0)
+    (property "Reference" "#PWR0281" (id 0) (at 170.18 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 170.18 111.2426 0)
@@ -252,7 +252,7 @@
   (symbol (lib_id "power:GND") (at 177.8 104.14 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid dae00e47-3713-4b7a-82c5-13bba541887c)
-    (property "Reference" "#PWR0280" (id 0) (at 177.8 110.49 0)
+    (property "Reference" "#PWR0282" (id 0) (at 177.8 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 177.8 108.7026 0)