X-Git-Url: https://git.gir.st/hardpass.git/blobdiff_plain/61f6ed9ae4c52d7503071d31de57f02644416005..4eabb4ce475a8d03efd44fdfa9e8d082801018ca:/kicad/hardpass-pcb/hardpass-pcb.net

diff --git a/kicad/hardpass-pcb/hardpass-pcb.net b/kicad/hardpass-pcb/hardpass-pcb.net
index eb44cba..7eeb360 100755
--- a/kicad/hardpass-pcb/hardpass-pcb.net
+++ b/kicad/hardpass-pcb/hardpass-pcb.net
@@ -1,8 +1,8 @@
 (export (version D)
   (design
-    (source /home/tobias/Desktop/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb.sch)
-    (date "Mon 21 Nov 2016 18:24:36 CET")
-    (tool "Eeschema 4.0.4+e1-6308~48~ubuntu16.04.1-stable")
+    (source /home/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb.sch)
+    (date "Sam 07 Jän 2017 03:08:40 CET")
+    (tool "Eeschema 4.0.5-e0-6337~49~ubuntu16.04.1")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "Hardpass PCB")
@@ -17,88 +17,82 @@
   (components
     (comp (ref P1)
       (value Pi_Zero)
-      (footprint hardpass:Pin_Header_Mirrored-NoHoles_2x20)
+      (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 Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCA0F))
     (comp (ref SW2)
       (value 2)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCB0D))
     (comp (ref SW3)
       (value 3)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCC13))
     (comp (ref SW4)
       (value 4)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCDB9))
     (comp (ref SW5)
       (value 5)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BCFBE))
     (comp (ref SW6)
       (value 6)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD09D))
     (comp (ref SW7)
       (value 7)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD274))
     (comp (ref SW8)
       (value 8)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD343))
     (comp (ref SW9)
       (value 9)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD459))
     (comp (ref SW10)
       (value C/UP)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD528))
     (comp (ref SW11)
       (value 0/OK)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD6CB))
     (comp (ref SW12)
       (value OK/DN)
-      (footprint Buttons_Switches_SMD:SW_SPST_PTS645)
-      (libsource (lib device) (part SW_PUSH_SMALL))
+      (footprint hardpass:SW_SPST_PTS645_nosilk)
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH_SMALL))
       (sheetpath (names /) (tstamps /))
       (tstamp 572BD811))
-    (comp (ref CON1)
-      (value ER-OLED-FPC20)
-      (footprint hardpass:Solderpads_OLED20Pin_.5mmPitch)
-      (libsource (lib hardpass-pcb-cache) (part ER-OLED-FPC20))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 576AB656))
     (comp (ref C6)
       (value 1µF)
       (footprint Capacitors_SMD:C_1206)
@@ -111,12 +105,6 @@
       (libsource (lib device) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 576AB9B6))
