Various hardware changes.

hardware/backpanel/backpanel.kicad_pcb

@@ -78,7 +78,7 @@
 
   (footprint "FrontPanel-Footprints:PanelCutout_Banana_Jack_4mm_Deltron_571" (layer "F.Cu")
     (tedit 617B96AF) (tstamp 21dc2bdd-5abb-441a-99ac-dc7a72f11ac5)
-    (at 114.2 78.855)
+    (at 114.3 78.805)
     (property "Sheetfile" "backpanel.kicad_sch")
     (property "Sheetname" "")
     (path "/c4059d63-ff95-46e2-9815-de06d43a2f8c")
@@ -167,7 +167,7 @@
 
   (footprint "FrontPanel-Footprints:PanelCutout_Banana_Jack_4mm_Deltron_571" (layer "F.Cu")
     (tedit 617B96AF) (tstamp 5c5f883a-9f03-4ead-8c42-f6632217b4bf)
-    (at 100.36 78.855)
+    (at 100.3 78.8)
     (property "Sheetfile" "backpanel.kicad_sch")
     (property "Sheetname" "")
     (path "/00c084c2-d6ba-4f86-9de6-440905949b5c")
@@ -256,7 +256,7 @@
 
   (footprint "FrontPanel-Footprints:PanelCutout_Banana_Jack_4mm_Deltron_571" (layer "F.Cu")
     (tedit 617B96AF) (tstamp 9d7ed3c7-1c60-4807-b9fb-015c95ba15a0)
-    (at 142.4 78.855)
+    (at 142.3 78.805)
     (property "Sheetfile" "backpanel.kicad_sch")
     (property "Sheetname" "")
     (path "/1da1fdb9-2956-45ec-8de5-61c0a892fd93")
@@ -377,7 +377,7 @@
 
   (footprint "FrontPanel-Footprints:PanelCutout_Banana_Jack_4mm_Deltron_571" (layer "F.Cu")
     (tedit 617B96AF) (tstamp ffe727a7-4487-45bd-a714-ab8c12a47b9b)
-    (at 128.2 78.855)
+    (at 128.3 78.805)
     (property "Sheetfile" "backpanel.kicad_sch")
     (property "Sheetname" "")
     (path "/ed4bce34-8e56-449c-b402-7ba7223a8d86")
@@ -402,5 +402,68 @@
   (gr_rect (start 91.3 92.8) (end 151.3 93.8) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 3b4aad02-f3d3-4bef-832b-786f3809e60d))
   (gr_rect (start 128.5 86.3) (end 112.5 70.3) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp a39b56ff-d84b-498d-9b24-2776800551ec))
   (gr_rect (start 91.3 86.3) (end 151.3 87.3) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp bc77d427-e0b8-4590-91c9-944b9aa518d8))
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp 0ee723cb-046f-4aca-aaac-20bff142d130)
+    (pts (xy 114.3 86.3) (xy 100.3 86.3))
+    (height 21.5)
+    (gr_text "14,0000 mm" (at 107.3 63.65) (layer "Dwgs.User") (tstamp 205642db-a236-4782-9ecd-0a19bd4781cd)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp 1ce022e1-1108-46c1-b2be-d7fe7bf1d786)
+    (pts (xy 91.3 102.3) (xy 97.9 102.3))
+    (height 13.7)
+    (gr_text "6,6000 mm" (at 94.6 114.85) (layer "Dwgs.User") (tstamp 1ce022e1-1108-46c1-b2be-d7fe7bf1d786)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp 510aeffd-18e0-4866-b139-755c1907e1c1)
+    (pts (xy 97.9 102.3) (xy 111.9 102.3))
+    (height 13.7)
+    (gr_text "14,0000 mm" (at 104.9 114.85) (layer "Dwgs.User") (tstamp 510aeffd-18e0-4866-b139-755c1907e1c1)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp 760517fb-1002-40e7-896f-663e61c4a9a1)
+    (pts (xy 111.9 102.3) (xy 126.1 102.3))
+    (height 13.7)
+    (gr_text "14,2000 mm" (at 119 114.85) (layer "Dwgs.User") (tstamp 760517fb-1002-40e7-896f-663e61c4a9a1)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp a6239d8a-8577-4535-8f2a-243d005787d2)
+    (pts (xy 121.3 86.3) (xy 114.3 86.3))
+    (height 21.5)
+    (gr_text "7,0000 mm" (at 117.8 63.65) (layer "Dwgs.User") (tstamp b40e18fa-ed6a-4b9e-8b87-f65161b9a9f6)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp ad8c04a1-3b52-465d-8e92-911d1b8f9774)
+    (pts (xy 128.3 86.3) (xy 142.3 86.3))
+    (height -21.5)
+    (gr_text "14,0000 mm" (at 135.3 63.65) (layer "Dwgs.User") (tstamp da73fc2e-6350-4038-9f7e-5b48801241cc)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp b3fb3fae-44ff-4f26-abae-7e39f7c3d06e)
+    (pts (xy 121.3 86.3) (xy 128.3 86.3))
+    (height -21.5)
+    (gr_text "7,0000 mm" (at 124.8 63.65) (layer "Dwgs.User") (tstamp e46318c4-a8e3-40cc-9809-c2711a639678)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.15) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
 
 )

hardware/base/HackAmp-Footprints.pretty/Banana_Jack_Deltron_571.kicad_mod

@@ -0,0 +1,36 @@
+(footprint "Banana_Jack_Deltron_571" (version 20211014) (generator pcbnew) (layer "F.Cu")
+  (tedit 619BED2F)
+  (attr smd)
+  (fp_text reference "REF**" (at 0 19.75 unlocked) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c64f0be7-ba2d-4444-8ae2-caa84f8b68b0)
+  )
+  (fp_text value "Banana_Jack_Deltron_571" (at 3.45 8.4 90 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 51c9adad-332c-429d-b43f-b18999183c1c)
+  )
+  (fp_text user "${REFERENCE}" (at -4.05 7.9 90 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 398873c9-6469-40e3-b43a-a63e80149d6d)
+  )
+  (fp_line (start -5.1 -1.65) (end -5.1 18.85) (layer "F.SilkS") (width 0.12) (tstamp 419ff15c-9e52-40be-825d-5ecca552d89c))
+  (fp_line (start 5.1 18.85) (end 5.1 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 56e87966-39ef-4f40-b093-86dd6eabf0aa))
+  (fp_line (start -5.1 18.85) (end 5.1 18.85) (layer "F.SilkS") (width 0.12) (tstamp c876671b-35d1-4f92-aecd-53ef8fd723d2))
+  (fp_line (start 5.25 -4.65) (end -5.25 -4.65) (layer "F.CrtYd") (width 0.05) (tstamp 09e02114-ef03-49e5-a4bf-c5fc5393b53b))
+  (fp_line (start 5.25 -2.65) (end 5.25 -4.65) (layer "F.CrtYd") (width 0.05) (tstamp 0e4626b4-f474-43c0-8e8e-ca41bdc366eb))
+  (fp_line (start -5.5 19.25) (end 5.5 19.25) (layer "F.CrtYd") (width 0.05) (tstamp 466722ca-894d-44bc-8826-863ef4c74bf3))
+  (fp_line (start -5.5 -2.65) (end -5.5 19.25) (layer "F.CrtYd") (width 0.05) (tstamp 5cfd82d2-7388-4717-b98c-3f7fa859d04d))
+  (fp_line (start -5.25 -4.65) (end -5.25 -2.65) (layer "F.CrtYd") (width 0.05) (tstamp 6b50d9fa-1604-4647-a2bf-84d8065cdfac))
+  (fp_line (start 5.5 -2.65) (end 5.25 -2.65) (layer "F.CrtYd") (width 0.05) (tstamp d853bdd9-a564-4fad-a24b-e89cb19d8686))
+  (fp_line (start -5.25 -2.65) (end -5.5 -2.65) (layer "F.CrtYd") (width 0.05) (tstamp d92537d3-8dce-4308-a41e-2fb9f1821140))
+  (fp_line (start 5.5 19.25) (end 5.5 -2.65) (layer "F.CrtYd") (width 0.05) (tstamp f4baf280-7eec-4fe0-b3e0-5cbb236c2693))
+  (fp_line (start 4.75 -4.15) (end 4.75 -2.15) (layer "F.Fab") (width 0.1) (tstamp 072e094e-822a-4dcb-8543-53958ecdf3e3))
+  (fp_line (start -4.75 -4.15) (end 4.75 -4.15) (layer "F.Fab") (width 0.1) (tstamp 4236420c-5205-4de5-9234-645e64defeee))
+  (fp_line (start -5 18.75) (end -5 -2.15) (layer "F.Fab") (width 0.1) (tstamp 6911ef54-1237-47e8-917d-c85bcf6883ea))
+  (fp_line (start 5 -2.15) (end 5 18.75) (layer "F.Fab") (width 0.1) (tstamp 6c26acab-c5a8-4e13-8555-b7eb84862fa2))
+  (fp_line (start -4.75 -2.15) (end -4.75 -4.15) (layer "F.Fab") (width 0.1) (tstamp 762bca73-8aa6-4903-8cc3-dd33073fa4e6))
+  (fp_line (start 5 18.75) (end -5 18.75) (layer "F.Fab") (width 0.1) (tstamp 8b12a26e-5f36-48c4-aeea-43770a43723d))
+  (fp_line (start -5 -2.15) (end 5 -2.15) (layer "F.Fab") (width 0.1) (tstamp f541e1c6-2783-418e-9883-271101aaff64))
+  (pad "1" thru_hole circle (at 0 15.3) (size 3.5 3.5) (drill 1.94) (layers *.Cu *.Mask) (tstamp 2d23f65d-bc57-446b-81df-8f93fab0cf52))
+  (pad "1" thru_hole circle (at 0 0) (size 3.5 3.5) (drill 1.94) (layers *.Cu *.Mask) (tstamp 5b6ace08-214d-4bd3-8f46-51b9533e1729))
+)

