Hybrid AIC Key PCB and AIC touch RGB back to 1204

PCB/Key/aic_key.kicad_prl

@@ -23,9 +23,9 @@
       "lockedItems": false,
       "otherItems": false,
       "pads": false,
-      "text": false,
+      "text": true,
-      "tracks": true,
+      "tracks": false,
-      "vias": true,
+      "vias": false,
       "zones": false
     },
     "visible_items": [
@@ -68,7 +68,7 @@
     "zone_display_mode": 0
   },
   "meta": {
-    "filename": "aic_key_pn532.kicad_prl",
+    "filename": "aic_key.kicad_prl",
     "version": 3
   },
   "project": {

PCB/Key/aic_key.kicad_pro

@@ -57,8 +57,8 @@
         }
       ],
       "drc_exclusions": [
-        "copper_edge_clearance|119620000|134653576|abc3d2cd-d9a1-4e43-92fc-b09afead24b8|30eb18f0-f4fe-41fa-9177-a9aeb757d397",
+        "copper_edge_clearance|119620000|134653576|abc3d2cd-d9a1-4e43-92fc-b09afead24b8|35b71eeb-420e-4fbf-b627-4f7c399bceb6",
-        "copper_edge_clearance|151020000|134653577|35768b9f-de06-455c-ae38-8ee617c659ac|039b4c92-4676-448a-9586-483834eb35dd"
+        "copper_edge_clearance|151020000|134653577|35768b9f-de06-455c-ae38-8ee617c659ac|bb953c57-4da8-41ef-bb35-036dc4e11e55"
       ],
       "meta": {
         "version": 2
@@ -412,7 +412,7 @@
     "pinned_symbol_libs": []
   },
   "meta": {
-    "filename": "aic_pico_pn5180.kicad_pro",
+    "filename": "aic_key.kicad_pro",
     "version": 1
   },
   "net_settings": {

PCB/Key/aic_key.kicad_sch

@@ -113,57 +113,6 @@
         )
       )
     )
