hardware: Draw the remaining layout of the TAS5760M module.

Some errors remain w.r.t. placement of the pin headers.

modules/tas5760m-amp-module/tas5760m-amp-module.kicad_sch

@@ -5,11 +5,11 @@
   (paper "A4")
 
   (lib_symbols
-    (symbol "Connector_Generic:Conn_01x02" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 2.54 0)
+    (symbol "Connector_Generic:Conn_01x07" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at 0 10.16 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_01x02" (id 1) (at 0 -5.08 0)
+      (property "Value" "Conn_01x07" (id 1) (at 0 -10.16 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
@@ -21,55 +21,19 @@
       (property "ki_keywords" "connector" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connector, single row, 01x07, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Conn_01x02_1_1"
-        (rectangle (start -1.27 -2.413) (end 0 -2.667)
+      (symbol "Conn_01x07_1_1"
+        (rectangle (start -1.27 -7.493) (end 0 -7.747)
           (stroke (width 0.1524)) (fill (type none))
         )
-        (rectangle (start -1.27 0.127) (end 0 -0.127)
+        (rectangle (start -1.27 -4.953) (end 0 -5.207)
           (stroke (width 0.1524)) (fill (type none))
         )
-        (rectangle (start -1.27 1.27) (end 1.27 -3.81)
-          (stroke (width 0.254)) (fill (type background))
-        )
-        (pin passive line (at -5.08 0 0) (length 3.81)
-          (name "Pin_1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
-          (name "Pin_2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "Connector_Generic:Conn_01x03" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Conn_01x03" (id 1) (at 0 -5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Conn_01x03_1_1"
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
           (stroke (width 0.1524)) (fill (type none))
         )
@@ -79,21 +43,43 @@
         (rectangle (start -1.27 2.667) (end 0 2.413)
           (stroke (width 0.1524)) (fill (type none))
         )
-        (rectangle (start -1.27 3.81) (end 1.27 -3.81)
+        (rectangle (start -1.27 5.207) (end 0 4.953)
+          (stroke (width 0.1524)) (fill (type none))
+        )
+        (rectangle (start -1.27 7.747) (end 0 7.493)
+          (stroke (width 0.1524)) (fill (type none))
+        )
+        (rectangle (start -1.27 8.89) (end 1.27 -8.89)
           (stroke (width 0.254)) (fill (type background))
         )
-        (pin passive line (at -5.08 2.54 0) (length 3.81)
+        (pin passive line (at -5.08 7.62 0) (length 3.81)
           (name "Pin_1" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 0 0) (length 3.81)
+        (pin passive line (at -5.08 5.08 0) (length 3.81)
           (name "Pin_2" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
+        (pin passive line (at -5.08 2.54 0) (length 3.81)
           (name "Pin_3" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at -5.08 0 0) (length 3.81)
+          (name "Pin_4" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -2.54 0) (length 3.81)
+          (name "Pin_5" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -5.08 0) (length 3.81)
+          (name "Pin_6" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -7.62 0) (length 3.81)
+          (name "Pin_7" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
       )
     )
     (symbol "Connector_Generic:Conn_01x12" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
@@ -745,9 +731,9 @@
   (junction (at 218.44 55.88) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 218.44 88.9) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 218.44 121.92) (diameter 0.9144) (color 0 0 0 0))
-  (junction (at 251.46 63.5) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 259.08 60.96) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 259.08 66.04) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 234.95 106.68) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 242.57 104.14) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 242.57 109.22) (diameter 1.016) (color 0 0 0 0))
 
   (wire (pts (xy 30.48 111.76) (xy 48.26 111.76))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -1301,7 +1287,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d5d06d5d-81e2-4276-af87-d0b26e503c35)
   )
-  (wire (pts (xy 200.66 91.44) (xy 220.98 91.44))
+  (wire (pts (xy 200.66 91.44) (xy 247.65 91.44))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid e57dca3a-6396-411d-9e72-f585cbbaeaff)
   )
@@ -1317,7 +1303,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 0563a9b6-6aae-41e0-9748-5007dbe36c2f)
   )
-  (wire (pts (xy 200.66 124.46) (xy 220.98 124.46))
+  (wire (pts (xy 200.66 124.46) (xy 250.19 124.46))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c8611955-be61-4954-8caa-9ad42d995152)
   )
@@ -1361,7 +1347,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ef6eb5fb-767f-400f-9bb3-6d5489a360f9)
   )
-  (wire (pts (xy 218.44 88.9) (xy 220.98 88.9))
+  (wire (pts (xy 218.44 88.9) (xy 250.19 88.9))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f13c5607-8719-4f1d-832d-1c5bc2f02d81)
   )
@@ -1381,54 +1367,86 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 6f179ac2-bf1d-424a-8eb4-728b935c8fa0)
   )
-  (wire (pts (xy 218.44 134.62) (xy 218.44 137.16))
+  (wire (pts (xy 218.44 121.92) (xy 247.65 121.92))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 07102f11-6f6d-4f4e-941d-f28e677932f7)
+    (uuid 44a94ed9-09d6-4968-98ec-21be58c02f7e)
   )
-  (wire (pts (xy 220.98 121.92) (xy 218.44 121.92))
+  (wire (pts (xy 218.44 134.62) (xy 218.44 137.16))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 44a94ed9-09d6-4968-98ec-21be58c02f7e)
+    (uuid 07102f11-6f6d-4f4e-941d-f28e677932f7)
   )
   (wire (pts (xy 224.155 24.13) (xy 224.155 26.67))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 6f497c5b-4354-47f8-9ac3-d1e898f53843)
   )
-  (wire (pts (xy 246.38 24.13) (xy 246.38 26.67))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 07ff932c-3f25-4044-b0a2-cff6a73cd29d)
-  )
-  (wire (pts (xy 248.92 63.5) (xy 251.46 63.5))
+  (wire (pts (xy 232.41 106.68) (xy 234.95 106.68))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid e963abfb-8bb3-4b17-8a5d-f8460bcddb98)
   )
-  (wire (pts (xy 251.46 60.96) (xy 251.46 63.5))
+  (wire (pts (xy 234.95 104.14) (xy 234.95 106.68))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ee6967e5-c745-40a4-ad7f-5d1392c76427)
   )
-  (wire (pts (xy 251.46 63.5) (xy 261.62 63.5))
+  (wire (pts (xy 234.95 106.68) (xy 257.81 106.68))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid e963abfb-8bb3-4b17-8a5d-f8460bcddb98)
   )
-  (wire (pts (xy 259.08 58.42) (xy 259.08 60.96))
+  (wire (pts (xy 242.57 101.6) (xy 242.57 104.14))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 01738f71-ece1-47e3-bcd4-f6841515e465)
   )
-  (wire (pts (xy 259.08 60.96) (xy 261.62 60.96))
+  (wire (pts (xy 242.57 104.14) (xy 257.81 104.14))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f3f5da28-9981-4b4c-acc6-0a9392fc2682)
   )
-  (wire (pts (xy 259.08 66.04) (xy 259.08 60.96))
+  (wire (pts (xy 242.57 109.22) (xy 242.57 104.14))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f3f5da28-9981-4b4c-acc6-0a9392fc2682)
   )
-  (wire (pts (xy 259.08 66.04) (xy 261.62 66.04))
+  (wire (pts (xy 242.57 109.22) (xy 257.81 109.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid a0f513c6-f251-4382-956b-463a1c76538b)
   )
-  (wire (pts (xy 259.08 68.58) (xy 259.08 66.04))
+  (wire (pts (xy 242.57 111.76) (xy 242.57 109.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f3f5da28-9981-4b4c-acc6-0a9392fc2682)
   )
+  (wire (pts (xy 246.38 24.13) (xy 246.38 26.67))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 07ff932c-3f25-4044-b0a2-cff6a73cd29d)
+  )
+  (wire (pts (xy 247.65 101.6) (xy 247.65 91.44))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid f4df29a0-b412-4c11-b33b-a00878058175)
+  )
+  (wire (pts (xy 247.65 114.3) (xy 247.65 121.92))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 75598bbe-15d1-4db8-bda9-4d13cebc8176)
+  )
+  (wire (pts (xy 250.19 88.9) (xy 250.19 99.06))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 25b1cf3f-d531-40dc-b9f3-ba9e3163157f)
+  )
+  (wire (pts (xy 250.19 99.06) (xy 257.81 99.06))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 25b1cf3f-d531-40dc-b9f3-ba9e3163157f)
+  )
+  (wire (pts (xy 250.19 111.76) (xy 250.19 124.46))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid e3ce0de7-5527-4aa4-84e5-6c3afd20180f)
+  )
+  (wire (pts (xy 250.19 111.76) (xy 257.81 111.76))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 276dc428-32e1-4646-978c-f4581b24bd11)
+  )
+  (wire (pts (xy 257.81 101.6) (xy 247.65 101.6))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid f4df29a0-b412-4c11-b33b-a00878058175)
+  )
+  (wire (pts (xy 257.81 114.3) (xy 247.65 114.3))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 75598bbe-15d1-4db8-bda9-4d13cebc8176)
+  )
 
   (label "~SPK_FAULT" (at 38.1 111.76 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -1491,7 +1509,7 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 7014ffa9-41dd-4a02-b608-ae6f909f626a)
   )