hardware/base/base.kicad_sch

@@ -67,7 +67,7 @@
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "MountingHole_Pad_0_1"
-        (circle (center 0 1.27) (radius 1.27)           (stroke (width 1.27) (type default) (color 0 0 0 0))
+        (circle (center 0 1.27) (radius 1.27) (stroke (width 1.27))           (stroke (width 1.27) (type default) (color 0 0 0 0))
           (fill (type none))
         )
       )
@@ -172,171 +172,171 @@
     )
   )
 
-  (junction (at 57.15 43.18) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 54.61 50.8) (diameter 0) (color 0 0 0 0))
+  (junction (at 57.15 43.18) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 57.15 53.34) (diameter 0) (color 0 0 0 0))
   (junction (at 59.69 55.88) (diameter 0) (color 0 0 0 0))
   (junction (at 67.31 45.72) (diameter 0.9144) (color 0 0 0 0))
-  (junction (at 57.15 53.34) (diameter 0) (color 0 0 0 0))
 
-  (wire (pts (xy 113.03 44.45) (xy 118.11 44.45))
+  (wire (pts (xy 52.07 26.67) (xy 77.47 26.67))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 05bdf016-bff4-471e-a81f-6143ca30f466)
+    (uuid d48c1b9f-c5ed-4f04-b6a5-65898ff01f7f)
   )
-  (wire (pts (xy 57.15 43.18) (xy 77.47 43.18))
+  (wire (pts (xy 52.07 43.18) (xy 57.15 43.18))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 07b3e3cb-e65a-4841-9873-ddb510419fc3)
+    (uuid c5be4f92-1b23-446f-bd1b-89a93b5f0b3d)
   )
   (wire (pts (xy 52.07 45.72) (xy 67.31 45.72))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 0c9e1fea-c061-41ab-b653-5cc1061954c6)
   )
-  (wire (pts (xy 113.03 34.29) (xy 118.11 34.29))
+  (wire (pts (xy 52.07 50.8) (xy 54.61 50.8))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 53b74402-d61c-4929-a5f2-ec9bc6561e08)
+  )
+  (wire (pts (xy 52.07 53.34) (xy 57.15 53.34))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8838ff63-360f-48b1-a817-5d68779d104a)
+  )
+  (wire (pts (xy 52.07 55.88) (xy 59.69 55.88))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 1ac18345-64a6-47d1-bf23-d186b7554cd2)
+    (uuid ca9e5a23-766a-422c-8b2d-5483b3f4b01d)
   )
   (wire (pts (xy 52.07 58.42) (xy 77.47 58.42))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 1f7c90a7-471a-4824-b4e7-6e37ef0e5716)
   )
-  (wire (pts (xy 113.03 31.75) (xy 118.11 31.75))
+  (wire (pts (xy 52.07 60.96) (xy 77.47 60.96))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f5af299a-5bf7-4bdb-9bce-42b38cc249fb)
+  )
+  (wire (pts (xy 52.07 66.04) (xy 77.47 66.04))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 2ccae202-e48a-48d6-ad86-c0d2f9ff2e63)
+    (uuid a9330b67-b923-42ee-8e46-cfc6cd2b72ec)
   )