-    (symbol "Device:L" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "L" (at -1.27 0 90)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "L" (at 1.905 0 90)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "inductor choke coil reactor magnetic" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Inductor" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Choke_* *Coil* Inductor_* L_*" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "L_0_1"
-        (arc (start 0 -2.54) (mid 0.6323 -1.905) (end 0 -1.27)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (arc (start 0 -1.27) (mid 0.6323 -0.635) (end 0 0)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (arc (start 0 0) (mid 0.6323 0.635) (end 0 1.27)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (arc (start 0 1.27) (mid 0.6323 1.905) (end 0 2.54)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-      )
-      (symbol "L_1_1"
-        (pin passive line (at 0 3.81 270) (length 1.27)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -3.81 90) (length 1.27)
-          (name "2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:LED" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "D" (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
@@ -367,6 +316,51 @@
         )
       )
     )
+    (symbol "aic_pico:PN532" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (at -1.27 6.35 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "PN532" (at 1.27 -6.985 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "aic_pico:pn532_conn" (at -0.635 -7.62 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "connector" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Generic connector, single row, 01x13, script generated" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Connector*:*_1x??_*" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PN532_1_1"
+        (rectangle (start -2.54 5.08) (end 4.445 -5.08)
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (pin power_in line (at -6.35 3.81 0) (length 3.81)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at -6.35 1.27 0) (length 3.81)
+          (name "VCC" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -6.35 -1.27 0) (length 3.81)
+          (name "SDA" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -6.35 -3.81 0) (length 3.81)
+          (name "SCL" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "aic_pico:Pico_Trim" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
       (property "Reference" "U" (at -13.97 27.94 0)
         (effects (font (size 1.27 1.27)))
@@ -937,9 +931,6 @@
   (junction (at 203.2 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 941ccbb3-6ecf-4dfe-9a14-a585de4ff137)
   )
-  (junction (at 245.11 81.28) (diameter 0) (color 0 0 0 0)
-    (uuid 98ed3037-d7dd-4434-8e32-92023e997856)
-  )
   (junction (at 215.9 158.75) (diameter 0) (color 0 0 0 0)
     (uuid 98f45ed8-3359-4049-8b8e-49336e162522)
   )
@@ -976,6 +967,9 @@
   (junction (at 236.22 93.98) (diameter 0) (color 0 0 0 0)
     (uuid eb6cccb9-dd9d-439e-b15a-f5c4ad573581)
   )
+  (junction (at 220.98 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid f0b85d95-8f03-4af7-9294-706649a9d847)
+  )
   (junction (at 228.6 191.77) (diameter 0) (color 0 0 0 0)
     (uuid f1a87dcf-0d01-4f3d-8cb6-54bfe5d07cdd)
   )
@@ -985,9 +979,6 @@
   (junction (at 236.22 119.38) (diameter 0) (color 0 0 0 0)
     (uuid fb54ca38-cbd4-415f-87ee-b5e4215fbba8)
   )
-  (junction (at 255.27 68.58) (diameter 0) (color 0 0 0 0)
-    (uuid fc04b151-f929-4346-819a-c67950779e52)
-  )
   (junction (at 80.01 99.06) (diameter 0) (color 0 0 0 0)
     (uuid ff976ad6-38b2-45ee-9bc6-bc2bad64b1c7)
   )
@@ -999,8 +990,6 @@
   (no_connect (at 209.55 88.9) (uuid 490ed4ff-9da7-4951-bd46-3715875e8858))
   (no_connect (at 209.55 91.44) (uuid 4fd199c4-5de5-42fd-82e8-5266094a993d))
   (no_connect (at 234.95 151.13) (uuid 58ffe2e7-e3e3-49cc-9161-310b712decd8))
-  (no_connect (at 209.55 111.76) (uuid 5c2c7e92-ce5e-4593-9504-fd7cfb62932c))
-  (no_connect (at 209.55 109.22) (uuid 684397f7-216b-4379-87f0-d93a719841d2))
   (no_connect (at 279.4 104.14) (uuid c7a3d5d7-f91e-4c05-bd6f-4028f4e02b41))
   (no_connect (at 279.4 111.76) (uuid e5f413f5-26df-4ac3-b8cf-44e3c70ef5a9))
 
@@ -1032,7 +1021,7 @@
     (stroke (width 0) (type default))
     (uuid 05ea8712-6b49-4d0e-9c87-baae3b2c0196)
   )
-  (wire (pts (xy 255.27 68.58) (xy 278.13 68.58))
+  (wire (pts (xy 245.11 68.58) (xy 278.13 68.58))
     (stroke (width 0) (type default))
     (uuid 0613a9e4-d91a-4d7d-b069-94454ee19840)
   )
@@ -1052,6 +1041,10 @@
     (stroke (width 0) (type default))
     (uuid 08abbc7b-9e3c-421d-aa0b-6361a16fc4a4)
   )
+  (wire (pts (xy 209.55 78.74) (xy 220.98 78.74))
+    (stroke (width 0) (type default))
+    (uuid 0960d85e-fa0e-471f-aec1-500c0a456e05)
+  )
   (wire (pts (xy 209.55 119.38) (xy 236.22 119.38))
     (stroke (width 0) (type default))
     (uuid 113a5723-b992-4056-9a1e-c806d23524a5)
@@ -1064,6 +1057,10 @@
     (stroke (width 0) (type default))
     (uuid 12528e47-ad2a-4aa8-ba58-1189b06bfd1c)
   )
+  (wire (pts (xy 247.65 111.76) (xy 209.55 111.76))
+    (stroke (width 0) (type default))
+    (uuid 1406f89f-f03d-4387-a242-648b15547fff)
+  )
   (wire (pts (xy 203.2 171.45) (xy 203.2 176.53))
     (stroke (width 0) (type default))
     (uuid 14dfea36-77ce-41c9-90f3-68d9e68db4dd)
@@ -1112,10 +1109,18 @@
     (stroke (width 0) (type default))
     (uuid 241fb39b-4804-4750-a208-146b04ed6100)
   )
+  (wire (pts (xy 278.13 161.29) (xy 250.825 161.29))
+    (stroke (width 0) (type default))
+    (uuid 27073eae-9c77-47ad-89ae-0b061c7b4e1b)
+  )
   (wire (pts (xy 283.21 129.54) (xy 295.91 129.54))
     (stroke (width 0) (type default))
     (uuid 28c25ed1-489a-4944-94b7-428474ff5385)
   )
+  (wire (pts (xy 275.59 146.05) (xy 275.59 156.21))
+    (stroke (width 0) (type default))
+    (uuid 2ab1cbbc-f99c-4e75-83cc-fc3ccb117bda)
+  )
   (wire (pts (xy 173.99 109.22) (xy 136.525 109.22))
     (stroke (width 0) (type default))
     (uuid 2d257943-3192-42cc-ab9d-fe7a446499c3)
@@ -1132,6 +1137,10 @@
     (stroke (width 0) (type default))
     (uuid 30e2ace9-399c-43f6-93de-804209bf45e6)
   )
+  (wire (pts (xy 220.98 78.74) (xy 220.98 68.58))
+    (stroke (width 0) (type default))
+    (uuid 361dc2b7-d4cb-4699-b5ec-aa25d8ecfbad)
+  )
   (wire (pts (xy 107.95 107.95) (xy 107.95 105.41))
     (stroke (width 0) (type default))
     (uuid 3df78ec0-10ce-4c04-bc76-1a0fffb584d3)
@@ -1184,6 +1193,14 @@
     (stroke (width 0) (type default))
     (uuid 50f5f5d9-6d84-46a6-af43-59bd3138aa54)
   )
+  (wire (pts (xy 278.13 148.59) (xy 295.91 148.59))
+    (stroke (width 0) (type default))
+    (uuid 54eb8773-8856-4985-99c8-cb151eb77fc5)
+  )
+  (wire (pts (xy 247.65 158.75) (xy 247.65 111.76))
+    (stroke (width 0) (type default))
+    (uuid 55746978-6214-45da-a816-9a7d124cdd7a)
+  )
   (wire (pts (xy 80.01 101.6) (xy 80.01 107.95))
     (stroke (width 0) (type default))
     (uuid 56024fd2-4d44-4706-97a9-85a9f2677a45)
@@ -1292,6 +1309,10 @@
     (stroke (width 0) (type default))
     (uuid 750f60d3-fdae-4931-bf04-cd21db27f633)
   )
+  (wire (pts (xy 250.825 109.22) (xy 209.55 109.22))
+    (stroke (width 0) (type default))
+    (uuid 75d6bd6a-37e9-4935-ab70-98b85cc3d84c)
+  )
   (wire (pts (xy 99.06 96.52) (xy 99.06 99.06))
     (stroke (width 0) (type default))
     (uuid 78216481-3c58-4845-8133-51952e63f562)
@@ -1320,10 +1341,6 @@
     (stroke (width 0) (type default))
     (uuid 7fc5d8f5-c9a5-488c-9d06-2ebe60e382ce)
   )
-  (wire (pts (xy 212.725 68.58) (xy 234.315 68.58))
-    (stroke (width 0) (type default))
-    (uuid 8029645a-545c-450d-861f-78f5b5083d7f)
-  )
   (wire (pts (xy 173.99 88.9) (xy 125.095 88.9))
     (stroke (width 0) (type default))
     (uuid 802c52e4-8fee-4106-b3d0-afdbbbcbcded)
@@ -1340,10 +1357,6 @@
     (stroke (width 0) (type default))
     (uuid 85b321da-a41c-4dbe-afa4-5f70c2c9e0d1)
   )
-  (wire (pts (xy 212.725 76.2) (xy 209.55 76.2))
-    (stroke (width 0) (type default))
-    (uuid 863c7f7a-59cc-4e6c-9583-2974ca955369)
-  )
   (wire (pts (xy 80.01 120.65) (xy 80.01 127))
     (stroke (width 0) (type default))
     (uuid 865b05a7-27f0-4a6c-bfeb-31291bcb0424)
@@ -1356,6 +1369,10 @@
     (stroke (width 0) (type default))
     (uuid 89c8ced3-3e80-498b-ad0c-c6e6347c6527)
   )
+  (wire (pts (xy 278.13 158.75) (xy 247.65 158.75))
+    (stroke (width 0) (type default))
+    (uuid 8ac192ac-48d1-4e2f-ad58-186b657c5388)
+  )
   (wire (pts (xy 177.8 191.77) (xy 190.5 191.77))
     (stroke (width 0) (type default))
     (uuid 8c1238bb-6986-4654-9413-e8e56c365a6e)
@@ -1372,10 +1389,6 @@
     (stroke (width 0) (type default))
     (uuid 8df42f2f-2062-4531-b868-713f8b82e27a)
   )
-  (wire (pts (xy 212.725 76.2) (xy 212.725 68.58))
-    (stroke (width 0) (type default))
-    (uuid 90bb92ac-f703-4799-934c-3bea3dc3be6a)
-  )
   (wire (pts (xy 203.2 189.23) (xy 203.2 191.77))
     (stroke (width 0) (type default))
     (uuid 92252c34-c90a-4ec0-89d8-64bf2e545ad9)
@@ -1392,10 +1405,6 @@
     (stroke (width 0) (type default))
     (uuid 95d23102-31a5-4318-b5c7-4c41b1373a2b)
   )
-  (wire (pts (xy 245.11 81.28) (xy 255.27 81.28))
-    (stroke (width 0) (type default))
-    (uuid 97dda32f-0e40-4cdc-8072-856091218820)
-  )
   (wire (pts (xy 99.06 80.01) (xy 107.95 80.01))
     (stroke (width 0) (type default))
     (uuid 99175ca8-ca23-4f35-939f-55ba4a0ba2c5)
@@ -1404,10 +1413,6 @@
     (stroke (width 0) (type default))
     (uuid 9b6c13e6-508a-4c9e-babe-8d4f06d43149)
   )
-  (wire (pts (xy 217.17 78.74) (xy 209.55 78.74))
-    (stroke (width 0) (type default))
-    (uuid 9caa4a44-dd69-4cb8-aa58-d8fd3381072d)
-  )
   (wire (pts (xy 127 82.55) (xy 80.01 82.55))
     (stroke (width 0) (type default))
     (uuid 9d32f96f-6867-422d-a261-7d6b0abeef38)
@@ -1432,6 +1437,10 @@
     (stroke (width 0) (type default))
     (uuid a2d2d79a-b892-4764-a76e-4ba899feca99)
   )
+  (wire (pts (xy 278.13 153.67) (xy 278.13 148.59))
+    (stroke (width 0) (type default))
+    (uuid a5502daa-1c01-4b70-a69a-0bd45f72c8d4)
+  )
   (wire (pts (xy 99.06 134.62) (xy 99.06 137.16))
     (stroke (width 0) (type default))
     (uuid aad00869-7cb9-43ad-aa15-94180b43b194)
@@ -1520,10 +1529,6 @@
     (stroke (width 0) (type default))
     (uuid c3d76342-5fb6-4155-932e-f6a5d15d4a99)
   )
-  (wire (pts (xy 245.11 68.58) (xy 255.27 68.58))
-    (stroke (width 0) (type default))
-    (uuid c3d854e5-4492-4308-9336-be704b83daa7)
-  )
   (wire (pts (xy 209.55 81.28) (xy 236.22 81.28))
     (stroke (width 0) (type default))
     (uuid c52c8eb1-c93d-450d-8a76-c57a0e8eb778)
@@ -1556,6 +1561,10 @@
     (stroke (width 0) (type default))
     (uuid cefeebac-484c-4de5-ba3c-fb862ee6c768)
   )
+  (wire (pts (xy 275.59 156.21) (xy 278.13 156.21))
+    (stroke (width 0) (type default))
+    (uuid d17826dd-39f2-4845-a137-3253fd91f063)
+  )
   (wire (pts (xy 248.92 86.36) (xy 279.4 86.36))
     (stroke (width 0) (type default))
     (uuid d1c6ff6a-a299-4aa0-b601-90d55e55512a)
@@ -1592,6 +1601,14 @@
     (stroke (width 0) (type default))
     (uuid e1864965-69e2-45af-a891-bbc2c108d204)
   )
+  (wire (pts (xy 295.91 148.59) (xy 295.91 152.4))
+    (stroke (width 0) (type default))
+    (uuid e2fa05a0-aff4-42b9-ab58-ef37eb8ffd53)
+  )
+  (wire (pts (xy 250.825 161.29) (xy 250.825 109.22))
+    (stroke (width 0) (type default))
+    (uuid e44b19c3-bf44-4300-a681-af57fb9dd920)
+  )
   (wire (pts (xy 209.55 116.84) (xy 262.89 116.84))
     (stroke (width 0) (type default))
     (uuid e6437f89-6456-4950-9545-62c1d48bbdce)
@@ -1636,10 +1653,6 @@
     (stroke (width 0) (type default))
     (uuid eeddcaab-c7ce-46f2-9978-b910c96ef1dd)
   )
-  (wire (pts (xy 255.27 81.28) (xy 255.27 78.74))
-    (stroke (width 0) (type default))
-    (uuid efe11135-a37c-47b0-9c9c-d6e8c7aa5807)
-  )
   (wire (pts (xy 248.92 86.36) (xy 248.92 96.52))
     (stroke (width 0) (type default))
     (uuid f273ba96-6571-489d-bf04-5ed71d666a51)
@@ -1664,10 +1677,6 @@
     (stroke (width 0) (type default))
     (uuid f4f65441-8943-4c3e-b485-489ab89c3ba2)
   )
-  (wire (pts (xy 217.17 75.565) (xy 217.17 78.74))
-    (stroke (width 0) (type default))
-    (uuid f5ca67d5-89f0-4b84-8625-319746f035ba)
-  )
   (wire (pts (xy 215.9 191.77) (xy 228.6 191.77))
     (stroke (width 0) (type default))
     (uuid f603e5e3-3f00-42e3-985a-4481e4cdbb73)
@@ -1700,10 +1709,6 @@
     (stroke (width 0) (type default))
     (uuid f9d86473-2129-4dd6-b820-509bfee8bff6)
   )
-  (wire (pts (xy 255.27 71.12) (xy 255.27 68.58))
-    (stroke (width 0) (type default))
-    (uuid faef9811-9a83-4c6b-a297-c80f5276aeb1)
-  )
   (wire (pts (xy 107.95 115.57) (xy 107.95 118.11))
     (stroke (width 0) (type default))
     (uuid fb9dfcd4-b6c3-486f-abd6-df673efb717b)
@@ -1716,7 +1721,7 @@
     (stroke (width 0) (type default))
     (uuid fd30b724-ac2b-4357-9a65-fe3eef4a3d43)
   )
-  (wire (pts (xy 245.11 68.58) (xy 241.935 68.58))
+  (wire (pts (xy 245.11 68.58) (xy 220.98 68.58))
     (stroke (width 0) (type default))
     (uuid feb215bc-63f0-4a60-a4bd-b27b61c05d21)
   )
@@ -1734,24 +1739,24 @@
     (uuid db75764e-6cb2-4216-9895-80996565ea1e)
   )
 
-  (symbol (lib_id "power:+5V") (at 217.17 75.565 0) (unit 1)
+  (symbol (lib_id "power:+5V") (at 220.98 68.58 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-000060fad45e)
-    (property "Reference" "#PWR0114" (at 217.17 79.375 0)
+    (property "Reference" "#PWR0114" (at 220.98 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+5V" (at 217.17 71.755 0)
+    (property "Value" "+5V" (at 220.98 64.77 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 217.17 75.565 0)
+    (property "Footprint" "" (at 220.98 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 217.17 75.565 0)
+    (property "Datasheet" "" (at 220.98 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 25f13122-3fda-45b6-ba39-faa2f9934cb5))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR0114") (unit 1)
         )
@@ -1777,7 +1782,7 @@
     (pin "1" (uuid 232d7931-5b85-4c91-b25a-fe5379a25365))
     (pin "2" (uuid 89bad635-5ff8-4c93-88af-e7edd7401109))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D11") (unit 1)
         )
@@ -1785,6 +1790,31 @@
     )
   )
 
+  (symbol (lib_id "power:+3V3") (at 275.59 146.05 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 073f947c-6b0e-4895-91c9-abbb1608c967)
+    (property "Reference" "#PWR06" (at 275.59 149.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (at 271.78 144.78 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 275.59 146.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 275.59 146.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5219d9fc-8b44-4e66-87db-47fc03df08f5))
+    (instances
+      (project "aic_key"
+        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
+          (reference "#PWR06") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "aic_pico:SKRR_4pin") (at 93.98 130.81 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 088bd231-7931-4473-ad39-e38aabfe9232)
@@ -1808,7 +1838,7 @@
     (pin "3" (uuid 80d874f1-8be4-48eb-a94a-204662b2efa9))
     (pin "4" (uuid ae5048d0-7b1e-4de6-8af2-abe21ab1813f))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW11") (unit 1)
         )
@@ -1836,7 +1866,7 @@
     (pin "O" (uuid db5f9878-d305-4b4e-8cfe-3b36155e63be))
     (pin "V" (uuid ac91f7bd-ad8e-45ae-b6d3-e642d96961f2))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D1") (unit 1)
         )
@@ -1865,7 +1895,7 @@
     (pin "1" (uuid 5a4bcf9a-c99e-4240-9456-f56604030bea))
     (pin "2" (uuid 4b85981b-6a71-4d66-ab55-88e6f9b7dcf0))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R4") (unit 1)
         )
@@ -1891,7 +1921,7 @@
     (pin "1" (uuid b8ab8dfc-c86c-49ce-a76f-476527984e8a))
     (pin "2" (uuid b4cd33c3-b72b-4136-8508-912e2706fa72))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D12") (unit 1)
         )
@@ -1920,7 +1950,7 @@
     (pin "1" (uuid 95ba07fb-0b1e-4b37-8524-e21cc808f881))
     (pin "2" (uuid b211907f-43fc-4173-a618-2c2822685132))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R7") (unit 1)
         )
@@ -1949,7 +1979,7 @@
     (pin "1" (uuid 346af028-8cbf-4e12-b454-6260ec49b085))
     (pin "2" (uuid c892c78c-dc90-40f5-a39f-554a07374613))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R1") (unit 1)
         )
@@ -1974,7 +2004,7 @@
     )
     (pin "1" (uuid 40a66edf-d6f9-4f02-8244-adb71dcec1f1))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR0125") (unit 1)
         )
@@ -1999,7 +2029,7 @@
     )
     (pin "1" (uuid a096ef01-08b2-4c3a-8bcc-006875297a34))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR0103") (unit 1)
         )
@@ -2030,7 +2060,7 @@
     (pin "3" (uuid 6c40003c-38ad-47b3-975a-ab74dc47f5bf))
     (pin "4" (uuid 392ecbc8-7087-499d-9b07-543da6c7cd76))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW2") (unit 1)
         )
@@ -2061,7 +2091,7 @@
     (pin "3" (uuid ecf21464-9c75-4969-888c-bfb4b25b8562))
     (pin "4" (uuid b2408de8-3d60-4ab1-832e-74c4344ed097))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW1") (unit 1)
         )
@@ -2092,7 +2122,7 @@
     (pin "3" (uuid d8d02b57-503a-4329-9d18-ecbc09d80f1e))
     (pin "4" (uuid 6dda8f4d-dcb8-4fd6-839f-a87ffaa71a1e))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW5") (unit 1)
         )
@@ -2120,7 +2150,7 @@
     (pin "O" (uuid f2f56d9e-51c9-4822-96b5-9847d2724016))
     (pin "V" (uuid eedaf03a-e901-440a-992f-37d81cd3e1be))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D3") (unit 1)
         )
@@ -2151,7 +2181,7 @@
     (pin "3" (uuid 4b11770f-c1d8-4e10-b8f3-e30ec41b79ef))
     (pin "4" (uuid a919321e-a607-495c-b1da-1066fee56626))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW4") (unit 1)
         )
@@ -2176,7 +2206,7 @@
     )
     (pin "1" (uuid 7ac0638c-88cb-4c19-8fed-a341dd0fd8b2))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR01") (unit 1)
         )
