X-Git-Url: https://git.gir.st/hardpass.git/blobdiff_plain/0b964a2ff705b9e4b31bb5e50feadb5a38a6833a..4beef92da1ad79accca2ef96b506ecfa14b309e7:/kicad/hardpass-pcb/hardpass-pcb.net

diff --git a/kicad/hardpass-pcb/hardpass-pcb.net b/kicad/hardpass-pcb/hardpass-pcb.net
index 23e597f..c4525ff 100755
--- a/kicad/hardpass-pcb/hardpass-pcb.net
+++ b/kicad/hardpass-pcb/hardpass-pcb.net
@@ -1,7 +1,7 @@
 (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")
+    (date "Sam 22 Jul 2017 19:48:47 CEST")
     (tool "Eeschema 4.0.6-e0-6349~53~ubuntu16.04.1")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -94,31 +94,31 @@
       (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 +129,11 @@
       (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)
       (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)
@@ -213,7 +183,7 @@
       (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 /))
@@ -330,8 +300,34 @@
       (footprint hardpass:Pin_Header_Straight_2x20_Pitch2.54mm_centered)
       (libsource (lib conn) (part CONN_02X20))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5881588C)))
+      (tstamp 5881588C))
+    (comp (ref IC1)
+      (value APX803)
+      (footprint TO_SOT_Packages_SMD:SOT-23)
+      (libsource (lib conn) (part CONN_01X03))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 593C6F9B))
+    (comp (ref R2)
+      (value 10k)
+      (footprint Resistors_SMD:R_1206)
+      (libsource (lib device) (part R_Small))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 593C7684)))
   (libparts
+    (libpart (lib conn) (part CONN_01X03)
+      (description "Connector, single row, 01x03, pin header")
+      (footprints
+        (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_01X03))
+      (pins
+        (pin (num 1) (name P1) (type passive))
+        (pin (num 2) (name P2) (type passive))
+        (pin (num 3) (name P3) (type passive))))
     (libpart (lib conn) (part CONN_01X30)
       (description "Connector, single row, 01x30, pin header")
       (footprints
@@ -554,234 +550,240 @@
         (pin (num 32) (name P30/RX) (type input))
         (pin (num ??) (name P31/TX) (type output)))))
   (libraries
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib))
     (library (logical ESP8266)
       (uri /home/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/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/tobias/Desktop/30pin-hardpass/hardpass-passwordmanager/kicad/hardpass-pcb/hardpass-pcb-cache.lib))
