Removed cmp out -> rx connection, silkscreen cleanup

2 files changed, 112 insertions, 289 deletions

diff --git a/laser-tag badge v2/laser-tag.kicad_pcb b/laser-tag badge v2/laser-tag.kicad_pcb
index 1252e4e..290c251 100644
--- a/laser-tag badge v2/laser-tag.kicad_pcb
+++ b/laser-tag badge v2/laser-tag.kicad_pcb
@@ -158,21 +158,22 @@
   (net 68 "unconnected-(U1-Pad10)")
   (net 69 "unconnected-(U1-Pad13)")
   (net 70 "unconnected-(U1-Pad14)")
-  (net 71 "CMP_OUT")
-  (net 72 "unconnected-(U1-Pad24)")
-  (net 73 "unconnected-(U1-Pad25)")
-  (net 74 "unconnected-(U1-Pad27)")
-  (net 75 "unconnected-(U1-Pad28)")
-  (net 76 "unconnected-(U1-Pad29)")
-  (net 77 "unconnected-(U1-Pad30)")
-  (net 78 "unconnected-(U1-Pad31)")
-  (net 79 "unconnected-(U1-Pad32)")
-  (net 80 "USB_D+")
-  (net 81 "USB_D-")
-  (net 82 "/USB0_D+")
-  (net 83 "/USB0_D-")
-  (net 84 "Net-(R2-Pad1)")
-  (net 85 "Net-(LD1-Pad2)")
+  (net 71 "unconnected-(U1-Pad24)")
+  (net 72 "unconnected-(U1-Pad25)")
+  (net 73 "unconnected-(U1-Pad27)")
+  (net 74 "unconnected-(U1-Pad28)")
+  (net 75 "unconnected-(U1-Pad29)")
+  (net 76 "unconnected-(U1-Pad30)")
+  (net 77 "unconnected-(U1-Pad31)")
+  (net 78 "unconnected-(U1-Pad32)")
+  (net 79 "USB_D+")
+  (net 80 "USB_D-")
+  (net 81 "/USB0_D+")
+  (net 82 "/USB0_D-")
+  (net 83 "Net-(R2-Pad1)")
+  (net 84 "Net-(LD1-Pad2)")
+  (net 85 "unconnected-(U1-Pad18)")
+  (net 86 "unconnected-(U1-Pad33)")
 
   (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" placed (layer "F.Cu")
     (tedit 5F68FEEF) (tstamp 10089ee3-9e04-4e15-86f8-ce21a1e1ccea)
@@ -283,7 +284,7 @@
     (model "${KIPRJMOD}/laser-tag.pretty/JS5208.step"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz -90 0 0))
+      (rotate (xyz -90 0 180))
     )
   )
 
@@ -319,7 +320,7 @@
     (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp a7029ffc-9aee-4a66-a6da-849cc2bac489))
     (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp bacc7935-7d5c-4815-8a45-a84f2e934bab))
     (pad "1" smd roundrect (at -0.9125 0) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 84 "Net-(R2-Pad1)") (pintype "passive") (tstamp 68f687d6-4f66-40ba-95cf-36c4cde0df51))
+      (net 83 "Net-(R2-Pad1)") (pintype "passive") (tstamp 68f687d6-4f66-40ba-95cf-36c4cde0df51))
     (pad "2" smd roundrect (at 0.9125 0) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 56 "Net-(Q1-Pad3)") (pintype "passive") (tstamp a50a4817-715a-4e4b-af0e-cd0b9a51f158))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
@@ -493,9 +494,9 @@
     (pad "2" smd roundrect (at -3.4375 -2.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 1 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp a232975c-8298-4ef6-b028-699375f28e0a))
     (pad "3" smd roundrect (at -3.4375 -1.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 82 "/USB0_D+") (pinfunction "USB0_DP") (pintype "bidirectional") (tstamp e4986bb7-86fd-4bc5-a47a-719d8ac31b34))
+      (net 81 "/USB0_D+") (pinfunction "USB0_DP") (pintype "bidirectional") (tstamp e4986bb7-86fd-4bc5-a47a-719d8ac31b34))
     (pad "4" smd roundrect (at -3.4375 -1.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 83 "/USB0_D-") (pinfunction "USB0_DM") (pintype "bidirectional") (tstamp 83548335-53e7-4406-a863-2b09297a2c3b))
+      (net 82 "/USB0_D-") (pinfunction "USB0_DM") (pintype "bidirectional") (tstamp 83548335-53e7-4406-a863-2b09297a2c3b))
     (pad "5" smd roundrect (at -3.4375 -0.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "VCC") (pinfunction "VOUT33") (pintype "power_out") (tstamp ec2e8e13-d6a6-4ee2-8f65-27e1a9a9437c))
     (pad "6" smd roundrect (at -3.4375 -0.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -523,7 +524,7 @@
     (pad "17" smd roundrect (at -0.75 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 40 "SWD_CLK") (pinfunction "PTA0") (pintype "bidirectional") (tstamp 22699765-963e-4227-82c6-dd7c582b18b5))
     (pad "18" smd roundrect (at -0.25 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 71 "CMP_OUT") (pinfunction "PTA1") (pintype "bidirectional") (tstamp eb9f678f-fdc9-4d97-b262-1f1af980de62))
+      (net 85 "unconnected-(U1-Pad18)") (pinfunction "PTA1") (pintype "bidirectional+no_connect") (tstamp eb9f678f-fdc9-4d97-b262-1f1af980de62))
     (pad "19" smd roundrect (at 0.25 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 57 "TX") (pinfunction "PTA2") (pintype "bidirectional") (tstamp 1e822eb0-b2a0-43bf-9f29-09555a63277a))
     (pad "20" smd roundrect (at 0.75 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -535,25 +536,25 @@
     (pad "23" smd roundrect (at 2.25 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 1 "GND") (pinfunction "VSS") (pintype "passive") (tstamp 0bb368e4-780c-4015-a45c-58537a00eedc))
     (pad "24" smd roundrect (at 2.75 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 72 "unconnected-(U1-Pad24)") (pinfunction "PTA18") (pintype "bidirectional+no_connect") (tstamp 6bfcf29e-c5d1-4172-b457-9ba63dd7cc9e))
+      (net 71 "unconnected-(U1-Pad24)") (pinfunction "PTA18") (pintype "bidirectional+no_connect") (tstamp 6bfcf29e-c5d1-4172-b457-9ba63dd7cc9e))
     (pad "25" smd roundrect (at 3.4375 2.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 73 "unconnected-(U1-Pad25)") (pinfunction "PTA19") (pintype "bidirectional+no_connect") (tstamp 9078df3f-4a47-4e40-9c4d-ce6483466262))
+      (net 72 "unconnected-(U1-Pad25)") (pinfunction "PTA19") (pintype "bidirectional+no_connect") (tstamp 9078df3f-4a47-4e40-9c4d-ce6483466262))
     (pad "26" smd roundrect (at 3.4375 2.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 43 "RESET") (pinfunction "PTA20") (pintype "bidirectional") (tstamp 98da048f-80ca-45c0-be67-d1e33865a92e))
     (pad "27" smd roundrect (at 3.4375 1.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 74 "unconnected-(U1-Pad27)") (pinfunction "PTB0/LLWU_P5") (pintype "bidirectional+no_connect") (tstamp a3f0cfbd-db8f-414a-a341-87c2418a1752))
+      (net 73 "unconnected-(U1-Pad27)") (pinfunction "PTB0/LLWU_P5") (pintype "bidirectional+no_connect") (tstamp a3f0cfbd-db8f-414a-a341-87c2418a1752))
     (pad "28" smd roundrect (at 3.4375 1.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 75 "unconnected-(U1-Pad28)") (pinfunction "PTB1") (pintype "bidirectional+no_connect") (tstamp 45057df0-9dfa-4600-9493-40a289f7c500))
