X-Git-Url: https://git.gir.st/hardpass.git/blobdiff_plain/9667c1aeaf70ebb3400ba86dfb82215cedc9d7f0..0afd58a30ec5d008a19a540bbc8d5adb4b41ee04:/kicad/hardpass-pcb/hardpass-pcb.net

diff --git a/kicad/hardpass-pcb/hardpass-pcb.net b/kicad/hardpass-pcb/hardpass-pcb.net
index 23e597f..5bd4dbc 100755
--- a/kicad/hardpass-pcb/hardpass-pcb.net
+++ b/kicad/hardpass-pcb/hardpass-pcb.net
@@ -1,124 +1,118 @@
 (export (version D)
   (design
-    (source /home/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb.sch)
-    (date "Sam 11 Mär 2017 21:57:18 CET")
-    (tool "Eeschema 4.0.6-e0-6349~53~ubuntu16.04.1")
+    (source /home/t/projects/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb.sch)
+    (date "Sat 10 Feb 2018 19:28:03 CET")
+    (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "Hardpass PCB")
         (company isticktoit.net)
         (rev 1)
-        (date 2016-04-27)
+        (date 2018-02-10)
         (source hardpass-pcb.sch)
         (comment (number 1) (value ""))
         (comment (number 2) (value ""))
         (comment (number 3) (value ""))
         (comment (number 4) (value "")))))
   (components
-    (comp (ref P1)
-      (value Pi_Zero)
-      (footprint hardpass:Pin_Header_Mirrored-NoHoles_centered_2x20)
-      (libsource (lib conn) (part CONN_02X20))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 57211855))
     (comp (ref SW1)
       (value 1)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCA0F))
     (comp (ref SW2)
       (value 2)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCB0D))
     (comp (ref SW3)
       (value 3)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCC13))
     (comp (ref SW4)
       (value 4)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCDB9))
     (comp (ref SW5)
       (value 5)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCFBE))
     (comp (ref SW6)
       (value 6)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD09D))
     (comp (ref SW7)
       (value 7)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD274))
     (comp (ref SW8)
       (value 8)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD343))
     (comp (ref SW9)
       (value 9)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD459))
     (comp (ref SW10)
       (value C/UP)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD528))
     (comp (ref SW11)
       (value 0/OK)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD6CB))
     (comp (ref SW12)
       (value OK/DN)
-      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD811))
     (comp (ref C6)
-      (value 1µF)
+      (value 2.2µF)
       (footprint Capacitors_SMD:C_1206)
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 576AB858))
     (comp (ref C5)
-      (value 1µF)
+      (value 2.2µF)
       (footprint Capacitors_SMD:C_1206)
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 576AB9B6))
     (comp (ref C2)
-      (value 1µF)
+      (value 2.2µF)
       (footprint Capacitors_SMD:C_1206)
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 576ABF65))
     (comp (ref C3)
-      (value 2.2µF)
+      (value 10µF)
       (footprint Capacitors_SMD:C_1206)
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 576AC79A))
     (comp (ref C4)
-      (value 4.7µF)
+      (value 2.2µF)
       (footprint Capacitors_SMD:C_1206)
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
@@ -129,41 +123,12 @@
       (libsource (lib device) (part R_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 576AE193))
-    (comp (ref R11)
-      (value 10k)
-      (footprint Resistors_SMD:R_1206)
-      (libsource (lib device) (part R_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 576BAD7F))
-    (comp (ref R10)
-      (value 10k)
-      (footprint Resistors_SMD:R_1206)
-      (libsource (lib device) (part R_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 576BB1ED))
     (comp (ref SW13)
       (value SHUTDN)
+      (footprint Buttons_Switches_SMD:SW_SPST_SKQG)
       (libsource (lib hardpass-pcb-cache) (part SW_PUSH))
       (sheetpath (names /) (tstamps /))
       (tstamp 57715A24))
-    (comp (ref C7)
-      (value 0.1µF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 58337245))
-    (comp (ref R2)
-      (value 100k)
-      (footprint Resistors_SMD:R_1206)
-      (libsource (lib device) (part R_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 583372D3))
-    (comp (ref R3)
-      (value 100k)
-      (footprint Resistors_SMD:R_1206)
-      (libsource (lib device) (part R_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 58337469))
     (comp (ref R12)
       (value 33)
       (footprint Resistors_SMD:R_1206)
@@ -208,132 +173,36 @@
       (tstamp 57B86D32))
     (comp (ref P2)
       (value OLED_I2C)
-      (footprint adafruit-oled:UG-2864HSWEG01_0.96IN_WRAPAROUND)
-      (libsource (lib conn) (part CONN_01X30))
+      (footprint UG-2864HSWEG01_0.96IN_WRAPAROUND)
+      (libsource (lib hardpass-pcb-cache) (part CONN_01X30))
       (sheetpath (names /) (tstamps /))
       (tstamp 58700E5C))
     (comp (ref C1)
-      (value 1µF)
+      (value 2.2µF)
       (footprint Capacitors_SMD:C_1206)
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 58702958))
-    (comp (ref C20)
-      (value 220nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
+    (comp (ref IC1)
+      (value APX803)
+      (footprint TO_SOT_Packages_SMD:SOT-23)
+      (libsource (lib hardpass-pcb-cache) (part CONN_01X03))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5880B4CE))
-    (comp (ref C21)
-      (value 220nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880B97A))
-    (comp (ref C18)
-      (value 100nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880BA0C))
-    (comp (ref C19)
-      (value 10µF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880BB0F))
-    (comp (ref C16)
-      (value 220nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880BBA9))
-    (comp (ref C8)
-      (value 220nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880BE78))
-    (comp (ref C13)
-      (value 22nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880C0C1))
-    (comp (ref C12)
-      (value 100nF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880C189))
-    (comp (ref C11)
-      (value 10µF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880C234))
-    (comp (ref U1)
-      (value ISO7816)
-      (footprint hardpass:CAF99-08153-S132)
-      (libsource (lib hardpass-pcb-cache) (part ISO7816))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 58821579))
-    (comp (ref R5)
-      (value 180)
-      (footprint Resistors_SMD:R_1206)
-      (libsource (lib device) (part R_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 58823E8F))
-    (comp (ref C14)
-      (value 100pF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 588317FD))
-    (comp (ref Y1)
-      (value 14.745MHz)
-      (footprint Crystals:Crystal_SMD_5032-2pin_5.0x3.2mm_HandSoldering)
-      (libsource (lib device) (part Crystal))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 58839E8A))
-    (comp (ref C17)
-      (value 22pF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5883A764))
-    (comp (ref C15)
-      (value 22pF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5883A85B))
-    (comp (ref SW14)
-      (value SW_PUSH_SMALL)
-      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5883F21C))
-    (comp (ref U3)
-      (value TDA8029)
-      (footprint Housings_QFP:LQFP-32_7x7mm_Pitch0.8mm)
-      (libsource (lib hardpass-pcb-cache) (part TDA8029))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5880AAA0))
-    (comp (ref R4)
-      (value 100)
+      (tstamp 593C6F9B))
+    (comp (ref R2)
+      (value 10k)
       (footprint Resistors_SMD:R_1206)
       (libsource (lib device) (part R_Small))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5884B8AE))
-    (comp (ref P3)
-      (value Pi_Zero)
-      (footprint hardpass:Pin_Header_Straight_2x20_Pitch2.54mm_centered)
-      (libsource (lib conn) (part CONN_02X20))
+      (tstamp 593C7684))
+    (comp (ref J1)
+      (value Raspberry_Pi_2_3)
+      (footprint hardpass:Pin_Header_Mirrored-NoHoles_centered_2x20)
+      (libsource (lib conn) (part Raspberry_Pi_2_3))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5881588C)))
+      (tstamp 5A7E4ACF)))
   (libparts
-    (libpart (lib conn) (part CONN_01X30)
-      (description "Connector, single row, 01x30, pin header")
+    (libpart (lib hardpass-pcb-cache) (part CONN_01X03)
       (footprints
         (fp Pin_Header_Straight_1X*)
         (fp Pin_Header_Angled_1X*)
@@ -341,49 +210,20 @@
         (fp Socket_Strip_Angled_1X*))
       (fields
         (field (name Reference) J)
-        (field (name Value) CONN_01X30))
+        (field (name Value) CONN_01X03))
       (pins
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name P2) (type passive))
-        (pin (num 3) (name P3) (type passive))
-        (pin (num 4) (name P4) (type passive))
-        (pin (num 5) (name P5) (type passive))
-        (pin (num 6) (name P6) (type passive))
-        (pin (num 7) (name P7) (type passive))
-        (pin (num 8) (name P8) (type passive))
-        (pin (num 9) (name P9) (type passive))
-        (pin (num 10) (name P10) (type passive))
-        (pin (num 11) (name P11) (type passive))
-        (pin (num 12) (name P12) (type passive))
-        (pin (num 13) (name P13) (type passive))
-        (pin (num 14) (name P14) (type passive))
-        (pin (num 15) (name P15) (type passive))
-        (pin (num 16) (name P16) (type passive))
-        (pin (num 17) (name P17) (type passive))
-        (pin (num 18) (name P18) (type passive))
-        (pin (num 19) (name P19) (type passive))
-        (pin (num 20) (name P20) (type passive))
-        (pin (num 21) (name P21) (type passive))
-        (pin (num 22) (name P22) (type passive))
-        (pin (num 23) (name P23) (type passive))
-        (pin (num 24) (name P24) (type passive))
-        (pin (num 25) (name P25) (type passive))
-        (pin (num 26) (name P26) (type passive))
-        (pin (num 27) (name P27) (type passive))
-        (pin (num 28) (name P28) (type passive))
-        (pin (num 29) (name P29) (type passive))
-        (pin (num 30) (name P30) (type passive))))
-    (libpart (lib conn) (part CONN_02X20)
-      (description "Connector, double row, 02x20, pin header")
+        (pin (num 3) (name P3) (type passive))))
+    (libpart (lib hardpass-pcb-cache) (part CONN_01X30)
       (footprints
-        (fp Pin_Header_Straight_2X*)
-        (fp Pin_Header_Angled_2X*)
-        (fp Socket_Strip_Straight_2X*)
-        (fp Socket_Strip_Angled_2X*)
-        (fp IDC_Header_Straight_*))
+        (fp Pin_Header_Straight_1X*)
+        (fp Pin_Header_Angled_1X*)
+        (fp Socket_Strip_Straight_1X*)
+        (fp Socket_Strip_Angled_1X*))
       (fields
         (field (name Reference) J)
-        (field (name Value) CONN_02X20))
+        (field (name Value) CONN_01X30))
       (pins
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name P2) (type passive))
@@ -414,17 +254,7 @@
         (pin (num 27) (name P27) (type passive))
         (pin (num 28) (name P28) (type passive))
         (pin (num 29) (name P29) (type passive))