+    (library (logical conn)
+      (uri /usr/share/kicad/library/conn.lib))
+    (library (logical device)
+      (uri /usr/share/kicad/library/device.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)")
+    (net (code 1) (name "Net-(R5-Pad2)")
+      (node (ref R5) (pin 2))
+      (node (ref U3) (pin 7)))
+    (net (code 2) (name "Net-(P3-Pad27)")
       (node (ref P3) (pin 27)))
-    (net (code 13) (name "Net-(P3-Pad37)")
+    (net (code 3) (name "Net-(P3-Pad37)")
       (node (ref P3) (pin 37)))
-    (net (code 14) (name "Net-(P3-Pad18)")
+    (net (code 4) (name "Net-(P3-Pad18)")
       (node (ref P3) (pin 18)))
-    (net (code 15) (name "Net-(P3-Pad28)")
+    (net (code 5) (name "Net-(P3-Pad28)")
       (node (ref P3) (pin 28)))
-    (net (code 16) (name "Net-(P3-Pad38)")
+    (net (code 6) (name "Net-(P3-Pad38)")
       (node (ref P3) (pin 38)))
-    (net (code 17) (name "Net-(P3-Pad19)")
+    (net (code 7) (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)")
+    (net (code 8) (name "Net-(P3-Pad29)")
+      (node (ref P3) (pin 29)))
+    (net (code 9) (name "Net-(U1-Pad2)")
+      (node (ref U3) (pin 12))
+      (node (ref U1) (pin 2)))
+    (net (code 10) (name "Net-(C20-Pad2)")
+      (node (ref U3) (pin 15))
+      (node (ref C20) (pin 2)))
+    (net (code 11) (name "Net-(C20-Pad1)")
+      (node (ref C20) (pin 1))
+      (node (ref U3) (pin 17)))
+    (net (code 12) (name "Net-(C17-Pad2)")
+      (node (ref C17) (pin 2))
+      (node (ref U3) (pin 26))
+      (node (ref Y1) (pin 2)))
+    (net (code 13) (name "Net-(C15-Pad2)")
+      (node (ref C15) (pin 2))
+      (node (ref Y1) (pin 1))
+      (node (ref U3) (pin 27)))
+    (net (code 14) (name "Net-(C21-Pad2)")
+      (node (ref C21) (pin 2))
+      (node (ref U3) (pin 14)))
+    (net (code 15) (name OLED_SDA)
+      (node (ref P1) (pin 3))
+      (node (ref P2) (pin 20))
+      (node (ref P2) (pin 19)))
+    (net (code 16) (name "Net-(U3-Pad2)")
+      (node (ref U3) (pin 2)))
+    (net (code 17) (name "Net-(R5-Pad1)")
+      (node (ref R5) (pin 1))
+      (node (ref U1) (pin 7)))
+    (net (code 18) (name "Net-(P3-Pad17)")
+      (node (ref P3) (pin 17)))
+    (net (code 19) (name "Net-(U3-Pad24)")
+      (node (ref U3) (pin 24)))
+    (net (code 20) (name "Net-(C16-Pad1)")
+      (node (ref C16) (pin 1))
+      (node (ref U3) (pin 13)))
+    (net (code 21) (name "Net-(C21-Pad1)")
+      (node (ref C21) (pin 1))
+      (node (ref U3) (pin 19)))
+    (net (code 22) (name "Net-(U3-Pad29)")
+      (node (ref U3) (pin 29)))
+    (net (code 23) (name "Net-(SW14-Pad2)")
+      (node (ref U3) (pin 28))
+      (node (ref SW14) (pin 2)))
+    (net (code 24) (name "Net-(R4-Pad1)")
+      (node (ref R4) (pin 1))
+      (node (ref U1) (pin 3)))
+    (net (code 25) (name "Net-(R4-Pad2)")
+      (node (ref R4) (pin 2))
+      (node (ref U3) (pin 10)))
+    (net (code 26) (name "Net-(C13-Pad1)")
+      (node (ref U3) (pin 6))
+      (node (ref C13) (pin 1)))
+    (net (code 27) (name "Net-(U3-Pad30)")
+      (node (ref U3) (pin 30)))
+    (net (code 28) (name "Net-(U3-Pad22)")
+      (node (ref U3) (pin 22)))
+    (net (code 29) (name "Net-(U3-Pad23)")
+      (node (ref U3) (pin 23)))
+    (net (code 30) (name "Net-(P3-Pad11)")
+      (node (ref P3) (pin 11)))
+    (net (code 31) (name "Net-(P3-Pad21)")
+      (node (ref P3) (pin 21)))
+    (net (code 32) (name "Net-(P3-Pad31)")
+      (node (ref P3) (pin 31)))
+    (net (code 33) (name "Net-(P3-Pad12)")
+      (node (ref P3) (pin 12)))
+    (net (code 34) (name "Net-(P3-Pad22)")
+      (node (ref P3) (pin 22)))
+    (net (code 35) (name "Net-(P3-Pad32)")
+      (node (ref P3) (pin 32)))
+    (net (code 36) (name "Net-(P3-Pad13)")
       (node (ref P3) (pin 13)))
-    (net (code 20) (name GND)
+    (net (code 37) (name "Net-(P3-Pad23)")
+      (node (ref P3) (pin 23)))
+    (net (code 38) (name "Net-(P3-Pad33)")
+      (node (ref P3) (pin 33)))
+    (net (code 39) (name "Net-(P3-Pad40)")
+      (node (ref P3) (pin 40)))
+    (net (code 40) (name "Net-(P3-Pad24)")
+      (node (ref P3) (pin 24)))
+    (net (code 41) (name "Net-(P3-Pad15)")
+      (node (ref P3) (pin 15)))
+    (net (code 42) (name GND)
+      (node (ref U3) (pin 4))
+      (node (ref SW13) (pin 2))
+      (node (ref C2) (pin 1))
+      (node (ref R1) (pin 2))
+      (node (ref C4) (pin 2))
+      (node (ref C3) (pin 2))
+      (node (ref C14) (pin 1))
+      (node (ref C19) (pin 2))
+      (node (ref C16) (pin 2))
+      (node (ref C8) (pin 1))
+      (node (ref C17) (pin 1))
+      (node (ref C15) (pin 1))
+      (node (ref U1) (pin 5))
+      (node (ref C18) (pin 2))
+      (node (ref U2) (pin 15))
+      (node (ref P2) (pin 1))
+      (node (ref P2) (pin 29))
+      (node (ref C1) (pin 1))
       (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))
-      (node (ref P2) (pin 1))
+      (node (ref P2) (pin 30))
+      (node (ref P2) (pin 12))
       (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 14))
+      (node (ref P1) (pin 34))
+      (node (ref P1) (pin 25))
       (node (ref P1) (pin 6))
-      (node (ref SW13) (pin 2))
+      (node (ref P1) (pin 9))
       (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 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 P1) (pin 30))
+      (node (ref P1) (pin 39))
+      (node (ref C11) (pin 1))
+      (node (ref C13) (pin 2))
       (node (ref P3) (pin 6))
       (node (ref P3) (pin 9))
-      (node (ref U3) (pin 4))
+      (node (ref P3) (pin 20))
       (node (ref P3) (pin 30))
-      (node (ref U3) (pin 20))
+      (node (ref P3) (pin 25))
+      (node (ref P3) (pin 39))
       (node (ref U3) (pin 25))
-      (node (ref C15) (pin 1))
       (node (ref U3) (pin 18))
+      (node (ref U3) (pin 9))
+      (node (ref U3) (pin 20))
       (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 IC1) (pin 1)))
+    (net (code 43) (name "Net-(P3-Pad35)")
+      (node (ref P3) (pin 35)))
+    (net (code 44) (name "Net-(P3-Pad16)")
+      (node (ref P3) (pin 16)))
+    (net (code 45) (name "Net-(P3-Pad26)")
+      (node (ref P3) (pin 26)))
+    (net (code 46) (name "Net-(P3-Pad36)")
+      (node (ref P3) (pin 36)))
+    (net (code 47) (name +5V)
+      (node (ref C19) (pin 1))
+      (node (ref U3) (pin 21))
+      (node (ref U3) (pin 16))
+      (node (ref SW14) (pin 1))
+      (node (ref U3) (pin 1))
+      (node (ref U3) (pin 3))
+      (node (ref P3) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref P3) (pin 4))
+      (node (ref C18) (pin 1))
+      (node (ref U3) (pin 8))
+      (node (ref U3) (pin 5))
+      (node (ref U1) (pin 10))
+      (node (ref U1) (pin 9)))
+    (net (code 48) (name "Net-(P3-Pad1)")
+      (node (ref P3) (pin 1)))
+    (net (code 49) (name "Net-(P3-Pad3)")
       (node (ref P3) (pin 3)))
-    (net (code 36) (name "Net-(P3-Pad5)")
+    (net (code 50) (name "Net-(P3-Pad5)")
       (node (ref P3) (pin 5)))
-    (net (code 37) (name "Net-(P3-Pad7)")
+    (net (code 51) (name "Net-(P3-Pad7)")
       (node (ref P3) (pin 7)))
-    (net (code 38) (name CARD_RX)
+    (net (code 52) (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 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)")
+    (net (code 53) (name CARD_TX)
+      (node (ref P3) (pin 10))
+      (node (ref U3) (pin 31)))
+    (net (code 54) (name "Net-(C14-Pad2)")
       (node (ref U1) (pin 1))
-      (node (ref U3) (pin 11))
       (node (ref C14) (pin 2))
+      (node (ref U1) (pin 6))
       (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 U3) (pin 11)))
+    (net (code 55) (name OLED_RST)
+      (node (ref IC1) (pin 2))
+      (node (ref R2) (pin 2))
+      (node (ref P2) (pin 14)))
+    (net (code 56) (name +3V3)
+      (node (ref P1) (pin 17))
+      (node (ref R2) (pin 1))
+      (node (ref P1) (pin 1))
+      (node (ref P2) (pin 9))
+      (node (ref P2) (pin 6))
+      (node (ref P2) (pin 11))
+      (node (ref C1) (pin 2))
+      (node (ref U2) (pin 8))
+      (node (ref IC1) (pin 3))
+      (node (ref C2) (pin 2)))
+    (net (code 57) (name "Net-(C6-Pad2)")
+      (node (ref C6) (pin 2))
+      (node (ref P2) (pin 3)))
+    (net (code 58) (name "Net-(C5-Pad2)")
+      (node (ref P2) (pin 5))
+      (node (ref C5) (pin 2)))
+    (net (code 59) (name OLED_SCL)
+      (node (ref P1) (pin 5))
+      (node (ref P2) (pin 18)))
+    (net (code 60) (name "Net-(C6-Pad1)")
+      (node (ref P2) (pin 2))
+      (node (ref C6) (pin 1)))
+    (net (code 61) (name "Net-(C5-Pad1)")
       (node (ref P2) (pin 4))
       (node (ref C5) (pin 1)))
+    (net (code 62) (name "Net-(C3-Pad1)")
+      (node (ref P2) (pin 28))
+      (node (ref C3) (pin 1)))
     (net (code 63) (name "Net-(C4-Pad1)")
       (node (ref C4) (pin 1))
       (node (ref P2) (pin 27)))
@@ -790,167 +792,155 @@
       (node (ref P2) (pin 26)))
     (net (code 65) (name ROW_2)
       (node (ref SW4) (pin 2))
+      (node (ref SW6) (pin 2))
       (node (ref SW5) (pin 2))
-      (node (ref P1) (pin 36))
-      (node (ref SW6) (pin 2)))
+      (node (ref P1) (pin 36)))
     (net (code 66) (name ROW_3)
-      (node (ref SW8) (pin 2))
       (node (ref SW9) (pin 2))
+      (node (ref SW8) (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)))
+      (node (ref SW12) (pin 2))
+      (node (ref SW10) (pin 2))
+      (node (ref P1) (pin 40)))
+    (net (code 68) (name SD_D1)
+      (node (ref R16) (pin 2))
+      (node (ref P1) (pin 22)))
     (net (code 69) (name "Net-(R12-Pad1)")
-      (node (ref U2) (pin 9))
-      (node (ref R12) (pin 1)))
+      (node (ref R12) (pin 1))
+      (node (ref U2) (pin 9)))
     (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 U2) (pin 10))
+      (node (ref R13) (pin 1)))
+    (net (code 72) (name SD_D0)
+      (node (ref P1) (pin 18))
+      (node (ref R13) (pin 2)))
+    (net (code 73) (name "Net-(R14-Pad1)")
+      (node (ref U2) (pin 11))
+      (node (ref R14) (pin 1)))
+    (net (code 74) (name SD_D2)
+      (node (ref R14) (pin 2))
+      (node (ref P1) (pin 37)))
+    (net (code 75) (name "Net-(R15-Pad1)")
+      (node (ref R15) (pin 1))
+      (node (ref U2) (pin 12)))
+    (net (code 76) (name SD_D3)
+      (node (ref R15) (pin 2))
+      (node (ref P1) (pin 13)))
+    (net (code 77) (name "Net-(R16-Pad1)")
+      (node (ref R16) (pin 1))
+      (node (ref U2) (pin 13)))
+    (net (code 78) (name "Net-(R17-Pad1)")
+      (node (ref R17) (pin 1))
+      (node (ref U2) (pin 14)))
+    (net (code 79) (name ESP_CLK)
+      (node (ref P1) (pin 15))
+      (node (ref R17) (pin 2)))
+    (net (code 80) (name "Net-(U2-Pad17)")
+      (node (ref U2) (pin 17)))
+    (net (code 81) (name "Net-(U2-Pad16)")
+      (node (ref U2) (pin 16)))
+    (net (code 82) (name "Net-(U2-Pad18)")
+      (node (ref U2) (pin 18)))
+    (net (code 83) (name "Net-(U2-Pad19)")
+      (node (ref U2) (pin 19)))
+    (net (code 84) (name SHUTDOWN)
+      (node (ref P1) (pin 11))
+      (node (ref SW13) (pin 1)))
+    (net (code 85) (name "Net-(P1-Pad23)")
       (node (ref P1) (pin 23)))