+      (net 74 "unconnected-(U1-Pad28)") (pinfunction "PTB1") (pintype "bidirectional+no_connect") (tstamp 45057df0-9dfa-4600-9493-40a289f7c500))
     (pad "29" smd roundrect (at 3.4375 0.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 76 "unconnected-(U1-Pad29)") (pinfunction "PTB2") (pintype "bidirectional+no_connect") (tstamp e44db084-47e8-4acb-9104-a766db6eff90))
+      (net 75 "unconnected-(U1-Pad29)") (pinfunction "PTB2") (pintype "bidirectional+no_connect") (tstamp e44db084-47e8-4acb-9104-a766db6eff90))
     (pad "30" smd roundrect (at 3.4375 0.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 77 "unconnected-(U1-Pad30)") (pinfunction "PTB3") (pintype "bidirectional+no_connect") (tstamp cf9573e0-953b-486b-9258-2678587b0d7a))
+      (net 76 "unconnected-(U1-Pad30)") (pinfunction "PTB3") (pintype "bidirectional+no_connect") (tstamp cf9573e0-953b-486b-9258-2678587b0d7a))
     (pad "31" smd roundrect (at 3.4375 -0.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 78 "unconnected-(U1-Pad31)") (pinfunction "PTB16") (pintype "bidirectional+no_connect") (tstamp 0b8f96bd-c9a0-4166-8ae2-b83490127aab))
+      (net 77 "unconnected-(U1-Pad31)") (pinfunction "PTB16") (pintype "bidirectional+no_connect") (tstamp 0b8f96bd-c9a0-4166-8ae2-b83490127aab))
     (pad "32" smd roundrect (at 3.4375 -0.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 79 "unconnected-(U1-Pad32)") (pinfunction "PTB17") (pintype "bidirectional+no_connect") (tstamp b9ae4894-5063-4577-a2a8-36709f12ec9a))
+      (net 78 "unconnected-(U1-Pad32)") (pinfunction "PTB17") (pintype "bidirectional+no_connect") (tstamp b9ae4894-5063-4577-a2a8-36709f12ec9a))
     (pad "33" smd roundrect (at 3.4375 -1.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 71 "CMP_OUT") (pinfunction "PTC0") (pintype "bidirectional") (tstamp b49add4e-9c91-49a6-a05e-8bd537732e38))
+      (net 86 "unconnected-(U1-Pad33)") (pinfunction "PTC0") (pintype "bidirectional+no_connect") (tstamp b49add4e-9c91-49a6-a05e-8bd537732e38))
     (pad "34" smd roundrect (at 3.4375 -1.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 66 "SW1") (pinfunction "PTC1/LLWU_P6/RTC_CLKIN") (pintype "bidirectional") (tstamp 4c7d1788-dd0a-437f-be83-e3fe181cdb79))
     (pad "35" smd roundrect (at 3.4375 -2.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -625,9 +626,9 @@
     (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp 876e9821-365d-47f7-916a-d71e6af294fd))
     (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp cc361c6b-3a47-4e76-af56-ce1e75a87efa))
     (pad "1" smd roundrect (at -0.9125 0 270) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 80 "USB_D+") (pintype "passive") (tstamp 240577de-f80a-4ce4-82b9-e44c556e6f31))
+      (net 79 "USB_D+") (pintype "passive") (tstamp 240577de-f80a-4ce4-82b9-e44c556e6f31))
     (pad "2" smd roundrect (at 0.9125 0 270) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 82 "/USB0_D+") (pintype "passive") (tstamp 2642ce39-82cb-4217-a2b2-f44ba2fea60d))
+      (net 81 "/USB0_D+") (pintype "passive") (tstamp 2642ce39-82cb-4217-a2b2-f44ba2fea60d))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -898,7 +899,7 @@
     (fp_line (start -1.65 -1.25) (end 1.65 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp dca2ff65-75db-4c03-b51c-c73b184bbeb7))
     (fp_line (start -1.65 -1.25) (end -1.65 1.25) (layer "F.CrtYd") (width 0.05) (tstamp f395f619-2197-4971-9146-312f4ad78ec3))
     (pad "1" smd custom (at -0.65 0 180) (size 1 0.5) (layers "F.Cu" "F.Mask")
-      (net 84 "Net-(R2-Pad1)") (pinfunction "A") (pintype "passive") (zone_connect 2)
+      (net 83 "Net-(R2-Pad1)") (pinfunction "A") (pintype "passive") (zone_connect 2)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0) (fill yes))
@@ -934,7 +935,7 @@
     (property "Sheetname" "")
     (path "/8974f1e3-812f-4fa3-80ec-77f1b7541272")
     (attr through_hole)
-    (fp_text reference "J2" (at -1.27 -2.77 90) (layer "F.SilkS")
+    (fp_text reference "J2" (at -1.27 -2.77 90) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0d82ce40-381a-4eb1-890a-859499ceecfe)
     )
@@ -1242,7 +1243,7 @@
           ) (width 0) (fill yes))
       ) (tstamp a68c8731-3662-417c-b7a7-df946fc69bc7))
     (pad "2" smd custom (at 0.65 0 180) (size 1 0.5) (layers "F.Cu" "F.Mask")
-      (net 85 "Net-(LD1-Pad2)") (pinfunction "B") (pintype "passive") (zone_connect 2)
+      (net 84 "Net-(LD1-Pad2)") (pinfunction "B") (pintype "passive") (zone_connect 2)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0) (fill yes))
@@ -1288,9 +1289,9 @@
     (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer "F.Fab") (width 0.1) (tstamp a7444ade-a00f-4596-862f-685e8dbcd1b9))
     (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer "F.Fab") (width 0.1) (tstamp f553d89c-bb2a-4bae-86ba-d7571a7eeebd))
     (pad "1" smd roundrect (at -0.9125 0 270) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 81 "USB_D-") (pintype "passive") (tstamp b82eba83-b25c-461a-8ff3-394cf30b9541))
+      (net 80 "USB_D-") (pintype "passive") (tstamp b82eba83-b25c-461a-8ff3-394cf30b9541))
     (pad "2" smd roundrect (at 0.9125 0 270) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 83 "/USB0_D-") (pintype "passive") (tstamp fe0ee3dd-b857-40c7-83da-bd80b45560c2))