@@ -2202,7 +2232,7 @@
     (pin "1" (uuid f5d9878d-e0c9-4085-9a96-7822a6c54b59))
     (pin "2" (uuid 791ed403-a51a-4a23-a874-7dae176a69c0))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D9") (unit 1)
         )
@@ -2210,32 +2240,6 @@
     )
   )
 
-  (symbol (lib_id "Device:C") (at 255.27 74.93 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 6233a7a5-00b6-471f-9fdc-0f0f7d3b32c5)
-    (property "Reference" "C2" (at 258.445 73.66 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10uF" (at 256.54 77.47 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 256.2352 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 255.27 74.93 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 412b8edc-4d96-4f1d-a8f9-f6b1be30854e))
-    (pin "2" (uuid 08e19a52-0d16-4958-b6c8-2adf17305ba6))
-    (instances
-      (project "aic_pico_pn5180"
-        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
-          (reference "C2") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "aic_pico:SKRR_4pin") (at 74.93 111.76 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 62d5bf92-62df-4b14-be88-50d5839279ee)
@@ -2259,7 +2263,7 @@
     (pin "3" (uuid c4020f91-75da-4fe4-8e63-d14bc5ab7b7c))
     (pin "4" (uuid 5d3468ae-1509-4898-a9df-0606f701eb37))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW7") (unit 1)
         )
@@ -2267,32 +2271,6 @@
     )
   )
 
-  (symbol (lib_id "Device:L") (at 238.125 68.58 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 633c6d74-706e-4305-87a2-cc4fa2b78789)
-    (property "Reference" "L1" (at 238.125 63.5 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "100nH" (at 238.125 66.04 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Inductor_SMD:L_1206_3216Metric" (at 238.125 68.58 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 238.125 68.58 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fc20a535-c5a0-4196-97b2-a8df7e3094ed))
-    (pin "2" (uuid 6952e8c6-25f2-4f79-a039-968e72a99fa8))
-    (instances
-      (project "aic_pico_pn5180"
-        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
-          (reference "L1") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "aic_pico:PN5180") (at 284.48 96.52 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 7a270d39-d3dd-4dfb-98d2-2a103e3f877b)
@@ -2322,7 +2300,7 @@
     (pin "8" (uuid 6d5bc3f9-afa1-48cc-bf5c-ede927979246))
     (pin "9" (uuid 1faf5a3c-3d19-41e1-a78b-04b718ecfe18))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "J2") (unit 1)
         )
@@ -2350,7 +2328,7 @@
     (pin "O" (uuid a5a3e281-8423-4293-8e86-5408bd0661d1))
     (pin "V" (uuid 0d1c8a0b-dd06-43d6-87fe-91d0462998fb))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D4") (unit 1)
         )
@@ -2381,7 +2359,7 @@
     (pin "3" (uuid 0d6b9157-c699-4911-9418-654ec372e631))
     (pin "4" (uuid 55da0958-4617-47f6-ac54-89cb301a1311))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW8") (unit 1)
         )
@@ -2412,7 +2390,7 @@
     (pin "3" (uuid 6dd47892-122f-4a70-b119-4ed3f4f46b9c))
     (pin "4" (uuid afbe3172-2b94-46e3-a9fb-18399fcfbc51))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW3") (unit 1)
         )
@@ -2438,7 +2416,7 @@
     (pin "1" (uuid cc20cb11-aed2-4836-b0cb-095da33dc3bf))
     (pin "2" (uuid 293c2365-1b4c-4b2c-8acc-6c78486a4ae7))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D10") (unit 1)
         )
@@ -2502,7 +2480,7 @@
     (pin "8" (uuid 8d296e3c-b7f7-4146-ac49-95758fb9dcdd))
     (pin "9" (uuid 29a63251-2e01-4b26-a4c2-7cd4cd372f72))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "U1") (unit 1)
         )
@@ -2531,7 +2509,7 @@
     (pin "1" (uuid a70aed65-5b77-46c9-904e-7ebef9ccb478))
     (pin "2" (uuid 8e0f5191-9d22-4db7-b508-37f2ee7a7113))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R2") (unit 1)
         )
@@ -2556,7 +2534,7 @@
     )
     (pin "1" (uuid b4e9d37b-4c20-4bfd-9419-209e7cddf183))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR04") (unit 1)
         )
@@ -2582,7 +2560,7 @@
     (pin "1" (uuid 5f41b3e5-fc7e-47ab-aa0b-c23f7919921a))
     (pin "2" (uuid bdcf276a-53cc-4013-858c-c4d5d34a3361))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "C1") (unit 1)
         )
@@ -2610,7 +2588,7 @@
     (pin "O" (uuid e5d03e9d-9e63-46ed-862a-8b4eb565ff82))
     (pin "V" (uuid 6f7bccda-d473-4d1e-861f-2e7ad1a460ec))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D6") (unit 1)
         )
@@ -2639,7 +2617,7 @@
     (pin "1" (uuid 4163f8c6-b774-4b0d-89ba-eb3d1e4f0af1))
     (pin "2" (uuid 4d17c207-5dc8-4015-81e0-b8575c7306a3))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R6") (unit 1)
         )
@@ -2665,7 +2643,7 @@
     (pin "1" (uuid cd464a17-11bc-4ced-84ba-d931d6461968))
     (pin "2" (uuid 3fb26551-a8f8-48ba-a2a4-02e6cb236861))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "J1") (unit 1)
         )
@@ -2696,7 +2674,7 @@
     (pin "3" (uuid eff90656-6691-4fd6-afb8-a73fcfc501bf))
     (pin "4" (uuid a4cfcbd5-e17a-4ebd-abfb-5fda6ff82987))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW9") (unit 1)
         )
@@ -2721,7 +2699,7 @@
     )
     (pin "1" (uuid 9233ed56-3825-4da6-8da9-78a6c0a7478a))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR0118") (unit 1)
         )
@@ -2750,7 +2728,7 @@
     (pin "1" (uuid 74a1b02a-8990-45e9-887f-aebfe5632cce))
     (pin "2" (uuid b726bbf7-691c-4720-82ff-376d21c7cad1))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R5") (unit 1)
         )
@@ -2775,7 +2753,7 @@
     )
     (pin "1" (uuid 114a070d-23fc-4d8b-a727-6c8902f798d8))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR02") (unit 1)
         )
@@ -2806,7 +2784,7 @@
     (pin "3" (uuid 6c20e15b-7cb1-4e34-9528-a1525260a6c2))
     (pin "4" (uuid c41fd6ff-ba6e-4fbf-a3f4-4199ac8236fc))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW12") (unit 1)
         )
@@ -2837,7 +2815,7 @@
     (pin "3" (uuid 314b9bd2-dd64-4e86-b6a7-1749c15d75b0))
     (pin "4" (uuid f783910c-6010-4d02-9341-11677e5fb3c6))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW6") (unit 1)
         )
@@ -2862,7 +2840,7 @@
     )
     (pin "1" (uuid fde1a70e-a3c8-47ff-8fdf-e495ddf31105))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR03") (unit 1)
         )
@@ -2890,7 +2868,7 @@
     (pin "O" (uuid ec5764bc-0e12-4adb-9776-036696970400))
     (pin "V" (uuid 4878ca27-b045-4f29-b2e4-1f20bc4930f2))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D5") (unit 1)
         )
@@ -2916,7 +2894,7 @@
     (pin "1" (uuid 85074886-53de-47bf-aa92-29c6e49b5cb6))
     (pin "2" (uuid 248575d7-f550-49b1-8f71-b4aa51ec9b95))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D8") (unit 1)
         )
@@ -2941,7 +2919,7 @@
     )
     (pin "1" (uuid 3cca6da4-4969-4ed9-a167-39fc9e8c7a66))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "#PWR0111") (unit 1)
         )
@@ -2969,7 +2947,7 @@
     (pin "O" (uuid b1e24636-d238-4426-ab3a-fef86b2020d8))
     (pin "V" (uuid dace634c-3806-4380-8a4a-b670320e33b7))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D2") (unit 1)
         )
@@ -2998,7 +2976,7 @@
     (pin "1" (uuid 6acd7301-42bd-4abb-89a5-8fbf9f6e07e5))
     (pin "2" (uuid 7ff27e6a-45ac-4487-9544-4a4cadbd45f5))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "R3") (unit 1)
         )
@@ -3024,7 +3002,7 @@
     (pin "1" (uuid e2c2eb2f-4d07-469c-b220-e1f65e697ea0))
     (pin "2" (uuid 5d19232e-ed34-49ed-8fc3-d4343203938b))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "D7") (unit 1)
         )
@@ -3032,6 +3010,34 @@
     )
   )
 