-  (wire (pts (xy 52.07 86.36) (xy 54.61 86.36))
+  (wire (pts (xy 52.07 78.74) (xy 77.47 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 30cdbe32-c9fe-47a6-85f6-122ed98f1215)
+    (uuid e8536da3-301e-4d7f-b672-0d3379da8e27)
   )
-  (wire (pts (xy 54.61 86.36) (xy 54.61 50.8))
+  (wire (pts (xy 52.07 81.28) (xy 77.47 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 52fc6d81-07fa-498e-8dbe-804dcaaffb38)
+  )
+  (wire (pts (xy 52.07 86.36) (xy 54.61 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30cdbe32-c9fe-47a6-85f6-122ed98f1215)
   )
-  (wire (pts (xy 88.9 133.35) (xy 88.9 135.89))
+  (wire (pts (xy 52.07 88.9) (xy 57.15 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3c9666ab-53b8-4f96-93f3-9ddda2382bc9)
+    (uuid 910c211b-6c12-4cec-a12d-5475125e6907)
   )
-  (wire (pts (xy 57.15 24.13) (xy 57.15 31.75))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 458ac129-8799-442d-bf1f-60a2bed77d2d)
+  (wire (pts (xy 52.07 91.44) (xy 59.69 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a45756bc-7b31-4771-a589-11d346ab9005)
   )
-  (wire (pts (xy 67.31 45.72) (xy 77.47 45.72))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 4b886480-97a1-44ac-a0c4-c2502134cd0f)
+  (wire (pts (xy 52.07 93.98) (xy 77.47 93.98))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e92d09c9-0fc6-4f56-b500-8f1192523db6)
   )
-  (wire (pts (xy 52.07 81.28) (xy 77.47 81.28))
+  (wire (pts (xy 52.07 96.52) (xy 77.47 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 52fc6d81-07fa-498e-8dbe-804dcaaffb38)
+    (uuid a59cd29a-cb65-4fa8-863b-5e6439292bbd)
   )
   (wire (pts (xy 54.61 50.8) (xy 77.47 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 53b74402-d61c-4929-a5f2-ec9bc6561e08)
   )
-  (wire (pts (xy 52.07 50.8) (xy 54.61 50.8))
+  (wire (pts (xy 54.61 86.36) (xy 54.61 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 53b74402-d61c-4929-a5f2-ec9bc6561e08)
-  )
-  (wire (pts (xy 113.03 26.67) (xy 118.11 26.67))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 564bb47e-bf05-420f-a48d-95e05cf9e00a)
-  )
-  (wire (pts (xy 113.03 29.21) (xy 118.11 29.21))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 623e4ea9-0bc4-4fd8-ba5e-0fa13b1b50b5)
+    (uuid 30cdbe32-c9fe-47a6-85f6-122ed98f1215)
   )
-  (wire (pts (xy 113.03 46.99) (xy 118.11 46.99))
+  (wire (pts (xy 57.15 24.13) (xy 57.15 31.75))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 70ca42a5-4ae2-4583-b9de-a6a6e08b612c)
+    (uuid 458ac129-8799-442d-bf1f-60a2bed77d2d)
   )
-  (wire (pts (xy 113.03 41.91) (xy 118.11 41.91))
+  (wire (pts (xy 57.15 43.18) (xy 57.15 39.37))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 75141eb0-cbfd-4c59-9513-c76f476a1c37)
+    (uuid e5003990-580f-4422-b4e4-7d6cbb7ffdb7)
   )
-  (wire (pts (xy 113.03 36.83) (xy 118.11 36.83))
+  (wire (pts (xy 57.15 43.18) (xy 77.47 43.18))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 761eb66c-77e1-4cb7-9991-8b2ecb768022)
-  )
-  (wire (pts (xy 113.03 54.61) (xy 118.11 54.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 87725e5f-b25c-4876-9f0b-6ebb02758028)
+    (uuid 07b3e3cb-e65a-4841-9873-ddb510419fc3)
   )
   (wire (pts (xy 57.15 53.34) (xy 77.47 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8838ff63-360f-48b1-a817-5d68779d104a)
   )
-  (wire (pts (xy 52.07 53.34) (xy 57.15 53.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8838ff63-360f-48b1-a817-5d68779d104a)
-  )
-  (wire (pts (xy 113.03 57.15) (xy 118.11 57.15))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8cedee41-6286-4fb0-9d55-17d981300e3e)
-  )
-  (wire (pts (xy 52.07 88.9) (xy 57.15 88.9))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 910c211b-6c12-4cec-a12d-5475125e6907)
-  )
   (wire (pts (xy 57.15 88.9) (xy 57.15 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 910c211b-6c12-4cec-a12d-5475125e6907)
   )
-  (wire (pts (xy 67.31 45.72) (xy 67.31 39.37))
+  (wire (pts (xy 59.69 55.88) (xy 77.47 55.88))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 9561e9dc-4ab8-4e7c-9501-cc5baed7fc9f)
+    (uuid ca9e5a23-766a-422c-8b2d-5483b3f4b01d)
+  )
+  (wire (pts (xy 59.69 91.44) (xy 59.69 55.88))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a45756bc-7b31-4771-a589-11d346ab9005)
   )
   (wire (pts (xy 67.31 24.13) (xy 67.31 31.75))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid a44e73f0-10ec-4428-9a31-ca91d6c25b38)
   )
-  (wire (pts (xy 59.69 91.44) (xy 59.69 55.88))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a45756bc-7b31-4771-a589-11d346ab9005)
+  (wire (pts (xy 67.31 45.72) (xy 67.31 39.37))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 9561e9dc-4ab8-4e7c-9501-cc5baed7fc9f)
   )
-  (wire (pts (xy 52.07 91.44) (xy 59.69 91.44))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a45756bc-7b31-4771-a589-11d346ab9005)
+  (wire (pts (xy 67.31 45.72) (xy 77.47 45.72))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 4b886480-97a1-44ac-a0c4-c2502134cd0f)
   )
-  (wire (pts (xy 52.07 96.52) (xy 77.47 96.52))
+  (wire (pts (xy 88.9 133.35) (xy 88.9 135.89))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a59cd29a-cb65-4fa8-863b-5e6439292bbd)
+    (uuid 3c9666ab-53b8-4f96-93f3-9ddda2382bc9)
   )
-  (wire (pts (xy 52.07 66.04) (xy 77.47 66.04))
+  (wire (pts (xy 113.03 26.67) (xy 118.11 26.67))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid a9330b67-b923-42ee-8e46-cfc6cd2b72ec)
+    (uuid 564bb47e-bf05-420f-a48d-95e05cf9e00a)
   )
-  (wire (pts (xy 52.07 43.18) (xy 57.15 43.18))
+  (wire (pts (xy 113.03 29.21) (xy 118.11 29.21))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid c5be4f92-1b23-446f-bd1b-89a93b5f0b3d)
+    (uuid 623e4ea9-0bc4-4fd8-ba5e-0fa13b1b50b5)
   )
-  (wire (pts (xy 52.07 55.88) (xy 59.69 55.88))
+  (wire (pts (xy 113.03 31.75) (xy 118.11 31.75))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid ca9e5a23-766a-422c-8b2d-5483b3f4b01d)
+    (uuid 2ccae202-e48a-48d6-ad86-c0d2f9ff2e63)
   )
-  (wire (pts (xy 59.69 55.88) (xy 77.47 55.88))
+  (wire (pts (xy 113.03 34.29) (xy 118.11 34.29))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid ca9e5a23-766a-422c-8b2d-5483b3f4b01d)
+    (uuid 1ac18345-64a6-47d1-bf23-d186b7554cd2)
   )
-  (wire (pts (xy 52.07 26.67) (xy 77.47 26.67))
+  (wire (pts (xy 113.03 36.83) (xy 118.11 36.83))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid d48c1b9f-c5ed-4f04-b6a5-65898ff01f7f)
+    (uuid 761eb66c-77e1-4cb7-9991-8b2ecb768022)
   )
-  (wire (pts (xy 57.15 43.18) (xy 57.15 39.37))
+  (wire (pts (xy 113.03 41.91) (xy 118.11 41.91))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid e5003990-580f-4422-b4e4-7d6cbb7ffdb7)
+    (uuid 75141eb0-cbfd-4c59-9513-c76f476a1c37)
   )
-  (wire (pts (xy 52.07 78.74) (xy 77.47 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e8536da3-301e-4d7f-b672-0d3379da8e27)
+  (wire (pts (xy 113.03 44.45) (xy 118.11 44.45))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 05bdf016-bff4-471e-a81f-6143ca30f466)
   )
-  (wire (pts (xy 52.07 93.98) (xy 77.47 93.98))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e92d09c9-0fc6-4f56-b500-8f1192523db6)
+  (wire (pts (xy 113.03 46.99) (xy 118.11 46.99))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 70ca42a5-4ae2-4583-b9de-a6a6e08b612c)
   )
   (wire (pts (xy 113.03 52.07) (xy 118.11 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ea50cbb1-af10-44b9-b444-6e6277708849)
   )
-  (wire (pts (xy 52.07 60.96) (xy 77.47 60.96))
+  (wire (pts (xy 113.03 54.61) (xy 118.11 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f5af299a-5bf7-4bdb-9bce-42b38cc249fb)
+    (uuid 87725e5f-b25c-4876-9f0b-6ebb02758028)
+  )
+  (wire (pts (xy 113.03 57.15) (xy 118.11 57.15))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8cedee41-6286-4fb0-9d55-17d981300e3e)
   )
 
   (text "Conventions for fields:\n- Datasheet\n- Part Name\n- Digikey\n- Reichelt"
@@ -345,63 +345,52 @@
     (uuid 05252515-bcde-4836-ab14-041bf14857e1)
   )
 
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 88.9 130.81 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 3d06ff65-4aaf-42fd-a72b-f650b4f93d3c)
-    (property "Reference" "H1" (id 0) (at 92.71 129.2224 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Module" (id 1) (at 92.71 131.7624 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "power:+3V3") (at 57.15 24.13 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid bce15e77-c55c-4d9e-8c1b-3991b33f94e5)
+    (property "Reference" "#PWR0157" (id 0) (at 57.15 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "HackAmp-Footprints:HackAmp-Module" (id 2) (at 88.9 130.81 0)
+    (property "Value" "+3V3" (id 1) (at 58.42 19.05 0))
+    (property "Footprint" "" (id 2) (at 57.15 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 88.9 130.81 0)
+    (property "Datasheet" "" (id 3) (at 57.15 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid dbcf5db6-54b3-4ea1-973d-ab84ffcafd75))
+    (pin "1" (uuid 3801ead1-ea34-4609-a4a8-d0304c1561eb))
   )
 
-  (symbol (lib_id "Device:R") (at 67.31 35.56 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 67.31 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 899a433f-d5c9-4c79-a4c5-5132b8c3416f)
-    (property "Reference" "R24" (id 0) (at 69.85 34.29 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 69.85 35.56 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 65.532 35.56 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 67.31 35.56 0)
+    (uuid e217b260-b577-4b22-adc1-97bd3d60c872)
+    (property "Reference" "#PWR0158" (id 0) (at 67.31 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Mouser" "652-CR0603FX-1002ELF" (id 4) (at 67.31 35.56 0)
+    (property "Value" "+3V3" (id 1) (at 68.58 19.05 0))
+    (property "Footprint" "" (id 2) (at 67.31 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Part Name" "Bourns CR0603-FX-1002ELF" (id 5) (at 67.31 35.56 0)
+    (property "Datasheet" "" (id 3) (at 67.31 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9c63ad51-f4e0-4c9a-987f-689a856d2194))
-    (pin "2" (uuid 29c3c535-56ad-46ea-b68c-848f49e4928f))
+    (pin "1" (uuid cd8e82b8-619c-467c-9aee-56d143356abe))
   )
 
-  (symbol (lib_id "power:+3V3") (at 57.15 24.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid bce15e77-c55c-4d9e-8c1b-3991b33f94e5)
-    (property "Reference" "#PWR0157" (id 0) (at 57.15 27.94 0)
+  (symbol (lib_id "power:GND") (at 88.9 135.89 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid dc5626e6-ecea-472a-a977-61032b46ad95)
+    (property "Reference" "#PWR0177" (id 0) (at 88.9 142.24 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 58.42 19.05 0))
-    (property "Footprint" "" (id 2) (at 57.15 24.13 0)
+    (property "Value" "GND" (id 1) (at 88.9 140.97 0))
+    (property "Footprint" "" (id 2) (at 88.9 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 57.15 24.13 0)
+    (property "Datasheet" "" (id 3) (at 88.9 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3801ead1-ea34-4609-a4a8-d0304c1561eb))
+    (pin "1" (uuid 041e1d42-1b4a-4b2f-ba8e-1d5fb8c71494))
   )
 
   (symbol (lib_id "Device:R") (at 57.15 35.56 0) (unit 1)
@@ -429,51 +418,102 @@
     (pin "2" (uuid eb312c58-15fc-45ff-a2f4-74380fee97ad))
   )
 
-  (symbol (lib_id "power:GND") (at 88.9 135.89 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid dc5626e6-ecea-472a-a977-61032b46ad95)
-    (property "Reference" "#PWR0177" (id 0) (at 88.9 142.24 0)
+  (symbol (lib_id "Device:R") (at 67.31 35.56 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 899a433f-d5c9-4c79-a4c5-5132b8c3416f)
+    (property "Reference" "R24" (id 0) (at 69.85 34.29 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 69.85 35.56 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 65.532 35.56 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 88.9 140.97 0))
-    (property "Footprint" "" (id 2) (at 88.9 135.89 0)
+    (property "Datasheet" "~" (id 3) (at 67.31 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 88.9 135.89 0)
+    (property "Mouser" "652-CR0603FX-1002ELF" (id 4) (at 67.31 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 041e1d42-1b4a-4b2f-ba8e-1d5fb8c71494))
+    (property "Part Name" "Bourns CR0603-FX-1002ELF" (id 5) (at 67.31 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9c63ad51-f4e0-4c9a-987f-689a856d2194))
+    (pin "2" (uuid 29c3c535-56ad-46ea-b68c-848f49e4928f))
   )
 
-  (symbol (lib_id "power:+3V3") (at 67.31 24.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e217b260-b577-4b22-adc1-97bd3d60c872)
-    (property "Reference" "#PWR0158" (id 0) (at 67.31 27.94 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 88.9 130.81 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 3d06ff65-4aaf-42fd-a72b-f650b4f93d3c)
+    (property "Reference" "H1" (id 0) (at 92.71 129.2224 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "+3V3" (id 1) (at 68.58 19.05 0))
-    (property "Footprint" "" (id 2) (at 67.31 24.13 0)
+    (property "Value" "Module" (id 1) (at 92.71 131.7624 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "HackAmp-Footprints:HackAmp-Module" (id 2) (at 88.9 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 67.31 24.13 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid cd8e82b8-619c-467c-9aee-56d143356abe))
+    (pin "1" (uuid dbcf5db6-54b3-4ea1-973d-ab84ffcafd75))
   )
 
-  (sheet (at 21.59 24.13) (size 30.48 5.08)
+  (sheet (at 118.11 24.13) (size 21.59 35.56)
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
-    (uuid 00000000-0000-0000-0000-00005fa5bc7f)
-    (property "Schaltplanname" "Power Supply" (id 0) (at 21.59 23.4945 0)
+    (uuid 00000000-0000-0000-0000-00005fb71226)
+    (property "Schaltplanname" "Front" (id 0) (at 118.11 23.4945 0)
       (effects (font (size 1.27 1.27)) (justify left bottom))
     )
-    (property "Dateiname Blatt" "power-supply.kicad_sch" (id 1) (at 21.59 29.7185 0)
+    (property "Dateiname Blatt" "front.kicad_sch" (id 1) (at 118.11 60.96 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "19V_ANALOG" output (at 52.07 26.67 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-      (uuid 423fca22-5277-4d6a-91b5-4a517a206987)
+    (pin "PWR" output (at 118.11 26.67 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 5885a8d5-f5a4-4f14-acfb-de9969cf454c)
+    )
+    (pin "ENC_B" output (at 118.11 44.45 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid c2690113-f9c5-4ea6-a0c0-633d55b799d0)
+    )
+    (pin "ENC_A" output (at 118.11 41.91 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 5da0ab28-cf00-4b2b-9111-8029e97626b7)
+    )
+    (pin "ENC_SW" output (at 118.11 46.99 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid eef85435-6493-4915-b802-15e2fdff8032)
+    )
+    (pin "MIC1" output (at 118.11 29.21 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 63d824a7-60d5-4377-90db-6f87ab5fbec1)
+    )
+    (pin "BT2" output (at 118.11 36.83 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 3b5a64f5-4aa6-41c9-9914-7fac24622981)
+    )
+    (pin "MIC2" output (at 118.11 31.75 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 4115ab33-d372-442f-9f01-9cd104022c54)
+    )
+    (pin "BT1" output (at 118.11 34.29 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 2cb4bc6e-3c8a-4f4a-b3a8-32fb3f6ec112)
+    )
+    (pin "~{PWR_LED}" input (at 118.11 52.07 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 7e1648b5-7a69-4e61-ab5d-044a23f185e8)
+    )
+    (pin "~{MIC_LED}" input (at 118.11 54.61 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 42235eb9-abd5-434a-9d46-243c5b345ded)
+    )
+    (pin "~{RADIO_LED}" input (at 118.11 57.15 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 5a9baa36-8643-4b7f-b56b-7fe89cd06d17)
     )
   )
 
@@ -521,6 +561,22 @@
     )
   )
 
+  (sheet (at 21.59 24.13) (size 30.48 5.08)
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (fill (color 0 0 0 0.0000))
+    (uuid 00000000-0000-0000-0000-00005fa5bc7f)
+    (property "Schaltplanname" "Power Supply" (id 0) (at 21.59 23.4945 0)
+      (effects (font (size 1.27 1.27)) (justify left bottom))
+    )
+    (property "Dateiname Blatt" "power-supply.kicad_sch" (id 1) (at 21.59 29.7185 0)
+      (effects (font (size 1.27 1.27)) (justify left top))
+    )
+    (pin "19V_ANALOG" output (at 52.07 26.67 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+      (uuid 423fca22-5277-4d6a-91b5-4a517a206987)
+    )
+  )
+
   (sheet (at 77.47 24.13) (size 35.56 74.93)
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
@@ -629,62 +685,6 @@
     )
   )
 
-  (sheet (at 118.11 24.13) (size 21.59 35.56)
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (fill (color 0 0 0 0.0000))
-    (uuid 00000000-0000-0000-0000-00005fb71226)
-    (property "Schaltplanname" "Front" (id 0) (at 118.11 23.4945 0)
-      (effects (font (size 1.27 1.27)) (justify left bottom))
-    )
-    (property "Dateiname Blatt" "front.kicad_sch" (id 1) (at 118.11 60.96 0)
-      (effects (font (size 1.27 1.27)) (justify left top))
-    )
-    (pin "PWR" output (at 118.11 26.67 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 5885a8d5-f5a4-4f14-acfb-de9969cf454c)
-    )
-    (pin "ENC_B" output (at 118.11 44.45 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid c2690113-f9c5-4ea6-a0c0-633d55b799d0)
-    )
-    (pin "ENC_A" output (at 118.11 41.91 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 5da0ab28-cf00-4b2b-9111-8029e97626b7)
-    )
-    (pin "ENC_SW" output (at 118.11 46.99 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid eef85435-6493-4915-b802-15e2fdff8032)
-    )
-    (pin "MIC1" output (at 118.11 29.21 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 63d824a7-60d5-4377-90db-6f87ab5fbec1)
-    )
-    (pin "BT2" output (at 118.11 36.83 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 3b5a64f5-4aa6-41c9-9914-7fac24622981)
-    )
-    (pin "MIC2" output (at 118.11 31.75 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 4115ab33-d372-442f-9f01-9cd104022c54)
-    )
-    (pin "BT1" output (at 118.11 34.29 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 2cb4bc6e-3c8a-4f4a-b3a8-32fb3f6ec112)
-    )
-    (pin "~{PWR_LED}" input (at 118.11 52.07 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 7e1648b5-7a69-4e61-ab5d-044a23f185e8)
-    )
-    (pin "~{MIC_LED}" input (at 118.11 54.61 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 42235eb9-abd5-434a-9d46-243c5b345ded)
-    )
-    (pin "~{RADIO_LED}" input (at 118.11 57.15 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid 5a9baa36-8643-4b7f-b56b-7fe89cd06d17)
-    )
-  )
-
   (sheet (at 21.59 76.2) (size 30.48 22.86) (fields_autoplaced)
     (stroke (width 0.1524) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
@@ -1095,15 +1095,6 @@
     (path "/00000000-0000-0000-0000-00005fa5bd7a/49856d73-4490-42eb-bec9-361a57a88f47"
       (reference "#PWR0216") (unit 1) (value "GND") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-00005fb71226/0db92e0a-281c-4e4e-a69f-246473a5484b"
-      (reference "#PWR0217") (unit 1) (value "+5V") (footprint "")
-    )
-    (path "/00000000-0000-0000-0000-00005fb71226/3b2206d7-ab67-4143-994d-f82b77f6c99a"
-      (reference "#PWR0218") (unit 1) (value "+5V") (footprint "")
-    )
-    (path "/00000000-0000-0000-0000-00005fb71226/bdc4b91f-b51d-4f03-843d-31df11d19307"
-      (reference "#PWR0219") (unit 1) (value "+5V") (footprint "")
-    )
     (path "/00000000-0000-0000-0000-00005fb71226/79ad8c62-da0a-43be-b330-99a0cfa1ecb8"
       (reference "#PWR0220") (unit 1) (value "GND") (footprint "")
     )
@@ -1119,6 +1110,15 @@
     (path "/00000000-0000-0000-0000-00005fa5bc7f/bf045521-4e65-4de5-bf03-f695f61ccb19"
       (reference "#PWR0234") (unit 1) (value "+5V") (footprint "")
     )
+    (path "/00000000-0000-0000-0000-00005fb71226/5b882e46-af6b-4476-9b5a-395cabfaa2a2"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005fb71226/cbf42cd8-c8e2-4b65-a3aa-8855de7839a1"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005fb71226/f90ccf02-0619-4286-a0e0-605de1d1b3f5"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/00000000-0000-0000-0000-00005fa5bc7f/00000000-0000-0000-0000-00005faf6729"
       (reference "C1") (unit 1) (value "100uF/35V") (footprint "Capacitor_SMD:CP_Elec_8x10")
     )
@@ -1279,13 +1279,13 @@
       (reference "C71") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/8a1b403a-0ab4-43ca-bae5-45876297f770"
-      (reference "D1") (unit 1) (value "LED") (footprint "HackAmp-Footprints:LED_0603_1608Metric_SideView_Inolux")
+      (reference "D1") (unit 1) (value "BLUE") (footprint "HackAmp-Footprints:LED_0603_1608Metric_SideView_Inolux")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/164ce529-95d5-49e8-bc8d-878903dc1856"
-      (reference "D2") (unit 1) (value "LED") (footprint "HackAmp-Footprints:LED_0603_1608Metric_SideView_Inolux")
+      (reference "D2") (unit 1) (value "RED") (footprint "HackAmp-Footprints:LED_0603_1608Metric_SideView_Inolux")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/676b09e0-6b95-478d-8c85-1b522c078161"
-      (reference "D3") (unit 1) (value "LED") (footprint "HackAmp-Footprints:LED_0603_1608Metric_SideView_Inolux")
+      (reference "D3") (unit 1) (value "BLUE") (footprint "HackAmp-Footprints:LED_0603_1608Metric_SideView_Inolux")
     )
     (path "/00000000-0000-0000-0000-00005fa5bc7f/00000000-0000-0000-0000-00005faf53da"
       (reference "F1") (unit 1) (value "4A") (footprint "HackAmp-Footprints:Fuseholder_Littlefuse_NANO2-154")
@@ -1450,13 +1450,13 @@
       (reference "R36") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/893582db-03ff-4f92-bcda-d00390109578"
-      (reference "R37") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
+      (reference "R37") (unit 1) (value "100") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/7ba19e7c-1f00-4267-80ee-c62a7617cd1c"
-      (reference "R38") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
+      (reference "R38") (unit 1) (value "300") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/53fd3a9c-3778-4d67-a10e-4bf72da927a4"
-      (reference "R39") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
+      (reference "R39") (unit 1) (value "100") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00005fb71226/a419c525-2015-4aaa-b09c-cee0fc9a0e3a"
       (reference "R52") (unit 1) (value "82k") (footprint "Resistor_SMD:R_0603_1608Metric")

hardware/base/wireless.kicad_sch

@@ -440,7 +440,7 @@
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "SW_Push_0_1"
-        (circle (center -2.032 0) (radius 0.508)           (stroke (width 0) (type default) (color 0 0 0 0))
+        (circle (center -2.032 0) (radius 0.508) (stroke (width 0))           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
@@ -459,7 +459,7 @@
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (circle (center 2.032 0) (radius 0.508)           (stroke (width 0) (type default) (color 0 0 0 0))
+        (circle (center 2.032 0) (radius 0.508) (stroke (width 0))           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (pin passive line (at -5.08 0 0) (length 2.54)
@@ -566,26 +566,15 @@
     )
   )
 
-  (junction (at 200.66 140.97) (diameter 0) (color 0 0 0 0))
-  (junction (at 195.58 125.73) (diameter 0) (color 0 0 0 0))
-  (junction (at 138.43 38.1) (diameter 0) (color 0 0 0 0))
+  (junction (at 118.11 38.1) (diameter 0) (color 0 0 0 0))
+  (junction (at 128.27 38.1) (diameter 0) (color 0 0 0 0))
   (junction (at 128.27 48.26) (diameter 0) (color 0 0 0 0))
-  (junction (at 200.66 125.73) (diameter 0) (color 0 0 0 0))
+  (junction (at 138.43 38.1) (diameter 0) (color 0 0 0 0))
   (junction (at 138.43 48.26) (diameter 0) (color 0 0 0 0))
-  (junction (at 128.27 38.1) (diameter 0) (color 0 0 0 0))
-  (junction (at 118.11 38.1) (diameter 0) (color 0 0 0 0))
+  (junction (at 195.58 125.73) (diameter 0) (color 0 0 0 0))
+  (junction (at 200.66 125.73) (diameter 0) (color 0 0 0 0))
+  (junction (at 200.66 140.97) (diameter 0) (color 0 0 0 0))
 
-  (no_connect (at 128.27 101.6) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 104.14) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 106.68) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 109.22) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 111.76) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 114.3) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 116.84) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 58.42) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 63.5) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 68.58) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
-  (no_connect (at 128.27 71.12) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
   (no_connect (at 97.79 63.5) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
   (no_connect (at 97.79 66.04) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
   (no_connect (at 97.79 88.9) (uuid d719ce81-5956-4315-850e-fb53902cf85f))
@@ -594,10 +583,21 @@
   (no_connect (at 97.79 96.52) (uuid d719ce81-5956-4315-850e-fb53902cf85f))
   (no_connect (at 97.79 99.06) (uuid d719ce81-5956-4315-850e-fb53902cf85f))
   (no_connect (at 97.79 101.6) (uuid d719ce81-5956-4315-850e-fb53902cf85f))
+  (no_connect (at 128.27 58.42) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 63.5) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 68.58) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 71.12) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 101.6) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 104.14) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 106.68) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 109.22) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 111.76) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 114.3) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
+  (no_connect (at 128.27 116.84) (uuid b08059ea-8a6b-4677-9f68-42b312e4f362))
 
-  (wire (pts (xy 128.27 73.66) (xy 133.35 73.66))
+  (wire (pts (xy 90.17 58.42) (xy 97.79 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 092f25c2-6a37-4a09-ac1c-c7b5724fb90f)
+    (uuid 40debdb7-2d24-4aaf-a90e-81d20640a814)
   )
   (wire (pts (xy 113.03 38.1) (xy 118.11 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -607,173 +607,169 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 198d48b4-530b-4170-ac06-b7e55653debf)
   )
-  (wire (pts (xy 128.27 81.28) (xy 133.35 81.28))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 278a263c-eecf-44e3-9c04-4c6fd4ec2bda)
-  )
-  (wire (pts (xy 140.97 66.04) (xy 128.27 66.04))
+  (wire (pts (xy 113.03 124.46) (xy 113.03 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2b18011a-bc6b-4dbe-acd0-2da0692f69ca)
+    (uuid 39abe0f8-49e5-479a-9772-24cded7d7bf4)
   )
-  (wire (pts (xy 200.66 123.19) (xy 200.66 125.73))
+  (wire (pts (xy 118.11 38.1) (xy 118.11 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2c759e40-952b-4e44-893c-bb38fd32744a)
+    (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
   )
-  (wire (pts (xy 128.27 38.1) (xy 118.11 38.1))
+  (wire (pts (xy 118.11 45.72) (xy 118.11 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
+    (uuid 6c317c20-f37d-4368-af3a-6ab36f63bb3f)
   )
-  (wire (pts (xy 118.11 38.1) (xy 118.11 40.64))
+  (wire (pts (xy 118.11 48.26) (xy 128.27 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
+    (uuid 6c317c20-f37d-4368-af3a-6ab36f63bb3f)
   )
-  (wire (pts (xy 138.43 38.1) (xy 128.27 38.1))
+  (wire (pts (xy 128.27 38.1) (xy 118.11 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
   )
-  (wire (pts (xy 138.43 40.64) (xy 138.43 38.1))
+  (wire (pts (xy 128.27 38.1) (xy 128.27 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
+    (uuid aced7c57-1fff-44de-a4a2-006965481b51)
   )
-  (wire (pts (xy 210.82 135.89) (xy 215.9 135.89))
+  (wire (pts (xy 128.27 45.72) (xy 128.27 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 37889b6d-834a-4dcd-bcee-82579b8d1994)
+    (uuid b9aa33c8-fbed-4357-acc9-3d73e5e1853c)
   )
-  (wire (pts (xy 215.9 133.35) (xy 210.82 133.35))
+  (wire (pts (xy 128.27 48.26) (xy 138.43 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 39a3b405-a108-423f-adf5-1ec6e7130f2b)
+    (uuid 6c317c20-f37d-4368-af3a-6ab36f63bb3f)
   )
-  (wire (pts (xy 113.03 124.46) (xy 113.03 127))
+  (wire (pts (xy 128.27 73.66) (xy 133.35 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 39abe0f8-49e5-479a-9772-24cded7d7bf4)
+    (uuid 092f25c2-6a37-4a09-ac1c-c7b5724fb90f)
   )
-  (wire (pts (xy 128.27 99.06) (xy 130.81 99.06))
+  (wire (pts (xy 128.27 76.2) (xy 133.35 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3fbcce07-e967-49ee-83c1-07840bdfe857)
+    (uuid 9f53713b-d492-4a4a-8846-2929da4f4d23)
   )
-  (wire (pts (xy 90.17 58.42) (xy 97.79 58.42))
+  (wire (pts (xy 128.27 78.74) (xy 133.35 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 40debdb7-2d24-4aaf-a90e-81d20640a814)
+    (uuid a0318ed7-744d-45db-9f0f-924f3eda09f2)
   )
-  (wire (pts (xy 176.53 60.96) (xy 189.23 60.96))
+  (wire (pts (xy 128.27 81.28) (xy 133.35 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4b8e4cb8-bf8c-4a0b-9675-4472c2b6ba67)
+    (uuid 278a263c-eecf-44e3-9c04-4c6fd4ec2bda)
   )
-  (wire (pts (xy 200.66 113.03) (xy 200.66 115.57))
+  (wire (pts (xy 128.27 83.82) (xy 130.81 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4d0c63fc-8b35-4eee-8c31-147c0cb622e5)
+    (uuid bfd90a53-ee25-4cc2-bc81-59c2b044cf81)
   )
-  (wire (pts (xy 128.27 96.52) (xy 130.81 96.52))
+  (wire (pts (xy 128.27 86.36) (xy 130.81 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 517e9a70-0c91-4c35-bdf9-7f02c2f11ba6)
+    (uuid b59a5177-ac4a-4403-8550-a62cfb277593)
   )
-  (wire (pts (xy 210.82 128.27) (xy 215.9 128.27))
+  (wire (pts (xy 128.27 88.9) (xy 130.81 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5b7ab339-7a7b-4f59-86be-3d9fd201eba6)
+    (uuid 7d2242b0-99c1-4e18-ac7e-68aeb776eb29)
   )
-  (wire (pts (xy 186.69 55.88) (xy 186.69 53.34))
+  (wire (pts (xy 128.27 91.44) (xy 130.81 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5dca9f74-fbf5-4ab7-9359-206be46e12c1)
+    (uuid c5641c85-b301-4390-b459-9a452727ef96)
   )
-  (wire (pts (xy 189.23 55.88) (xy 186.69 55.88))
+  (wire (pts (xy 128.27 93.98) (xy 130.81 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5dca9f74-fbf5-4ab7-9359-206be46e12c1)
+    (uuid ae2e231d-7f51-4de1-a0e0-b93f76c27f23)
   )
-  (wire (pts (xy 200.66 125.73) (xy 200.66 128.27))
+  (wire (pts (xy 128.27 96.52) (xy 130.81 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5f5b7b6f-9d11-4504-b394-59e95cb1df9f)
+    (uuid 517e9a70-0c91-4c35-bdf9-7f02c2f11ba6)
   )
-  (wire (pts (xy 118.11 48.26) (xy 128.27 48.26))
+  (wire (pts (xy 128.27 99.06) (xy 130.81 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c317c20-f37d-4368-af3a-6ab36f63bb3f)
+    (uuid 3fbcce07-e967-49ee-83c1-07840bdfe857)
   )
-  (wire (pts (xy 118.11 45.72) (xy 118.11 48.26))
+  (wire (pts (xy 138.43 35.56) (xy 138.43 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c317c20-f37d-4368-af3a-6ab36f63bb3f)
+    (uuid c7913f4c-ce75-42fe-b3a8-6995a3b83cea)
   )
-  (wire (pts (xy 128.27 48.26) (xy 138.43 48.26))
+  (wire (pts (xy 138.43 38.1) (xy 128.27 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c317c20-f37d-4368-af3a-6ab36f63bb3f)
+    (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
   )
-  (wire (pts (xy 195.58 138.43) (xy 195.58 140.97))
+  (wire (pts (xy 138.43 40.64) (xy 138.43 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 755bfde1-fad1-431f-9370-3c3cd41c7f46)
+    (uuid 328d7672-798e-4802-a047-a0b91c9656b9)
   )
-  (wire (pts (xy 195.58 140.97) (xy 200.66 140.97))
+  (wire (pts (xy 138.43 45.72) (xy 138.43 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 755bfde1-fad1-431f-9370-3c3cd41c7f46)
+    (uuid fa8520d0-0aff-4716-b64e-94f9ad8e2508)
   )
-  (wire (pts (xy 215.9 130.81) (xy 210.82 130.81))
+  (wire (pts (xy 138.43 48.26) (xy 138.43 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 781831de-3bb2-48fe-b5b5-4d42df99d2b0)
+    (uuid fa8520d0-0aff-4716-b64e-94f9ad8e2508)
   )
-  (wire (pts (xy 128.27 88.9) (xy 130.81 88.9))
+  (wire (pts (xy 140.97 60.96) (xy 128.27 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7d2242b0-99c1-4e18-ac7e-68aeb776eb29)
+    (uuid 89daa0d8-0a21-400f-9e6f-707b538b61b3)
   )
-  (wire (pts (xy 187.96 125.73) (xy 195.58 125.73))
+  (wire (pts (xy 140.97 66.04) (xy 128.27 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 81e8cb50-8fe0-48b2-8f84-20014674eeae)
+    (uuid 2b18011a-bc6b-4dbe-acd0-2da0692f69ca)
   )
-  (wire (pts (xy 195.58 125.73) (xy 200.66 125.73))
+  (wire (pts (xy 176.53 58.42) (xy 189.23 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 81e8cb50-8fe0-48b2-8f84-20014674eeae)
+    (uuid 82f6f64b-b745-4593-8235-eb6b2bc92c9a)
   )
-  (wire (pts (xy 200.66 125.73) (xy 215.9 125.73))
+  (wire (pts (xy 176.53 60.96) (xy 189.23 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 81e8cb50-8fe0-48b2-8f84-20014674eeae)
+    (uuid 4b8e4cb8-bf8c-4a0b-9675-4472c2b6ba67)
   )
-  (wire (pts (xy 176.53 58.42) (xy 189.23 58.42))
+  (wire (pts (xy 186.69 55.88) (xy 186.69 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 82f6f64b-b745-4593-8235-eb6b2bc92c9a)
+    (uuid 5dca9f74-fbf5-4ab7-9359-206be46e12c1)
   )
-  (wire (pts (xy 140.97 60.96) (xy 128.27 60.96))
+  (wire (pts (xy 186.69 63.5) (xy 189.23 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 89daa0d8-0a21-400f-9e6f-707b538b61b3)
+    (uuid deae0d35-5f56-4588-8b6f-609104c65b16)
   )
-  (wire (pts (xy 210.82 138.43) (xy 215.9 138.43))
+  (wire (pts (xy 186.69 66.04) (xy 186.69 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 96c38a84-302d-404c-af98-925c4623140f)
+    (uuid deae0d35-5f56-4588-8b6f-609104c65b16)
   )
-  (wire (pts (xy 210.82 140.97) (xy 210.82 138.43))
+  (wire (pts (xy 187.96 125.73) (xy 195.58 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 96c38a84-302d-404c-af98-925c4623140f)
+    (uuid 81e8cb50-8fe0-48b2-8f84-20014674eeae)
   )
-  (wire (pts (xy 128.27 76.2) (xy 133.35 76.2))
+  (wire (pts (xy 189.23 55.88) (xy 186.69 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9f53713b-d492-4a4a-8846-2929da4f4d23)
+    (uuid 5dca9f74-fbf5-4ab7-9359-206be46e12c1)
   )
-  (wire (pts (xy 128.27 78.74) (xy 133.35 78.74))
+  (wire (pts (xy 195.58 125.73) (xy 195.58 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a0318ed7-744d-45db-9f0f-924f3eda09f2)
+    (uuid e71fec33-3af5-49b0-93be-9465b71651be)
   )
-  (wire (pts (xy 128.27 38.1) (xy 128.27 40.64))
+  (wire (pts (xy 195.58 125.73) (xy 200.66 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid aced7c57-1fff-44de-a4a2-006965481b51)
+    (uuid 81e8cb50-8fe0-48b2-8f84-20014674eeae)
   )
-  (wire (pts (xy 128.27 93.98) (xy 130.81 93.98))
+  (wire (pts (xy 195.58 138.43) (xy 195.58 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ae2e231d-7f51-4de1-a0e0-b93f76c27f23)
+    (uuid 755bfde1-fad1-431f-9370-3c3cd41c7f46)
   )
-  (wire (pts (xy 128.27 86.36) (xy 130.81 86.36))
+  (wire (pts (xy 195.58 140.97) (xy 200.66 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b59a5177-ac4a-4403-8550-a62cfb277593)
+    (uuid 755bfde1-fad1-431f-9370-3c3cd41c7f46)
   )
-  (wire (pts (xy 128.27 45.72) (xy 128.27 48.26))
+  (wire (pts (xy 200.66 113.03) (xy 200.66 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b9aa33c8-fbed-4357-acc9-3d73e5e1853c)
+    (uuid 4d0c63fc-8b35-4eee-8c31-147c0cb622e5)
   )
-  (wire (pts (xy 128.27 83.82) (xy 130.81 83.82))
+  (wire (pts (xy 200.66 123.19) (xy 200.66 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bfd90a53-ee25-4cc2-bc81-59c2b044cf81)
+    (uuid 2c759e40-952b-4e44-893c-bb38fd32744a)
   )
-  (wire (pts (xy 128.27 91.44) (xy 130.81 91.44))
+  (wire (pts (xy 200.66 125.73) (xy 200.66 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c5641c85-b301-4390-b459-9a452727ef96)
+    (uuid 5f5b7b6f-9d11-4504-b394-59e95cb1df9f)
   )
-  (wire (pts (xy 138.43 35.56) (xy 138.43 38.1))
+  (wire (pts (xy 200.66 125.73) (xy 215.9 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c7913f4c-ce75-42fe-b3a8-6995a3b83cea)
+    (uuid 81e8cb50-8fe0-48b2-8f84-20014674eeae)
   )
   (wire (pts (xy 200.66 133.35) (xy 200.66 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -783,161 +779,211 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid db8f4bb3-7c47-4eaf-986f-c40be2dfebd4)
   )
-  (wire (pts (xy 186.69 63.5) (xy 189.23 63.5))
+  (wire (pts (xy 210.82 128.27) (xy 215.9 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid deae0d35-5f56-4588-8b6f-609104c65b16)
+    (uuid 5b7ab339-7a7b-4f59-86be-3d9fd201eba6)
   )
-  (wire (pts (xy 186.69 66.04) (xy 186.69 63.5))
+  (wire (pts (xy 210.82 135.89) (xy 215.9 135.89))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid deae0d35-5f56-4588-8b6f-609104c65b16)
+    (uuid 37889b6d-834a-4dcd-bcee-82579b8d1994)
   )
-  (wire (pts (xy 195.58 125.73) (xy 195.58 128.27))
+  (wire (pts (xy 210.82 138.43) (xy 215.9 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e71fec33-3af5-49b0-93be-9465b71651be)
+    (uuid 96c38a84-302d-404c-af98-925c4623140f)
   )
-  (wire (pts (xy 138.43 45.72) (xy 138.43 48.26))
+  (wire (pts (xy 210.82 140.97) (xy 210.82 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fa8520d0-0aff-4716-b64e-94f9ad8e2508)
+    (uuid 96c38a84-302d-404c-af98-925c4623140f)
   )
-  (wire (pts (xy 138.43 48.26) (xy 138.43 50.8))
+  (wire (pts (xy 215.9 130.81) (xy 210.82 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fa8520d0-0aff-4716-b64e-94f9ad8e2508)
-  )
-
-  (label "DEBUG_RXD" (at 176.53 58.42 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 198f95f4-3673-4117-88c2-132053240f92)
-  )
-  (label "~{RESET}" (at 187.96 125.73 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 2f71807d-902e-4747-9460-f83d89ed820f)
+    (uuid 781831de-3bb2-48fe-b5b5-4d42df99d2b0)
   )
-  (label "TMS" (at 133.35 78.74 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 3d3e6811-0254-482f-8fdb-3835a46d41a4)
+  (wire (pts (xy 215.9 133.35) (xy 210.82 133.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 39a3b405-a108-423f-adf5-1ec6e7130f2b)
   )
+
   (label "~{RESET}" (at 90.17 58.42 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3ecc5429-5a51-433f-bfd9-0a1de4803f77)
   )
-  (label "DEBUG_TXD" (at 140.97 66.04 180)
+  (label "TDI" (at 133.35 73.66 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 490eec46-f3af-4a90-a5b7-af96383ba8ed)
+    (uuid c46365ae-0965-4395-8642-a02e2926f857)
   )
   (label "TCK" (at 133.35 76.2 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5591e874-c8b9-4988-935b-5d46fd183591)
   )
-  (label "TCK" (at 210.82 133.35 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 56ec24f4-898f-4c68-847e-71b39fc48b00)
+  (label "TMS" (at 133.35 78.74 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 3d3e6811-0254-482f-8fdb-3835a46d41a4)
   )
   (label "TDO" (at 133.35 81.28 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 77e7b452-bbcc-413c-a6c0-d3cd3cf40732)
   )
+  (label "DEBUG_RXD" (at 140.97 60.96 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid fd70403f-449e-4488-8940-26fbc46ef0a2)
+  )
+  (label "DEBUG_TXD" (at 140.97 66.04 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 490eec46-f3af-4a90-a5b7-af96383ba8ed)
+  )
+  (label "DEBUG_RXD" (at 176.53 58.42 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 198f95f4-3673-4117-88c2-132053240f92)
+  )
   (label "DEBUG_TXD" (at 176.53 60.96 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 82de3ddf-160c-4884-a7ce-3b8711506a62)
   )
-  (label "TDO" (at 210.82 135.89 0)
+  (label "~{RESET}" (at 187.96 125.73 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 8b32c486-0161-4c2e-8613-ebc32c81d319)
+    (uuid 2f71807d-902e-4747-9460-f83d89ed820f)
   )
   (label "TMS" (at 210.82 128.27 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 92a1979f-c11d-4ce1-a839-0d89db07f906)
   )
-  (label "TDI" (at 133.35 73.66 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid c46365ae-0965-4395-8642-a02e2926f857)
-  )
   (label "TDI" (at 210.82 130.81 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f7719c67-076e-4af4-ae1a-14233ea1f63e)
   )
-  (label "DEBUG_RXD" (at 140.97 60.96 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid fd70403f-449e-4488-8940-26fbc46ef0a2)
+  (label "TCK" (at 210.82 133.35 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 56ec24f4-898f-4c68-847e-71b39fc48b00)
   )
-
-  (hierarchical_label "WS" (shape input) (at 130.81 93.98 0)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 1df88613-4cc9-407d-904e-fd95cf28ec4b)
+  (label "TDO" (at 210.82 135.89 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 8b32c486-0161-4c2e-8613-ebc32c81d319)
   )
+
   (hierarchical_label "RX" (shape input) (at 130.81 83.82 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2793a7d2-f092-466a-af1e-98845a897b46)
   )
-  (hierarchical_label "SDO" (shape output) (at 130.81 99.06 0)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 2f611d54-7837-416d-beab-e2b5a134cb2e)
-  )
   (hierarchical_label "TX" (shape output) (at 130.81 86.36 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 48615102-4703-4db6-bdd6-225d4ee7a823)
   )
-  (hierarchical_label "SDI" (shape input) (at 130.81 96.52 0)
+  (hierarchical_label "MCK" (shape input) (at 130.81 88.9 0)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a04880c9-342e-440d-a862-d0f3cff16da7)
+    (uuid ee0d7088-ce33-4d8f-bbda-5530c0262f1c)
   )
   (hierarchical_label "CK" (shape input) (at 130.81 91.44 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid ada35c79-cd1a-47d2-8565-6495daa5d746)
   )
-  (hierarchical_label "MCK" (shape input) (at 130.81 88.9 0)
+  (hierarchical_label "WS" (shape input) (at 130.81 93.98 0)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid ee0d7088-ce33-4d8f-bbda-5530c0262f1c)
+    (uuid 1df88613-4cc9-407d-904e-fd95cf28ec4b)
+  )
+  (hierarchical_label "SDI" (shape input) (at 130.81 96.52 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid a04880c9-342e-440d-a862-d0f3cff16da7)
+  )
+  (hierarchical_label "SDO" (shape output) (at 130.81 99.06 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 2f611d54-7837-416d-beab-e2b5a134cb2e)
   )
 
-  (symbol (lib_id "Device:C_Small") (at 128.27 43.18 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 09561b11-20a7-42fa-8daf-7d6083b7b113)
-    (property "Reference" "C27" (id 0) (at 130.5942 42.0306 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "power:+3.3V") (at 138.43 35.56 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5751ac58-a532-4c02-a8f7-fb38f48ce08c)
+    (property "Reference" "#PWR0167" (id 0) (at 138.43 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "10uF" (id 1) (at 130.594 44.3296 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "+3.3V" (id 1) (at 138.43 30.48 0))
+    (property "Footprint" "" (id 2) (at 138.43 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 128.27 43.18 0)
+    (property "Datasheet" "" (id 3) (at 138.43 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 128.27 43.18 0)
+    (pin "1" (uuid 1aa50622-58e1-41b4-b87c-e3b0745f7d70))
+  )
+
+  (symbol (lib_id "power:+3.3V") (at 186.69 53.34 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid c4a1295d-bcd0-4277-9b0b-6fc26c1b0e5a)
+    (property "Reference" "#PWR0182" (id 0) (at 186.69 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Mouser" "581-06033C104KAT4A" (id 4) (at 128.27 43.18 0)
+    (property "Value" "+3.3V" (id 1) (at 186.69 48.26 0))
+    (property "Footprint" "" (id 2) (at 186.69 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Part Name" "AVX 06033C104KAT4A" (id 5) (at 128.27 43.18 0)
+    (property "Datasheet" "" (id 3) (at 186.69 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 35e4b8eb-2ad0-46bb-8c2c-4be505fada91))
-    (pin "2" (uuid df1685ed-2690-4031-bbdb-3b9d250d2465))
+    (pin "1" (uuid 22b14273-4656-4b72-abb5-309815c80735))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 138.43 43.18 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 123dcaa4-51a5-4f77-8b3c-789cdeafbb04)
-    (property "Reference" "C28" (id 0) (at 140.7542 42.0306 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "power:+3.3V") (at 200.66 113.03 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 551334d8-c60c-4e60-8be5-cf90c9052d93)
+    (property "Reference" "#PWR0180" (id 0) (at 200.66 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 200.66 107.95 0))
+    (property "Footprint" "" (id 2) (at 200.66 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 200.66 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 38ff78ff-58c0-4046-b178-ecff7cd6311e))
+  )
+
+  (symbol (lib_id "power:GND") (at 113.03 127 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b7122150-2acd-409f-8b81-6c11f20b5df1)
+    (property "Reference" "#PWR0183" (id 0) (at 113.03 133.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 113.03 132.08 0))
+    (property "Footprint" "" (id 2) (at 113.03 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 113.03 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bcb17f29-0467-47d6-8390-5c098ce55fe7))
+  )
+
+  (symbol (lib_id "power:GND") (at 138.43 50.8 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f8baa737-4d22-49e0-aa1b-ea9568b5c421)
+    (property "Reference" "#PWR0161" (id 0) (at 138.43 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "10uF" (id 1) (at 140.754 44.3296 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "GND" (id 1) (at 138.43 55.88 0))
+    (property "Footprint" "" (id 2) (at 138.43 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 138.43 43.18 0)
+    (property "Datasheet" "" (id 3) (at 138.43 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 138.43 43.18 0)
+    (pin "1" (uuid 66ab2fb4-c654-448a-a473-4ae7f27afdd1))
+  )
+
+  (symbol (lib_id "power:GND") (at 186.69 66.04 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid c5171cca-5d66-4fb8-bc90-22aa4470b7fc)
+    (property "Reference" "#PWR0181" (id 0) (at 186.69 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Mouser" "581-06033C104KAT4A" (id 4) (at 138.43 43.18 0)
+    (property "Value" "GND" (id 1) (at 186.69 71.12 0))
+    (property "Footprint" "" (id 2) (at 186.69 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Part Name" "AVX 06033C104KAT4A" (id 5) (at 138.43 43.18 0)
+    (property "Datasheet" "" (id 3) (at 186.69 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 32975a18-84a2-4f21-9cdf-5b4fb30e4666))
-    (pin "2" (uuid 70ecfece-bc14-47c3-bdc1-01b5a87cce53))
+    (pin "1" (uuid 7229671c-a4fb-431e-947a-4f850055d95d))
   )
 
   (symbol (lib_id "power:GND") (at 200.66 143.51 0) (unit 1)
@@ -997,61 +1043,54 @@
     (pin "2" (uuid e1ddc217-5e90-4589-8ffc-9f57bdca566f))
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 195.58 133.35 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 128.27 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 49318602-b90c-49a3-bff2-3857ceb4202a)
-    (property "Reference" "SW6" (id 0) (at 194.4369 132.2006 90)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 09561b11-20a7-42fa-8daf-7d6083b7b113)
+    (property "Reference" "C27" (id 0) (at 130.5942 42.0306 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Reset" (id 1) (at 194.4369 134.4993 90)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (property "Value" "10uF" (id 1) (at 130.594 44.3296 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_SMD:SW_SPST_PTS810" (id 2) (at 200.66 133.35 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 128.27 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 200.66 133.35 0)
+    (property "Datasheet" "~" (id 3) (at 128.27 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Mouser" "506-FSM4JSMA" (id 4) (at 195.58 133.35 0)
+    (property "Mouser" "581-06033C104KAT4A" (id 4) (at 128.27 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Part Name" "TE Connectivity FSM4JSMA" (id 5) (at 195.58 133.35 0)
+    (property "Part Name" "AVX 06033C104KAT4A" (id 5) (at 128.27 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid aa47a212-3e0b-4621-80a9-f8a161b74ef6))
-    (pin "2" (uuid 2da38f2c-ab4a-4a32-a43a-214b871900de))
+    (pin "1" (uuid 35e4b8eb-2ad0-46bb-8c2c-4be505fada91))
+    (pin "2" (uuid df1685ed-2690-4031-bbdb-3b9d250d2465))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 200.66 113.03 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 551334d8-c60c-4e60-8be5-cf90c9052d93)
-    (property "Reference" "#PWR0180" (id 0) (at 200.66 116.84 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Device:C_Small") (at 138.43 43.18 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 123dcaa4-51a5-4f77-8b3c-789cdeafbb04)
+    (property "Reference" "C28" (id 0) (at 140.7542 42.0306 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "+3.3V" (id 1) (at 200.66 107.95 0))
-    (property "Footprint" "" (id 2) (at 200.66 113.03 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "10uF" (id 1) (at 140.754 44.3296 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Datasheet" "" (id 3) (at 200.66 113.03 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 138.43 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 38ff78ff-58c0-4046-b178-ecff7cd6311e))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 138.43 35.56 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5751ac58-a532-4c02-a8f7-fb38f48ce08c)
-    (property "Reference" "#PWR0167" (id 0) (at 138.43 39.37 0)
+    (property "Datasheet" "~" (id 3) (at 138.43 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 138.43 30.48 0))
-    (property "Footprint" "" (id 2) (at 138.43 35.56 0)
+    (property "Mouser" "581-06033C104KAT4A" (id 4) (at 138.43 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 138.43 35.56 0)
+    (property "Part Name" "AVX 06033C104KAT4A" (id 5) (at 138.43 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1aa50622-58e1-41b4-b87c-e3b0745f7d70))
+    (pin "1" (uuid 32975a18-84a2-4f21-9cdf-5b4fb30e4666))
+    (pin "2" (uuid 70ecfece-bc14-47c3-bdc1-01b5a87cce53))
   )
 
   (symbol (lib_id "Device:C_Small") (at 200.66 130.81 0) (unit 1)
@@ -1079,6 +1118,50 @@
     (pin "2" (uuid fe605cd5-3986-4ff0-9a7d-30bfe37eeaf4))
   )
 
+  (symbol (lib_id "Device:R") (at 200.66 119.38 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e740f9c3-60a8-490a-b1b0-aab01cb12532)
+    (property "Reference" "R35" (id 0) (at 203.2 118.1099 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 203.2 120.6499 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 198.882 119.38 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 200.66 119.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5f6606cb-cc7e-4d52-a5df-4d5e5bb8d00c))
+    (pin "2" (uuid f63be469-53d6-4c7d-a5b7-16bd2db5fed4))
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 195.58 133.35 270) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 49318602-b90c-49a3-bff2-3857ceb4202a)
+    (property "Reference" "SW6" (id 0) (at 194.4369 132.2006 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "Reset" (id 1) (at 194.4369 134.4993 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Button_Switch_SMD:SW_SPST_PTS810" (id 2) (at 200.66 133.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 200.66 133.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Mouser" "506-FSM4JSMA" (id 4) (at 195.58 133.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Part Name" "TE Connectivity FSM4JSMA" (id 5) (at 195.58 133.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid aa47a212-3e0b-4621-80a9-f8a161b74ef6))
+    (pin "2" (uuid 2da38f2c-ab4a-4a32-a43a-214b871900de))
+  )
+
   (symbol (lib_id "Connector_Generic:Conn_01x04") (at 194.31 58.42 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a3f5407b-85d5-49ee-af6b-f9ec2a995458)
@@ -1100,6 +1183,29 @@
     (pin "4" (uuid d4b9d8c6-9512-4ef3-9546-3c660c249b40))
   )
 
+  (symbol (lib_id "Connector_Generic:Conn_01x06") (at 220.98 130.81 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid c6c801d1-5e46-4922-815f-a4af2fdabcc4)
+    (property "Reference" "J6" (id 0) (at 223.52 130.8099 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "WIFI_JTAG" (id 1) (at 223.52 133.3499 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" (id 2) (at 220.98 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 220.98 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2e379e92-ab8b-4e47-b468-2b5cb4c81e1c))
+    (pin "2" (uuid bb354aeb-ca31-4536-9481-21fe108b1dfc))
+    (pin "3" (uuid a7099f7e-0349-4612-aa5d-27dbaed26652))
+    (pin "4" (uuid eee3c551-2aa8-4475-a51b-38d529ac661e))
+    (pin "5" (uuid e10e1982-38e2-400d-8540-5c0da4b2a128))
+    (pin "6" (uuid 5d165531-9390-407f-932d-8a88aee9de38))
+  )
+
   (symbol (lib_id "RF_Module:ESP32-WROOM-32U") (at 113.03 88.9 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b6aac19c-1f5e-42ea-b202-f1072c07754b)
@@ -1151,110 +1257,4 @@
     (pin "8" (uuid 961ca756-4052-4e30-814b-156e39800fc1))
     (pin "9" (uuid ee4efaf2-33b2-4d1e-a23d-abb059ea1345))
   )
-
-  (symbol (lib_id "power:GND") (at 113.03 127 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b7122150-2acd-409f-8b81-6c11f20b5df1)
-    (property "Reference" "#PWR0183" (id 0) (at 113.03 133.35 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 113.03 132.08 0))
-    (property "Footprint" "" (id 2) (at 113.03 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 113.03 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid bcb17f29-0467-47d6-8390-5c098ce55fe7))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 186.69 53.34 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c4a1295d-bcd0-4277-9b0b-6fc26c1b0e5a)
-    (property "Reference" "#PWR0182" (id 0) (at 186.69 57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at 186.69 48.26 0))
-    (property "Footprint" "" (id 2) (at 186.69 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 186.69 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 22b14273-4656-4b72-abb5-309815c80735))
-  )
-
-  (symbol (lib_id "power:GND") (at 186.69 66.04 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c5171cca-5d66-4fb8-bc90-22aa4470b7fc)
-    (property "Reference" "#PWR0181" (id 0) (at 186.69 72.39 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 186.69 71.12 0))
-    (property "Footprint" "" (id 2) (at 186.69 66.04 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 186.69 66.04 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7229671c-a4fb-431e-947a-4f850055d95d))
-  )
-
-  (symbol (lib_id "Connector_Generic:Conn_01x06") (at 220.98 130.81 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c6c801d1-5e46-4922-815f-a4af2fdabcc4)
-    (property "Reference" "J6" (id 0) (at 223.52 130.8099 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "WIFI_JTAG" (id 1) (at 223.52 133.3499 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" (id 2) (at 220.98 130.81 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 220.98 130.81 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2e379e92-ab8b-4e47-b468-2b5cb4c81e1c))
-    (pin "2" (uuid bb354aeb-ca31-4536-9481-21fe108b1dfc))
-    (pin "3" (uuid a7099f7e-0349-4612-aa5d-27dbaed26652))
-    (pin "4" (uuid eee3c551-2aa8-4475-a51b-38d529ac661e))
-    (pin "5" (uuid e10e1982-38e2-400d-8540-5c0da4b2a128))
-    (pin "6" (uuid 5d165531-9390-407f-932d-8a88aee9de38))
-  )
-
-  (symbol (lib_id "Device:R") (at 200.66 119.38 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid e740f9c3-60a8-490a-b1b0-aab01cb12532)
-    (property "Reference" "R35" (id 0) (at 203.2 118.1099 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 203.2 120.6499 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 198.882 119.38 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 200.66 119.38 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5f6606cb-cc7e-4d52-a5df-4d5e5bb8d00c))
-    (pin "2" (uuid f63be469-53d6-4c7d-a5b7-16bd2db5fed4))
-  )
-
-  (symbol (lib_id "power:GND") (at 138.43 50.8 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid f8baa737-4d22-49e0-aa1b-ea9568b5c421)
-    (property "Reference" "#PWR0161" (id 0) (at 138.43 57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 138.43 55.88 0))
-    (property "Footprint" "" (id 2) (at 138.43 50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 138.43 50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 66ab2fb4-c654-448a-a473-4ae7f27afdd1))
-  )
 )

hardware/speakers/fp-lib-table

@@ -1,3 +1,3 @@
 (fp_lib_table
-  (lib (name "HackAmp-Footprints")(type "KiCad")(uri "${KIPRJMOD}/../../hackamp/hardware/HackAmp-Footprints.pretty")(options "")(descr ""))
+  (lib (name "HackAmp-Footprints")(type "KiCad")(uri "${KIPRJMOD}/../../hardware/base/HackAmp-Footprints.pretty")(options "")(descr ""))
 )

hardware/speakers/speakers.kicad_pro

@@ -69,6 +69,7 @@
         "drill_out_of_range": "error",
         "duplicate_footprints": "warning",
         "extra_footprint": "warning",
+        "footprint_type_mismatch": "error",
         "hole_clearance": "error",
         "hole_near_hole": "error",
         "invalid_outline": "error",
@@ -87,6 +88,7 @@
         "silk_over_copper": "error",
         "silk_overlap": "error",
         "skew_out_of_range": "error",
+        "through_hole_pad_without_hole": "error",
         "too_many_vias": "error",
         "track_dangling": "warning",
         "track_width": "error",
@@ -345,7 +347,9 @@
     }
   },
   "libraries": {
-    "pinned_footprint_libs": [],
+    "pinned_footprint_libs": [
+      "HackAmp-Footprints"
+    ],
     "pinned_symbol_libs": []
   },
   "meta": {

hardware/speakers/sym-lib-table

@@ -1,3 +1,3 @@
 (sym_lib_table
-  (lib (name "HackAmp-Symbols")(type "KiCad")(uri "${KIPRJMOD}/../../hackamp/hardware/HackAmp-Symbols.kicad_sym")(options "")(descr ""))
+  (lib (name "HackAmp-Symbols")(type "KiCad")(uri "${KIPRJMOD}/../../hardware/base/HackAmp-Symbols.kicad_sym")(options "")(descr ""))
 )