-  (hierarchical_label "19V" (shape input) (at 248.92 63.5 180)
+  (hierarchical_label "19V" (shape input) (at 232.41 106.68 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ba6a5e38-33ad-4aa0-964d-5c3649bc2465)
   )
@@ -1576,33 +1594,33 @@
     (pin "1" (uuid 37981944-54c7-4736-871c-fc4f40fc5ac6))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 251.46 60.96 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 234.95 104.14 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ce2b4da1-2bcc-4a9f-a52c-5345f7fc40e9)
-    (property "Reference" "#FLG0102" (id 0) (at 251.46 59.055 0)
+    (property "Reference" "#FLG0102" (id 0) (at 234.95 102.235 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 251.46 57.15 0))
-    (property "Footprint" "" (id 2) (at 251.46 60.96 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 234.95 100.33 0))
+    (property "Footprint" "" (id 2) (at 234.95 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 251.46 60.96 0)
+    (property "Datasheet" "~" (id 3) (at 234.95 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0dc90a07-1061-40e3-b313-22be04a726bb))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 259.08 58.42 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 242.57 101.6 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c079dfbb-e14f-4130-9d91-0aa1b489ebaf)
-    (property "Reference" "#FLG0101" (id 0) (at 259.08 56.515 0)
+    (property "Reference" "#FLG0101" (id 0) (at 242.57 99.695 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 259.08 54.61 0))
-    (property "Footprint" "" (id 2) (at 259.08 58.42 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 242.57 97.79 0))
+    (property "Footprint" "" (id 2) (at 242.57 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 259.08 58.42 0)
+    (property "Datasheet" "~" (id 3) (at 242.57 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 03b31376-cf75-4aea-b27c-2e13d88e6926))
@@ -1864,36 +1882,36 @@
     (pin "1" (uuid 43ed0648-b440-4ae5-848a-32f533310dad))
   )
 
-  (symbol (lib_id "power:GND") (at 246.38 26.67 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 242.57 111.76 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 29bcfd36-48b0-4981-b3c2-c938ef9ebef0)
-    (property "Reference" "#PWR0107" (id 0) (at 246.38 33.02 0)
+    (uuid 2fd2b0ae-2930-4634-b11c-482c51407295)
+    (property "Reference" "#PWR0108" (id 0) (at 242.57 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 246.38 30.48 0))
-    (property "Footprint" "" (id 2) (at 246.38 26.67 0)
+    (property "Value" "GND" (id 1) (at 242.57 115.57 0))
+    (property "Footprint" "" (id 2) (at 242.57 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 246.38 26.67 0)
+    (property "Datasheet" "" (id 3) (at 242.57 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ddf05447-851b-4608-b2eb-baf4a87c8ca5))
+    (pin "1" (uuid cdb9f8f4-85b3-4c79-adf4-a86f3c689abd))
   )
 
-  (symbol (lib_id "power:GND") (at 259.08 68.58 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 246.38 26.67 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 2fd2b0ae-2930-4634-b11c-482c51407295)
-    (property "Reference" "#PWR0108" (id 0) (at 259.08 74.93 0)
+    (uuid 29bcfd36-48b0-4981-b3c2-c938ef9ebef0)
+    (property "Reference" "#PWR0107" (id 0) (at 246.38 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 259.08 72.39 0))
-    (property "Footprint" "" (id 2) (at 259.08 68.58 0)
+    (property "Value" "GND" (id 1) (at 246.38 30.48 0))
+    (property "Footprint" "" (id 2) (at 246.38 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 259.08 68.58 0)
+    (property "Datasheet" "" (id 3) (at 246.38 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid cdb9f8f4-85b3-4c79-adf4-a86f3c689abd))
+    (pin "1" (uuid ddf05447-851b-4608-b2eb-baf4a87c8ca5))
   )
 
   (symbol (lib_id "Device:L") (at 189.23 88.9 90) (unit 1)
@@ -2123,36 +2141,6 @@
     (pin "1" (uuid c80e125a-92c5-41bd-a11a-4fbdd52711d7))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x02") (at 226.06 88.9 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid d04587d2-82e5-4b66-b0b2-ec0ca595eee8)
-    (property "Reference" "J2" (id 0) (at 226.06 86.36 0))
-    (property "Value" "SpkA" (id 1) (at 226.06 93.98 0))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 226.06 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 226.06 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid dc3e7b3b-fcdc-4d23-9062-dc513f17200c))
-    (pin "2" (uuid 3a178042-ac7b-4048-a6af-65d0ec9ce861))
-  )
-
-  (symbol (lib_id "Connector_Generic:Conn_01x02") (at 226.06 121.92 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 049c08a6-fb26-436d-b1ba-9a2e3ea569e8)
-    (property "Reference" "J3" (id 0) (at 226.06 119.38 0))
-    (property "Value" "SpkB" (id 1) (at 226.06 127 0))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 226.06 121.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 226.06 121.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 450eeaa3-1ba8-4879-b1fd-d066dfa31a84))
-    (pin "2" (uuid aed8aec7-3130-4c7a-bf4d-aa5dac3fe20f))
-  )
-
   (symbol (lib_id "Device:C") (at 72.39 97.79 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 45925bb6-a13d-41c9-8b32-eb3833668e1d)
@@ -2550,7 +2538,7 @@
     (property "Value" "470uF/50V" (id 1) (at 219.075 64.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:CP_Elec_16x17.5" (id 2) (at 219.4052 66.04 0)
+    (property "Footprint" "HackAmp-Footprints:CP_Elec_16x17.5_Nichicon" (id 2) (at 219.4052 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 218.44 62.23 0)
@@ -2616,20 +2604,28 @@
     (pin "2" (uuid bc83bb1a-c0f2-49ac-a904-eca386f17e1d))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x03") (at 266.7 63.5 0) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x07") (at 262.89 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 8547f41f-d577-4cc5-a8e1-51ccb095a910)
-    (property "Reference" "J4" (id 0) (at 266.7 58.42 0))
-    (property "Value" "19V" (id 1) (at 266.7 68.58 0))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 266.7 63.5 0)
+    (uuid 066f0c5d-fe52-4376-8b0b-cd31163b1114)
+    (property "Reference" "J2" (id 0) (at 264.9221 105.9191 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Conn_01x07" (id 1) (at 264.9221 108.2178 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical" (id 2) (at 262.89 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 266.7 63.5 0)
+    (property "Datasheet" "~" (id 3) (at 262.89 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid b7df7a38-4d09-49b9-b9e6-a83e1ea1a922))
-    (pin "2" (uuid 018e58b6-ce02-45e9-8f10-200ba56079f9))
-    (pin "3" (uuid 733659ad-724b-4f66-870e-953e22886340))
+    (pin "1" (uuid ac6e6cbb-f4fb-4ee5-9605-4ce5ada51de0))
+    (pin "2" (uuid f67456a4-22dc-4a74-affa-d883deee2907))
+    (pin "3" (uuid 026fa5ad-0388-4502-835f-471c0653ca18))
+    (pin "4" (uuid bfc21df0-e4b8-453c-ae7e-a52fbb65f5e6))
+    (pin "5" (uuid 4753d691-f009-4ecb-a3f6-54b371c49806))
+    (pin "6" (uuid ce65cb0c-8203-488e-846d-85357a6bf958))
+    (pin "7" (uuid ab2ea7b8-cce1-4364-bb1c-269f1213de8b))
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x12") (at 25.4 121.92 0) (mirror y) (unit 1)
@@ -2842,7 +2838,7 @@
       (reference "C16") (unit 1) (value "DNP") (footprint "Capacitor_THT:C_Rect_L10.3mm_W4.5mm_P7.50mm_MKS4")
     )
     (path "/0a7c2a05-03b7-4cba-ae82-a238c63082b6"
-      (reference "C17") (unit 1) (value "470uF/50V") (footprint "Capacitor_SMD:CP_Elec_16x17.5")
+      (reference "C17") (unit 1) (value "470uF/50V") (footprint "HackAmp-Footprints:CP_Elec_16x17.5_Nichicon")
     )
     (path "/3dfe530a-6d9e-44d2-9feb-fe3626d7eac2"
       (reference "C18") (unit 1) (value "3.3uF/50V") (footprint "Capacitor_SMD:C_0805_2012Metric")
@@ -2865,14 +2861,8 @@
     (path "/7623719f-2eac-4ffe-b0d8-daef14ce85d7"
       (reference "J1") (unit 1) (value "Digital") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x12_P2.54mm_Vertical")
     )
-    (path "/d04587d2-82e5-4b66-b0b2-ec0ca595eee8"
-      (reference "J2") (unit 1) (value "SpkA") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
-    )
-    (path "/049c08a6-fb26-436d-b1ba-9a2e3ea569e8"
-      (reference "J3") (unit 1) (value "SpkB") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
-    )
-    (path "/8547f41f-d577-4cc5-a8e1-51ccb095a910"
-      (reference "J4") (unit 1) (value "19V") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical")
+    (path "/066f0c5d-fe52-4376-8b0b-cd31163b1114"
+      (reference "J2") (unit 1) (value "Conn_01x07") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical")
     )
     (path "/d1a38236-6d21-4c3c-9a1c-3720ced7225b"
       (reference "L1") (unit 1) (value "15uH") (footprint "HackAmp-Footprints:L_Bourns_SRR1208")