-    (comp (ref C1)
-      (value 1µF)
-      (footprint Capacitors_SMD:C_1206)
-      (libsource (lib device) (part C_Small))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 576ABC45))
     (comp (ref C2)
       (value 1µF)
       (footprint Capacitors_SMD:C_1206)
@@ -155,7 +143,7 @@
       (tstamp 576BB1ED))
     (comp (ref SW13)
       (value SHUTDN)
-      (libsource (lib device) (part SW_PUSH))
+      (libsource (lib hardpass-pcb-cache) (part SW_PUSH))
       (sheetpath (names /) (tstamps /))
       (tstamp 57715A24))
     (comp (ref C7)
@@ -175,10 +163,105 @@
       (footprint Resistors_SMD:R_1206)
       (libsource (lib device) (part R_Small))
       (sheetpath (names /) (tstamps /))
-      (tstamp 58337469)))
+      (tstamp 58337469))
+    (comp (ref R12)
+      (value 33)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B87105))
+    (comp (ref R13)
+      (value 33)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B88365))
+    (comp (ref R14)
+      (value 33)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B88405))
+    (comp (ref R15)
+      (value 33)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B884A8))
+    (comp (ref R16)
+      (value 33)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B8854E))
+    (comp (ref R17)
+      (value 33)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B885F7))
+    (comp (ref U2)
+      (value ESP-12E)
+      (footprint hardpass:ESP-12E_smd)
+      (libsource (lib ESP8266) (part ESP-12E))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 57B86D32))
+    (comp (ref P2)
+      (value OLED_I2C)
+      (footprint adafruit-oled:UG-2864HSWEG01_0.96IN_WRAPAROUND)
+      (libsource (lib conn) (part CONN_01X30))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 58700E5C))
+    (comp (ref C1)
+      (value 1µF)
+      (footprint Capacitors_SMD:C_1206)
+      (libsource (lib device) (part C_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 58702958)))
   (libparts
+    (libpart (lib conn) (part CONN_01X30)
+      (description "Connector, single row, 01x30")
+      (footprints
+        (fp Pin_Header_Straight_1X30)
+        (fp Pin_Header_Angled_1X30)
+        (fp Socket_Strip_Straight_1X30)
+        (fp Socket_Strip_Angled_1X30))
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_01X30))
+      (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 02x20")
+      (description "Connector, double row, 02x20")
       (footprints
         (fp Pin_Header_Straight_2X20)
         (fp Pin_Header_Angled_2X20)
@@ -242,33 +325,39 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib hardpass-pcb-cache) (part ER-OLED-FPC20)
+    (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/)
+      (footprints
+        (fp ESP-12E))
       (fields
-        (field (name Reference) CON)
-        (field (name Value) ER-OLED-FPC20))
+        (field (name Reference) U)
+        (field (name Value) ESP-12E))
       (pins
-        (pin (num 1) (name GND) (type power_in))
-        (pin (num 2) (name C2P) (type passive))
-        (pin (num 3) (name C2N) (type passive))
-        (pin (num 4) (name C1P) (type passive))
-        (pin (num 5) (name C1N) (type passive))
-        (pin (num 6) (name VDDB) (type power_in))
-        (pin (num 7) (name NC) (type NotConnected))
-        (pin (num 8) (name VDD) (type power_in))
-        (pin (num 9) (name VSS) (type power_in))
-        (pin (num 10) (name CS) (type input))
-        (pin (num 11) (name RES) (type input))
-        (pin (num 12) (name D/C) (type input))
-        (pin (num 13) (name SCLK) (type input))
-        (pin (num 14) (name SDIN) (type input))
-        (pin (num 15) (name IREF) (type input))
-        (pin (num 16) (name VCOMH) (type input))
-        (pin (num 17) (name VCC) (type input))
-        (pin (num 18) (name VLSS) (type 3state))
-        (pin (num 19) (name VSS) (type 3state))
-        (pin (num 20) (name GND) (type 3state))))
+        (pin (num 1) (name REST) (type input))
+        (pin (num 2) (name ADC) (type passive))
+        (pin (num 3) (name CH_PD) (type input))
+        (pin (num 4) (name GPIO16) (type BiDi))
+        (pin (num 5) (name GPIO14) (type BiDi))
+        (pin (num 6) (name GPIO12) (type BiDi))
+        (pin (num 7) (name GPIO13) (type BiDi))
+        (pin (num 8) (name VCC) (type power_in))
+        (pin (num 9) (name CS0) (type BiDi))
+        (pin (num 10) (name MISO) (type BiDi))
+        (pin (num 11) (name GPIO9) (type BiDi))
+        (pin (num 12) (name GPIO10) (type BiDi))
+        (pin (num 13) (name MOSI) (type BiDi))
+        (pin (num 14) (name SCLK) (type BiDi))
+        (pin (num 15) (name GND) (type power_in))
+        (pin (num 16) (name GPIO15) (type BiDi))
+        (pin (num 17) (name GPIO2) (type BiDi))
+        (pin (num 18) (name GPIO0) (type BiDi))
+        (pin (num 19) (name GPIO4) (type BiDi))
+        (pin (num 20) (name GPIO5) (type BiDi))
+        (pin (num 21) (name RXD) (type input))
+        (pin (num 22) (name TXD) (type output))))
     (libpart (lib device) (part R_Small)
-      (description Resistor)
+      (description "Resistor, small symbol")
       (footprints
         (fp Resistor_*)
         (fp R_*))
@@ -278,15 +367,14 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part SW_PUSH)
-      (description Button)
+    (libpart (lib hardpass-pcb-cache) (part SW_PUSH)
       (fields
         (field (name Reference) SW)
         (field (name Value) SW_PUSH))
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib device) (part SW_PUSH_SMALL)
+    (libpart (lib hardpass-pcb-cache) (part SW_PUSH_SMALL)
       (fields
         (field (name Reference) SW)
         (field (name Value) SW_PUSH_SMALL))
@@ -296,162 +384,233 @@
   (libraries
     (library (logical conn)
       (uri /usr/share/kicad/library/conn.lib))
-    (library (logical hardpass-pcb-cache)
-      (uri /home/tobias/Desktop/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb-cache.lib))
+    (library (logical ESP8266)
+      (uri kicad-ESP8266/ESP8266.lib))
     (library (logical device)
-      (uri /usr/share/kicad/library/device.lib)))
+      (uri /usr/share/kicad/library/device.lib))
+    (library (logical hardpass-pcb-cache)
+      (uri /home/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb-cache.lib)))
   (nets
-    (net (code 1) (name +3V3)
-      (node (ref C1) (pin 2))
+    (net (code 1) (name "Net-(C3-Pad1)")
+      (node (ref P2) (pin 28))
+      (node (ref C3) (pin 1)))
+    (net (code 2) (name "Net-(C4-Pad1)")
+      (node (ref C4) (pin 1))
+      (node (ref P2) (pin 27)))
+    (net (code 3) (name "Net-(P2-Pad17)")
+      (node (ref P2) (pin 17)))
+    (net (code 4) (name "Net-(P2-Pad26)")
+      (node (ref R1) (pin 1))
+      (node (ref P2) (pin 26)))
+    (net (code 5) (name "Net-(P2-Pad16)")
+      (node (ref P2) (pin 16)))
+    (net (code 6) (name "Net-(P2-Pad25)")
+      (node (ref P2) (pin 25)))
+    (net (code 7) (name "Net-(P2-Pad24)")
+      (node (ref P2) (pin 24)))
+    (net (code 8) (name "Net-(P2-Pad14)")
+      (node (ref P2) (pin 14))
+      (node (ref R3) (pin 1)))
+    (net (code 9) (name "Net-(P2-Pad23)")
+      (node (ref P2) (pin 23)))
+    (net (code 10) (name "Net-(P2-Pad13)")
+      (node (ref P2) (pin 13)))
+    (net (code 11) (name "Net-(P2-Pad22)")
+      (node (ref P2) (pin 22)))
+    (net (code 12) (name "Net-(P2-Pad21)")
+      (node (ref P2) (pin 21)))
+    (net (code 13) (name +3V3)
+      (node (ref U2) (pin 8))
+      (node (ref R2) (pin 2))
+      (node (ref P1) (pin 17))
+      (node (ref P2) (pin 9))
+      (node (ref P2) (pin 6))
       (node (ref C2) (pin 2))
-      (node (ref CON1) (pin 6))
-      (node (ref CON1) (pin 8))
-      (node (ref R11) (pin 2))
-      (node (ref R10) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref P2) (pin 11))
       (node (ref P1) (pin 1))
-      (node (ref P1) (pin 17))
-      (node (ref R2) (pin 2)))
-    (net (code 2) (name GND)
-      (node (ref P1) (pin 25))
-      (node (ref P1) (pin 30))
+      (node (ref R11) (pin 2))
+      (node (ref R10) (pin 2)))
+    (net (code 14) (name GND)
+      (node (ref R1) (pin 2))
       (node (ref C4) (pin 2))
+      (node (ref C2) (pin 1))
+      (node (ref C7) (pin 2))
+      (node (ref C1) (pin 1))
+      (node (ref SW13) (pin 2))
+      (node (ref P1) (pin 14))
+      (node (ref P1) (pin 34))
+      (node (ref P1) (pin 25))
+      (node (ref C3) (pin 2))
       (node (ref P1) (pin 39))
       (node (ref P1) (pin 6))
       (node (ref P1) (pin 9))
+      (node (ref P1) (pin 30))
       (node (ref P1) (pin 20))
-      (node (ref P1) (pin 14))
-      (node (ref P1) (pin 34))
-      (node (ref R1) (pin 2))
-      (node (ref CON1) (pin 18))
-      (node (ref CON1) (pin 19))
-      (node (ref C1) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref C3) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref CON1) (pin 1))
-      (node (ref SW13) (pin 2))
-      (node (ref CON1) (pin 9))
-      (node (ref CON1) (pin 20)))
-    (net (code 3) (name /OLED_RES)
-      (node (ref CON1) (pin 11))
-      (node (ref R3) (pin 1)))
-    (net (code 4) (name "Net-(C7-Pad1)")
-      (node (ref R3) (pin 2))
+      (node (ref U2) (pin 15))
+      (node (ref P2) (pin 1))
+      (node (ref P2) (pin 8))
+      (node (ref P2) (pin 10))
+      (node (ref P2) (pin 30))
+      (node (ref P2) (pin 12))
+      (node (ref P2) (pin 29))
+      (node (ref P2) (pin 15)))
+    (net (code 15) (name "Net-(C7-Pad1)")
+      (node (ref C7) (pin 1))
       (node (ref R2) (pin 1))
-      (node (ref C7) (pin 1)))
-    (net (code 5) (name "Net-(CON1-Pad15)")
-      (node (ref CON1) (pin 15))
-      (node (ref R1) (pin 1)))
-    (net (code 6) (name OLED_SDA)
-      (node (ref P1) (pin 3))
-      (node (ref CON1) (pin 14))
-      (node (ref R11) (pin 1)))
-    (net (code 7) (name OLED_SCL)
-      (node (ref CON1) (pin 13))
-      (node (ref P1) (pin 5))
-      (node (ref R10) (pin 1)))
-    (net (code 8) (name SHUTDOWN)
-      (node (ref P1) (pin 11))
-      (node (ref SW13) (pin 1)))
-    (net (code 9) (name "Net-(C5-Pad2)")
-      (node (ref CON1) (pin 5))
+      (node (ref R3) (pin 2)))
+    (net (code 16) (name "Net-(P2-Pad7)")
+      (node (ref P2) (pin 7)))
+    (net (code 17) (name "Net-(U2-Pad1)")
+      (node (ref U2) (pin 1)))
+    (net (code 18) (name "Net-(U2-Pad20)")
+      (node (ref U2) (pin 20)))
+    (net (code 19) (name "Net-(R13-Pad1)")
+      (node (ref R13) (pin 1))
+      (node (ref U2) (pin 10)))
+    (net (code 20) (name "Net-(R12-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref U2) (pin 9)))
+    (net (code 21) (name "Net-(U2-Pad7)")
+      (node (ref U2) (pin 7)))
+    (net (code 22) (name "Net-(U2-Pad6)")
+      (node (ref U2) (pin 6)))
+    (net (code 23) (name "Net-(U2-Pad5)")
+      (node (ref U2) (pin 5)))
+    (net (code 24) (name "Net-(U2-Pad4)")
+      (node (ref U2) (pin 4)))
+    (net (code 25) (name ESP_CHPD)
+      (node (ref P1) (pin 7))
+      (node (ref U2) (pin 3)))
+    (net (code 26) (name "Net-(U2-Pad2)")
+      (node (ref U2) (pin 2)))
+    (net (code 27) (name "Net-(R14-Pad1)")
+      (node (ref R14) (pin 1))
+      (node (ref U2) (pin 11)))
+    (net (code 28) (name "Net-(U2-Pad19)")
+      (node (ref U2) (pin 19)))
+    (net (code 29) (name "Net-(C5-Pad1)")
+      (node (ref C5) (pin 1))
+      (node (ref P2) (pin 4)))
+    (net (code 30) (name "Net-(C6-Pad1)")
+      (node (ref C6) (pin 1))
+      (node (ref P2) (pin 2)))
+    (net (code 31) (name "Net-(U2-Pad18)")
+      (node (ref U2) (pin 18)))
+    (net (code 32) (name "Net-(U2-Pad17)")
+      (node (ref U2) (pin 17)))
+    (net (code 33) (name "Net-(U2-Pad16)")
+      (node (ref U2) (pin 16)))
+    (net (code 34) (name "Net-(R17-Pad1)")
+      (node (ref R17) (pin 1))
+      (node (ref U2) (pin 14)))
+    (net (code 35) (name "Net-(R16-Pad1)")
+      (node (ref R16) (pin 1))
+      (node (ref U2) (pin 13)))
+    (net (code 36) (name "Net-(U2-Pad22)")
+      (node (ref U2) (pin 22)))
+    (net (code 37) (name "Net-(R15-Pad1)")
+      (node (ref R15) (pin 1))
+      (node (ref U2) (pin 12)))
+    (net (code 38) (name "Net-(U2-Pad21)")
+      (node (ref U2) (pin 21)))
+    (net (code 39) (name "Net-(C5-Pad2)")
+      (node (ref P2) (pin 5))
       (node (ref C5) (pin 2)))
-    (net (code 10) (name "Net-(C6-Pad2)")
-      (node (ref CON1) (pin 3))
-      (node (ref C6) (pin 2)))
-    (net (code 11) (name COL_1)
-      (node (ref SW10) (pin 1))
-      (node (ref SW7) (pin 1))
-      (node (ref SW4) (pin 1))
-      (node (ref SW1) (pin 1))
-      (node (ref P1) (pin 29)))
-    (net (code 12) (name "Net-(P1-Pad19)")
-      (node (ref P1) (pin 19)))
-    (net (code 13) (name ROW_3)
-      (node (ref SW7) (pin 2))
-      (node (ref SW8) (pin 2))
-      (node (ref SW9) (pin 2))
-      (node (ref P1) (pin 38)))
-    (net (code 14) (name "Net-(P1-Pad28)")
+    (net (code 40) (name "Net-(C6-Pad2)")
+      (node (ref C6) (pin 2))
+      (node (ref P2) (pin 3)))
+    (net (code 41) (name "Net-(P1-Pad28)")
       (node (ref P1) (pin 28)))
-    (net (code 15) (name SD_D0)
-      (node (ref P1) (pin 18)))
-    (net (code 16) (name SD_D2)
-      (node (ref P1) (pin 37)))
-    (net (code 17) (name "Net-(P1-Pad27)")
+    (net (code 42) (name "Net-(P1-Pad27)")
       (node (ref P1) (pin 27)))
-    (net (code 18) (name "Net-(P1-Pad12)")
+    (net (code 43) (name "Net-(P1-Pad23)")
+      (node (ref P1) (pin 23)))
+    (net (code 44) (name SD_D3)
+      (node (ref R15) (pin 2))
+      (node (ref P1) (pin 13)))
+    (net (code 45) (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 46) (name SD_D1)
+      (node (ref P1) (pin 22))
+      (node (ref R16) (pin 2)))
+    (net (code 47) (name "Net-(P1-Pad12)")
       (node (ref P1) (pin 12)))
-    (net (code 19) (name "Net-(P1-Pad2)")
-      (node (ref P1) (pin 2)))
-    (net (code 20) (name "Net-(P1-Pad4)")
-      (node (ref P1) (pin 4)))
-    (net (code 21) (name ESP_CHPD)
-      (node (ref P1) (pin 7)))
-    (net (code 22) (name UART_TX)
-      (node (ref P1) (pin 8)))
-    (net (code 23) (name UART_RX)
-      (node (ref P1) (pin 10)))
-    (net (code 24) (name ROW_4)
+    (net (code 48) (name COL_2)
+      (node (ref SW11) (pin 1))
+      (node (ref P1) (pin 31))
+      (node (ref SW2) (pin 1))
+      (node (ref SW8) (pin 1))
+      (node (ref SW5) (pin 1)))
+    (net (code 49) (name "Net-(P1-Pad21)")
+      (node (ref P1) (pin 21)))
+    (net (code 50) (name SHUTDOWN)
+      (node (ref P1) (pin 11))
+      (node (ref SW13) (pin 1)))
+    (net (code 51) (name ROW_4)
       (node (ref SW10) (pin 2))
       (node (ref SW11) (pin 2))
       (node (ref SW12) (pin 2))
       (node (ref P1) (pin 40)))
-    (net (code 25) (name "Net-(P1-Pad21)")
-      (node (ref P1) (pin 21)))
-    (net (code 26) (name COL_2)
-      (node (ref P1) (pin 31))
-      (node (ref SW11) (pin 1))
-      (node (ref SW2) (pin 1))
-      (node (ref SW5) (pin 1))
-      (node (ref SW8) (pin 1)))
-    (net (code 27) (name SD_D1)
-      (node (ref P1) (pin 22)))
-    (net (code 28) (name ROW_1)
-      (node (ref P1) (pin 32))
-      (node (ref SW3) (pin 2))
-      (node (ref SW1) (pin 2))
-      (node (ref SW2) (pin 2)))
-    (net (code 29) (name SD_D3)
-      (node (ref P1) (pin 13)))
-    (net (code 30) (name "Net-(P1-Pad23)")
-      (node (ref P1) (pin 23)))
-    (net (code 31) (name COL_3)
+    (net (code 52) (name COL_3)
+      (node (ref SW6) (pin 1))
       (node (ref SW9) (pin 1))
       (node (ref SW12) (pin 1))
       (node (ref SW3) (pin 1))
-      (node (ref P1) (pin 33))
-      (node (ref SW6) (pin 1)))
-    (net (code 32) (name "Net-(P1-Pad24)")
-      (node (ref P1) (pin 24)))
-    (net (code 33) (name ESP_CLK)
-      (node (ref P1) (pin 15)))
-    (net (code 34) (name "Net-(P1-Pad35)")
-      (node (ref P1) (pin 35)))
-    (net (code 35) (name SD_CMD)
-      (node (ref P1) (pin 16)))
-    (net (code 36) (name "Net-(P1-Pad26)")
-      (node (ref P1) (pin 26)))
-    (net (code 37) (name ROW_2)
+      (node (ref P1) (pin 33)))
+    (net (code 53) (name UART_RX)
+      (node (ref P1) (pin 10)))
+    (net (code 54) (name UART_TX)
+      (node (ref P1) (pin 8)))
+    (net (code 55) (name OLED_SCL)
+      (node (ref P2) (pin 18))
+      (node (ref R10) (pin 1))
+      (node (ref P1) (pin 5)))
+    (net (code 56) (name "Net-(P1-Pad4)")
+      (node (ref P1) (pin 4)))
+    (net (code 57) (name OLED_SDA)
+      (node (ref P2) (pin 19))
+      (node (ref R11) (pin 1))
+      (node (ref P2) (pin 20))
+      (node (ref P1) (pin 3)))
+    (net (code 58) (name "Net-(P1-Pad2)")
+      (node (ref P1) (pin 2)))
+    (net (code 59) (name COL_1)
+      (node (ref SW4) (pin 1))
+      (node (ref SW10) (pin 1))
+      (node (ref SW7) (pin 1))
+      (node (ref SW1) (pin 1))
+      (node (ref P1) (pin 29)))
+    (net (code 60) (name "Net-(P1-Pad19)")
+      (node (ref P1) (pin 19)))
+    (net (code 61) (name ROW_3)
+      (node (ref SW7) (pin 2))
+      (node (ref SW8) (pin 2))
+      (node (ref P1) (pin 38))
+      (node (ref SW9) (pin 2)))
+    (net (code 62) (name SD_D0)
+      (node (ref P1) (pin 18))
+      (node (ref R13) (pin 2)))
+    (net (code 63) (name SD_D2)
+      (node (ref R14) (pin 2))
+      (node (ref P1) (pin 37)))
+    (net (code 64) (name ROW_2)
       (node (ref SW6) (pin 2))
-      (node (ref P1) (pin 36))
+      (node (ref SW5) (pin 2))
       (node (ref SW4) (pin 2))
-      (node (ref SW5) (pin 2)))
-    (net (code 38) (name "Net-(C6-Pad1)")
-      (node (ref C6) (pin 1))
-      (node (ref CON1) (pin 2)))
-    (net (code 39) (name "Net-(C5-Pad1)")
-      (node (ref C5) (pin 1))
-      (node (ref CON1) (pin 4)))
-    (net (code 40) (name "Net-(CON1-Pad7)")
-      (node (ref CON1) (pin 7)))
-    (net (code 41) (name /OLED_CS)
-      (node (ref CON1) (pin 10)))
-    (net (code 42) (name /OLED_DC)
-      (node (ref CON1) (pin 12)))
-    (net (code 43) (name "Net-(C4-Pad1)")
-      (node (ref C4) (pin 1))
-      (node (ref CON1) (pin 16)))
-    (net (code 44) (name "Net-(C3-Pad1)")
-      (node (ref C3) (pin 1))
-      (node (ref CON1) (pin 17)))))
\ No newline at end of file
+      (node (ref P1) (pin 36)))
+    (net (code 65) (name "Net-(P1-Pad26)")
+      (node (ref P1) (pin 26)))
+    (net (code 66) (name SD_CMD)
+      (node (ref P1) (pin 16))
+      (node (ref R12) (pin 2)))
+    (net (code 67) (name "Net-(P1-Pad35)")
+      (node (ref P1) (pin 35)))
+    (net (code 68) (name ESP_CLK)
+      (node (ref P1) (pin 15))
+      (node (ref R17) (pin 2)))
+    (net (code 69) (name "Net-(P1-Pad24)")
+      (node (ref P1) (pin 24)))))
\ No newline at end of file