+  (symbol (lib_id "aic_pico:PN532") (at 284.48 157.48 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid eac7121d-3bc2-4614-beb1-a57e5e344a87)
+    (property "Reference" "J3" (at 285.4325 167.64 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PN532" (at 285.4325 165.1 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "aic_pico:pn532_conn" (at 283.845 165.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 284.48 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8e9d8fc3-eff6-466d-b77e-22807afc9d75))
+    (pin "2" (uuid b598db55-f7e2-4323-a2fd-adf7312e9402))
+    (pin "3" (uuid 1911d282-bdf4-4204-aef4-5ff28f30d1c1))
+    (pin "4" (uuid bb6c6346-4d9d-469c-b705-4e82c0fa31df))
+    (instances
+      (project "aic_key"
+        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
+          (reference "J3") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "aic_pico:SKRR_4pin") (at 74.93 130.81 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid ffbf5eb3-1224-48b9-b986-e97c47e72413)
@@ -3055,7 +3061,7 @@
     (pin "3" (uuid 91915098-de5b-43f3-91e9-1d634ce493ff))
     (pin "4" (uuid 580d59fc-2451-4089-938a-85094744bc6d))
     (instances
-      (project "aic_pico_pn5180"
+      (project "aic_key"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
           (reference "SW10") (unit 1)
         )
@@ -3063,6 +3069,31 @@
     )
   )
 
+  (symbol (lib_id "power:GND") (at 295.91 152.4 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid ffeb6ead-3f81-41ce-b410-49808bf444cf)
+    (property "Reference" "#PWR05" (at 295.91 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (at 296.037 156.7942 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 295.91 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 295.91 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7a5dac6d-1ede-4a41-8694-76b2b267f7b3))
+    (instances
+      (project "aic_key"
+        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
+          (reference "#PWR05") (unit 1)
+        )
+      )
+    )
+  )
+
   (sheet_instances
     (path "/" (page "1"))
   )

PCB/Key_PN5180/aic_pico_pn5180.kicad_prl

@@ -1,77 +0,0 @@
-{
-  "board": {
-    "active_layer": 31,
-    "active_layer_preset": "",
-    "auto_track_width": true,
-    "hidden_netclasses": [],
-    "hidden_nets": [],
-    "high_contrast_mode": 0,
-    "net_color_mode": 1,
-    "opacity": {
-      "images": 0.6,
-      "pads": 1.0,
-      "tracks": 1.0,
-      "vias": 1.0,
-      "zones": 0.6
-    },
-    "ratsnest_display_mode": 0,
-    "selection_filter": {
-      "dimensions": false,
-      "footprints": true,
-      "graphics": false,
-      "keepouts": false,
-      "lockedItems": false,
-      "otherItems": false,
-      "pads": false,
-      "text": true,
-      "tracks": true,
-      "vias": false,
-      "zones": false
-    },
-    "visible_items": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24,
-      25,
-      26,
-      27,
-      28,
-      29,
-      30,
-      32,
-      33,
-      34,
-      35,
-      36
-    ],
-    "visible_layers": "ffefeff_ffffffff",
-    "zone_display_mode": 0
-  },
-  "meta": {
-    "filename": "aic_pico_pn5180.kicad_prl",
-    "version": 3
-  },
-  "project": {
-    "files": []
-  }
-}

PCB/Key_PN532/aic_key_pn532.kicad_pro

@@ -1,504 +0,0 @@
-{
-  "board": {
-    "3dviewports": [],
-    "design_settings": {
-      "defaults": {
-        "board_outline_line_width": 0.09999999999999999,
-        "copper_line_width": 0.19999999999999998,
-        "copper_text_italic": false,
-        "copper_text_size_h": 1.5,
-        "copper_text_size_v": 1.5,
-        "copper_text_thickness": 0.3,
-        "copper_text_upright": false,
-        "courtyard_line_width": 0.049999999999999996,
-        "dimension_precision": 4,
-        "dimension_units": 3,
-        "dimensions": {
-          "arrow_length": 1270000,
-          "extension_offset": 500000,
-          "keep_text_aligned": true,
-          "suppress_zeroes": false,
-          "text_position": 0,
-          "units_format": 1
-        },
-        "fab_line_width": 0.09999999999999999,
-        "fab_text_italic": false,
-        "fab_text_size_h": 1.0,
-        "fab_text_size_v": 1.0,
-        "fab_text_thickness": 0.15,
-        "fab_text_upright": false,
-        "other_line_width": 0.15,
-        "other_text_italic": false,
-        "other_text_size_h": 1.0,
-        "other_text_size_v": 1.0,
-        "other_text_thickness": 0.15,
-        "other_text_upright": false,
-        "pads": {
-          "drill": 0.95,
-          "height": 1.95,
-          "width": 1.7
-        },
-        "silk_line_width": 0.15,
-        "silk_text_italic": false,
-        "silk_text_size_h": 1.0,
-        "silk_text_size_v": 1.0,
-        "silk_text_thickness": 0.15,
-        "silk_text_upright": false,
-        "zones": {
-          "45_degree_only": false,
-          "min_clearance": 0.6
-        }
-      },
-      "diff_pair_dimensions": [
-        {
-          "gap": 0.0,
-          "via_gap": 0.0,
-          "width": 0.0
-        }
-      ],
-      "drc_exclusions": [],
-      "meta": {
-        "version": 2
-      },
-      "rule_severities": {
-        "annular_width": "error",
-        "clearance": "error",
-        "connection_width": "warning",
-        "copper_edge_clearance": "error",
-        "copper_sliver": "warning",
-        "courtyards_overlap": "error",
-        "diff_pair_gap_out_of_range": "error",
-        "diff_pair_uncoupled_length_too_long": "error",
-        "drill_out_of_range": "error",
-        "duplicate_footprints": "warning",
-        "extra_footprint": "warning",
-        "footprint": "error",
-        "footprint_type_mismatch": "error",
-        "hole_clearance": "error",
-        "hole_near_hole": "error",
-        "invalid_outline": "error",
-        "isolated_copper": "warning",
-        "item_on_disabled_layer": "error",
-        "items_not_allowed": "error",
-        "length_out_of_range": "error",
-        "lib_footprint_issues": "warning",
-        "lib_footprint_mismatch": "warning",
-        "malformed_courtyard": "error",
-        "microvia_drill_out_of_range": "error",
-        "missing_courtyard": "ignore",
-        "missing_footprint": "warning",
-        "net_conflict": "warning",
-        "npth_inside_courtyard": "ignore",
-        "padstack": "error",
-        "pth_inside_courtyard": "ignore",
-        "shorting_items": "error",
-        "silk_edge_clearance": "ignore",
-        "silk_over_copper": "warning",
-        "silk_overlap": "warning",
-        "skew_out_of_range": "error",
-        "solder_mask_bridge": "error",
-        "starved_thermal": "error",
-        "text_height": "warning",
-        "text_thickness": "warning",
-        "through_hole_pad_without_hole": "error",
-        "too_many_vias": "error",
-        "track_dangling": "warning",
-        "track_width": "error",
-        "tracks_crossing": "error",
-        "unconnected_items": "error",
-        "unresolved_variable": "error",
-        "via_dangling": "warning",
-        "zones_intersect": "error"
-      },
-      "rules": {
-        "allow_blind_buried_vias": false,
-        "allow_microvias": false,
-        "max_error": 0.005,
-        "min_clearance": 0.0,
-        "min_connection": 0.0,
-        "min_copper_edge_clearance": 0.0,
-        "min_hole_clearance": 0.25,
-        "min_hole_to_hole": 0.25,
-        "min_microvia_diameter": 0.19999999999999998,
-        "min_microvia_drill": 0.09999999999999999,
-        "min_resolved_spokes": 2,
-        "min_silk_clearance": 0.0,
-        "min_text_height": 0.7999999999999999,
-        "min_text_thickness": 0.08,
-        "min_through_hole_diameter": 0.3,
-        "min_track_width": 0.19999999999999998,
-        "min_via_annular_width": 0.049999999999999996,
-        "min_via_diameter": 0.39999999999999997,
-        "solder_mask_clearance": 0.0,
-        "solder_mask_min_width": 0.0,
-        "solder_mask_to_copper_clearance": 0.0,
-        "use_height_for_length_calcs": true
-      },
-      "teardrop_options": [
-        {
-          "td_allow_use_two_tracks": true,
-          "td_curve_segcount": 5,
-          "td_on_pad_in_zone": false,
-          "td_onpadsmd": true,
-          "td_onroundshapesonly": false,
-          "td_ontrackend": false,
-          "td_onviapad": true
-        }
-      ],
-      "teardrop_parameters": [
-        {
-          "td_curve_segcount": 0,
-          "td_height_ratio": 1.0,
-          "td_length_ratio": 0.5,
-          "td_maxheight": 2.0,
-          "td_maxlen": 1.0,
-          "td_target_name": "td_round_shape",
-          "td_width_to_size_filter_ratio": 0.9
-        },
-        {
-          "td_curve_segcount": 0,
-          "td_height_ratio": 1.0,
-          "td_length_ratio": 0.5,
-          "td_maxheight": 2.0,
-          "td_maxlen": 1.0,
-          "td_target_name": "td_rect_shape",
-          "td_width_to_size_filter_ratio": 0.9
-        },
-        {
-          "td_curve_segcount": 0,
-          "td_height_ratio": 1.0,
-          "td_length_ratio": 0.5,
-          "td_maxheight": 2.0,
-          "td_maxlen": 1.0,
-          "td_target_name": "td_track_end",
-          "td_width_to_size_filter_ratio": 0.9
-        }
-      ],
-      "track_widths": [
-        0.0
-      ],
-      "via_dimensions": [
-        {
-          "diameter": 0.0,
-          "drill": 0.0
-        }
-      ],
-      "zones_allow_external_fillets": false,
-      "zones_use_no_outline": true
-    },
-    "layer_presets": [],
-    "viewports": []
-  },
-  "boards": [],
-  "cvpcb": {
-    "equivalence_files": []
-  },
-  "erc": {
-    "erc_exclusions": [],
-    "meta": {
-      "version": 0
-    },
-    "pin_map": [
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        1,
-        0,
-        1,
-        2
-      ],
-      [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        2,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        1,
-        1,
-        1,
-        1,
-        1,
-        0,
-        1,
-        1,
-        1,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        2,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2
-      ]
-    ],
-    "rule_severities": {
-      "bus_definition_conflict": "error",
-      "bus_entry_needed": "error",
-      "bus_to_bus_conflict": "error",
-      "bus_to_net_conflict": "error",
-      "conflicting_netclasses": "error",
-      "different_unit_footprint": "error",
-      "different_unit_net": "error",
-      "duplicate_reference": "error",
-      "duplicate_sheet_names": "error",
-      "endpoint_off_grid": "warning",
-      "extra_units": "error",
-      "global_label_dangling": "warning",
-      "hier_label_mismatch": "error",
-      "label_dangling": "error",
-      "lib_symbol_issues": "warning",
-      "missing_bidi_pin": "warning",
-      "missing_input_pin": "warning",
-      "missing_power_pin": "error",
-      "missing_unit": "warning",
-      "multiple_net_names": "warning",
-      "net_not_bus_member": "warning",
-      "no_connect_connected": "warning",
-      "no_connect_dangling": "warning",
-      "pin_not_connected": "error",
-      "pin_not_driven": "error",
-      "pin_to_pin": "warning",
-      "power_pin_not_driven": "error",
-      "similar_labels": "warning",
-      "simulation_model_issue": "ignore",
-      "unannotated": "error",
-      "unit_value_mismatch": "error",
-      "unresolved_variable": "error",
-      "wire_dangling": "error"
-    }
-  },
-  "libraries": {
-    "pinned_footprint_libs": [],
-    "pinned_symbol_libs": []
-  },
-  "meta": {
-    "filename": "aic_key_pn532.kicad_pro",
-    "version": 1
-  },
-  "net_settings": {
-    "classes": [
-      {
-        "bus_width": 12,
-        "clearance": 0.175,
-        "diff_pair_gap": 0.25,
-        "diff_pair_via_gap": 0.25,
-        "diff_pair_width": 0.2,
-        "line_style": 0,
-        "microvia_diameter": 0.3,
-        "microvia_drill": 0.1,
-        "name": "Default",
-        "pcb_color": "rgba(0, 0, 0, 0.000)",
-        "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.3,
-        "via_diameter": 0.8,
-        "via_drill": 0.4,
-        "wire_width": 6
-      }
-    ],
-    "meta": {
-      "version": 3
-    },
-    "net_colors": null,
-    "netclass_assignments": null,
-    "netclass_patterns": []
-  },
-  "pcbnew": {
-    "last_paths": {
-      "gencad": "",
-      "idf": "",
-      "netlist": "",
-      "specctra_dsn": "",
-      "step": "iidx_pico_v1.step",
-      "vrml": "iidx_pico.wrl"
-    },
-    "page_layout_descr_file": ""
-  },
-  "schematic": {
-    "annotate_start_num": 0,
-    "drawing": {
-      "dashed_lines_dash_length_ratio": 12.0,
-      "dashed_lines_gap_length_ratio": 3.0,
-      "default_line_thickness": 6.0,
-      "default_text_size": 50.0,
-      "field_names": [],
-      "intersheets_ref_own_page": false,
-      "intersheets_ref_prefix": "",
-      "intersheets_ref_short": false,
-      "intersheets_ref_show": false,
-      "intersheets_ref_suffix": "",
-      "junction_size_choice": 3,
-      "label_size_ratio": 0.375,
-      "pin_symbol_size": 25.0,
-      "text_offset_ratio": 0.15
-    },
-    "legacy_lib_dir": "",
-    "legacy_lib_list": [],
-    "meta": {
-      "version": 1
-    },
-    "net_format_name": "",
-    "ngspice": {
-      "fix_include_paths": true,
-      "fix_passive_vals": false,
-      "meta": {
-        "version": 0
-      },
-      "model_mode": 0,
-      "workbook_filename": ""
-    },
-    "page_layout_descr_file": "",
-    "plot_directory": "",
-    "spice_adjust_passive_values": false,
-    "spice_current_sheet_as_root": false,
-    "spice_external_command": "spice \"%I\"",
-    "spice_model_current_sheet_as_root": true,
-    "spice_save_all_currents": false,
-    "spice_save_all_voltages": false,
-    "subpart_first_id": 65,
-    "subpart_id_separator": 0
-  },
-  "sheets": [
-    [
-      "2e3f5573-c264-4a8b-a2f0-0e6473d39aad",
-      ""
-    ]
-  ],
-  "text_variables": {}
-}

PCB/Key_PN532/fp-lib-table

@@ -1,5 +0,0 @@
-(fp_lib_table
-  (version 7)
-  (lib (name "aic_pico")(type "KiCad")(uri "D:/Code/aic_pico/PCB/Lib/aic_pico.pretty")(options "")(descr ""))
-  (lib (name "MCU_RaspberryPi_and_Boards")(type "KiCad")(uri "D:/Code/aic_pico/PCB/Lib/RP_Silicon_KiCad/KiCadLibraries/MCU_RaspberryPi_and_Boards.pretty")(options "")(descr ""))
-)

PCB/Key_PN532/sym-lib-table

@@ -1,5 +0,0 @@
-(sym_lib_table
-  (version 7)
-  (lib (name "aic_pico")(type "KiCad")(uri "D:/Code/aic_pico/PCB/Lib/aic_pico.kicad_sym")(options "")(descr ""))
-  (lib (name "MCU_RaspberryPi_and_Boards")(type "Legacy")(uri "D:/Code/aic_pico/PCB/Lib/RP_Silicon_KiCad/KiCadLibraries/MCU_RaspberryPi_and_Boards.lib")(options "")(descr ""))
-)

PCB/Lib/aic_pico.pretty/RPi_Pico_SMD_No_USB.kicad_mod

@@ -43,6 +43,10 @@
       (effects (font (size 0.8 0.8) (thickness 0.15)))
     (tstamp 2ebe85cd-db9a-456c-bca5-12c43146896e)
   )
+  (fp_text user "USB" (at -1.524 -23.114 unlocked) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.1)) (justify left bottom))
+    (tstamp 3d632168-2c02-46af-bc25-e39751f73a47)
+  )
   (fp_text user "3" (at -12.1 -13.97) (layer "F.SilkS")
       (effects (font (size 0.8 0.8) (thickness 0.15)))
     (tstamp 3ef78a32-9229-43d6-bb73-95121358d409)
@@ -181,8 +185,6 @@
   )
   (fp_line (start -10.5 -23.1) (end -10.5 -22.7)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d1eb9f49-3c8a-42cf-8505-f71a4977bc4b))