+      (net 82 "/USB0_D-") (pintype "passive") (tstamp fe0ee3dd-b857-40c7-83da-bd80b45560c2))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1445,7 +1446,7 @@
     (fp_line (start 1.65 1.25) (end -1.65 1.25) (layer "F.CrtYd") (width 0.05) (tstamp 4128045d-4a41-43a9-9f4e-c21520e0c5e7))
     (fp_line (start -1.65 -1.25) (end 1.65 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 6dc2a63c-2273-4869-93c6-38011cd57416))
     (pad "1" smd custom (at -0.65 0 180) (size 1 0.5) (layers "F.Cu" "F.Mask")
-      (net 84 "Net-(R2-Pad1)") (pinfunction "A") (pintype "passive") (zone_connect 2)
+      (net 83 "Net-(R2-Pad1)") (pinfunction "A") (pintype "passive") (zone_connect 2)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0) (fill yes))
@@ -1458,7 +1459,7 @@
           ) (width 0) (fill yes))
       ) (tstamp ade3861a-bff8-4ba5-a648-75bb8296436d))
     (pad "2" smd custom (at 0.65 0 180) (size 1 0.5) (layers "F.Cu" "F.Mask")
-      (net 85 "Net-(LD1-Pad2)") (pinfunction "B") (pintype "passive") (zone_connect 2)
+      (net 84 "Net-(LD1-Pad2)") (pinfunction "B") (pintype "passive") (zone_connect 2)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0) (fill yes))
@@ -1504,7 +1505,7 @@
     (pad "1" smd rect (at 6.35 0) (size 2.54 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 60 "Net-(LD1-Pad1)") (pinfunction "K") (pintype "passive") (solder_mask_margin 0.0508) (tstamp cc40e3df-dc0e-4e18-9f71-009659caac40))
     (pad "2" smd rect (at 0 0) (size 6.4516 3.2512) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 85 "Net-(LD1-Pad2)") (pinfunction "A") (pintype "passive") (solder_mask_margin 0.0508) (tstamp 0c427c98-19d5-4c7e-950c-e9a68265988d))