-    (net (code 75) (name "Net-(P1-Pad24)")
+    (net (code 86) (name "Net-(P1-Pad24)")
       (node (ref P1) (pin 24)))
-    (net (code 76) (name "Net-(P1-Pad35)")
+    (net (code 87) (name "Net-(P1-Pad35)")
       (node (ref P1) (pin 35)))
-    (net (code 77) (name "Net-(P1-Pad27)")
+    (net (code 88) (name "Net-(P1-Pad26)")
+      (node (ref P1) (pin 26)))
+    (net (code 89) (name "Net-(P1-Pad27)")
       (node (ref P1) (pin 27)))
-    (net (code 78) (name "Net-(P1-Pad28)")
+    (net (code 90) (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)")
+    (net (code 91) (name UART_RX)
+      (node (ref P1) (pin 10)))
+    (net (code 92) (name "Net-(P1-Pad2)")
       (node (ref P1) (pin 2)))
-    (net (code 81) (name "Net-(P1-Pad4)")
+    (net (code 93) (name "Net-(P1-Pad4)")
       (node (ref P1) (pin 4)))
-    (net (code 82) (name ESP_CHPD)
+    (net (code 94) (name ESP_CHPD)
       (node (ref P1) (pin 7))
       (node (ref U2) (pin 3)))
-    (net (code 83) (name UART_TX)
+    (net (code 95) (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)")
+    (net (code 96) (name "Net-(P1-Pad19)")
+      (node (ref P1) (pin 19)))
+    (net (code 97) (name "Net-(P1-Pad21)")
       (node (ref P1) (pin 21)))
-    (net (code 86) (name "Net-(P1-Pad12)")
+    (net (code 98) (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))
+    (net (code 99) (name COL_2)
       (node (ref SW8) (pin 1))
+      (node (ref SW2) (pin 1))
+      (node (ref SW5) (pin 1))
       (node (ref SW11) (pin 1))
-      (node (ref SW5) (pin 1)))
-    (net (code 88) (name COL_3)
+      (node (ref P1) (pin 31)))
+    (net (code 100) (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 33))
+      (node (ref SW12) (pin 1))
+      (node (ref SW9) (pin 1)))
+    (net (code 101) (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 SW7) (pin 1))
-      (node (ref SW10) (pin 1))
+    (net (code 102) (name COL_1)
       (node (ref SW1) (pin 1))
+      (node (ref P1) (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 SW10) (pin 1))
+      (node (ref SW7) (pin 1)))
+    (net (code 103) (name "Net-(U2-Pad22)")
+      (node (ref U2) (pin 22)))
+    (net (code 104) (name "Net-(U1-Pad8)")
       (node (ref U1) (pin 8)))
-    (net (code 94) (name "Net-(U1-Pad4)")
+    (net (code 105) (name "Net-(U1-Pad4)")
       (node (ref U1) (pin 4)))
-    (net (code 95) (name "Net-(U2-Pad7)")
+    (net (code 106) (name "Net-(U2-Pad20)")
+      (node (ref U2) (pin 20)))
+    (net (code 107) (name "Net-(U2-Pad21)")
+      (node (ref U2) (pin 21)))
+    (net (code 108) (name "Net-(U2-Pad7)")
       (node (ref U2) (pin 7)))
-    (net (code 96) (name "Net-(U2-Pad6)")
+    (net (code 109) (name "Net-(U2-Pad4)")
+      (node (ref U2) (pin 4)))
+    (net (code 110) (name "Net-(U2-Pad2)")
+      (node (ref U2) (pin 2)))
+    (net (code 111) (name "Net-(U2-Pad6)")
       (node (ref U2) (pin 6)))
-    (net (code 97) (name "Net-(U2-Pad5)")
+    (net (code 112) (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)")
+    (net (code 113) (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 U2) (pin 16)))
-    (net (code 112) (name "Net-(U2-Pad18)")
-      (node (ref U2) (pin 18)))
-    (net (code 113) (name "Net-(U2-Pad19)")
-      (node (ref U2) (pin 19)))
-    (net (code 114) (name "Net-(U2-Pad22)")
-      (node (ref U2) (pin 22)))
-    (net (code 115) (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)")
+    (net (code 114) (name "Net-(P2-Pad16)")
+      (node (ref P2) (pin 16)))
+    (net (code 115) (name "Net-(P2-Pad17)")
+      (node (ref P2) (pin 17)))
+    (net (code 116) (name "Net-(P2-Pad25)")
+      (node (ref P2) (pin 25)))
+    (net (code 117) (name "Net-(P2-Pad7)")
+      (node (ref P2) (pin 7)))
+    (net (code 118) (name "Net-(P2-Pad21)")
       (node (ref P2) (pin 21)))
-    (net (code 118) (name "Net-(P2-Pad22)")
+    (net (code 119) (name "Net-(P2-Pad22)")
       (node (ref P2) (pin 22)))
-    (net (code 119) (name "Net-(P2-Pad13)")
+    (net (code 120) (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 121) (name "Net-(P2-Pad23)")
+      (node (ref P2) (pin 23)))
+    (net (code 122) (name "Net-(P2-Pad24)")
+      (node (ref P2) (pin 24)))))
\ No newline at end of file