-  (fp_line (start -10.5 -22.833) (end -7.493 -22.833)
-    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 75c933d5-c25a-42a5-954d-73a6fcc2aa56))
   (fp_line (start -10.5 -20.5) (end -10.5 -20.1)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2d3cc976-fb78-4605-95ed-a14cc0518d0b))
   (fp_line (start -10.5 -18) (end -10.5 -17.6)
@@ -257,6 +259,8 @@
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b816cad4-b559-4e16-9d4b-7a3a00e0cdcb))
   (fp_line (start 10.5 22.7) (end 10.5 23.1)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c54d27ea-32ee-4e2e-89c2-09fa49878876))
+  (fp_rect (start -2.54 -24.892) (end 2.54 -22.606)
+    (stroke (width 0.1) (type default)) (fill none) (layer "F.SilkS") (tstamp d1323596-0353-4bb6-9168-992c638aea30))
   (fp_poly
     (pts
       (xy -1.5 -16.5)

PCB/Touch/aic_touch.kicad_prl

@@ -1,7 +1,7 @@
 {
   "board": {
     "active_layer": 36,
-    "active_layer_preset": "",
+    "active_layer_preset": "All Layers",
     "auto_track_width": true,
     "hidden_netclasses": [],
     "hidden_nets": [],
@@ -18,14 +18,14 @@
     "selection_filter": {
       "dimensions": false,
       "footprints": true,
-      "graphics": true,
+      "graphics": false,
       "keepouts": false,
       "lockedItems": false,
       "otherItems": false,
-      "pads": true,
+      "pads": false,
       "text": true,
       "tracks": true,
-      "vias": true,
+      "vias": false,
       "zones": false
     },
     "visible_items": [
@@ -64,7 +64,7 @@
       35,
       36
     ],
-    "visible_layers": "ffffcff_ffffffff",
+    "visible_layers": "fffffff_ffffffff",
     "zone_display_mode": 0
   },
   "meta": {

PCB/Touch/aic_touch.kicad_sch

@@ -286,57 +286,6 @@
         )
       )
     )
-    (symbol "Device:L" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "L" (at -1.27 0 90)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "L" (at 1.905 0 90)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "inductor choke coil reactor magnetic" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Inductor" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Choke_* *Coil* Inductor_* L_*" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "L_0_1"
-        (arc (start 0 -2.54) (mid 0.6323 -1.905) (end 0 -1.27)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (arc (start 0 -1.27) (mid 0.6323 -0.635) (end 0 0)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (arc (start 0 0) (mid 0.6323 0.635) (end 0 1.27)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (arc (start 0 1.27) (mid 0.6323 1.905) (end 0 2.54)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-      )
-      (symbol "L_1_1"
-        (pin passive line (at 0 3.81 270) (length 1.27)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -3.81 90) (length 1.27)
-          (name "2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:R_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
       (property "Reference" "R" (at 0.762 0.508 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -916,9 +865,12 @@
     )
   )
 
-  (junction (at 236.22 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 231.775 81.28) (diameter 0) (color 0 0 0 0)
     (uuid 0642315a-8bbe-4097-92c0-8381bc7da6e8)
   )
+  (junction (at 252.73 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 0f705086-8757-4ccd-898e-850f1e34f022)
+  )
   (junction (at 177.8 158.75) (diameter 0) (color 0 0 0 0)
     (uuid 1535672b-00bd-4f01-b5f6-6c89487baad7)
   )
@@ -934,7 +886,7 @@
   (junction (at 190.5 158.75) (diameter 0) (color 0 0 0 0)
     (uuid 307b47b3-1ef1-480d-8c2d-2ffcb1fdcdc2)
   )
-  (junction (at 240.03 86.36) (diameter 0) (color 0 0 0 0)
+  (junction (at 235.585 86.36) (diameter 0) (color 0 0 0 0)
     (uuid 40d30f47-ddb9-492d-af90-985cc745e334)
   )
   (junction (at 177.8 143.51) (diameter 0) (color 0 0 0 0)
@@ -943,8 +895,8 @@
   (junction (at 203.2 158.75) (diameter 0) (color 0 0 0 0)
     (uuid 4d02e5f1-05e6-4474-a6f7-a3866e145eab)
   )
-  (junction (at 254.635 69.215) (diameter 0) (color 0 0 0 0)
+  (junction (at 242.57 93.98) (diameter 0) (color 0 0 0 0)
-    (uuid 5248b989-cea6-4938-9307-fc197fc231f2)
+    (uuid 5135447d-eb65-4a4e-95ee-d08583074355)
   )
   (junction (at 165.1 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 5a771f0e-90db-42f5-bbb7-c78542f642aa)
@@ -973,13 +925,16 @@
   (junction (at 215.9 158.75) (diameter 0) (color 0 0 0 0)
     (uuid 98f45ed8-3359-4049-8b8e-49336e162522)
   )
+  (junction (at 219.075 78.74) (diameter 0) (color 0 0 0 0)
+    (uuid a4cecb75-2c58-40cb-ba5b-7f8182abf5a7)
+  )
   (junction (at 109.22 80.01) (diameter 0) (color 0 0 0 0)
     (uuid a6c4df32-05b0-4540-bdc1-ab4155f2b0a6)
   )
   (junction (at 109.22 77.47) (diameter 0) (color 0 0 0 0)
     (uuid a711bd98-c1f5-444a-ace6-c6fb40082bd0)
   )
-  (junction (at 236.22 119.38) (diameter 0) (color 0 0 0 0)
+  (junction (at 231.775 119.38) (diameter 0) (color 0 0 0 0)
     (uuid af04cdde-acf5-4e11-a9b1-d30caa0be199)
   )
   (junction (at 170.18 106.68) (diameter 0) (color 0 0 0 0)
@@ -988,7 +943,7 @@
   (junction (at 295.91 123.19) (diameter 0) (color 0 0 0 0)
     (uuid b8b3249a-1330-4dc7-9518-f865d92fefd6)
   )
-  (junction (at 236.22 101.6) (diameter 0) (color 0 0 0 0)
+  (junction (at 231.775 101.6) (diameter 0) (color 0 0 0 0)
     (uuid c4f037e7-eee6-4d5a-8c03-0cfdbe21e0a5)
   )
   (junction (at 170.18 93.98) (diameter 0) (color 0 0 0 0)
@@ -997,24 +952,24 @@
   (junction (at 170.18 121.92) (diameter 0) (color 0 0 0 0)
     (uuid d402c566-4ac0-45c5-96f2-1940baee18e4)
   )
-  (junction (at 244.475 69.215) (diameter 0) (color 0 0 0 0)
-    (uuid d61c8db0-48c7-40ba-ad54-41a91c7d34e9)
-  )
   (junction (at 104.14 100.33) (diameter 0) (color 0 0 0 0)
     (uuid da5223dc-1c46-41af-8505-d59313de5639)
   )
-  (junction (at 236.22 106.68) (diameter 0) (color 0 0 0 0)
+  (junction (at 242.57 69.215) (diameter 0) (color 0 0 0 0)
+    (uuid e2b3a7b5-7002-46ae-a341-cbb54d2539ec)
+  )
+  (junction (at 231.775 106.68) (diameter 0) (color 0 0 0 0)
     (uuid eb040594-1569-4b81-abeb-13d79c4b83a5)
   )
-  (junction (at 236.22 93.98) (diameter 0) (color 0 0 0 0)
+  (junction (at 231.775 93.98) (diameter 0) (color 0 0 0 0)
     (uuid eb6cccb9-dd9d-439e-b15a-f5c4ad573581)
   )
+  (junction (at 242.57 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid ebe26ef2-89f0-48db-a530-c1707503284b)
+  )
   (junction (at 295.91 125.73) (diameter 0) (color 0 0 0 0)
     (uuid f447bbaa-3251-493f-b974-3e55f57bf618)
   )
-  (junction (at 244.475 81.28) (diameter 0) (color 0 0 0 0)
-    (uuid ff03eea9-577e-4524-84e0-ff400f856fca)
-  )
   (junction (at 104.14 82.55) (diameter 0) (color 0 0 0 0)
     (uuid fffe80bd-e6b2-45d8-aa4b-18edc8f20b26)
   )
@@ -1028,6 +983,7 @@
   (no_connect (at 173.99 124.46) (uuid 4a841462-8c86-4850-9dd9-3ab9c50d54e4))
   (no_connect (at 209.55 91.44) (uuid 4fd199c4-5de5-42fd-82e8-5266094a993d))
   (no_connect (at 234.95 151.13) (uuid 58ffe2e7-e3e3-49cc-9161-310b712decd8))
+  (no_connect (at 209.55 76.2) (uuid ba58ab36-f6d5-4961-a9a4-40867c047f77))
   (no_connect (at 173.99 116.84) (uuid ba715425-ee40-44ec-b5fb-279c28eb95ef))
   (no_connect (at 279.4 104.14) (uuid c7a3d5d7-f91e-4c05-bd6f-4028f4e02b41))
   (no_connect (at 173.99 96.52) (uuid d552b4cb-ac65-48fb-937f-dd5c5895fa10))
@@ -1107,7 +1063,7 @@
     (uuid fe76c10d-8d76-4b82-8c52-d51155e8bcb7)
   )
 
-  (wire (pts (xy 240.03 83.82) (xy 279.4 83.82))
+  (wire (pts (xy 235.585 83.82) (xy 242.57 83.82))
     (stroke (width 0) (type default))
     (uuid 017bb6c2-a5a5-45ad-b6a8-016561f67002)
   )
@@ -1120,7 +1076,7 @@
     (uuid 030c3d87-ec84-4844-868a-01b76d7f2524)
   )
 
-  (wire (pts (xy 268.605 96.52) (xy 279.4 96.52))
+  (wire (pts (xy 271.145 96.52) (xy 279.4 96.52))
     (stroke (width 0) (type default))
     (uuid 05318c79-b84f-4bb3-b72b-3d46db2442ae)
   )
@@ -1128,7 +1084,11 @@
     (stroke (width 0) (type default))
     (uuid 05df71de-724c-4632-8c41-7288fe19d044)
   )
-  (wire (pts (xy 209.55 114.3) (xy 260.985 114.3))
+  (wire (pts (xy 219.075 78.74) (xy 231.775 78.74))
+    (stroke (width 0) (type default))
+    (uuid 05e49ac0-f443-45ec-b909-456096a77c5e)
+  )
+  (wire (pts (xy 209.55 114.3) (xy 263.525 114.3))
     (stroke (width 0) (type default))
     (uuid 05ea8712-6b49-4d0e-9c87-baae3b2c0196)
   )
@@ -1136,7 +1096,7 @@
     (stroke (width 0) (type default))
     (uuid 061ed33a-c368-4e83-8119-e3222027301e)
   )
-  (wire (pts (xy 244.475 79.375) (xy 244.475 81.28))
+  (wire (pts (xy 242.57 79.375) (xy 242.57 81.28))
     (stroke (width 0) (type default))
     (uuid 06618423-83e3-46e3-b965-61d6144a9373)
   )
@@ -1144,10 +1104,6 @@
     (stroke (width 0) (type default))
     (uuid 0769c21f-9220-47c5-ad60-d025c9e7507c)
   )
-  (wire (pts (xy 213.36 76.2) (xy 213.36 69.215))
-    (stroke (width 0) (type default))
-    (uuid 093d0ca5-fefd-4ae4-a11b-9ef587de0eb7)
-  )
   (wire (pts (xy 158.75 114.3) (xy 173.99 114.3))
     (stroke (width 0) (type default))
     (uuid 0a2f30d7-2622-402b-8054-c38fd1169533)
@@ -1165,6 +1121,10 @@
     (stroke (width 0) (type default))
     (uuid 0c2786e7-643e-4e7c-9505-99ee221f1fe4)
   )
+  (wire (pts (xy 231.775 78.74) (xy 231.775 69.215))
+    (stroke (width 0) (type default))
+    (uuid 0fe73fe5-6380-4f98-98ae-0b4b58b26362)
+  )
   (wire (pts (xy 97.79 72.39) (xy 104.14 72.39))
     (stroke (width 0) (type default))
     (uuid 13839a03-0118-4a78-a6c2-0f6364670272)
@@ -1190,21 +1150,17 @@
     (stroke (width 0) (type default))
     (uuid 18f5038c-d230-4448-b753-c90ec1d8037a)
   )
-  (wire (pts (xy 209.55 119.38) (xy 236.22 119.38))
+  (wire (pts (xy 209.55 119.38) (xy 231.775 119.38))
     (stroke (width 0) (type default))
     (uuid 1ccf86f8-7679-43dd-b932-d4a05cc190af)
   )
-  (wire (pts (xy 236.22 81.28) (xy 236.22 93.98))
+  (wire (pts (xy 231.775 81.28) (xy 231.775 93.98))
     (stroke (width 0) (type default))
     (uuid 1d1a95b4-7da5-48cb-ae78-f0d88b02ccc0)
   )
-  (wire (pts (xy 254.635 71.755) (xy 254.635 69.215))
+  (wire (pts (xy 231.775 93.98) (xy 242.57 93.98))
     (stroke (width 0) (type default))
-    (uuid 2105a7b9-56ce-494d-989b-9ca5248b5880)
+    (uuid 2199e6b1-c65e-4042-9009-75745e0ba3d8)
-  )
-  (wire (pts (xy 213.36 69.215) (xy 233.68 69.215))
-    (stroke (width 0) (type default))
-    (uuid 212d3dc2-f1bd-4586-8059-01f78d89e757)
   )
   (bus (pts (xy 139.7 109.22) (xy 139.7 110.49))
     (stroke (width 0) (type default))
@@ -1215,7 +1171,7 @@
     (uuid 23395fdf-7e63-446c-86a8-18969aafaf80)
   )
 
-  (wire (pts (xy 209.55 121.92) (xy 263.525 121.92))
+  (wire (pts (xy 209.55 121.92) (xy 266.065 121.92))
     (stroke (width 0) (type default))
     (uuid 2339d0e9-4574-43e7-874c-cdc78f8b646c)
   )
@@ -1227,7 +1183,7 @@
     (stroke (width 0) (type default))
     (uuid 28c25ed1-489a-4944-94b7-428474ff5385)
   )
-  (wire (pts (xy 236.22 101.6) (xy 236.22 106.68))
+  (wire (pts (xy 231.775 101.6) (xy 231.775 106.68))
     (stroke (width 0) (type default))
     (uuid 2b899cbd-d46b-4fd8-9d6c-7814695ed2cc)
   )
@@ -1252,7 +1208,7 @@
     (uuid 3846775d-f37c-4092-bb2a-15e95d78f463)
   )
 
-  (wire (pts (xy 244.475 71.755) (xy 244.475 69.215))
+  (wire (pts (xy 242.57 71.755) (xy 242.57 69.215))
     (stroke (width 0) (type default))
     (uuid 38ef8fbe-eb9d-46ca-884d-4ad71740b634)
   )
@@ -1260,6 +1216,11 @@
     (stroke (width 0) (type default))
     (uuid 3a474863-103c-405e-8e42-736f2c513b38)
   )
+
+  (wire (pts (xy 242.57 93.98) (xy 252.73 93.98))
+    (stroke (width 0) (type default))
+    (uuid 3a95b268-e303-428c-905e-1affa58cc0a5)
+  )
   (bus (pts (xy 139.7 77.47) (xy 139.7 81.28))
     (stroke (width 0) (type default))
     (uuid 40f3e2fa-01ce-4375-9ca1-ee0cf5ff9e66)
@@ -1269,7 +1230,7 @@
     (uuid 413a4587-e21b-40ac-9ea5-5faa2b58c2d2)
   )
 
-  (wire (pts (xy 218.44 86.36) (xy 240.03 86.36))
+  (wire (pts (xy 218.44 86.36) (xy 235.585 86.36))
     (stroke (width 0) (type default))
     (uuid 45f0c82d-5825-49c9-9601-468b70c04197)
   )
@@ -1277,7 +1238,7 @@
     (stroke (width 0) (type default))
     (uuid 461584b2-a586-4891-9042-38ae06fe1099)
   )
-  (wire (pts (xy 263.525 121.92) (xy 263.525 88.9))
+  (wire (pts (xy 266.065 121.92) (xy 266.065 88.9))
     (stroke (width 0) (type default))
     (uuid 469c3794-ac25-42c7-b65f-0892a6dd6116)
   )
@@ -1285,11 +1246,11 @@
     (stroke (width 0) (type default))
     (uuid 4adcfb4d-7d50-4bc3-bc95-b7a633f31cb9)
   )
-  (wire (pts (xy 236.22 106.68) (xy 236.22 119.38))
+  (wire (pts (xy 231.775 106.68) (xy 231.775 119.38))
     (stroke (width 0) (type default))
     (uuid 4b45beb2-f05d-4b62-b428-691ed790546f)
   )
-  (wire (pts (xy 236.22 119.38) (xy 236.22 126.365))
+  (wire (pts (xy 231.775 119.38) (xy 231.775 126.365))
     (stroke (width 0) (type default))
     (uuid 4d0951ed-33d7-4ce0-870d-4d8234d1c72f)
   )
@@ -1297,7 +1258,7 @@
     (stroke (width 0) (type default))
     (uuid 4d45f7f8-e881-4283-8a7b-b2006be6c100)
   )
-  (wire (pts (xy 263.525 88.9) (xy 279.4 88.9))
+  (wire (pts (xy 266.065 88.9) (xy 279.4 88.9))
     (stroke (width 0) (type default))
     (uuid 50f5f5d9-6d84-46a6-af43-59bd3138aa54)
   )
@@ -1305,6 +1266,10 @@
     (stroke (width 0) (type default))
     (uuid 592adaf4-bb39-45b5-ae6b-56446b5a3205)
   )
+  (wire (pts (xy 252.73 83.82) (xy 279.4 83.82))
+    (stroke (width 0) (type default))
+    (uuid 5d678862-047b-407b-bcd1-5a8f1a45bc43)
+  )
   (wire (pts (xy 97.79 102.87) (xy 137.16 102.87))
     (stroke (width 0) (type default))
     (uuid 5e541560-1a90-444b-8359-c2373885b8e9)
@@ -1334,16 +1299,16 @@
     (stroke (width 0) (type default))
     (uuid 6a29459a-7f95-446b-86f8-87e04e52c0bf)
   )
-  (wire (pts (xy 254.635 69.215) (xy 277.495 69.215))
+  (wire (pts (xy 242.57 83.82) (xy 252.73 83.82))
     (stroke (width 0) (type default))
-    (uuid 6d128d24-3bcf-4cab-8813-bda85197eb56)
+    (uuid 6cf51089-7b63-4c67-bc19-c3d3e98b1da6)
   )
   (bus (pts (xy 139.7 90.17) (xy 139.7 92.71))
     (stroke (width 0) (type default))
     (uuid 6fcdb1fe-0c30-4c04-bdd6-ede7aa7d164e)
   )
 
-  (wire (pts (xy 242.57 106.68) (xy 240.03 106.68))
+  (wire (pts (xy 242.57 106.68) (xy 235.585 106.68))
     (stroke (width 0) (type default))
     (uuid 7014eb2c-98bf-4ec6-ba27-f74377546b6f)
   )
@@ -1359,10 +1324,22 @@
     (stroke (width 0) (type default))
     (uuid 74801381-a39c-49e5-8a33-8a9bf3cbfdd9)
   )
+  (wire (pts (xy 252.73 93.98) (xy 252.73 92.71))
+    (stroke (width 0) (type default))
+    (uuid 7498a4fd-5dac-48b6-a3d4-7e453da968a7)
+  )
   (wire (pts (xy 158.75 114.3) (xy 158.75 129.54))
     (stroke (width 0) (type default))
     (uuid 750f60d3-fdae-4931-bf04-cd21db27f633)
   )
+  (wire (pts (xy 242.57 92.71) (xy 242.57 93.98))
+    (stroke (width 0) (type default))
+    (uuid 76841c89-bf72-47ac-b4dd-eb5f0f423903)
+  )
+  (wire (pts (xy 242.57 69.215) (xy 277.495 69.215))
+    (stroke (width 0) (type default))
+    (uuid 79628ec7-feb3-42ae-b71b-b22e69e84d85)
+  )
   (wire (pts (xy 142.24 86.36) (xy 173.99 86.36))
     (stroke (width 0) (type default))
     (uuid 7ae00249-cb55-4f93-9292-f6ecab63a95e)
@@ -1375,7 +1352,7 @@
     (stroke (width 0) (type default))
     (uuid 81ea6fd2-ede8-487b-a78a-89b57b2dd1f9)
   )
-  (wire (pts (xy 236.22 81.28) (xy 244.475 81.28))
+  (wire (pts (xy 231.775 81.28) (xy 242.57 81.28))
     (stroke (width 0) (type default))
     (uuid 858f12cc-bb92-4036-91c5-4684fe854aae)
   )
@@ -1383,7 +1360,7 @@
     (stroke (width 0) (type default))
     (uuid 85a8f15c-feb9-4a35-b68d-4f1bae272908)
   )
-  (wire (pts (xy 240.03 104.14) (xy 240.03 86.36))
+  (wire (pts (xy 235.585 104.14) (xy 235.585 86.36))
     (stroke (width 0) (type default))
     (uuid 860693df-4a81-4894-a538-73372ff00fdf)
   )
@@ -1416,10 +1393,6 @@
     (stroke (width 0) (type default))
     (uuid 9341a03a-f345-4e25-8235-b5643e957b3d)
   )
-  (wire (pts (xy 209.55 76.2) (xy 213.36 76.2))
-    (stroke (width 0) (type default))
-    (uuid 93e3f696-166e-414c-ae68-e7ee758de1a0)
-  )
   (wire (pts (xy 177.8 143.51) (xy 190.5 143.51))
     (stroke (width 0) (type default))
     (uuid 94aa8de4-a27e-4ced-9ddf-1ebe61ba7a69)
@@ -1485,11 +1458,7 @@
     (stroke (width 0) (type default))
     (uuid a9bf0793-3aee-4425-8d0d-8e5953666597)
   )
-  (wire (pts (xy 244.475 81.28) (xy 254.635 81.28))
+  (wire (pts (xy 235.585 86.36) (xy 235.585 83.82))
-    (stroke (width 0) (type default))
-    (uuid aa2b6ac3-3a7f-407a-9638-c3ad6fa9ffe4)
-  )
-  (wire (pts (xy 240.03 86.36) (xy 240.03 83.82))
     (stroke (width 0) (type default))
     (uuid aad1746c-5445-45c4-948d-4138f4e4b9eb)
   )
@@ -1498,11 +1467,11 @@
     (uuid ace14457-f661-4c7c-ace5-00b95c12ec7f)
   )
 
-  (wire (pts (xy 260.985 114.3) (xy 260.985 91.44))
+  (wire (pts (xy 263.525 114.3) (xy 263.525 91.44))
     (stroke (width 0) (type default))
     (uuid ae126523-3262-472f-b335-7e84b3477cbe)
   )
-  (wire (pts (xy 240.03 111.76) (xy 209.55 111.76))
+  (wire (pts (xy 235.585 111.76) (xy 209.55 111.76))
     (stroke (width 0) (type default))
     (uuid af70640e-d96f-4456-b40f-54fb704061dc)
   )
@@ -1544,23 +1513,27 @@
     (stroke (width 0) (type default))
     (uuid b9d924e9-968b-4b6d-996d-a399f1df67af)
   )
+  (wire (pts (xy 242.57 85.09) (xy 242.57 83.82))
+    (stroke (width 0) (type default))
+    (uuid bbf131be-5781-4c08-ae8d-98444fe4fe57)
+  )
   (wire (pts (xy 97.79 87.63) (xy 137.16 87.63))
     (stroke (width 0) (type default))
     (uuid c09ea6ab-da68-4074-bdea-ed00d2220c28)
   )
-  (wire (pts (xy 260.985 91.44) (xy 279.4 91.44))
+  (wire (pts (xy 263.525 91.44) (xy 279.4 91.44))
     (stroke (width 0) (type default))
     (uuid c1391825-34fe-4c00-a3dc-6386c837a968)
   )
-  (wire (pts (xy 266.065 93.98) (xy 279.4 93.98))
+  (wire (pts (xy 268.605 93.98) (xy 279.4 93.98))
     (stroke (width 0) (type default))
     (uuid c3d76342-5fb6-4155-932e-f6a5d15d4a99)
   )
-  (wire (pts (xy 242.57 104.14) (xy 240.03 104.14))
+  (wire (pts (xy 242.57 104.14) (xy 235.585 104.14))
     (stroke (width 0) (type default))
     (uuid c4f5d47f-457a-4c35-9cc9-90bdb2ea31d1)
   )
-  (wire (pts (xy 209.55 81.28) (xy 236.22 81.28))
+  (wire (pts (xy 209.55 81.28) (xy 231.775 81.28))
     (stroke (width 0) (type default))
     (uuid c52c8eb1-c93d-450d-8a76-c57a0e8eb778)
   )
@@ -1568,23 +1541,27 @@
     (stroke (width 0) (type default))
     (uuid c661c71e-b22a-45bf-8a93-7a12e2762e33)
   )
-  (wire (pts (xy 209.55 106.68) (xy 236.22 106.68))
+  (wire (pts (xy 209.55 106.68) (xy 231.775 106.68))
     (stroke (width 0) (type default))
     (uuid c8248b2c-8af4-4b76-b0fb-08eb5d103cb7)
   )
-  (wire (pts (xy 209.55 124.46) (xy 266.065 124.46))
+  (wire (pts (xy 209.55 124.46) (xy 268.605 124.46))
     (stroke (width 0) (type default))
     (uuid cad4148e-43f1-4ffa-8546-bae7f0bb94c3)
   )
-  (wire (pts (xy 266.065 124.46) (xy 266.065 93.98))
+  (wire (pts (xy 268.605 124.46) (xy 268.605 93.98))
     (stroke (width 0) (type default))
     (uuid cc6e0881-e4b4-4ef9-b614-26379d9bc8f7)
   )
-  (wire (pts (xy 236.22 93.98) (xy 236.22 101.6))
+  (wire (pts (xy 252.73 85.09) (xy 252.73 83.82))
+    (stroke (width 0) (type default))
+    (uuid ccd2464e-d8e3-4999-8a39-4787a8805e19)
+  )
+  (wire (pts (xy 231.775 93.98) (xy 231.775 101.6))
     (stroke (width 0) (type default))
     (uuid cefeebac-484c-4de5-ba3c-fb862ee6c768)
   )
-  (wire (pts (xy 258.445 86.36) (xy 279.4 86.36))
+  (wire (pts (xy 260.985 86.36) (xy 279.4 86.36))
     (stroke (width 0) (type default))
     (uuid d1c6ff6a-a299-4aa0-b601-90d55e55512a)
   )
@@ -1596,7 +1573,7 @@
     (stroke (width 0) (type default))
     (uuid d7242dae-eb58-4780-ba61-e4e4cead3c76)
   )
-  (wire (pts (xy 268.605 116.84) (xy 268.605 96.52))
+  (wire (pts (xy 271.145 116.84) (xy 271.145 96.52))
     (stroke (width 0) (type default))
     (uuid d7c13a81-4bab-4d79-8fbb-dd2ec5f6821f)
   )
@@ -1608,7 +1585,7 @@
     (stroke (width 0) (type default))
     (uuid d96bb9c2-8832-4644-a06e-c8b58e194f57)
   )
-  (wire (pts (xy 209.55 93.98) (xy 236.22 93.98))
+  (wire (pts (xy 209.55 93.98) (xy 231.775 93.98))
     (stroke (width 0) (type default))
     (uuid da8ac36b-b1d7-48b0-8e0a-9e0901496d83)
   )
@@ -1616,11 +1593,15 @@
     (stroke (width 0) (type default))
     (uuid dd7d9878-ee0c-45ad-82ca-f6170110b0c4)
   )
+  (wire (pts (xy 231.775 69.215) (xy 242.57 69.215))
+    (stroke (width 0) (type default))
+    (uuid e1c2c4ca-df47-4e46-8e28-38abdfad940e)
+  )
   (wire (pts (xy 209.55 109.22) (xy 242.57 109.22))
     (stroke (width 0) (type default))
     (uuid e312e1b1-66b5-4460-b6e5-b82a447d4878)
   )
-  (wire (pts (xy 209.55 116.84) (xy 268.605 116.84))
+  (wire (pts (xy 209.55 116.84) (xy 271.145 116.84))
     (stroke (width 0) (type default))
     (uuid e6437f89-6456-4950-9545-62c1d48bbdce)
   )
@@ -1628,7 +1609,7 @@
     (stroke (width 0) (type default))
     (uuid e9ad95fb-645c-44b3-a167-8f6189fde852)
   )
-  (wire (pts (xy 258.445 96.52) (xy 209.55 96.52))
+  (wire (pts (xy 260.985 96.52) (xy 209.55 96.52))
     (stroke (width 0) (type default))
     (uuid ea0d9c95-141c-49bb-a0c3-46d9aad6c413)
   )
@@ -1640,7 +1621,7 @@
     (stroke (width 0) (type default))
     (uuid ed32619c-b83c-476a-87bf-34c2c98cd95e)
   )
-  (wire (pts (xy 258.445 86.36) (xy 258.445 96.52))
+  (wire (pts (xy 260.985 86.36) (xy 260.985 96.52))
     (stroke (width 0) (type default))
     (uuid f273ba96-6571-489d-bf04-5ed71d666a51)
   )
@@ -1660,11 +1641,7 @@
     (stroke (width 0) (type default))
     (uuid f8100880-83bb-41b5-8888-8bc1c90aa6ff)
   )
-  (wire (pts (xy 244.475 69.215) (xy 241.3 69.215))
+  (wire (pts (xy 231.775 101.6) (xy 242.57 101.6))
-    (stroke (width 0) (type default))
-    (uuid f8f44e67-3f2f-40c5-8ee0-fd7563321830)
-  )
-  (wire (pts (xy 236.22 101.6) (xy 242.57 101.6))
     (stroke (width 0) (type default))
     (uuid f979a38f-f38e-4869-8b1a-e218fc1e16cb)
   )
@@ -1672,11 +1649,7 @@
     (stroke (width 0) (type default))
     (uuid fa7e2cb9-1cbe-4b3b-abff-4e4b9db32d42)
   )
-  (wire (pts (xy 244.475 69.215) (xy 254.635 69.215))
+  (wire (pts (xy 235.585 106.68) (xy 235.585 111.76))
-    (stroke (width 0) (type default))
-    (uuid fa9ad89b-e96c-471c-81e2-111d5aa30f56)
-  )
-  (wire (pts (xy 240.03 106.68) (xy 240.03 111.76))
     (stroke (width 0) (type default))
     (uuid fc59fc6b-9960-41f6-8d40-9701a6eb7bd2)
   )
@@ -1689,10 +1662,6 @@
     (stroke (width 0) (type default))
     (uuid ff410e6a-6cf7-4e0a-a645-ce194c3d179e)
   )
-  (wire (pts (xy 254.635 79.375) (xy 254.635 81.28))
-    (stroke (width 0) (type default))
-    (uuid ff69d92d-80da-488e-b2a5-5a5fc57f9ce3)
-  )
   (bus (pts (xy 139.7 95.25) (xy 139.7 96.52))
     (stroke (width 0) (type default))
     (uuid ffbcaa16-7357-4835-89fa-69d006882fe2)
@@ -1870,19 +1839,19 @@
     )
   )
 
-  (symbol (lib_id "Device:C") (at 244.475 75.565 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 242.57 75.565 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 07fb1984-a352-46e0-89d3-3350c8d62fd0)
-    (property "Reference" "C1" (at 247.65 74.295 0)
+    (property "Reference" "C1" (at 245.745 74.295 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (at 245.11 78.105 0)
+    (property "Value" "0.1uF" (at 243.205 78.105 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 245.4402 79.375 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 243.5352 79.375 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 244.475 75.565 0)
+    (property "Datasheet" "~" (at 242.57 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1b36a899-4ade-4878-a13a-e755e058beb6))
@@ -1947,7 +1916,7 @@
     (property "Value" "WS2812B_Unified" (at 180.34 149.3393 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "aic_pico:WS2812B-4020" (at 166.37 158.75 0)
+    (property "Footprint" "aic_pico:WS2812B-1204" (at 166.37 158.75 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (property "Datasheet" "" (at 167.64 160.655 0)
@@ -2020,19 +1989,19 @@
     )
   )
 
-  (symbol (lib_id "power:GND") (at 236.22 126.365 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 231.775 126.365 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 2eccbe09-1d76-4834-a4d6-ea03ee11e057)
-    (property "Reference" "#PWR0103" (at 236.22 132.715 0)
+    (property "Reference" "#PWR0103" (at 231.775 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (at 236.347 130.7592 0)
+    (property "Value" "GND" (at 231.902 130.7592 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 236.22 126.365 0)
+    (property "Footprint" "" (at 231.775 126.365 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 236.22 126.365 0)
+    (property "Datasheet" "" (at 231.775 126.365 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a096ef01-08b2-4c3a-8bcc-006875297a34))
@@ -2045,6 +2014,32 @@
     )
   )
 
+  (symbol (lib_id "Device:C") (at 252.73 88.9 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 45925b88-ac99-4a7b-a011-e42d8f5095ea)
+    (property "Reference" "C3" (at 255.905 87.63 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "0.1uF" (at 253.365 91.44 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 253.6952 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 252.73 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 222b8895-af35-4f5f-bef2-628794f883d4))
+    (pin "2" (uuid c5f38c07-dcf5-4f2d-a7b8-c3aaf1cd3962))
+    (instances
+      (project "aic_touch"
+        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
+          (reference "C3") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "aic_pico:WS2812B_Unified") (at 190.5 151.13 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 5125d05b-d6c9-4431-bce0-c5a8bc485c40)
@@ -2054,7 +2049,7 @@
     (property "Value" "WS2812B_Unified" (at 205.74 149.3393 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "aic_pico:WS2812B-4020" (at 191.77 158.75 0)
+    (property "Footprint" "aic_pico:WS2812B-1204" (at 191.77 158.75 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (property "Datasheet" "" (at 193.04 160.655 0)
@@ -2172,7 +2167,7 @@
     (property "Value" "WS2812B_Unified" (at 218.44 149.3393 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "aic_pico:WS2812B-4020" (at 204.47 158.75 0)
+    (property "Footprint" "aic_pico:WS2812B-1204" (at 204.47 158.75 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (property "Datasheet" "" (at 205.74 160.655 0)
@@ -2314,7 +2309,7 @@
     (property "Value" "WS2812B_Unified" (at 243.84 149.3393 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "aic_pico:WS2812B-4020" (at 229.87 158.75 0)
+    (property "Footprint" "aic_pico:WS2812B-1204" (at 229.87 158.75 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (property "Datasheet" "" (at 231.14 160.655 0)
@@ -2388,23 +2383,23 @@
     )
   )
 
-  (symbol (lib_id "Device:C") (at 254.635 75.565 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 242.57 88.9 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid b46995de-ca70-4a73-8e16-3d701d3ebb95)
+    (uuid ae86ed9c-4a22-425e-9745-2714d6b14987)
-    (property "Reference" "C2" (at 257.81 74.295 0)
+    (property "Reference" "C2" (at 245.745 87.63 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10uF" (at 255.905 78.105 0)
+    (property "Value" "0.1uF" (at 243.205 91.44 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 255.6002 79.375 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 243.5352 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 254.635 75.565 0)
+    (property "Datasheet" "~" (at 242.57 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e5dc90db-2f37-486d-be74-92be7173c736))
+    (pin "1" (uuid 39b02424-92d1-4f0e-92e4-210df6e205a2))
-    (pin "2" (uuid 5b55eaea-9afd-4b5d-af48-a6623f087af7))
+    (pin "2" (uuid 45c6f024-bede-43e1-a014-e2d48754fd2d))
     (instances
       (project "aic_touch"
         (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
@@ -2448,7 +2443,7 @@
     (property "Value" "WS2812B_Unified" (at 231.14 149.3393 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "aic_pico:WS2812B-4020" (at 217.17 158.75 0)
+    (property "Footprint" "aic_pico:WS2812B-1204" (at 217.17 158.75 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (property "Datasheet" "" (at 218.44 160.655 0)
@@ -2501,7 +2496,7 @@
     (property "Value" "WS2812B_Unified" (at 193.04 149.3393 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "aic_pico:WS2812B-4020" (at 179.07 158.75 0)
+    (property "Footprint" "aic_pico:WS2812B-1204" (at 179.07 158.75 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (property "Datasheet" "" (at 180.34 160.655 0)
@@ -2549,32 +2544,6 @@
     )
   )
 
-  (symbol (lib_id "Device:L") (at 237.49 69.215 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid efc71ccb-67ea-4e76-9785-e4f8e775f58e)
-    (property "Reference" "L1" (at 237.49 64.135 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "100nH" (at 237.49 66.675 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Inductor_SMD:L_1206_3216Metric" (at 237.49 69.215 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 237.49 69.215 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid b7e42a19-9593-4a2f-9190-a6d195586c83))
-    (pin "2" (uuid b84191ed-024b-4678-93d6-23620e80d8ed))
-    (instances
-      (project "aic_touch"
-        (path "/2e3f5573-c264-4a8b-a2f0-0e6473d39aad"
-          (reference "L1") (unit 1)
-        )
-      )
-    )
-  )
-
   (sheet_instances
     (path "/" (page "1"))
   )