-        (pin (num 30) (name P30) (type passive))
-        (pin (num 31) (name P31) (type passive))
-        (pin (num 32) (name P32) (type passive))
-        (pin (num 33) (name P33) (type passive))
-        (pin (num 34) (name P34) (type passive))
-        (pin (num 35) (name P35) (type passive))
-        (pin (num 36) (name P36) (type passive))
-        (pin (num 37) (name P37) (type passive))
-        (pin (num 38) (name P38) (type passive))
-        (pin (num 39) (name P39) (type passive))
-        (pin (num 40) (name P40) (type passive))))
+        (pin (num 30) (name P30) (type passive))))
     (libpart (lib device) (part C_Small)
       (description "Unpolarized capacitor")
       (footprints
@@ -435,16 +265,6 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part Crystal)
-      (description "Two pin crystal")
-      (footprints
-        (fp Crystal*))
-      (fields
-        (field (name Reference) Y)
-        (field (name Value) Crystal))
-      (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
     (libpart (lib ESP8266) (part ESP-12E)
       (description "ESP8266 ESP-12E module, 22 pins, 2mm, PCB antenna")
       (docs http://l0l.org.uk/2014/12/esp8266-modules-hardware-guide-gotta-catch-em-all/)
@@ -476,21 +296,6 @@
         (pin (num 20) (name GPIO5) (type BiDi))
         (pin (num 21) (name RXD) (type input))
         (pin (num 22) (name TXD) (type output))))
-    (libpart (lib hardpass-pcb-cache) (part ISO7816)
-      (fields
-        (field (name Reference) U)
-        (field (name Value) ISO7816))
-      (pins
-        (pin (num 1) (name C1) (type input))
-        (pin (num 2) (name C2) (type input))
-        (pin (num 3) (name C3) (type input))
-        (pin (num 4) (name C4) (type input))
-        (pin (num 5) (name C5) (type input))
-        (pin (num 6) (name C6) (type input))
-        (pin (num 7) (name C7) (type input))
-        (pin (num 8) (name C8) (type input))
-        (pin (num 9) (name K1) (type input))
-        (pin (num 10) (name K2) (type input))))
     (libpart (lib device) (part R_Small)
       (description "Resistor, small symbol")
       (footprints
@@ -501,6 +306,54 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
+    (libpart (lib conn) (part Raspberry_Pi_2_3)
+      (description "expansion header for Raspberry Pi 2 & 3")
+      (docs https://www.raspberrypi.org/documentation/hardware/raspberrypi/schematics/RPI-3B-V1_2-SCHEMATIC-REDUCED.pdf)
+      (fields
+        (field (name Reference) J)
+        (field (name Value) Raspberry_Pi_2_3)
+        (field (name Footprint) Pin_Headers:Pin_Header_Straight_2x20))
+      (pins
+        (pin (num 1) (name 3V3) (type power_out))
+        (pin (num 2) (name 5V) (type passive))
+        (pin (num 3) (name "(SDA1)_GPIO2") (type BiDi))
+        (pin (num 4) (name 5V) (type passive))
+        (pin (num 5) (name "(SCL1)_GPIO3") (type BiDi))
+        (pin (num 6) (name GND) (type passive))
+        (pin (num 7) (name "(GCLK)_GPIO4") (type BiDi))
+        (pin (num 8) (name "(TXD0)_GPIO14") (type BiDi))
+        (pin (num 9) (name GND) (type passive))
+        (pin (num 10) (name "(RXD0)_GPIO15") (type BiDi))
+        (pin (num 11) (name "GPIO17_(GEN0)") (type BiDi))
+        (pin (num 12) (name "GPIO18_(GEN1)") (type BiDi))
+        (pin (num 13) (name "GPIO27_(GEN2)") (type BiDi))
+        (pin (num 14) (name GND) (type passive))
+        (pin (num 15) (name "GPIO22_(GEN3)") (type BiDi))
+        (pin (num 16) (name "GPIO23_(GEN4)") (type BiDi))
+        (pin (num 17) (name 3V3) (type power_out))
+        (pin (num 18) (name "GPIO24_(GEN5)") (type BiDi))
+        (pin (num 19) (name "(SPI_MOSI)_GPIO10") (type BiDi))
+        (pin (num 20) (name GND) (type passive))
+        (pin (num 21) (name "(SPI_MISO)_GPIO9") (type BiDi))
+        (pin (num 22) (name "GPIO25_(GEN6)") (type BiDi))
+        (pin (num 23) (name "(SPI_SCLK)_GPIO11") (type BiDi))
+        (pin (num 24) (name "(~SPI_CE0~)_GPIO8") (type BiDi))
+        (pin (num 25) (name GND) (type passive))
+        (pin (num 26) (name "(~SPI_CE1~)_GPIO7") (type BiDi))
+        (pin (num 27) (name ID_SD) (type BiDi))
+        (pin (num 28) (name ID_SC) (type BiDi))
+        (pin (num 29) (name GPIO5) (type BiDi))
+        (pin (num 30) (name GND) (type passive))
+        (pin (num 31) (name GPIO6) (type BiDi))
+        (pin (num 32) (name GPIO12) (type BiDi))
+        (pin (num 33) (name GPIO13) (type BiDi))
+        (pin (num 34) (name GND) (type passive))
+        (pin (num 35) (name GPIO19) (type BiDi))
+        (pin (num 36) (name GPIO16) (type BiDi))
+        (pin (num 37) (name GPIO26) (type BiDi))
+        (pin (num 38) (name GPIO20) (type BiDi))
+        (pin (num 39) (name GND) (type passive))
+        (pin (num 40) (name GPIO21) (type BiDi))))
     (libpart (lib hardpass-pcb-cache) (part SW_PUSH)
       (fields
         (field (name Reference) SW)
@@ -514,443 +367,231 @@
         (field (name Value) SW_PUSH_SMALL))
       (pins
         (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
-    (libpart (lib hardpass-pcb-cache) (part TDA8029)
-      (fields
-        (field (name Reference) U)
-        (field (name Value) TDA8029))
-      (pins
-        (pin (num 1) (name P17) (type BiDi))
-        (pin (num 2) (name P16) (type BiDi))
-        (pin (num 3) (name VDD) (type power_in))
-        (pin (num 4) (name GND) (type power_in))
-        (pin (num 5) (name SDWN_N) (type input))
-        (pin (num 6) (name CDEL) (type input))
-        (pin (num 7) (name I/O) (type BiDi))
-        (pin (num 8) (name PRES) (type input))
-        (pin (num 9) (name GNDC) (type power_out))
-        (pin (num 10) (name CLK) (type output))
-        (pin (num 11) (name VCC) (type power_out))
-        (pin (num 12) (name RST) (type output))
-        (pin (num 13) (name VUP) (type power_out))
-        (pin (num 14) (name SAP) (type BiDi))
-        (pin (num 15) (name SBP) (type BiDi))
-        (pin (num 16) (name DCIN) (type input))
-        (pin (num 17) (name SBM) (type BiDi))
-        (pin (num 18) (name PGND) (type power_in))
-        (pin (num 19) (name SAM) (type BiDi))
-        (pin (num 20) (name TEST) (type input))
-        (pin (num 21) (name EA_N) (type input))
-        (pin (num 22) (name ALE) (type output))
-        (pin (num 23) (name PSEN_N) (type output))
-        (pin (num 24) (name P27) (type BiDi))
-        (pin (num 25) (name P26) (type BiDi))
-        (pin (num 26) (name XTAL1) (type input))
-        (pin (num 27) (name XTAL2) (type output))
-        (pin (num 28) (name RESET) (type input))
-        (pin (num 29) (name P32/INT0_N) (type output))
-        (pin (num 30) (name P33/INT1_N) (type BiDi))
-        (pin (num 31) (name P31/TX) (type output))
-        (pin (num 32) (name P30/RX) (type input))
-        (pin (num ??) (name P31/TX) (type output)))))
+        (pin (num 2) (name 2) (type passive)))))
   (libraries
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
     (library (logical conn)
       (uri /usr/share/kicad/library/conn.lib))
+    (library (logical device)
+      (uri /usr/share/kicad/library/device.lib))
     (library (logical ESP8266)
-      (uri /home/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/kicad-ESP8266/ESP8266.lib))
+      (uri kicad-ESP8266/ESP8266.lib))
     (library (logical hardpass-pcb-cache)
-      (uri /home/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb-cache.lib)))
+      (uri /home/t/projects/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb-cache.lib)))
   (nets
-    (net (code 1) (name +5V)
-      (node (ref C11) (pin 2))
-      (node (ref C12) (pin 2))
-      (node (ref C19) (pin 1))
-      (node (ref C18) (pin 1))
-      (node (ref U1) (pin 9))
-      (node (ref P3) (pin 4))
-      (node (ref P3) (pin 2))
-      (node (ref U3) (pin 8))
-      (node (ref U3) (pin 5))
-      (node (ref U3) (pin 3))
-      (node (ref SW14) (pin 1))
-      (node (ref U3) (pin 1))
-      (node (ref U1) (pin 10))
-      (node (ref U3) (pin 16))
-      (node (ref U3) (pin 21)))
-    (net (code 2) (name "Net-(P3-Pad29)")
-      (node (ref P3) (pin 29)))
-    (net (code 3) (name "Net-(P3-Pad26)")
-      (node (ref P3) (pin 26)))
-    (net (code 4) (name "Net-(P3-Pad23)")
-      (node (ref P3) (pin 23)))
-    (net (code 5) (name "Net-(P3-Pad33)")
-      (node (ref P3) (pin 33)))
-    (net (code 6) (name "Net-(P3-Pad24)")
-      (node (ref P3) (pin 24)))
-    (net (code 7) (name "Net-(P3-Pad15)")
-      (node (ref P3) (pin 15)))
-    (net (code 8) (name "Net-(P3-Pad35)")
-      (node (ref P3) (pin 35)))
-    (net (code 9) (name "Net-(P3-Pad16)")
-      (node (ref P3) (pin 16)))
-    (net (code 10) (name "Net-(P3-Pad36)")
-      (node (ref P3) (pin 36)))
-    (net (code 11) (name "Net-(P3-Pad17)")
-      (node (ref P3) (pin 17)))
-    (net (code 12) (name "Net-(P3-Pad27)")
-      (node (ref P3) (pin 27)))
-    (net (code 13) (name "Net-(P3-Pad37)")
-      (node (ref P3) (pin 37)))
-    (net (code 14) (name "Net-(P3-Pad18)")
-      (node (ref P3) (pin 18)))
-    (net (code 15) (name "Net-(P3-Pad28)")
-      (node (ref P3) (pin 28)))
-    (net (code 16) (name "Net-(P3-Pad38)")
-      (node (ref P3) (pin 38)))
-    (net (code 17) (name "Net-(P3-Pad19)")
-      (node (ref P3) (pin 19)))
-    (net (code 18) (name "Net-(R4-Pad1)")
-      (node (ref U1) (pin 3))
-      (node (ref R4) (pin 1)))
-    (net (code 19) (name "Net-(P3-Pad13)")
-      (node (ref P3) (pin 13)))
-    (net (code 20) (name GND)
-      (node (ref P2) (pin 8))
-      (node (ref P2) (pin 12))
-      (node (ref P2) (pin 30))
-      (node (ref P2) (pin 10))
-      (node (ref P3) (pin 39))
+    (net (code 1) (name "Net-(C6-Pad2)")
+      (node (ref P2) (pin 3))
+      (node (ref C6) (pin 2)))
+    (net (code 2) (name "Net-(C5-Pad2)")
+      (node (ref P2) (pin 5))
+      (node (ref C5) (pin 2)))
+    (net (code 3) (name OLED_RST)
+      (node (ref IC1) (pin 2))
+      (node (ref P2) (pin 14))
+      (node (ref R2) (pin 2)))
+    (net (code 4) (name OLED_SCL)
+      (node (ref J1) (pin 5))
+      (node (ref P2) (pin 18)))
+    (net (code 5) (name GND)
+      (node (ref J1) (pin 6))
+      (node (ref J1) (pin 25))
+      (node (ref J1) (pin 39))
       (node (ref P2) (pin 1))
-      (node (ref P2) (pin 15))
-      (node (ref U2) (pin 15))
-      (node (ref C1) (pin 1))
-      (node (ref P2) (pin 29))
-      (node (ref C11) (pin 1))
-      (node (ref C12) (pin 1))
-      (node (ref C13) (pin 2))
-      (node (ref C16) (pin 2))
-      (node (ref C19) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref C18) (pin 2))
-      (node (ref C8) (pin 1))
-      (node (ref P1) (pin 39))
-      (node (ref P1) (pin 30))
-      (node (ref P1) (pin 9))
-      (node (ref P1) (pin 6))
+      (node (ref R1) (pin 2))
       (node (ref SW13) (pin 2))
-      (node (ref P1) (pin 20))
-      (node (ref P1) (pin 25))
-      (node (ref P1) (pin 34))
-      (node (ref P1) (pin 14))
-      (node (ref C14) (pin 1))
-      (node (ref C17) (pin 1))
-      (node (ref U1) (pin 5))
+      (node (ref P2) (pin 8))
+      (node (ref U2) (pin 15))
       (node (ref C2) (pin 1))
       (node (ref C3) (pin 2))
       (node (ref C4) (pin 2))
-      (node (ref R1) (pin 2))
-      (node (ref U3) (pin 9))
-      (node (ref P3) (pin 20))
-      (node (ref P3) (pin 6))
-      (node (ref P3) (pin 9))
-      (node (ref U3) (pin 4))
-      (node (ref P3) (pin 30))
-      (node (ref U3) (pin 20))
-      (node (ref U3) (pin 25))
-      (node (ref C15) (pin 1))
-      (node (ref U3) (pin 18))
-      (node (ref P3) (pin 14))
-      (node (ref P3) (pin 34))
-      (node (ref P3) (pin 25)))
-    (net (code 21) (name "Net-(U3-Pad23)")
-      (node (ref U3) (pin 23)))
-    (net (code 22) (name "Net-(U3-Pad30)")
-      (node (ref U3) (pin 30)))
-    (net (code 23) (name "Net-(U1-Pad2)")
-      (node (ref U1) (pin 2))
-      (node (ref U3) (pin 12)))
-    (net (code 24) (name "Net-(U3-Pad22)")
-      (node (ref U3) (pin 22)))
-    (net (code 25) (name "Net-(C16-Pad1)")
-      (node (ref C16) (pin 1))
-      (node (ref U3) (pin 13)))
-    (net (code 26) (name "Net-(R4-Pad2)")
-      (node (ref R4) (pin 2))
-      (node (ref U3) (pin 10)))
-    (net (code 27) (name "Net-(U3-Pad24)")
-      (node (ref U3) (pin 24)))
-    (net (code 28) (name "Net-(C20-Pad2)")
-      (node (ref U3) (pin 15))
-      (node (ref C20) (pin 2)))
-    (net (code 29) (name "Net-(C20-Pad1)")
-      (node (ref C20) (pin 1))
-      (node (ref U3) (pin 17)))
-    (net (code 30) (name "Net-(C15-Pad2)")
-      (node (ref U3) (pin 27))
-      (node (ref C15) (pin 2))
-      (node (ref Y1) (pin 1)))
-    (net (code 31) (name "Net-(SW14-Pad2)")
-      (node (ref U3) (pin 28))
-      (node (ref SW14) (pin 2)))
-    (net (code 32) (name "Net-(U3-Pad2)")
-      (node (ref U3) (pin 2)))
-    (net (code 33) (name "Net-(C13-Pad1)")
-      (node (ref U3) (pin 6))
-      (node (ref C13) (pin 1)))
-    (net (code 34) (name "Net-(R5-Pad2)")
-      (node (ref U3) (pin 7))
-      (node (ref R5) (pin 2)))
-    (net (code 35) (name "Net-(P3-Pad3)")
-      (node (ref P3) (pin 3)))
-    (net (code 36) (name "Net-(P3-Pad5)")
-      (node (ref P3) (pin 5)))
-    (net (code 37) (name "Net-(P3-Pad7)")
-      (node (ref P3) (pin 7)))
-    (net (code 38) (name CARD_RX)
-      (node (ref U3) (pin 32))
-      (node (ref P3) (pin 8)))
-    (net (code 39) (name CARD_TX)
-      (node (ref U3) (pin 31))
-      (node (ref P3) (pin 10)))
-    (net (code 40) (name "Net-(P3-Pad1)")
-      (node (ref P3) (pin 1)))
-    (net (code 41) (name "Net-(P3-Pad40)")
-      (node (ref P3) (pin 40)))
-    (net (code 42) (name "Net-(P3-Pad11)")
-      (node (ref P3) (pin 11)))
-    (net (code 43) (name "Net-(P3-Pad21)")
-      (node (ref P3) (pin 21)))
-    (net (code 44) (name "Net-(P3-Pad31)")
-      (node (ref P3) (pin 31)))
-    (net (code 45) (name "Net-(P3-Pad12)")
-      (node (ref P3) (pin 12)))
-    (net (code 46) (name "Net-(P3-Pad22)")
-      (node (ref P3) (pin 22)))
-    (net (code 47) (name "Net-(P3-Pad32)")
-      (node (ref P3) (pin 32)))
-    (net (code 48) (name "Net-(U3-Pad29)")
-      (node (ref U3) (pin 29)))
-    (net (code 49) (name "Net-(C17-Pad2)")
-      (node (ref C17) (pin 2))
-      (node (ref U3) (pin 26))
-      (node (ref Y1) (pin 2)))
-    (net (code 50) (name OLED_SCL)
-      (node (ref P2) (pin 18))
-      (node (ref R10) (pin 1))
-      (node (ref P1) (pin 5)))
-    (net (code 51) (name OLED_SDA)
-      (node (ref P1) (pin 3))
-      (node (ref R11) (pin 1))
+      (node (ref J1) (pin 9))
+      (node (ref J1) (pin 20))
+      (node (ref J1) (pin 30))
+      (node (ref J1) (pin 14))
+      (node (ref J1) (pin 34))
+      (node (ref P2) (pin 15))
+      (node (ref P2) (pin 30))
+      (node (ref P2) (pin 10))
+      (node (ref P2) (pin 12))
+      (node (ref IC1) (pin 1))
+      (node (ref C1) (pin 1))
+      (node (ref P2) (pin 29)))
+    (net (code 6) (name +3V3)
+      (node (ref P2) (pin 6))
+      (node (ref U2) (pin 8))
+      (node (ref J1) (pin 1))
+      (node (ref R2) (pin 1))
+      (node (ref C1) (pin 2))
+      (node (ref J1) (pin 17))
+      (node (ref P2) (pin 9))
+      (node (ref P2) (pin 11))
+      (node (ref C2) (pin 2))
+      (node (ref IC1) (pin 3)))
+    (net (code 7) (name "Net-(P2-Pad7)")
+      (node (ref P2) (pin 7)))
+    (net (code 8) (name "Net-(J1-Pad19)")
+      (node (ref J1) (pin 19)))
+    (net (code 9) (name "Net-(J1-Pad28)")
+      (node (ref J1) (pin 28)))
+    (net (code 10) (name SD_D0)
+      (node (ref R13) (pin 2))
+      (node (ref J1) (pin 18)))
+    (net (code 11) (name SD_D2)
+      (node (ref J1) (pin 37))
+      (node (ref R14) (pin 2)))
+    (net (code 12) (name "Net-(J1-Pad27)")
+      (node (ref J1) (pin 27)))
+    (net (code 13) (name "Net-(J1-Pad36)")
+      (node (ref J1) (pin 36)))
+    (net (code 14) (name "Net-(J1-Pad26)")
+      (node (ref J1) (pin 26)))
+    (net (code 15) (name SD_CMD)
+      (node (ref R12) (pin 2))
+      (node (ref J1) (pin 16)))
+    (net (code 16) (name "Net-(P2-Pad25)")
+      (node (ref P2) (pin 25)))
+    (net (code 17) (name "Net-(P2-Pad24)")
+      (node (ref P2) (pin 24)))
+    (net (code 18) (name "Net-(P2-Pad23)")
+      (node (ref P2) (pin 23)))
+    (net (code 19) (name "Net-(P2-Pad22)")
+      (node (ref P2) (pin 22)))
+    (net (code 20) (name "Net-(P2-Pad21)")
+      (node (ref P2) (pin 21)))
+    (net (code 21) (name "Net-(P2-Pad17)")
+      (node (ref P2) (pin 17)))
+    (net (code 22) (name "Net-(P2-Pad16)")
+      (node (ref P2) (pin 16)))
+    (net (code 23) (name "Net-(P2-Pad13)")
+      (node (ref P2) (pin 13)))
+    (net (code 24) (name "Net-(J1-Pad23)")
+      (node (ref J1) (pin 23)))
+    (net (code 25) (name "Net-(J1-Pad21)")
+      (node (ref J1) (pin 21)))
+    (net (code 26) (name "Net-(J1-Pad24)")
+      (node (ref J1) (pin 24)))
+    (net (code 27) (name "Net-(J1-Pad11)")
+      (node (ref J1) (pin 11)))
+    (net (code 28) (name "Net-(J1-Pad10)")
+      (node (ref J1) (pin 10)))
+    (net (code 29) (name "Net-(J1-Pad8)")
+      (node (ref J1) (pin 8)))
+    (net (code 30) (name "Net-(J1-Pad4)")
+      (node (ref J1) (pin 4)))
+    (net (code 31) (name "Net-(J1-Pad2)")
+      (node (ref J1) (pin 2)))
+    (net (code 32) (name OLED_SDA)
       (node (ref P2) (pin 19))
-      (node (ref P2) (pin 20)))
-    (net (code 52) (name "Net-(P2-Pad14)")
-      (node (ref P2) (pin 14))
-      (node (ref R3) (pin 1)))
-    (net (code 53) (name "Net-(C21-Pad1)")
-      (node (ref C21) (pin 1))
-      (node (ref U3) (pin 19)))
-    (net (code 54) (name "Net-(C21-Pad2)")
-      (node (ref U3) (pin 14))
-      (node (ref C21) (pin 2)))
-    (net (code 55) (name "Net-(R5-Pad1)")
-      (node (ref R5) (pin 1))
-      (node (ref U1) (pin 7)))
-    (net (code 56) (name "Net-(C14-Pad2)")
-      (node (ref U1) (pin 1))
-      (node (ref U3) (pin 11))
-      (node (ref C14) (pin 2))
-      (node (ref C8) (pin 2))
-      (node (ref U1) (pin 6)))
-    (net (code 57) (name "Net-(C7-Pad1)")
-      (node (ref C7) (pin 1))
-      (node (ref R3) (pin 2))
-      (node (ref R2) (pin 1)))
-    (net (code 58) (name "Net-(C6-Pad2)")
-      (node (ref P2) (pin 3))
-      (node (ref C6) (pin 2)))
-    (net (code 59) (name "Net-(C5-Pad2)")
-      (node (ref C5) (pin 2))
-      (node (ref P2) (pin 5)))
-    (net (code 60) (name "Net-(C3-Pad1)")
-      (node (ref P2) (pin 28))
-      (node (ref C3) (pin 1)))
-    (net (code 61) (name "Net-(C6-Pad1)")
-      (node (ref C6) (pin 1))
-      (node (ref P2) (pin 2)))
-    (net (code 62) (name "Net-(C5-Pad1)")
+      (node (ref P2) (pin 20))
+      (node (ref J1) (pin 3)))
+    (net (code 33) (name ESP_CHPD)
+      (node (ref J1) (pin 7))
+      (node (ref U2) (pin 3)))
+    (net (code 34) (name "Net-(C3-Pad1)")
+      (node (ref C3) (pin 1))
+      (node (ref P2) (pin 28)))
+    (net (code 35) (name "Net-(C4-Pad1)")
+      (node (ref P2) (pin 27))
+      (node (ref C4) (pin 1)))
+    (net (code 36) (name "Net-(C5-Pad1)")
       (node (ref P2) (pin 4))
       (node (ref C5) (pin 1)))
-    (net (code 63) (name "Net-(C4-Pad1)")
-      (node (ref C4) (pin 1))
-      (node (ref P2) (pin 27)))
-    (net (code 64) (name "Net-(P2-Pad26)")
+    (net (code 37) (name "Net-(C6-Pad1)")
+      (node (ref P2) (pin 2))
+      (node (ref C6) (pin 1)))
+    (net (code 38) (name "Net-(P2-Pad26)")
       (node (ref R1) (pin 1))
       (node (ref P2) (pin 26)))
-    (net (code 65) (name ROW_2)
+    (net (code 39) (name ROW_4)
+      (node (ref J1) (pin 40))
+      (node (ref SW12) (pin 2))
+      (node (ref SW10) (pin 2))
+      (node (ref SW11) (pin 2)))
+    (net (code 40) (name SHUTDOWN)
+      (node (ref J1) (pin 12))
+      (node (ref SW13) (pin 1)))
+    (net (code 41) (name ROW_3)
+      (node (ref J1) (pin 38))
+      (node (ref SW7) (pin 2))
+      (node (ref SW8) (pin 2))
+      (node (ref SW9) (pin 2)))
+    (net (code 42) (name ROW_2)
       (node (ref SW4) (pin 2))
       (node (ref SW5) (pin 2))
-      (node (ref P1) (pin 36))
-      (node (ref SW6) (pin 2)))
-    (net (code 66) (name ROW_3)
-      (node (ref SW8) (pin 2))
-      (node (ref SW9) (pin 2))
-      (node (ref SW7) (pin 2))
-      (node (ref P1) (pin 38)))
-    (net (code 67) (name ROW_4)
-      (node (ref P1) (pin 40))
-      (node (ref SW12) (pin 2))
-      (node (ref SW11) (pin 2))
-      (node (ref SW10) (pin 2)))
-    (net (code 68) (name +3V3)
-      (node (ref C2) (pin 2))
-      (node (ref R2) (pin 2))
-      (node (ref C1) (pin 2))
-      (node (ref R11) (pin 2))
-      (node (ref R10) (pin 2))
-      (node (ref P2) (pin 11))
-      (node (ref P2) (pin 9))
-      (node (ref P1) (pin 1))
-      (node (ref P1) (pin 17))
-      (node (ref P2) (pin 6))
-      (node (ref U2) (pin 8)))
-    (net (code 69) (name "Net-(R12-Pad1)")
-      (node (ref U2) (pin 9))
-      (node (ref R12) (pin 1)))
-    (net (code 70) (name SD_CMD)
-      (node (ref P1) (pin 16))
-      (node (ref R12) (pin 2)))
-    (net (code 71) (name "Net-(R13-Pad1)")
-      (node (ref R13) (pin 1))
-      (node (ref U2) (pin 10)))
-    (net (code 72) (name SHUTDOWN)
-      (node (ref SW13) (pin 1))
-      (node (ref P1) (pin 11)))
-    (net (code 73) (name "Net-(P1-Pad26)")
-      (node (ref P1) (pin 26)))
-    (net (code 74) (name "Net-(P1-Pad23)")
-      (node (ref P1) (pin 23)))
-    (net (code 75) (name "Net-(P1-Pad24)")
-      (node (ref P1) (pin 24)))
-    (net (code 76) (name "Net-(P1-Pad35)")
-      (node (ref P1) (pin 35)))
-    (net (code 77) (name "Net-(P1-Pad27)")
-      (node (ref P1) (pin 27)))
-    (net (code 78) (name "Net-(P1-Pad28)")
-      (node (ref P1) (pin 28)))
-    (net (code 79) (name "Net-(P1-Pad19)")
-      (node (ref P1) (pin 19)))
-    (net (code 80) (name "Net-(P1-Pad2)")
-      (node (ref P1) (pin 2)))
-    (net (code 81) (name "Net-(P1-Pad4)")
-      (node (ref P1) (pin 4)))
-    (net (code 82) (name ESP_CHPD)
-      (node (ref P1) (pin 7))
-      (node (ref U2) (pin 3)))
-    (net (code 83) (name UART_TX)
-      (node (ref P1) (pin 8)))
-    (net (code 84) (name UART_RX)
-      (node (ref P1) (pin 10)))
-    (net (code 85) (name "Net-(P1-Pad21)")
-      (node (ref P1) (pin 21)))
-    (net (code 86) (name "Net-(P1-Pad12)")
-      (node (ref P1) (pin 12)))
-    (net (code 87) (name COL_2)
-      (node (ref SW2) (pin 1))
-      (node (ref P1) (pin 31))
-      (node (ref SW8) (pin 1))
-      (node (ref SW11) (pin 1))
-      (node (ref SW5) (pin 1)))
-    (net (code 88) (name COL_3)
-      (node (ref SW3) (pin 1))
-      (node (ref SW9) (pin 1))
-      (node (ref SW12) (pin 1))
-      (node (ref SW6) (pin 1))
-      (node (ref P1) (pin 33)))
-    (net (code 89) (name ROW_1)
-      (node (ref P1) (pin 32))
-      (node (ref SW1) (pin 2))
-      (node (ref SW2) (pin 2))
-      (node (ref SW3) (pin 2)))
-    (net (code 90) (name COL_1)
+      (node (ref SW6) (pin 2))
+      (node (ref J1) (pin 32)))
+    (net (code 43) (name COL_1)
       (node (ref SW7) (pin 1))
-      (node (ref SW10) (pin 1))
       (node (ref SW1) (pin 1))
+      (node (ref J1) (pin 29))
       (node (ref SW4) (pin 1))
-      (node (ref P1) (pin 29)))
-    (net (code 91) (name SD_D0)
-      (node (ref P1) (pin 18))
-      (node (ref R13) (pin 2)))
-    (net (code 92) (name "Net-(P2-Pad7)")
-      (node (ref P2) (pin 7)))
-    (net (code 93) (name "Net-(U1-Pad8)")
-      (node (ref U1) (pin 8)))
-    (net (code 94) (name "Net-(U1-Pad4)")
-      (node (ref U1) (pin 4)))
-    (net (code 95) (name "Net-(U2-Pad7)")
-      (node (ref U2) (pin 7)))
-    (net (code 96) (name "Net-(U2-Pad6)")
-      (node (ref U2) (pin 6)))
-    (net (code 97) (name "Net-(U2-Pad5)")
-      (node (ref U2) (pin 5)))
-    (net (code 98) (name "Net-(U2-Pad4)")
-      (node (ref U2) (pin 4)))
-    (net (code 99) (name "Net-(U2-Pad1)")
-      (node (ref U2) (pin 1)))
-    (net (code 100) (name "Net-(U2-Pad2)")
-      (node (ref U2) (pin 2)))
-    (net (code 101) (name "Net-(U2-Pad20)")
-      (node (ref U2) (pin 20)))
-    (net (code 102) (name "Net-(R14-Pad1)")
-      (node (ref R14) (pin 1))
-      (node (ref U2) (pin 11)))
-    (net (code 103) (name SD_D2)
-      (node (ref P1) (pin 37))
-      (node (ref R14) (pin 2)))
-    (net (code 104) (name "Net-(R15-Pad1)")
-      (node (ref U2) (pin 12))
-      (node (ref R15) (pin 1)))
-    (net (code 105) (name SD_D3)
-      (node (ref P1) (pin 13))
-      (node (ref R15) (pin 2)))
-    (net (code 106) (name "Net-(R16-Pad1)")
-      (node (ref R16) (pin 1))
-      (node (ref U2) (pin 13)))
-    (net (code 107) (name SD_D1)
-      (node (ref R16) (pin 2))
-      (node (ref P1) (pin 22)))
-    (net (code 108) (name "Net-(R17-Pad1)")
-      (node (ref R17) (pin 1))
-      (node (ref U2) (pin 14)))
-    (net (code 109) (name ESP_CLK)
-      (node (ref P1) (pin 15))
-      (node (ref R17) (pin 2)))
-    (net (code 110) (name "Net-(U2-Pad17)")
-      (node (ref U2) (pin 17)))
-    (net (code 111) (name "Net-(U2-Pad16)")
+      (node (ref SW10) (pin 1)))
+    (net (code 44) (name COL_3)
+      (node (ref J1) (pin 33))
+      (node (ref SW6) (pin 1))
+      (node (ref SW12) (pin 1))
+      (node (ref SW9) (pin 1))
+      (node (ref SW3) (pin 1)))
+    (net (code 45) (name ROW_1)
+      (node (ref J1) (pin 35))
+      (node (ref SW3) (pin 2))
+      (node (ref SW2) (pin 2))
+      (node (ref SW1) (pin 2)))
+    (net (code 46) (name COL_2)
+      (node (ref SW11) (pin 1))
+      (node (ref J1) (pin 31))
+      (node (ref SW2) (pin 1))
+      (node (ref SW8) (pin 1))
+      (node (ref SW5) (pin 1)))
+    (net (code 47) (name "Net-(U2-Pad16)")
       (node (ref U2) (pin 16)))
-    (net (code 112) (name "Net-(U2-Pad18)")
-      (node (ref U2) (pin 18)))
-    (net (code 113) (name "Net-(U2-Pad19)")
+    (net (code 48) (name "Net-(U2-Pad19)")
       (node (ref U2) (pin 19)))
-    (net (code 114) (name "Net-(U2-Pad22)")
+    (net (code 49) (name "Net-(U2-Pad18)")
+      (node (ref U2) (pin 18)))
+    (net (code 50) (name "Net-(U2-Pad17)")
+      (node (ref U2) (pin 17)))
+    (net (code 51) (name "Net-(R17-Pad1)")
+      (node (ref U2) (pin 14))
+      (node (ref R17) (pin 1)))
+    (net (code 52) (name "Net-(R16-Pad1)")
+      (node (ref R16) (pin 1))
+      (node (ref U2) (pin 13)))
+    (net (code 53) (name "Net-(U2-Pad22)")
       (node (ref U2) (pin 22)))
-    (net (code 115) (name "Net-(U2-Pad21)")
+    (net (code 54) (name "Net-(R15-Pad1)")
+      (node (ref R15) (pin 1))
+      (node (ref U2) (pin 12)))
+    (net (code 55) (name "Net-(U2-Pad21)")
       (node (ref U2) (pin 21)))
-    (net (code 116) (name "Net-(P2-Pad23)")
-      (node (ref P2) (pin 23)))
-    (net (code 117) (name "Net-(P2-Pad21)")
-      (node (ref P2) (pin 21)))
-    (net (code 118) (name "Net-(P2-Pad22)")
-      (node (ref P2) (pin 22)))
-    (net (code 119) (name "Net-(P2-Pad13)")
-      (node (ref P2) (pin 13)))
-    (net (code 120) (name "Net-(P2-Pad24)")
-      (node (ref P2) (pin 24)))
-    (net (code 121) (name "Net-(P2-Pad25)")
-      (node (ref P2) (pin 25)))
-    (net (code 122) (name "Net-(P2-Pad16)")
-      (node (ref P2) (pin 16)))
-    (net (code 123) (name "Net-(P2-Pad17)")
-      (node (ref P2) (pin 17)))))
\ No newline at end of file
+    (net (code 56) (name "Net-(R14-Pad1)")
+      (node (ref R14) (pin 1))
+      (node (ref U2) (pin 11)))
+    (net (code 57) (name "Net-(U2-Pad20)")
+      (node (ref U2) (pin 20)))
+    (net (code 58) (name "Net-(R13-Pad1)")
+      (node (ref U2) (pin 10))
+      (node (ref R13) (pin 1)))
+    (net (code 59) (name "Net-(R12-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref U2) (pin 9)))
+    (net (code 60) (name SD_D3)
+      (node (ref R15) (pin 2))
+      (node (ref J1) (pin 13)))
+    (net (code 61) (name ESP_CLK)
+      (node (ref R17) (pin 2))
+      (node (ref J1) (pin 15)))
+    (net (code 62) (name SD_D1)
+      (node (ref R16) (pin 2))
+      (node (ref J1) (pin 22)))
+    (net (code 63) (name "Net-(U2-Pad1)")
+      (node (ref U2) (pin 1)))
+    (net (code 64) (name "Net-(U2-Pad7)")
+      (node (ref U2) (pin 7)))
+    (net (code 65) (name "Net-(U2-Pad6)")
+      (node (ref U2) (pin 6)))
+    (net (code 66) (name "Net-(U2-Pad5)")
+      (node (ref U2) (pin 5)))
+    (net (code 67) (name "Net-(U2-Pad4)")
+      (node (ref U2) (pin 4)))
+    (net (code 68) (name "Net-(U2-Pad2)")
+      (node (ref U2) (pin 2)))))
\ No newline at end of file