+      (net 84 "Net-(LD1-Pad2)") (pinfunction "A") (pintype "passive") (solder_mask_margin 0.0508) (tstamp 0c427c98-19d5-4c7e-950c-e9a68265988d))
   )
 
   (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" placed (layer "F.Cu")
@@ -1611,7 +1612,7 @@
     (property "Sheetname" "")
     (path "/09bdc4d5-6d1d-4158-9cb1-502de786998f")
     (attr smd)
-    (fp_text reference "R8" (at -2.54 1.905) (layer "B.SilkS")
+    (fp_text reference "R8" (at 2.64 -0.04) (layer "B.SilkS")
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 5c59500b-081c-417d-88d7-e5ae8aa6ec66)
     )
@@ -2195,9 +2196,9 @@
     (pad "A5" smd rect (at -1.25 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 30 "Net-(J1-PadA5)") (pinfunction "CC1") (pintype "bidirectional") (tstamp 44fe2332-ea58-48ff-a04f-825402c8888c))
     (pad "A6" smd rect (at -0.25 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 80 "USB_D+") (pinfunction "D+") (pintype "bidirectional") (tstamp d8f2fcf7-e8ea-4437-a2cd-555721efa369))
+      (net 79 "USB_D+") (pinfunction "D+") (pintype "bidirectional") (tstamp d8f2fcf7-e8ea-4437-a2cd-555721efa369))
     (pad "A7" smd rect (at 0.25 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 81 "USB_D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 867b39b1-d53c-46d7-a7d9-245e40349b14))
+      (net 80 "USB_D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 867b39b1-d53c-46d7-a7d9-245e40349b14))
     (pad "A8" smd rect (at 1.25 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 31 "unconnected-(J1-PadA8)") (pinfunction "SBU1") (pintype "bidirectional+no_connect") (tstamp 1b174504-2c77-4f58-ad81-35d0c2182761))
     (pad "A9" smd rect (at 2.4 3.68) (size 0.6 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -2211,9 +2212,9 @@
     (pad "B5" smd rect (at 1.75 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 32 "Net-(J1-PadB5)") (pinfunction "CC2") (pintype "bidirectional") (tstamp 58988c10-4970-4443-82fb-9ba8ce59366f))
     (pad "B6" smd rect (at 0.75 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 80 "USB_D+") (pinfunction "D+") (pintype "bidirectional") (tstamp cedd018c-72da-4421-9f1b-dd9ae60f655f))
+      (net 79 "USB_D+") (pinfunction "D+") (pintype "bidirectional") (tstamp cedd018c-72da-4421-9f1b-dd9ae60f655f))
     (pad "B7" smd rect (at -0.75 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 81 "USB_D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 4d3ad991-3537-436b-9433-1a68425ca952))
+      (net 80 "USB_D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 4d3ad991-3537-436b-9433-1a68425ca952))
     (pad "B8" smd rect (at -1.75 3.68) (size 0.3 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 33 "unconnected-(J1-PadB8)") (pinfunction "SBU2") (pintype "bidirectional+no_connect") (tstamp dd0e2ccd-5ffb-4bff-81bf-4d952476882b))
     (pad "B9" smd rect (at -2.4 3.68) (size 0.6 1.15) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -2664,7 +2665,7 @@
     (property "Sheetname" "")
     (path "/f7187937-fcbe-4c51-80bc-d8edab3d1d56")
     (attr smd)
-    (fp_text reference "C11" (at -3.175 1.905) (layer "B.SilkS")
+    (fp_text reference "C11" (at 2.96 -0.055) (layer "B.SilkS")
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp d9cb1d07-5a7c-4abd-ac1c-d06d2c3ae9e5)
     )
@@ -2759,7 +2760,7 @@
     (property "Sheetname" "")
     (path "/ece78cb1-62dd-474c-8098-6c00435cc9eb")
     (attr smd)
-    (fp_text reference "Q3" (at 2.54 1.27) (layer "B.SilkS")
+    (fp_text reference "Q3" (at -3.48 0.725) (layer "B.SilkS")
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp f6789f19-1af8-4b06-8aea-a4940c51ea40)
     )
@@ -2848,7 +2849,7 @@
     (property "Sheetname" "")
     (path "/b1ad9ccd-6241-404f-895c-1d13ea157c8d")
     (attr smd)
-    (fp_text reference "Q4" (at 2.54 1.27) (layer "B.SilkS")
+    (fp_text reference "Q4" (at -3.48 0.75) (layer "B.SilkS")
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 56fb8fe4-137d-405b-93db-68876f36d0e0)
     )
@@ -3161,12 +3162,18 @@
   (gr_text "Large Pad-" (at 85 133) (layer "F.SilkS") (tstamp 3af44983-3e85-4c71-9833-ffd3d1b3965d)
     (effects (font (size 1 1) (thickness 0.15)))
   )
+  (gr_text "+3V" (at 130.2 54.6) (layer "F.SilkS") (tstamp 5607707f-5308-4d49-b19b-60ed52954c3a)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
   (gr_text "Hold while powering up\nto enter programming mode" (at 137.795 127.635) (layer "F.SilkS") (tstamp 61354697-863a-482f-a97e-65541ccc9466)
     (effects (font (size 0.747776 0.747776) (thickness 0.065024)) (justify left bottom))
   )
   (gr_text "Shitty Add-On" (at 136.525 60.325) (layer "F.SilkS") (tstamp 773713ee-6442-420d-80a0-a9c7acb3f3ec)
     (effects (font (size 1 1) (thickness 0.15)))
   )
+  (gr_text "GND" (at 130.4 57.2) (layer "F.SilkS") (tstamp 8517f2ec-5beb-4e9d-bfbd-da393c16d072)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
   (gr_text "LASER RADIATION\nAVOID DIRECT EYE EXPOSURE\nCLASS 3R LASER PRODUCT" (at 80.9498 151.1808 270) (layer "F.SilkS") (tstamp 889ea559-d9a0-426a-9066-bbecfe93c6eb)
     (effects (font (size 0.747776 0.747776) (thickness 0.065024)) (justify right top))
   )
@@ -3682,64 +3689,55 @@
   (segment (start 114.6 108.123) (end 114.6 112.1425) (width 0.25) (layer "F.Cu") (net 67) (tstamp d42607dd-abdc-4ea0-b668-add8e6b9e610))
   (segment (start 93.1075 122.1025) (end 93.1075 114.061861) (width 0.25) (layer "F.Cu") (net 67) (tstamp f5bcb5a3-e3c9-4c0d-934e-523a6e4abc83))
   (segment (start 93.1075 114.061861) (end 99.981361 107.188) (width 0.25) (layer "F.Cu") (net 67) (tstamp ff2f3c75-7bc2-4dcf-8f26-a6c6cd4d1c42))
-  (segment (start 116.6 119.0175) (end 116.6 120.001) (width 0.25) (layer "F.Cu") (net 71) (tstamp 18bd2a45-d1dc-44e8-bb5a-1e98afadf821))
-  (segment (start 116.6 120.001) (end 116.332 120.269) (width 0.25) (layer "F.Cu") (net 71) (tstamp 2e23141a-8755-4b02-b8ae-2931abaec64e))
-  (segment (start 121.442 114.33) (end 121.793 114.681) (width 0.25) (layer "F.Cu") (net 71) (tstamp 45d1dd59-62df-4669-adeb-92753ea784cb))
-  (segment (start 120.2875 114.33) (end 121.442 114.33) (width 0.25) (layer "F.Cu") (net 71) (tstamp e69ddf4f-5a62-47cf-9280-715019bd16bd))
-  (via (at 121.793 114.681) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 71) (tstamp 4280cdbb-2936-4463-8e98-1ab734147641))
-  (via (at 116.332 120.269) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 71) (tstamp b3d06038-3d50-4fb8-859d-cc563e32e666))
-  (segment (start 120.777 120.269) (end 116.332 120.269) (width 0.25) (layer "B.Cu") (net 71) (tstamp 25035e84-bc5f-4d06-8e76-af895b1fe8aa))
-  (segment (start 121.793 114.681) (end 121.793 119.253) (width 0.25) (layer "B.Cu") (net 71) (tstamp 8aa0f7ae-dd89-4d99-9f0c-cb38b0940e54))
-  (segment (start 121.793 119.253) (end 120.777 120.269) (width 0.25) (layer "B.Cu") (net 71) (tstamp cf6f9dae-ee1e-40da-8405-1319966f2bda))
-  (segment (start 106.9022 108.458) (end 106.8872 108.473) (width 0.77) (layer "F.Cu") (net 80) (tstamp 2a08a189-9784-492f-b26d-25f1360e3f7e))
-  (segment (start 106.8872 109.6722) (end 107.4275 110.2125) (width 0.77) (layer "F.Cu") (net 80) (tstamp 8efa8d9f-7efc-41d4-8de7-b5f3e711bc84))
-  (segment (start 106.8872 108.473) (end 106.8872 109.6722) (width 0.77) (layer "F.Cu") (net 80) (tstamp d96a5f4b-c791-417a-addd-1bb5c62a4f4d))
-  (via (at 106.9022 108.458) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 80) (tstamp 21ad1d65-b848-4f85-9654-9a39bf854045))
-  (segment (start 97.8134 59.69) (end 97.79 59.69) (width 0.2) (layer "B.Cu") (net 80) (tstamp 38c142d8-8e59-4cba-8568-00d5dd5f7a32))
-  (segment (start 98.54 58.1884) (end 98.54 58.9634) (width 0.2) (layer "B.Cu") (net 80) (tstamp 3a99676f-9ea8-47e7-a3ef-c21e958ef148))
-  (segment (start 98.54 58.9634) (end 97.8134 59.69) (width 0.2) (layer "B.Cu") (net 80) (tstamp 4bf85a52-9e80-4856-a930-bfa394b776f6))
-  (segment (start 106.8872 108.443) (end 106.9022 108.458) (width 0.77) (layer "B.Cu") (net 80) (tstamp 7308d17f-029e-4f17-9816-21df6125b116))
-  (segment (start 106.8872 71.055964) (end 106.8872 108.443) (width 0.77) (layer "B.Cu") (net 80) (tstamp 77bbadc2-28a6-4f3a-bdae-e757138f44e5))
-  (segment (start 97.54 58.1884) (end 97.54 59.44) (width 0.2) (layer "B.Cu") (net 80) (tstamp b269e78f-64c6-4697-8bb6-9fd1bf127e89))
-  (segment (start 97.79 61.958764) (end 106.8872 71.055964) (width 0.77) (layer "B.Cu") (net 80) (tstamp bc608e69-cf16-4608-b991-dea361765f1a))
-  (segment (start 97.54 59.44) (end 97.79 59.69) (width 0.2) (layer "B.Cu") (net 80) (tstamp f248fdbf-1a6a-4baa-a3e8-308c4951688a))
-  (segment (start 97.79 59.69) (end 97.79 61.958764) (width 0.77) (layer "B.Cu") (net 80) (tstamp f5fb7931-c5da-4965-ab2e-2a762ea107be))
-  (segment (start 105.9648 109.7702) (end 105.5225 110.2125) (width 0.77) (layer "F.Cu") (net 81) (tstamp 17fe0d95-dbab-49eb-9a35-4fb375d8b7a3))
-  (segment (start 105.9648 108.473) (end 105.9648 109.7702) (width 0.77) (layer "F.Cu") (net 81) (tstamp 36c1a4b8-715a-4d14-84fc-33b62b921751))
-  (segment (start 105.9498 108.458) (end 105.9648 108.473) (width 0.77) (layer "F.Cu") (net 81) (tstamp 61dab290-b5f1-4ecf-8963-83e7a28c7286))
-  (via (at 105.9498 108.458) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 81) (tstamp ee4398ec-d76e-4f30-b395-8066f0a8695f))
-  (segment (start 97.04 57.4586) (end 97.04 58.1884) (width 0.2) (layer "B.Cu") (net 81) (tstamp 0dd02722-4320-4208-977a-4cab2ea5c9d0))
-  (segment (start 97.04 59.424) (end 96.774 59.69) (width 0.2) (layer "B.Cu") (net 81) (tstamp 3fddac7d-59ac-4c19-bc2e-eb33d3057382))
-  (segment (start 105.9648 108.443) (end 105.9498 108.458) (width 0.77) (layer "B.Cu") (net 81) (tstamp 4cf7a6d1-49da-494c-bec8-2bb290ce3604))
-  (segment (start 98.04 57.4134) (end 97.9876 57.361) (width 0.2) (layer "B.Cu") (net 81) (tstamp 5f94f472-e89b-4795-b02f-17d5decd52e4))
-  (segment (start 96.774 62.247236) (end 105.9648 71.438036) (width 0.77) (layer "B.Cu") (net 81) (tstamp 64c3dc1e-36d6-43ae-8cfb-0637e3e16b2a))
-  (segment (start 98.04 58.1884) (end 98.04 57.4134) (width 0.2) (layer "B.Cu") (net 81) (tstamp 749f2389-c992-4e06-9503-8364872dbd98))
-  (segment (start 96.774 59.69) (end 96.774 62.247236) (width 0.77) (layer "B.Cu") (net 81) (tstamp 7a870397-ea59-47e2-bd38-2c6a5afa914c))
-  (segment (start 97.1376 57.361) (end 97.04 57.4586) (width 0.2) (layer "B.Cu") (net 81) (tstamp aff49e15-98c9-4aa2-aac6-442b919eeb20))
-  (segment (start 105.9648 71.438036) (end 105.9648 108.443) (width 0.77) (layer "B.Cu") (net 81) (tstamp db0a1281-ca51-4c5e-84c8-9865bb2f0e18))
-  (segment (start 97.9876 57.361) (end 97.1376 57.361) (width 0.2) (layer "B.Cu") (net 81) (tstamp f74c95c4-c339-45f7-9e0a-3f07f007d2f8))
-  (segment (start 97.04 58.1884) (end 97.04 59.424) (width 0.2) (layer "B.Cu") (net 81) (tstamp f8828814-0734-48b3-b977-42394fa8c6f3))
-  (segment (start 113.387501 113.854999) (end 112.649199 113.854999) (width 0.2) (layer "F.Cu") (net 82) (tstamp 4334746e-02dd-4bab-8361-a58291882b56))
-  (segment (start 113.4125 113.83) (end 113.387501 113.854999) (width 0.2) (layer "F.Cu") (net 82) (tstamp 7bdb8f53-3131-4674-b648-9c73819a7abb))
-  (segment (start 112.649199 113.854999) (end 110.8317 112.0375) (width 0.2) (layer "F.Cu") (net 82) (tstamp b9ba41fd-4dcb-4ef0-9980-63886474b68a))
-  (segment (start 110.8317 112.0375) (end 107.4275 112.0375) (width 0.2) (layer "F.Cu") (net 82) (tstamp db3c1c6d-130b-4703-af5f-2d867081aba8))
-  (segment (start 106.733098 112.4875) (end 105.9725 112.4875) (width 0.2) (layer "F.Cu") (net 83) (tstamp 3360c21b-7411-4dbe-b9ce-05342592773f))
-  (segment (start 113.387501 114.305001) (end 112.462801 114.305001) (width 0.2) (layer "F.Cu") (net 83) (tstamp 3506db7a-dae7-471d-946a-b1e6c495513c))
-  (segment (start 107.857402 112.752) (end 106.997598 112.752) (width 0.2) (layer "F.Cu") (net 83) (tstamp 3b2d9f41-31c9-421b-b3d5-7d69518f1642))
-  (segment (start 106.997598 112.752) (end 106.733098 112.4875) (width 0.2) (layer "F.Cu") (net 83) (tstamp 4a79ddda-24ca-429e-bf04-2722a1735b1d))
-  (segment (start 108.121902 112.4875) (end 107.857402 112.752) (width 0.2) (layer "F.Cu") (net 83) (tstamp 54f5a206-bebb-4d0c-b98f-1deccc9a54f2))
-  (segment (start 105.9725 112.4875) (end 105.5225 112.0375) (width 0.2) (layer "F.Cu") (net 83) (tstamp 6f283c74-c9fb-4300-891a-3d5caaa6f9d2))
-  (segment (start 113.4125 114.33) (end 113.387501 114.305001) (width 0.2) (layer "F.Cu") (net 83) (tstamp 864b2395-0867-43bc-a501-08ccd031a174))
-  (segment (start 112.462801 114.305001) (end 110.6453 112.4875) (width 0.2) (layer "F.Cu") (net 83) (tstamp aaf2156a-55a2-480f-bc9a-30c9ce264d30))
-  (segment (start 110.6453 112.4875) (end 108.121902 112.4875) (width 0.2) (layer "F.Cu") (net 83) (tstamp f01c7aac-6686-43f4-bd55-8e8478a9e215))
-  (segment (start 96.15 130.3125) (end 94.8375 129) (width 0.25) (layer "F.Cu") (net 84) (tstamp 451d30f8-c635-4335-bbc5-fb8449853705))
-  (segment (start 96.15 133) (end 96.15 130.3125) (width 0.25) (layer "F.Cu") (net 84) (tstamp 8284a0b2-2e52-42ee-8c39-5658e4828a66))
-  (segment (start 94.8375 129) (end 91.8 132.0375) (width 0.25) (layer "F.Cu") (net 84) (tstamp d7929f72-6955-4293-ae1c-fe08b3231193))
-  (segment (start 91.8 132.0375) (end 91.8 133) (width 0.25) (layer "F.Cu") (net 84) (tstamp e3f9861c-c27f-4792-a862-3156da4d750b))
-  (segment (start 90.5 133) (end 90.5 136.55) (width 0.25) (layer "F.Cu") (net 85) (tstamp 77bc59e8-72a4-400b-aa75-4e0efc1d63de))
-  (segment (start 85.09 139.7) (end 86.487 141.097) (width 0.25) (layer "F.Cu") (net 85) (tstamp 7b2a2ac6-c591-4b3d-b298-952f9763ad4e))
-  (segment (start 90.5 136.55) (end 88.24 136.55) (width 0.25) (layer "F.Cu") (net 85) (tstamp 8891c416-f7b4-49df-90cc-9e7d21b7b988))
-  (segment (start 88.24 136.55) (end 85.09 139.7) (width 0.25) (layer "F.Cu") (net 85) (tstamp a6c33eec-2436-4140-8b4f-8a7d6c8822f0))
+  (segment (start 106.9022 108.458) (end 106.8872 108.473) (width 0.77) (layer "F.Cu") (net 79) (tstamp 2a08a189-9784-492f-b26d-25f1360e3f7e))
+  (segment (start 106.8872 109.6722) (end 107.4275 110.2125) (width 0.77) (layer "F.Cu") (net 79) (tstamp 8efa8d9f-7efc-41d4-8de7-b5f3e711bc84))
+  (segment (start 106.8872 108.473) (end 106.8872 109.6722) (width 0.77) (layer "F.Cu") (net 79) (tstamp d96a5f4b-c791-417a-addd-1bb5c62a4f4d))
+  (via (at 106.9022 108.458) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 79) (tstamp 21ad1d65-b848-4f85-9654-9a39bf854045))
+  (segment (start 97.8134 59.69) (end 97.79 59.69) (width 0.2) (layer "B.Cu") (net 79) (tstamp 38c142d8-8e59-4cba-8568-00d5dd5f7a32))
+  (segment (start 98.54 58.1884) (end 98.54 58.9634) (width 0.2) (layer "B.Cu") (net 79) (tstamp 3a99676f-9ea8-47e7-a3ef-c21e958ef148))
+  (segment (start 98.54 58.9634) (end 97.8134 59.69) (width 0.2) (layer "B.Cu") (net 79) (tstamp 4bf85a52-9e80-4856-a930-bfa394b776f6))
+  (segment (start 106.8872 108.443) (end 106.9022 108.458) (width 0.77) (layer "B.Cu") (net 79) (tstamp 7308d17f-029e-4f17-9816-21df6125b116))
+  (segment (start 106.8872 71.055964) (end 106.8872 108.443) (width 0.77) (layer "B.Cu") (net 79) (tstamp 77bbadc2-28a6-4f3a-bdae-e757138f44e5))
+  (segment (start 97.54 58.1884) (end 97.54 59.44) (width 0.2) (layer "B.Cu") (net 79) (tstamp b269e78f-64c6-4697-8bb6-9fd1bf127e89))
+  (segment (start 97.79 61.958764) (end 106.8872 71.055964) (width 0.77) (layer "B.Cu") (net 79) (tstamp bc608e69-cf16-4608-b991-dea361765f1a))
+  (segment (start 97.54 59.44) (end 97.79 59.69) (width 0.2) (layer "B.Cu") (net 79) (tstamp f248fdbf-1a6a-4baa-a3e8-308c4951688a))
+  (segment (start 97.79 59.69) (end 97.79 61.958764) (width 0.77) (layer "B.Cu") (net 79) (tstamp f5fb7931-c5da-4965-ab2e-2a762ea107be))
+  (segment (start 105.9648 109.7702) (end 105.5225 110.2125) (width 0.77) (layer "F.Cu") (net 80) (tstamp 17fe0d95-dbab-49eb-9a35-4fb375d8b7a3))
+  (segment (start 105.9648 108.473) (end 105.9648 109.7702) (width 0.77) (layer "F.Cu") (net 80) (tstamp 36c1a4b8-715a-4d14-84fc-33b62b921751))
+  (segment (start 105.9498 108.458) (end 105.9648 108.473) (width 0.77) (layer "F.Cu") (net 80) (tstamp 61dab290-b5f1-4ecf-8963-83e7a28c7286))
+  (via (at 105.9498 108.458) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 80) (tstamp ee4398ec-d76e-4f30-b395-8066f0a8695f))
+  (segment (start 97.04 57.4586) (end 97.04 58.1884) (width 0.2) (layer "B.Cu") (net 80) (tstamp 0dd02722-4320-4208-977a-4cab2ea5c9d0))
+  (segment (start 97.04 59.424) (end 96.774 59.69) (width 0.2) (layer "B.Cu") (net 80) (tstamp 3fddac7d-59ac-4c19-bc2e-eb33d3057382))
+  (segment (start 105.9648 108.443) (end 105.9498 108.458) (width 0.77) (layer "B.Cu") (net 80) (tstamp 4cf7a6d1-49da-494c-bec8-2bb290ce3604))
+  (segment (start 98.04 57.4134) (end 97.9876 57.361) (width 0.2) (layer "B.Cu") (net 80) (tstamp 5f94f472-e89b-4795-b02f-17d5decd52e4))
+  (segment (start 96.774 62.247236) (end 105.9648 71.438036) (width 0.77) (layer "B.Cu") (net 80) (tstamp 64c3dc1e-36d6-43ae-8cfb-0637e3e16b2a))
+  (segment (start 98.04 58.1884) (end 98.04 57.4134) (width 0.2) (layer "B.Cu") (net 80) (tstamp 749f2389-c992-4e06-9503-8364872dbd98))
+  (segment (start 96.774 59.69) (end 96.774 62.247236) (width 0.77) (layer "B.Cu") (net 80) (tstamp 7a870397-ea59-47e2-bd38-2c6a5afa914c))
+  (segment (start 97.1376 57.361) (end 97.04 57.4586) (width 0.2) (layer "B.Cu") (net 80) (tstamp aff49e15-98c9-4aa2-aac6-442b919eeb20))
+  (segment (start 105.9648 71.438036) (end 105.9648 108.443) (width 0.77) (layer "B.Cu") (net 80) (tstamp db0a1281-ca51-4c5e-84c8-9865bb2f0e18))
+  (segment (start 97.9876 57.361) (end 97.1376 57.361) (width 0.2) (layer "B.Cu") (net 80) (tstamp f74c95c4-c339-45f7-9e0a-3f07f007d2f8))
+  (segment (start 97.04 58.1884) (end 97.04 59.424) (width 0.2) (layer "B.Cu") (net 80) (tstamp f8828814-0734-48b3-b977-42394fa8c6f3))
+  (segment (start 113.387501 113.854999) (end 112.649199 113.854999) (width 0.2) (layer "F.Cu") (net 81) (tstamp 4334746e-02dd-4bab-8361-a58291882b56))
+  (segment (start 113.4125 113.83) (end 113.387501 113.854999) (width 0.2) (layer "F.Cu") (net 81) (tstamp 7bdb8f53-3131-4674-b648-9c73819a7abb))
+  (segment (start 112.649199 113.854999) (end 110.8317 112.0375) (width 0.2) (layer "F.Cu") (net 81) (tstamp b9ba41fd-4dcb-4ef0-9980-63886474b68a))
+  (segment (start 110.8317 112.0375) (end 107.4275 112.0375) (width 0.2) (layer "F.Cu") (net 81) (tstamp db3c1c6d-130b-4703-af5f-2d867081aba8))
+  (segment (start 106.733098 112.4875) (end 105.9725 112.4875) (width 0.2) (layer "F.Cu") (net 82) (tstamp 3360c21b-7411-4dbe-b9ce-05342592773f))
+  (segment (start 113.387501 114.305001) (end 112.462801 114.305001) (width 0.2) (layer "F.Cu") (net 82) (tstamp 3506db7a-dae7-471d-946a-b1e6c495513c))
+  (segment (start 107.857402 112.752) (end 106.997598 112.752) (width 0.2) (layer "F.Cu") (net 82) (tstamp 3b2d9f41-31c9-421b-b3d5-7d69518f1642))
+  (segment (start 106.997598 112.752) (end 106.733098 112.4875) (width 0.2) (layer "F.Cu") (net 82) (tstamp 4a79ddda-24ca-429e-bf04-2722a1735b1d))
+  (segment (start 108.121902 112.4875) (end 107.857402 112.752) (width 0.2) (layer "F.Cu") (net 82) (tstamp 54f5a206-bebb-4d0c-b98f-1deccc9a54f2))
+  (segment (start 105.9725 112.4875) (end 105.5225 112.0375) (width 0.2) (layer "F.Cu") (net 82) (tstamp 6f283c74-c9fb-4300-891a-3d5caaa6f9d2))
+  (segment (start 113.4125 114.33) (end 113.387501 114.305001) (width 0.2) (layer "F.Cu") (net 82) (tstamp 864b2395-0867-43bc-a501-08ccd031a174))
+  (segment (start 112.462801 114.305001) (end 110.6453 112.4875) (width 0.2) (layer "F.Cu") (net 82) (tstamp aaf2156a-55a2-480f-bc9a-30c9ce264d30))
+  (segment (start 110.6453 112.4875) (end 108.121902 112.4875) (width 0.2) (layer "F.Cu") (net 82) (tstamp f01c7aac-6686-43f4-bd55-8e8478a9e215))
+  (segment (start 96.15 130.3125) (end 94.8375 129) (width 0.25) (layer "F.Cu") (net 83) (tstamp 451d30f8-c635-4335-bbc5-fb8449853705))
+  (segment (start 96.15 133) (end 96.15 130.3125) (width 0.25) (layer "F.Cu") (net 83) (tstamp 8284a0b2-2e52-42ee-8c39-5658e4828a66))
+  (segment (start 94.8375 129) (end 91.8 132.0375) (width 0.25) (layer "F.Cu") (net 83) (tstamp d7929f72-6955-4293-ae1c-fe08b3231193))
+  (segment (start 91.8 132.0375) (end 91.8 133) (width 0.25) (layer "F.Cu") (net 83) (tstamp e3f9861c-c27f-4792-a862-3156da4d750b))
+  (segment (start 90.5 133) (end 90.5 136.55) (width 0.25) (layer "F.Cu") (net 84) (tstamp 77bc59e8-72a4-400b-aa75-4e0efc1d63de))
+  (segment (start 85.09 139.7) (end 86.487 141.097) (width 0.25) (layer "F.Cu") (net 84) (tstamp 7b2a2ac6-c591-4b3d-b298-952f9763ad4e))
+  (segment (start 90.5 136.55) (end 88.24 136.55) (width 0.25) (layer "F.Cu") (net 84) (tstamp 8891c416-f7b4-49df-90cc-9e7d21b7b988))
+  (segment (start 88.24 136.55) (end 85.09 139.7) (width 0.25) (layer "F.Cu") (net 84) (tstamp a6c33eec-2436-4140-8b4f-8a7d6c8822f0))
 
   (zone (net 1) (net_name "GND") (layer "B.Cu") (tstamp 7e2d9e43-5ea1-41f7-b60f-26c085136de1) (hatch edge 0.508)
     (priority 6)
@@ -5046,143 +5044,6 @@
         (xy 117.078831 121.016)
         (xy 114.667977 121.016)
         (xy 114.623783 120.997694)
-        (xy 113.895089 120.269)
-        (xy 115.799948 120.269)
-        (xy 115.800483 120.273064)
-        (xy 115.815793 120.389355)
-        (xy 115.818077 120.406705)
-        (xy 115.819643 120.410485)
-        (xy 115.819643 120.410486)
-        (xy 115.853739 120.492801)
-        (xy 115.871229 120.535026)
-        (xy 115.955782 120.645218)
-        (xy 115.959027 120.647708)
-        (xy 116.016599 120.691884)
-        (xy 116.065974 120.729771)
-        (xy 116.069757 120.731338)
-        (xy 116.163077 120.769992)
-        (xy 116.194295 120.782923)
-        (xy 116.198351 120.783457)
-        (xy 116.198355 120.783458)
-        (xy 116.327936 120.800517)
-        (xy 116.332 120.801052)
-        (xy 116.336064 120.800517)
-        (xy 116.465645 120.783458)
-        (xy 116.465649 120.783457)
-        (xy 116.469705 120.782923)
-        (xy 116.500924 120.769992)
-        (xy 116.594243 120.731338)
-        (xy 116.598026 120.729771)
-        (xy 116.647402 120.691884)
-        (xy 116.704973 120.647708)
-        (xy 116.708218 120.645218)
-        (xy 116.710708 120.641973)
-        (xy 116.710711 120.64197)
-        (xy 116.784387 120.545953)
-        (xy 116.825814 120.522035)
-        (xy 116.833972 120.5215)
-        (xy 120.74597 120.5215)
-        (xy 120.758163 120.522701)
-        (xy 120.777 120.526448)
-        (xy 120.783037 120.525247)
-        (xy 120.801874 120.5215)
-        (xy 120.862148 120.50951)
-        (xy 120.875521 120.50685)
-        (xy 120.959043 120.451043)
-        (xy 120.969713 120.435074)
-        (xy 120.977486 120.425603)
-        (xy 121.949603 119.453486)
-        (xy 121.959074 119.445713)
-        (xy 121.969926 119.438462)
-        (xy 121.975043 119.435043)
-        (xy 122.03085 119.351521)
-        (xy 122.033895 119.336214)
-        (xy 122.049247 119.259038)
-        (xy 122.050448 119.253)
-        (xy 122.046701 119.234163)
-        (xy 122.0455 119.22197)
-        (xy 122.0455 115.182972)
-        (xy 122.063806 115.138778)
-        (xy 122.069953 115.133387)
-        (xy 122.16597 115.059711)
-        (xy 122.165973 115.059708)
-        (xy 122.169218 115.057218)
-        (xy 122.253771 114.947026)
-        (xy 122.306923 114.818705)
-        (xy 122.307483 114.814458)
-        (xy 122.324517 114.685064)
-        (xy 122.325052 114.681)
-        (xy 122.311283 114.576411)
-        (xy 122.307458 114.547355)
-        (xy 122.307457 114.547351)
-        (xy 122.306923 114.543295)
-        (xy 122.253771 114.414974)
-        (xy 122.169218 114.304782)
-        (xy 122.059026 114.220229)
-        (xy 121.930705 114.167077)
-        (xy 121.926649 114.166543)
-        (xy 121.926645 114.166542)
-        (xy 121.797064 114.149483)
-        (xy 121.793 114.148948)
-        (xy 121.788936 114.149483)
-        (xy 121.659355 114.166542)
-        (xy 121.659351 114.166543)
-        (xy 121.655295 114.167077)
-        (xy 121.526974 114.220229)
-        (xy 121.416782 114.304782)
-        (xy 121.332229 114.414974)
-        (xy 121.279077 114.543295)
-        (xy 121.278543 114.547351)
-        (xy 121.278542 114.547355)
-        (xy 121.274717 114.576411)
-        (xy 121.260948 114.681)
-        (xy 121.261483 114.685064)
-        (xy 121.278518 114.814458)
-        (xy 121.279077 114.818705)
-        (xy 121.332229 114.947026)
-        (xy 121.416782 115.057218)
-        (xy 121.420027 115.059708)
-        (xy 121.42003 115.059711)
-        (xy 121.516047 115.133387)
-        (xy 121.539965 115.174814)
-        (xy 121.5405 115.182972)
-        (xy 121.5405 119.122523)
-        (xy 121.522194 119.166717)
-        (xy 120.690717 119.998194)
-        (xy 120.646523 120.0165)
-        (xy 116.833972 120.0165)
-        (xy 116.789778 119.998194)
-        (xy 116.784387 119.992047)
-        (xy 116.710711 119.89603)
-        (xy 116.710708 119.896027)
-        (xy 116.708218 119.892782)
-        (xy 116.598026 119.808229)
-        (xy 116.567003 119.795379)
-        (xy 116.473486 119.756643)
-        (xy 116.473485 119.756643)
-        (xy 116.469705 119.755077)
-        (xy 116.465649 119.754543)
-        (xy 116.465645 119.754542)
-        (xy 116.336064 119.737483)
-        (xy 116.332 119.736948)
-        (xy 116.327936 119.737483)
-        (xy 116.198355 119.754542)
-        (xy 116.198351 119.754543)
-        (xy 116.194295 119.755077)
-        (xy 116.190515 119.756643)
-        (xy 116.190514 119.756643)
-        (xy 116.096997 119.795379)
-        (xy 116.065974 119.808229)
-        (xy 115.955782 119.892782)
-        (xy 115.871229 120.002974)
-        (xy 115.869662 120.006757)
-        (xy 115.825592 120.113153)
-        (xy 115.818077 120.131295)
-        (xy 115.817543 120.135351)
-        (xy 115.817542 120.135355)
-        (xy 115.804078 120.237626)
-        (xy 115.799948 120.269)
-        (xy 113.895089 120.269)
         (xy 112.296575 118.670486)
         (xy 112.278269 118.626292)
         (xy 112.278804 118.618135)
@@ -5252,7 +5113,7 @@
         (xy 111.229857 114.441486)
         (xy 111.229857 114.441485)
         (xy 111.231423 114.437705)
-        (xy 111.234844 114.411725)
+        (xy 111.238313 114.385374)
         (xy 111.249017 114.304064)
         (xy 111.249552 114.3)
         (xy 111.241784 114.240993)
@@ -8120,7 +7981,7 @@
         (xy 122.935897 114.240993)
         (xy 122.928129 114.3)
         (xy 122.928664 114.304064)
-        (xy 122.942838 114.411725)
+        (xy 122.939369 114.385374)
         (xy 122.946258 114.437705)
         (xy 122.947824 114.441485)
         (xy 122.947824 114.441486)
@@ -8144,7 +8005,7 @@
         (xy 123.972538 114.441486)
         (xy 123.972538 114.441485)
         (xy 123.974104 114.437705)
-        (xy 123.977525 114.411725)
+        (xy 123.980994 114.385374)
         (xy 123.991698 114.304064)
         (xy 123.992233 114.3)
         (xy 123.984465 114.240993)
@@ -8523,7 +8384,7 @@
         (xy 144.091016 120.957583)
         (xy 144.086886 120.912203)
         (xy 144.085718 120.908232)
-        (xy 144.039853 120.752398)
+        (xy 144.029584 120.717508)
         (xy 144.02872 120.714572)
         (xy 143.933274 120.532002)
         (xy 143.804185 120.371447)
@@ -8559,7 +8420,7 @@
         (xy 147.994443 115.102631)
         (xy 147.994719 115.105664)
         (xy 147.994719 115.105668)
-        (xy 147.998005 115.141771)
+        (xy 147.995784 115.117369)
         (xy 148.013114 115.307797)
         (xy 148.013977 115.31073)
         (xy 148.013978 115.310734)
@@ -8600,7 +8461,7 @@
         (xy 149.933274 114.532002)
         (xy 149.804185 114.371447)
         (xy 149.64637 114.239024)
-        (xy 149.516797 114.167791)
+        (xy 149.5068 114.162295)
         (xy 149.468518 114.141249)
         (xy 149.468515 114.141248)
         (xy 149.465838 114.139776)
@@ -11439,7 +11300,7 @@
         (xy 102.493357 120.664485)
         (xy 102.494923 120.660705)
         (xy 102.496333 120.65)
-        (xy 102.511041 120.538275)
+        (xy 102.510931 120.539112)
         (xy 102.513052 120.523)
         (xy 102.510414 120.502965)
         (xy 102.495458 120.389355)
diff --git a/laser-tag badge v2/laser-tag.kicad_sch b/laser-tag badge v2/laser-tag.kicad_sch
index d4f2303..4ef1b3f 100644
--- a/laser-tag badge v2/laser-tag.kicad_sch
+++ b/laser-tag badge v2/laser-tag.kicad_sch
@@ -2301,9 +2301,6 @@
   (junction (at 113.03 256.54) (diameter 0) (color 0 0 0 0)
     (uuid c40a0f4a-1dfe-49ec-8a4e-1559f8b21ab8)
   )
-  (junction (at 275.59 38.1) (diameter 0) (color 0 0 0 0)
-    (uuid c4a513a6-fbd2-4082-a4dd-398b1c2ccbaf)
-  )
   (junction (at 148.59 38.1) (diameter 0) (color 0 0 0 0)
     (uuid c4c84fb1-0f4a-44c7-8c8c-26820489e861)
   )
@@ -2352,7 +2349,9 @@
   (no_connect (at 59.69 177.8) (uuid 398f16ee-c23e-44af-91a5-913aa8acec41))
   (no_connect (at 49.53 121.92) (uuid 4e2dd0b8-0d6c-4c26-9b8a-7358ab892043))
   (no_connect (at 213.36 81.28) (uuid 4fd648c6-8671-42ff-9406-e8141c5acfdf))
+  (no_connect (at 213.36 40.64) (uuid 622ec036-77d8-463f-b717-52e0047f1192))
   (no_connect (at 213.36 76.2) (uuid 702013a3-4123-4d82-b04b-f6aa4de92a44))
+  (no_connect (at 275.59 38.1) (uuid 993df8d7-a448-4959-9fe3-f4a4adb5d5e5))
   (no_connect (at 274.32 116.84) (uuid bed0a1fc-4da8-4e3a-be62-24b8cea3e981))
   (no_connect (at 59.69 180.34) (uuid c8853ea7-d9cc-465d-85d0-c900321bc127))
   (no_connect (at 213.36 58.42) (uuid c8adff12-1a1f-49da-8784-8380024a5c56))
@@ -2513,10 +2512,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d91a905-f445-43b3-9e65-75754bea1a3a)
   )
-  (wire (pts (xy 275.59 38.1) (xy 278.13 38.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1de5dbfe-1eb8-40f3-b50e-e6f2b796d342)
-  )
   (wire (pts (xy 143.51 210.82) (xy 146.05 210.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1f9bb2fd-4a90-4faf-a0b9-7d566fb3d222)
@@ -2661,10 +2656,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3c94ec32-d0ea-48f5-a533-2ccce67c7b47)
   )
-  (wire (pts (xy 278.13 35.56) (xy 275.59 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3dcb3407-827e-4ee6-8f3e-5009e606b3ff)
-  )
   (wire (pts (xy 160.02 236.22) (xy 152.4 236.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3e082454-6cea-4600-8797-1069258b16aa)
@@ -3009,10 +3000,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 956d7e69-92a4-4e8d-bf96-bb05db25c866)
   )
-  (wire (pts (xy 209.55 40.64) (xy 213.36 40.64))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 95bc76f2-bdaf-46da-85d4-e5d170f1deeb)
-  )
   (wire (pts (xy 161.29 27.94) (xy 166.37 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 96639b8b-7580-43c5-a38e-975ef2df01b4)
@@ -3293,10 +3280,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d1bd13b9-41ee-4215-b0be-f40ca42e7e5e)
   )
-  (wire (pts (xy 275.59 35.56) (xy 275.59 38.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d2f939d4-b596-4fff-990e-25074a48d1c4)
-  )
   (wire (pts (xy 147.32 170.18) (xy 144.78 170.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d38a988a-4a53-49a4-8221-74ba4dd31ae3)
@@ -3719,20 +3702,6 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "CMP_OUT" (shape input) (at 278.13 38.1 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a14972fe-8da3-4be0-98c6-00479248f9e9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 289.1307 38.0206 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "RX" (shape input) (at 278.13 35.56 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a14b0a0c-a646-4fca-addf-04df47a876bd)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 283.0226 35.4806 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "BORDER" (shape input) (at 109.22 256.54 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid a3850e9e-f1c0-493e-97e8-381b1641dc29)
@@ -3796,13 +3765,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "RX" (shape input) (at 209.55 40.64 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid d21bec61-6dd7-4814-8c46-bf7595243187)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 204.6574 40.7194 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
   (global_label "SAO_SCL" (shape input) (at 278.13 111.76 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d4633363-05a8-4522-8001-0594d3669bed)