From d4a0fad6dc8674e509ac62f46c2beced0a3c89ae Mon Sep 17 00:00:00 2001
From: Ricardo Work <electropepper@yahoo.com>
Date: Tue, 21 Feb 2017 14:10:44 +0000
Subject: [PATCH] Finished schematic.

---
 NMM1_Kicad/nmm1-cache.lib |  60 ++--
 NMM1_Kicad/nmm1.bak       | 561 ++++++++++++++++++++++---------------
 NMM1_Kicad/nmm1.sch       | 567 +++++++++++++++++++++++---------------
 3 files changed, 720 insertions(+), 468 deletions(-)

diff --git a/NMM1_Kicad/nmm1-cache.lib b/NMM1_Kicad/nmm1-cache.lib
index 2936173..4b7188b 100755
--- a/NMM1_Kicad/nmm1-cache.lib
+++ b/NMM1_Kicad/nmm1-cache.lib
@@ -106,29 +106,55 @@ X P2 2 -200 -50 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_01X04
+# CONN_01X03
 #
-DEF CONN_01X04 P 0 40 Y N 1 F N
-F0 "P" 0 250 50 H V C CNN
-F1 "CONN_01X04" 100 0 50 V V C CNN
+DEF CONN_01X03 P 0 40 Y N 1 F N
+F0 "P" 0 200 50 H V C CNN
+F1 "CONN_01X03" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
- Pin_Header_Straight_1X04
- Pin_Header_Angled_1X04
- Socket_Strip_Straight_1X04
- Socket_Strip_Angled_1X04
+ Pin_Header_Straight_1X03
+ Pin_Header_Angled_1X03
+ Socket_Strip_Straight_1X03
+ Socket_Strip_Angled_1X03
 $ENDFPLIST
 DRAW
-S -50 -145 10 -155 0 1 0 N
-S -50 -45 10 -55 0 1 0 N
-S -50 55 10 45 0 1 0 N
-S -50 155 10 145 0 1 0 N
-S -50 200 50 -200 0 1 0 N
-X P1 1 -200 150 150 R 50 50 1 1 P
-X P2 2 -200 50 150 R 50 50 1 1 P
-X P3 3 -200 -50 150 R 50 50 1 1 P
-X P4 4 -200 -150 150 R 50 50 1 1 P
+S -50 -95 10 -105 0 1 0 N
+S -50 5 10 -5 0 1 0 N
+S -50 105 10 95 0 1 0 N
+S -50 150 50 -150 0 1 0 N
+X P1 1 -200 100 150 R 50 50 1 1 P
+X P2 2 -200 0 150 R 50 50 1 1 P
+X P3 3 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_01X05
+#
+DEF CONN_01X05 P 0 40 Y N 1 F N
+F0 "P" 0 300 50 H V C CNN
+F1 "CONN_01X05" 100 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X05
+ Pin_Header_Angled_1X05
+ Socket_Strip_Straight_1X05
+ Socket_Strip_Angled_1X05
+$ENDFPLIST
+DRAW
+S -50 -195 10 -205 0 1 0 N
+S -50 -95 10 -105 0 1 0 N
+S -50 5 10 -5 0 1 0 N
+S -50 105 10 95 0 1 0 N
+S -50 205 10 195 0 1 0 N
+S -50 250 50 -250 0 1 0 N
+X P1 1 -200 200 150 R 50 50 1 1 P
+X P2 2 -200 100 150 R 50 50 1 1 P
+X P3 3 -200 0 150 R 50 50 1 1 P
+X P4 4 -200 -100 150 R 50 50 1 1 P
+X P5 5 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/NMM1_Kicad/nmm1.bak b/NMM1_Kicad/nmm1.bak
index b60ebfb..b058f99 100755
--- a/NMM1_Kicad/nmm1.bak
+++ b/NMM1_Kicad/nmm1.bak
@@ -58,10 +58,10 @@ F 3 "" H 8625 5500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR32
 U 1 1 58800040
 P 10975 5300
-F 0 "#PWR01" H 10975 5050 50  0001 C CNN
+F 0 "#PWR32" H 10975 5050 50  0001 C CNN
 F 1 "GND" H 10975 5150 50  0000 C CNN
 F 2 "" H 10975 5300 50  0000 C CNN
 F 3 "" H 10975 5300 50  0000 C CNN
@@ -69,10 +69,10 @@ F 3 "" H 10975 5300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR20
 U 1 1 58800BCC
 P 7625 6800
-F 0 "#PWR02" H 7625 6550 50  0001 C CNN
+F 0 "#PWR20" H 7625 6550 50  0001 C CNN
 F 1 "GND" H 7625 6650 50  0000 C CNN
 F 2 "" H 7625 6800 50  0000 C CNN
 F 3 "" H 7625 6800 50  0000 C CNN
@@ -80,10 +80,10 @@ F 3 "" H 7625 6800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR03
+L +3V3 #PWR18
 U 1 1 58800C5F
 P 7525 4200
-F 0 "#PWR03" H 7525 4050 50  0001 C CNN
+F 0 "#PWR18" H 7525 4050 50  0001 C CNN
 F 1 "+3V3" H 7525 4340 50  0000 C CNN
 F 2 "" H 7525 4200 50  0000 C CNN
 F 3 "" H 7525 4200 50  0000 C CNN
@@ -102,10 +102,10 @@ F 3 "" H 5325 5550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR7
 U 1 1 588017A5
 P 5425 6700
-F 0 "#PWR04" H 5425 6450 50  0001 C CNN
+F 0 "#PWR7" H 5425 6450 50  0001 C CNN
 F 1 "GND" H 5425 6550 50  0000 C CNN
 F 2 "" H 5425 6700 50  0000 C CNN
 F 3 "" H 5425 6700 50  0000 C CNN
@@ -115,23 +115,23 @@ $EndComp
 $Comp
 L R R7
 U 1 1 58801EE8
-P 10175 6350
-F 0 "R7" H 10275 6250 50  0000 C CNN
-F 1 "1K" H 10075 6450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 10075 6400 50  0001 C CNN
-F 3 "" H 10175 6350 50  0000 C CNN
-	1    10175 6350
+P 10300 6350
+F 0 "R7" H 10400 6250 50  0000 C CNN
+F 1 "1K" H 10200 6450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10200 6400 50  0001 C CNN
+F 3 "" H 10300 6350 50  0000 C CNN
+	1    10300 6350
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R9
 U 1 1 588021DF
-P 10825 6250
-F 0 "R9" H 10775 6100 50  0000 C CNN
-F 1 "10K" H 10725 6400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 10755 6250 50  0001 C CNN
-F 3 "" H 10825 6250 50  0000 C CNN
-	1    10825 6250
+P 10925 6250
+F 0 "R9" H 10875 6100 50  0000 C CNN
+F 1 "10K" H 10825 6400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10855 6250 50  0001 C CNN
+F 3 "" H 10925 6250 50  0000 C CNN
+	1    10925 6250
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -146,10 +146,10 @@ F 3 "" V 2675 5050 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR2
 U 1 1 588157DF
 P 3125 5450
-F 0 "#PWR05" H 3125 5200 50  0001 C CNN
+F 0 "#PWR2" H 3125 5200 50  0001 C CNN
 F 1 "GND" H 3125 5300 50  0000 C CNN
 F 2 "" H 3125 5450 50  0000 C CNN
 F 3 "" H 3125 5450 50  0000 C CNN
@@ -168,10 +168,10 @@ F 3 "" H 3475 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR3
 U 1 1 58815D7B
 P 3475 6200
-F 0 "#PWR06" H 3475 5950 50  0001 C CNN
+F 0 "#PWR3" H 3475 5950 50  0001 C CNN
 F 1 "GND" H 3475 6050 50  0000 C CNN
 F 2 "" H 3475 6200 50  0000 C CNN
 F 3 "" H 3475 6200 50  0000 C CNN
@@ -195,7 +195,7 @@ U 1 1 588171AD
 P 5225 4400
 F 0 "JP2" V 5175 4300 50  0000 C CNN
 F 1 "Jumper" V 5325 4250 50  0000 C CNN
-F 2 "Electropepper parts:Jumper_2_SMD_1.27" H 5225 4400 50  0001 C CNN
+F 2 "Connectors:GS2" H 5225 4400 50  0001 C CNN
 F 3 "" H 5225 4400 50  0000 C CNN
 	1    5225 4400
 	0    1    1    0   
@@ -206,16 +206,16 @@ U 1 1 58817926
 P 4725 4150
 F 0 "JP1" V 4725 4000 60  0000 C CNN
 F 1 "Jumper3" V 4825 4300 39  0000 C CNN
-F 2 "Electropepper parts:Jumper_3_SMD_1.27" H 4825 4150 60  0001 C CNN
+F 2 "Connectors:GS3" H 4825 4150 60  0001 C CNN
 F 3 "" H 4825 4150 60  0001 C CNN
 	1    4725 4150
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR07
+L +3V3 #PWR6
 U 1 1 58818331
 P 4725 3950
-F 0 "#PWR07" H 4725 3800 50  0001 C CNN
+F 0 "#PWR6" H 4725 3800 50  0001 C CNN
 F 1 "+3V3" H 4725 4090 50  0000 C CNN
 F 2 "" H 4725 3950 50  0000 C CNN
 F 3 "" H 4725 3950 50  0000 C CNN
@@ -256,23 +256,23 @@ F 3 "" H 10725 5250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR08
+L +3V3 #PWR30
 U 1 1 5881BF45
-P 10825 6050
-F 0 "#PWR08" H 10825 5900 50  0001 C CNN
-F 1 "+3V3" H 10825 6190 50  0000 C CNN
-F 2 "" H 10825 6050 50  0000 C CNN
-F 3 "" H 10825 6050 50  0000 C CNN
-	1    10825 6050
+P 10925 6050
+F 0 "#PWR30" H 10925 5900 50  0001 C CNN
+F 1 "+3V3" H 10925 6190 50  0000 C CNN
+F 2 "" H 10925 6050 50  0000 C CNN
+F 3 "" H 10925 6050 50  0000 C CNN
+	1    10925 6050
 	1    0    0    -1  
 $EndComp
-Text Label 11025 6450 0    60   ~ 0
+Text Label 11225 6450 0    60   ~ 0
 RESET
 $Comp
-L GND #PWR09
+L GND #PWR19
 U 1 1 5881D109
 P 7625 5400
-F 0 "#PWR09" H 7625 5150 50  0001 C CNN
+F 0 "#PWR19" H 7625 5150 50  0001 C CNN
 F 1 "GND" H 7625 5250 50  0000 C CNN
 F 2 "" H 7625 5400 50  0000 C CNN
 F 3 "" H 7625 5400 50  0000 C CNN
@@ -291,10 +291,10 @@ F 3 "" H 6375 6250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR010
+L +3V3 #PWR14
 U 1 1 5881E300
 P 6925 6150
-F 0 "#PWR010" H 6925 6000 50  0001 C CNN
+F 0 "#PWR14" H 6925 6000 50  0001 C CNN
 F 1 "+3V3" H 6925 6290 50  0000 C CNN
 F 2 "" H 6925 6150 50  0000 C CNN
 F 3 "" H 6925 6150 50  0000 C CNN
@@ -304,12 +304,12 @@ $EndComp
 $Comp
 L R R8
 U 1 1 5881F228
-P 10425 6350
-F 0 "R8" H 10525 6250 50  0000 C CNN
-F 1 "1K" H 10325 6450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 10325 6400 50  0001 C CNN
-F 3 "" H 10425 6350 50  0000 C CNN
-	1    10425 6350
+P 10550 6350
+F 0 "R8" H 10650 6250 50  0000 C CNN
+F 1 "1K" H 10450 6450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10450 6400 50  0001 C CNN
+F 3 "" H 10550 6350 50  0000 C CNN
+	1    10550 6350
 	-1   0    0    1   
 $EndComp
 NoConn ~ 6125 6250
@@ -318,23 +318,23 @@ NoConn ~ 6125 6050
 $Comp
 L SW_Push SW4
 U 1 1 58821233
-P 10825 6700
-F 0 "SW4" V 10925 6800 50  0000 L CNN
-F 1 "SW_Push" V 10825 6500 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_B3S-1000" H 10825 6900 50  0001 C CNN
-F 3 "" H 10825 6900 50  0000 C CNN
-	1    10825 6700
+P 10925 6700
+F 0 "SW4" V 11025 6800 50  0000 L CNN
+F 1 "SW_Push" V 10925 6500 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_B3S-1000" H 10925 6900 50  0001 C CNN
+F 3 "" H 10925 6900 50  0000 C CNN
+	1    10925 6700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR31
 U 1 1 58821A31
-P 10825 6950
-F 0 "#PWR011" H 10825 6700 50  0001 C CNN
-F 1 "GND" H 10825 6800 50  0000 C CNN
-F 2 "" H 10825 6950 50  0000 C CNN
-F 3 "" H 10825 6950 50  0000 C CNN
-	1    10825 6950
+P 10925 6950
+F 0 "#PWR31" H 10925 6700 50  0001 C CNN
+F 1 "GND" H 10925 6800 50  0000 C CNN
+F 2 "" H 10925 6950 50  0000 C CNN
+F 3 "" H 10925 6950 50  0000 C CNN
+	1    10925 6950
 	1    0    0    -1  
 $EndComp
 Text Label 6625 5250 0    60   ~ 0
@@ -356,10 +356,10 @@ F 3 "" H 9400 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR012
+L +3V3 #PWR25
 U 1 1 588241EB
 P 8925 3600
-F 0 "#PWR012" H 8925 3450 50  0001 C CNN
+F 0 "#PWR25" H 8925 3450 50  0001 C CNN
 F 1 "+3V3" H 8925 3740 50  0000 C CNN
 F 2 "" H 8925 3600 50  0000 C CNN
 F 3 "" H 8925 3600 50  0000 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 8925 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR26
 U 1 1 58824336
 P 8925 3925
-F 0 "#PWR013" H 8925 3675 50  0001 C CNN
+F 0 "#PWR26" H 8925 3675 50  0001 C CNN
 F 1 "GND" H 8925 3775 50  0000 C CNN
 F 2 "" H 8925 3925 50  0000 C CNN
 F 3 "" H 8925 3925 50  0000 C CNN
@@ -391,10 +391,10 @@ F 3 "" H 7275 4400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR15
 U 1 1 588259C0
 P 7075 4550
-F 0 "#PWR014" H 7075 4300 50  0001 C CNN
+F 0 "#PWR15" H 7075 4300 50  0001 C CNN
 F 1 "GND" H 7075 4400 50  0000 C CNN
 F 2 "" H 7075 4550 50  0000 C CNN
 F 3 "" H 7075 4550 50  0000 C CNN
@@ -435,10 +435,10 @@ F 3 "" H 3100 3225 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR1
 U 1 1 588868B7
 P 3100 3450
-F 0 "#PWR019" H 3100 3200 50  0001 C CNN
+F 0 "#PWR1" H 3100 3200 50  0001 C CNN
 F 1 "GND" H 3100 3300 50  0000 C CNN
 F 2 "" H 3100 3450 50  0000 C CNN
 F 3 "" H 3100 3450 50  0000 C CNN
@@ -468,10 +468,10 @@ F 3 "" H 5275 3150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR8
 U 1 1 5888AE3C
 P 5475 3325
-F 0 "#PWR020" H 5475 3075 50  0001 C CNN
+F 0 "#PWR8" H 5475 3075 50  0001 C CNN
 F 1 "GND" H 5475 3175 50  0000 C CNN
 F 2 "" H 5475 3325 50  0000 C CNN
 F 3 "" H 5475 3325 50  0000 C CNN
@@ -479,10 +479,10 @@ F 3 "" H 5475 3325 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR9
 U 1 1 5888BD3C
 P 5725 3450
-F 0 "#PWR021" H 5725 3200 50  0001 C CNN
+F 0 "#PWR9" H 5725 3200 50  0001 C CNN
 F 1 "GND" H 5725 3300 50  0000 C CNN
 F 2 "" H 5725 3450 50  0000 C CNN
 F 3 "" H 5725 3450 50  0000 C CNN
@@ -501,10 +501,10 @@ F 3 "" H 6075 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR11
 U 1 1 58896C56
 P 6125 2800
-F 0 "#PWR022" H 6125 2550 50  0001 C CNN
+F 0 "#PWR11" H 6125 2550 50  0001 C CNN
 F 1 "GND" H 6125 2650 50  0000 C CNN
 F 2 "" H 6125 2800 50  0000 C CNN
 F 3 "" H 6125 2800 50  0000 C CNN
@@ -545,10 +545,10 @@ F 3 "" H 8500 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR12
 U 1 1 58899DC7
 P 6400 3525
-F 0 "#PWR023" H 6400 3275 50  0001 C CNN
+F 0 "#PWR12" H 6400 3275 50  0001 C CNN
 F 1 "GND" H 6400 3375 50  0000 C CNN
 F 2 "" H 6400 3525 50  0000 C CNN
 F 3 "" H 6400 3525 50  0000 C CNN
@@ -556,10 +556,10 @@ F 3 "" H 6400 3525 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR21
 U 1 1 5889C3E6
 P 7900 3525
-F 0 "#PWR024" H 7900 3275 50  0001 C CNN
+F 0 "#PWR21" H 7900 3275 50  0001 C CNN
 F 1 "GND" H 7900 3375 50  0000 C CNN
 F 2 "" H 7900 3525 50  0000 C CNN
 F 3 "" H 7900 3525 50  0000 C CNN
@@ -578,10 +578,10 @@ F 3 "" H 8075 3025 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR24
 U 1 1 5889CDDE
 P 8500 3475
-F 0 "#PWR025" H 8500 3225 50  0001 C CNN
+F 0 "#PWR24" H 8500 3225 50  0001 C CNN
 F 1 "GND" H 8500 3325 50  0000 C CNN
 F 2 "" H 8500 3475 50  0000 C CNN
 F 3 "" H 8500 3475 50  0000 C CNN
@@ -589,10 +589,10 @@ F 3 "" H 8500 3475 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR026
+L +3V3 #PWR23
 U 1 1 5889D9E5
 P 8500 2950
-F 0 "#PWR026" H 8500 2800 50  0001 C CNN
+F 0 "#PWR23" H 8500 2800 50  0001 C CNN
 F 1 "+3V3" H 8500 3090 50  0000 C CNN
 F 2 "" H 8500 2950 50  0000 C CNN
 F 3 "" H 8500 2950 50  0000 C CNN
@@ -665,103 +665,103 @@ $EndComp
 $Comp
 L R R3
 U 1 1 5894FF99
-P 6200 9125
-F 0 "R3" H 6150 8975 50  0000 C CNN
-F 1 "10K" H 6100 9275 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 6130 9125 50  0001 C CNN
-F 3 "" H 6200 9125 50  0000 C CNN
-	1    6200 9125
+P 3500 7775
+F 0 "R3" H 3450 7625 50  0000 C CNN
+F 1 "10K" H 3400 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3430 7775 50  0001 C CNN
+F 3 "" H 3500 7775 50  0000 C CNN
+	1    3500 7775
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR037
+L +3V3 #PWR5
 U 1 1 5894FF9F
-P 6200 8925
-F 0 "#PWR037" H 6200 8775 50  0001 C CNN
-F 1 "+3V3" H 6200 9065 50  0000 C CNN
-F 2 "" H 6200 8925 50  0000 C CNN
-F 3 "" H 6200 8925 50  0000 C CNN
-	1    6200 8925
+P 4625 7575
+F 0 "#PWR5" H 4625 7425 50  0001 C CNN
+F 1 "+3V3" H 4625 7715 50  0000 C CNN
+F 2 "" H 4625 7575 50  0000 C CNN
+F 3 "" H 4625 7575 50  0000 C CNN
+	1    4625 7575
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 5895063D
-P 7325 9125
-F 0 "R4" H 7275 8975 50  0000 C CNN
-F 1 "10K" H 7225 9275 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 7255 9125 50  0001 C CNN
-F 3 "" H 7325 9125 50  0000 C CNN
-	1    7325 9125
+P 4625 7775
+F 0 "R4" H 4575 7625 50  0000 C CNN
+F 1 "10K" H 4525 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 4555 7775 50  0001 C CNN
+F 3 "" H 4625 7775 50  0000 C CNN
+	1    4625 7775
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR038
+L +3V3 #PWR10
 U 1 1 58950643
-P 7325 8925
-F 0 "#PWR038" H 7325 8775 50  0001 C CNN
-F 1 "+3V3" H 7325 9065 50  0000 C CNN
-F 2 "" H 7325 8925 50  0000 C CNN
-F 3 "" H 7325 8925 50  0000 C CNN
-	1    7325 8925
+P 5750 7575
+F 0 "#PWR10" H 5750 7425 50  0001 C CNN
+F 1 "+3V3" H 5750 7715 50  0000 C CNN
+F 2 "" H 5750 7575 50  0000 C CNN
+F 3 "" H 5750 7575 50  0000 C CNN
+	1    5750 7575
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 58950803
-P 8450 9125
-F 0 "R5" H 8400 8975 50  0000 C CNN
-F 1 "10K" H 8350 9275 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 8380 9125 50  0001 C CNN
-F 3 "" H 8450 9125 50  0000 C CNN
-	1    8450 9125
+P 5750 7775
+F 0 "R5" H 5700 7625 50  0000 C CNN
+F 1 "10K" H 5650 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 5680 7775 50  0001 C CNN
+F 3 "" H 5750 7775 50  0000 C CNN
+	1    5750 7775
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR039
+L +3V3 #PWR13
 U 1 1 58950809
-P 8450 8925
-F 0 "#PWR039" H 8450 8775 50  0001 C CNN
-F 1 "+3V3" H 8450 9065 50  0000 C CNN
-F 2 "" H 8450 8925 50  0000 C CNN
-F 3 "" H 8450 8925 50  0000 C CNN
-	1    8450 8925
+P 6875 7575
+F 0 "#PWR13" H 6875 7425 50  0001 C CNN
+F 1 "+3V3" H 6875 7715 50  0000 C CNN
+F 2 "" H 6875 7575 50  0000 C CNN
+F 3 "" H 6875 7575 50  0000 C CNN
+	1    6875 7575
 	1    0    0    -1  
 $EndComp
-Text Label 6425 9325 0    60   ~ 0
-BTN_1
-Text Label 7550 9325 0    60   ~ 0
+Text Label 7100 7975 0    60   ~ 0
+BTN_4
+Text Label 4850 7975 0    60   ~ 0
 BTN_2
-Text Label 8675 9325 0    60   ~ 0
+Text Label 5975 7975 0    60   ~ 0
 BTN_3
 NoConn ~ 3025 5050
 $Comp
-L CONN_01X04 P8
+L CONN_01X05 P8
 U 1 1 589D3AE4
-P 9025 9775
-F 0 "P8" H 9025 10025 50  0000 C CNN
-F 1 "CONN_01X04" V 9125 9775 50  0000 C CNN
-F 2 "Connectors_Phoenix:PhoenixContact_MC-G_04x5.08mm_Angled" H 9025 9775 50  0001 C CNN
-F 3 "" H 9025 9775 50  0000 C CNN
-	1    9025 9775
+P 7450 8475
+F 0 "P8" H 7450 8775 50  0000 C CNN
+F 1 "CONN_01X05" V 7550 8475 50  0000 C CNN
+F 2 "Connectors_Phoenix:PhoenixContact_MC-G_04x5.08mm_Angled" H 7450 8475 50  0001 C CNN
+F 3 "" H 7450 8475 50  0000 C CNN
+	1    7450 8475
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR16
 U 1 1 589D4B80
-P 8750 10000
-F 0 "#PWR040" H 8750 9750 50  0001 C CNN
-F 1 "GND" H 8750 9850 50  0000 C CNN
-F 2 "" H 8750 10000 50  0000 C CNN
-F 3 "" H 8750 10000 50  0000 C CNN
-	1    8750 10000
+P 7175 8750
+F 0 "#PWR16" H 7175 8500 50  0001 C CNN
+F 1 "GND" H 7175 8600 50  0000 C CNN
+F 2 "" H 7175 8750 50  0000 C CNN
+F 3 "" H 7175 8750 50  0000 C CNN
+	1    7175 8750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR17
 U 1 1 589EDA0C
 P 7300 3725
-F 0 "#PWR042" H 7300 3475 50  0001 C CNN
+F 0 "#PWR17" H 7300 3475 50  0001 C CNN
 F 1 "GND" H 7300 3575 50  0000 C CNN
 F 2 "" H 7300 3725 50  0000 C CNN
 F 3 "" H 7300 3725 50  0000 C CNN
@@ -769,21 +769,21 @@ F 3 "" H 7300 3725 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X05 P?
+L CONN_02X05 P6
 U 1 1 58AC71D2
 P 10675 3225
-F 0 "P?" H 10675 3525 50  0000 C CNN
+F 0 "P6" H 10675 3525 50  0000 C CNN
 F 1 "CONN_02X05" H 10675 2925 50  0000 C CNN
-F 2 "" H 10675 2025 50  0000 C CNN
+F 2 "Connectors_Multicomp:Multicomp_MC9A12-1034_2x05x2.54mm_Straight" H 10675 2025 50  0001 C CNN
 F 3 "" H 10675 2025 50  0000 C CNN
 	1    10675 3225
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR?
+L +3V3 #PWR28
 U 1 1 58AC9036
 P 10475 2900
-F 0 "#PWR?" H 10475 2750 50  0001 C CNN
+F 0 "#PWR28" H 10475 2750 50  0001 C CNN
 F 1 "+3V3" H 10475 3040 50  0000 C CNN
 F 2 "" H 10475 2900 50  0000 C CNN
 F 3 "" H 10475 2900 50  0000 C CNN
@@ -907,16 +907,16 @@ Wire Wire Line
 	10875 5250 10975 5250
 Connection ~ 10975 5250
 Wire Wire Line
-	9625 5850 10625 5850
+	9625 5850 10725 5850
 Wire Wire Line
-	10625 5850 10625 6450
+	10725 5850 10725 6450
 Wire Wire Line
-	10625 6450 11275 6450
+	10725 6450 11525 6450
 Wire Wire Line
-	10825 6400 10825 6500
-Connection ~ 10825 6450
+	10925 6400 10925 6500
+Connection ~ 10925 6450
 Wire Wire Line
-	10825 6100 10825 6050
+	10925 6100 10925 6050
 Wire Wire Line
 	7725 5000 7625 5000
 Wire Wire Line
@@ -944,31 +944,31 @@ Wire Wire Line
 	6675 6400 6675 6500
 Connection ~ 6675 6500
 Wire Wire Line
-	9625 6100 10175 6100
+	9625 6100 10300 6100
 Wire Wire Line
-	10175 6100 10175 6200
+	10300 6100 10300 6200
 Wire Wire Line
-	9625 6000 10425 6000
+	9625 6000 10550 6000
 Wire Wire Line
-	10425 6000 10425 6200
+	10550 6000 10550 6200
 Wire Wire Line
 	6125 4950 7225 4950
 Wire Wire Line
 	7225 4950 7225 7100
 Wire Wire Line
-	7225 7100 10175 7100
+	7225 7100 10300 7100
 Wire Wire Line
-	10175 7100 10175 6500
+	10300 7100 10300 6500
 Wire Wire Line
-	10425 6500 10425 7200
+	10550 6500 10550 7200
 Wire Wire Line
-	10425 7200 7125 7200
+	10550 7200 7125 7200
 Wire Wire Line
 	7125 7200 7125 4850
 Wire Wire Line
 	7125 4850 6125 4850
 Wire Wire Line
-	10825 6900 10825 6950
+	10925 6900 10925 6950
 Wire Wire Line
 	6125 5250 6225 5250
 Wire Wire Line
@@ -1100,45 +1100,45 @@ Wire Wire Line
 Wire Wire Line
 	10050 4350 11125 4350
 Wire Wire Line
-	6200 9275 6200 9825
-Connection ~ 6200 9325
+	4625 7925 4625 8475
+Connection ~ 4625 7975
 Wire Wire Line
-	6200 8975 6200 8925
+	4625 7625 4625 7575
 Wire Wire Line
-	7325 9275 7325 9725
-Connection ~ 7325 9325
+	5750 7925 5750 8375
+Connection ~ 5750 7975
 Wire Wire Line
-	7325 8975 7325 8925
+	5750 7625 5750 7575
 Wire Wire Line
-	8450 9275 8450 9625
-Connection ~ 8450 9325
+	6875 7925 6875 8275
+Connection ~ 6875 7975
 Wire Wire Line
-	8450 8975 8450 8925
+	6875 7625 6875 7575
 Wire Wire Line
-	6200 9325 6750 9325
+	4625 7975 5175 7975
 Wire Wire Line
-	7325 9325 7875 9325
+	5750 7975 6300 7975
 Wire Wire Line
-	8450 9325 9000 9325
+	6875 7975 7425 7975
 Wire Wire Line
-	8450 9625 8825 9625
+	6875 8275 7250 8275
 Wire Wire Line
-	7325 9725 8825 9725
+	5750 8375 7250 8375
 Wire Wire Line
-	6200 9825 8825 9825
+	4625 8475 7250 8475
 Wire Wire Line
-	8825 9925 8750 9925
+	7250 8675 7175 8675
 Wire Wire Line
-	8750 9925 8750 10000
+	7175 8675 7175 8750
 Wire Wire Line
 	7300 3675 7300 3725
 Wire Wire Line
 	10475 2900 10475 2975
 $Comp
-L GND #PWR?
+L GND #PWR29
 U 1 1 58ACBA19
 P 10475 3550
-F 0 "#PWR?" H 10475 3300 50  0001 C CNN
+F 0 "#PWR29" H 10475 3300 50  0001 C CNN
 F 1 "GND" H 10475 3400 50  0000 C CNN
 F 2 "" H 10475 3550 50  0000 C CNN
 F 3 "" H 10475 3550 50  0000 C CNN
@@ -1179,77 +1179,190 @@ NoConn ~ 10575 3475
 NoConn ~ 10775 2975
 NoConn ~ 10575 2975
 Wire Wire Line
-	9625 5750 9850 5750
+	9625 5750 10125 5750
 Wire Wire Line
-	9850 5750 9850 7400
+	10125 5750 10125 7400
 Wire Wire Line
-	9850 7400 9625 7400
+	10125 7400 8425 7400
 $Comp
-L R R?
+L R R13
 U 1 1 58AE025B
-P 9475 7400
-F 0 "R?" V 9550 7450 50  0000 C CNN
-F 1 "330K" V 9375 7400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9375 7450 50  0001 C CNN
-F 3 "" H 9475 7400 50  0000 C CNN
-	1    9475 7400
+P 8275 7400
+F 0 "R13" V 8350 7450 50  0000 C CNN
+F 1 "330K" V 8175 7400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 8175 7450 50  0001 C CNN
+F 3 "" H 8275 7400 50  0000 C CNN
+	1    8275 7400
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	9325 7400 8850 7400
-Text Label 8875 7400 0    60   ~ 0
+	7650 7400 8125 7400
+Text Label 7675 7400 0    60   ~ 0
 VBatt
 $Comp
-L R R?
+L R R10
 U 1 1 58AE3757
-P 9200 7650
-F 0 "R?" H 9100 7725 50  0000 C CNN
-F 1 "36K" H 9325 7575 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9100 7700 50  0001 C CNN
-F 3 "" H 9200 7650 50  0000 C CNN
-	1    9200 7650
+P 8000 7650
+F 0 "R10" H 7900 7725 50  0000 C CNN
+F 1 "36K" H 8125 7575 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7900 7700 50  0001 C CNN
+F 3 "" H 8000 7650 50  0000 C CNN
+	1    8000 7650
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R11
 U 1 1 58AE393C
-P 9200 8025
-F 0 "R?" H 9100 8100 50  0000 C CNN
-F 1 "330R" H 9350 7950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9100 8075 50  0001 C CNN
-F 3 "" H 9200 8025 50  0000 C CNN
-	1    9200 8025
+P 8000 8025
+F 0 "R11" H 7900 8100 50  0000 C CNN
+F 1 "330R" H 8150 7950 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7900 8075 50  0001 C CNN
+F 3 "" H 8000 8025 50  0000 C CNN
+	1    8000 8025
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R12
 U 1 1 58AE3E88
-P 9200 8400
-F 0 "R?" H 9100 8475 50  0000 C CNN
-F 1 "330R" H 9350 8325 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9100 8450 50  0001 C CNN
-F 3 "" H 9200 8400 50  0000 C CNN
-	1    9200 8400
+P 8000 8400
+F 0 "R12" H 7900 8475 50  0000 C CNN
+F 1 "330R" H 8150 8325 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7900 8450 50  0001 C CNN
+F 3 "" H 8000 8400 50  0000 C CNN
+	1    8000 8400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9200 7500 9200 7400
-Connection ~ 9200 7400
+	8000 7500 8000 7400
+Connection ~ 8000 7400
 Wire Wire Line
-	9200 7800 9200 7875
+	8000 7800 8000 7875
 $Comp
-L GND #PWR?
+L GND #PWR22
 U 1 1 58AE7333
-P 9200 8625
-F 0 "#PWR?" H 9200 8375 50  0001 C CNN
-F 1 "GND" H 9200 8475 50  0000 C CNN
-F 2 "" H 9200 8625 50  0000 C CNN
-F 3 "" H 9200 8625 50  0000 C CNN
-	1    9200 8625
+P 8000 8625
+F 0 "#PWR22" H 8000 8375 50  0001 C CNN
+F 1 "GND" H 8000 8475 50  0000 C CNN
+F 2 "" H 8000 8625 50  0000 C CNN
+F 3 "" H 8000 8625 50  0000 C CNN
+	1    8000 8625
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9200 8625 9200 8550
+	8000 8625 8000 8550
 Wire Wire Line
-	9200 8250 9200 8175
+	8000 8250 8000 8175
+$Comp
+L CONN_01X03 P2
+U 1 1 58AC3DF0
+P 10650 7625
+F 0 "P2" H 10650 7825 50  0000 C CNN
+F 1 "Serial 1" H 10850 7650 50  0000 C CNN
+F 2 "Connectors:PINHEAD1-3" H 10650 7625 50  0001 C CNN
+F 3 "" H 10650 7625 50  0000 C CNN
+	1    10650 7625
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9625 6700 9700 6700
+Wire Wire Line
+	9700 6700 9700 8250
+Wire Wire Line
+	9700 8250 10450 8250
+Wire Wire Line
+	9625 6600 9775 6600
+Wire Wire Line
+	9775 6600 9775 8150
+Wire Wire Line
+	9775 8150 10450 8150
+Wire Wire Line
+	9625 6400 10050 6400
+Wire Wire Line
+	10050 6400 10050 7525
+Wire Wire Line
+	10050 7525 10450 7525
+Wire Wire Line
+	9625 6500 9975 6500
+Wire Wire Line
+	9975 6500 9975 7625
+Wire Wire Line
+	9975 7625 10450 7625
+Wire Wire Line
+	10450 7725 10375 7725
+Wire Wire Line
+	10375 7725 10375 8425
+Wire Wire Line
+	10450 8350 10375 8350
+Connection ~ 10375 8350
+$Comp
+L GND #PWR27
+U 1 1 58AC7D39
+P 10375 8425
+F 0 "#PWR27" H 10375 8175 50  0001 C CNN
+F 1 "GND" H 10375 8275 50  0000 C CNN
+F 2 "" H 10375 8425 50  0000 C CNN
+F 3 "" H 10375 8425 50  0000 C CNN
+	1    10375 8425
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_01X03 P5
+U 1 1 58AC9EA0
+P 10650 8250
+F 0 "P5" H 10650 8450 50  0000 C CNN
+F 1 "Serial 2" H 10850 8275 50  0000 C CNN
+F 2 "Connectors:PINHEAD1-3" H 10650 8250 50  0001 C CNN
+F 3 "" H 10650 8250 50  0000 C CNN
+	1    10650 8250
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R6
+U 1 1 58AD148C
+P 6875 7775
+F 0 "R6" H 6825 7625 50  0000 C CNN
+F 1 "10K" H 6775 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6805 7775 50  0001 C CNN
+F 3 "" H 6875 7775 50  0000 C CNN
+	1    6875 7775
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3500 7925 3500 8575
+Wire Wire Line
+	3500 8575 7250 8575
+Text Label 3725 7975 0    60   ~ 0
+BTN_1
+Wire Wire Line
+	4050 7975 3500 7975
+Connection ~ 3500 7975
+$Comp
+L +3V3 #PWR4
+U 1 1 58ADA9ED
+P 3500 7575
+F 0 "#PWR4" H 3500 7425 50  0001 C CNN
+F 1 "+3V3" H 3500 7715 50  0000 C CNN
+F 2 "" H 3500 7575 50  0000 C CNN
+F 3 "" H 3500 7575 50  0000 C CNN
+	1    3500 7575
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3500 7625 3500 7575
+Text Label 9700 5250 0    60   ~ 0
+BTN_1
+Text Label 9700 5350 0    60   ~ 0
+BTN_2
+Text Label 9700 5450 0    60   ~ 0
+BTN_3
+Text Label 9700 5550 0    60   ~ 0
+BTN_4
+Wire Wire Line
+	9625 5250 10025 5250
+Wire Wire Line
+	9625 5350 10025 5350
+Wire Wire Line
+	9625 5450 10025 5450
+Wire Wire Line
+	9625 5550 10025 5550
 $EndSCHEMATC
diff --git a/NMM1_Kicad/nmm1.sch b/NMM1_Kicad/nmm1.sch
index d81f8c2..f837bd6 100755
--- a/NMM1_Kicad/nmm1.sch
+++ b/NMM1_Kicad/nmm1.sch
@@ -37,9 +37,9 @@ EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 1 1
-Title ""
+Title "NMM-1"
 Date ""
-Rev ""
+Rev "A"
 Comp ""
 Comment1 ""
 Comment2 ""
@@ -58,10 +58,10 @@ F 3 "" H 8625 5500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR32
 U 1 1 58800040
 P 10975 5300
-F 0 "#PWR01" H 10975 5050 50  0001 C CNN
+F 0 "#PWR32" H 10975 5050 50  0001 C CNN
 F 1 "GND" H 10975 5150 50  0000 C CNN
 F 2 "" H 10975 5300 50  0000 C CNN
 F 3 "" H 10975 5300 50  0000 C CNN
@@ -69,10 +69,10 @@ F 3 "" H 10975 5300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR20
 U 1 1 58800BCC
 P 7625 6800
-F 0 "#PWR02" H 7625 6550 50  0001 C CNN
+F 0 "#PWR20" H 7625 6550 50  0001 C CNN
 F 1 "GND" H 7625 6650 50  0000 C CNN
 F 2 "" H 7625 6800 50  0000 C CNN
 F 3 "" H 7625 6800 50  0000 C CNN
@@ -80,10 +80,10 @@ F 3 "" H 7625 6800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR03
+L +3V3 #PWR18
 U 1 1 58800C5F
 P 7525 4200
-F 0 "#PWR03" H 7525 4050 50  0001 C CNN
+F 0 "#PWR18" H 7525 4050 50  0001 C CNN
 F 1 "+3V3" H 7525 4340 50  0000 C CNN
 F 2 "" H 7525 4200 50  0000 C CNN
 F 3 "" H 7525 4200 50  0000 C CNN
@@ -102,10 +102,10 @@ F 3 "" H 5325 5550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR7
 U 1 1 588017A5
 P 5425 6700
-F 0 "#PWR04" H 5425 6450 50  0001 C CNN
+F 0 "#PWR7" H 5425 6450 50  0001 C CNN
 F 1 "GND" H 5425 6550 50  0000 C CNN
 F 2 "" H 5425 6700 50  0000 C CNN
 F 3 "" H 5425 6700 50  0000 C CNN
@@ -115,23 +115,23 @@ $EndComp
 $Comp
 L R R7
 U 1 1 58801EE8
-P 10175 6350
-F 0 "R7" H 10275 6250 50  0000 C CNN
-F 1 "1K" H 10075 6450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 10075 6400 50  0001 C CNN
-F 3 "" H 10175 6350 50  0000 C CNN
-	1    10175 6350
+P 10300 6350
+F 0 "R7" H 10400 6250 50  0000 C CNN
+F 1 "1K" H 10200 6450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10200 6400 50  0001 C CNN
+F 3 "" H 10300 6350 50  0000 C CNN
+	1    10300 6350
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R9
 U 1 1 588021DF
-P 10825 6250
-F 0 "R9" H 10775 6100 50  0000 C CNN
-F 1 "10K" H 10725 6400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 10755 6250 50  0001 C CNN
-F 3 "" H 10825 6250 50  0000 C CNN
-	1    10825 6250
+P 10925 6250
+F 0 "R9" H 10875 6100 50  0000 C CNN
+F 1 "10K" H 10825 6400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10855 6250 50  0001 C CNN
+F 3 "" H 10925 6250 50  0000 C CNN
+	1    10925 6250
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -146,10 +146,10 @@ F 3 "" V 2675 5050 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR2
 U 1 1 588157DF
 P 3125 5450
-F 0 "#PWR05" H 3125 5200 50  0001 C CNN
+F 0 "#PWR2" H 3125 5200 50  0001 C CNN
 F 1 "GND" H 3125 5300 50  0000 C CNN
 F 2 "" H 3125 5450 50  0000 C CNN
 F 3 "" H 3125 5450 50  0000 C CNN
@@ -168,10 +168,10 @@ F 3 "" H 3475 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR3
 U 1 1 58815D7B
 P 3475 6200
-F 0 "#PWR06" H 3475 5950 50  0001 C CNN
+F 0 "#PWR3" H 3475 5950 50  0001 C CNN
 F 1 "GND" H 3475 6050 50  0000 C CNN
 F 2 "" H 3475 6200 50  0000 C CNN
 F 3 "" H 3475 6200 50  0000 C CNN
@@ -195,7 +195,7 @@ U 1 1 588171AD
 P 5225 4400
 F 0 "JP2" V 5175 4300 50  0000 C CNN
 F 1 "Jumper" V 5325 4250 50  0000 C CNN
-F 2 "Electropepper parts:Jumper_2_SMD_1.27" H 5225 4400 50  0001 C CNN
+F 2 "Connectors:GS2" H 5225 4400 50  0001 C CNN
 F 3 "" H 5225 4400 50  0000 C CNN
 	1    5225 4400
 	0    1    1    0   
@@ -206,16 +206,16 @@ U 1 1 58817926
 P 4725 4150
 F 0 "JP1" V 4725 4000 60  0000 C CNN
 F 1 "Jumper3" V 4825 4300 39  0000 C CNN
-F 2 "Electropepper parts:Jumper_3_SMD_1.27" H 4825 4150 60  0001 C CNN
+F 2 "Connectors:GS3" H 4825 4150 60  0001 C CNN
 F 3 "" H 4825 4150 60  0001 C CNN
 	1    4725 4150
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR07
+L +3V3 #PWR6
 U 1 1 58818331
 P 4725 3950
-F 0 "#PWR07" H 4725 3800 50  0001 C CNN
+F 0 "#PWR6" H 4725 3800 50  0001 C CNN
 F 1 "+3V3" H 4725 4090 50  0000 C CNN
 F 2 "" H 4725 3950 50  0000 C CNN
 F 3 "" H 4725 3950 50  0000 C CNN
@@ -256,23 +256,23 @@ F 3 "" H 10725 5250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR08
+L +3V3 #PWR30
 U 1 1 5881BF45
-P 10825 6050
-F 0 "#PWR08" H 10825 5900 50  0001 C CNN
-F 1 "+3V3" H 10825 6190 50  0000 C CNN
-F 2 "" H 10825 6050 50  0000 C CNN
-F 3 "" H 10825 6050 50  0000 C CNN
-	1    10825 6050
+P 10925 6050
+F 0 "#PWR30" H 10925 5900 50  0001 C CNN
+F 1 "+3V3" H 10925 6190 50  0000 C CNN
+F 2 "" H 10925 6050 50  0000 C CNN
+F 3 "" H 10925 6050 50  0000 C CNN
+	1    10925 6050
 	1    0    0    -1  
 $EndComp
-Text Label 11125 6450 0    60   ~ 0
+Text Label 11225 6450 0    60   ~ 0
 RESET
 $Comp
-L GND #PWR09
+L GND #PWR19
 U 1 1 5881D109
 P 7625 5400
-F 0 "#PWR09" H 7625 5150 50  0001 C CNN
+F 0 "#PWR19" H 7625 5150 50  0001 C CNN
 F 1 "GND" H 7625 5250 50  0000 C CNN
 F 2 "" H 7625 5400 50  0000 C CNN
 F 3 "" H 7625 5400 50  0000 C CNN
@@ -291,10 +291,10 @@ F 3 "" H 6375 6250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR010
+L +3V3 #PWR14
 U 1 1 5881E300
 P 6925 6150
-F 0 "#PWR010" H 6925 6000 50  0001 C CNN
+F 0 "#PWR14" H 6925 6000 50  0001 C CNN
 F 1 "+3V3" H 6925 6290 50  0000 C CNN
 F 2 "" H 6925 6150 50  0000 C CNN
 F 3 "" H 6925 6150 50  0000 C CNN
@@ -304,12 +304,12 @@ $EndComp
 $Comp
 L R R8
 U 1 1 5881F228
-P 10425 6350
-F 0 "R8" H 10525 6250 50  0000 C CNN
-F 1 "1K" H 10325 6450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 10325 6400 50  0001 C CNN
-F 3 "" H 10425 6350 50  0000 C CNN
-	1    10425 6350
+P 10550 6350
+F 0 "R8" H 10650 6250 50  0000 C CNN
+F 1 "1K" H 10450 6450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10450 6400 50  0001 C CNN
+F 3 "" H 10550 6350 50  0000 C CNN
+	1    10550 6350
 	-1   0    0    1   
 $EndComp
 NoConn ~ 6125 6250
@@ -318,23 +318,23 @@ NoConn ~ 6125 6050
 $Comp
 L SW_Push SW4
 U 1 1 58821233
-P 10825 6700
-F 0 "SW4" V 10925 6800 50  0000 L CNN
-F 1 "SW_Push" V 10825 6500 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_B3S-1000" H 10825 6900 50  0001 C CNN
-F 3 "" H 10825 6900 50  0000 C CNN
-	1    10825 6700
+P 10925 6700
+F 0 "SW4" V 11025 6800 50  0000 L CNN
+F 1 "SW_Push" V 10925 6500 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_B3S-1000" H 10925 6900 50  0001 C CNN
+F 3 "" H 10925 6900 50  0000 C CNN
+	1    10925 6700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR31
 U 1 1 58821A31
-P 10825 6950
-F 0 "#PWR011" H 10825 6700 50  0001 C CNN
-F 1 "GND" H 10825 6800 50  0000 C CNN
-F 2 "" H 10825 6950 50  0000 C CNN
-F 3 "" H 10825 6950 50  0000 C CNN
-	1    10825 6950
+P 10925 6950
+F 0 "#PWR31" H 10925 6700 50  0001 C CNN
+F 1 "GND" H 10925 6800 50  0000 C CNN
+F 2 "" H 10925 6950 50  0000 C CNN
+F 3 "" H 10925 6950 50  0000 C CNN
+	1    10925 6950
 	1    0    0    -1  
 $EndComp
 Text Label 6625 5250 0    60   ~ 0
@@ -356,10 +356,10 @@ F 3 "" H 9400 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR012
+L +3V3 #PWR25
 U 1 1 588241EB
 P 8925 3600
-F 0 "#PWR012" H 8925 3450 50  0001 C CNN
+F 0 "#PWR25" H 8925 3450 50  0001 C CNN
 F 1 "+3V3" H 8925 3740 50  0000 C CNN
 F 2 "" H 8925 3600 50  0000 C CNN
 F 3 "" H 8925 3600 50  0000 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 8925 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR26
 U 1 1 58824336
 P 8925 3925
-F 0 "#PWR013" H 8925 3675 50  0001 C CNN
+F 0 "#PWR26" H 8925 3675 50  0001 C CNN
 F 1 "GND" H 8925 3775 50  0000 C CNN
 F 2 "" H 8925 3925 50  0000 C CNN
 F 3 "" H 8925 3925 50  0000 C CNN
@@ -391,10 +391,10 @@ F 3 "" H 7275 4400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR15
 U 1 1 588259C0
 P 7075 4550
-F 0 "#PWR014" H 7075 4300 50  0001 C CNN
+F 0 "#PWR15" H 7075 4300 50  0001 C CNN
 F 1 "GND" H 7075 4400 50  0000 C CNN
 F 2 "" H 7075 4550 50  0000 C CNN
 F 3 "" H 7075 4550 50  0000 C CNN
@@ -435,10 +435,10 @@ F 3 "" H 3100 3225 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR1
 U 1 1 588868B7
 P 3100 3450
-F 0 "#PWR019" H 3100 3200 50  0001 C CNN
+F 0 "#PWR1" H 3100 3200 50  0001 C CNN
 F 1 "GND" H 3100 3300 50  0000 C CNN
 F 2 "" H 3100 3450 50  0000 C CNN
 F 3 "" H 3100 3450 50  0000 C CNN
@@ -468,10 +468,10 @@ F 3 "" H 5275 3150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR8
 U 1 1 5888AE3C
 P 5475 3325
-F 0 "#PWR020" H 5475 3075 50  0001 C CNN
+F 0 "#PWR8" H 5475 3075 50  0001 C CNN
 F 1 "GND" H 5475 3175 50  0000 C CNN
 F 2 "" H 5475 3325 50  0000 C CNN
 F 3 "" H 5475 3325 50  0000 C CNN
@@ -479,10 +479,10 @@ F 3 "" H 5475 3325 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR9
 U 1 1 5888BD3C
 P 5725 3450
-F 0 "#PWR021" H 5725 3200 50  0001 C CNN
+F 0 "#PWR9" H 5725 3200 50  0001 C CNN
 F 1 "GND" H 5725 3300 50  0000 C CNN
 F 2 "" H 5725 3450 50  0000 C CNN
 F 3 "" H 5725 3450 50  0000 C CNN
@@ -501,10 +501,10 @@ F 3 "" H 6075 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR11
 U 1 1 58896C56
 P 6125 2800
-F 0 "#PWR022" H 6125 2550 50  0001 C CNN
+F 0 "#PWR11" H 6125 2550 50  0001 C CNN
 F 1 "GND" H 6125 2650 50  0000 C CNN
 F 2 "" H 6125 2800 50  0000 C CNN
 F 3 "" H 6125 2800 50  0000 C CNN
@@ -545,10 +545,10 @@ F 3 "" H 8500 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR12
 U 1 1 58899DC7
 P 6400 3525
-F 0 "#PWR023" H 6400 3275 50  0001 C CNN
+F 0 "#PWR12" H 6400 3275 50  0001 C CNN
 F 1 "GND" H 6400 3375 50  0000 C CNN
 F 2 "" H 6400 3525 50  0000 C CNN
 F 3 "" H 6400 3525 50  0000 C CNN
@@ -556,10 +556,10 @@ F 3 "" H 6400 3525 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR21
 U 1 1 5889C3E6
 P 7900 3525
-F 0 "#PWR024" H 7900 3275 50  0001 C CNN
+F 0 "#PWR21" H 7900 3275 50  0001 C CNN
 F 1 "GND" H 7900 3375 50  0000 C CNN
 F 2 "" H 7900 3525 50  0000 C CNN
 F 3 "" H 7900 3525 50  0000 C CNN
@@ -578,10 +578,10 @@ F 3 "" H 8075 3025 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR24
 U 1 1 5889CDDE
 P 8500 3475
-F 0 "#PWR025" H 8500 3225 50  0001 C CNN
+F 0 "#PWR24" H 8500 3225 50  0001 C CNN
 F 1 "GND" H 8500 3325 50  0000 C CNN
 F 2 "" H 8500 3475 50  0000 C CNN
 F 3 "" H 8500 3475 50  0000 C CNN
@@ -589,10 +589,10 @@ F 3 "" H 8500 3475 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR026
+L +3V3 #PWR23
 U 1 1 5889D9E5
 P 8500 2950
-F 0 "#PWR026" H 8500 2800 50  0001 C CNN
+F 0 "#PWR23" H 8500 2800 50  0001 C CNN
 F 1 "+3V3" H 8500 3090 50  0000 C CNN
 F 2 "" H 8500 2950 50  0000 C CNN
 F 3 "" H 8500 2950 50  0000 C CNN
@@ -665,103 +665,103 @@ $EndComp
 $Comp
 L R R3
 U 1 1 5894FF99
-P 6200 9125
-F 0 "R3" H 6150 8975 50  0000 C CNN
-F 1 "10K" H 6100 9275 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 6130 9125 50  0001 C CNN
-F 3 "" H 6200 9125 50  0000 C CNN
-	1    6200 9125
+P 3500 7775
+F 0 "R3" H 3450 7625 50  0000 C CNN
+F 1 "10K" H 3400 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3430 7775 50  0001 C CNN
+F 3 "" H 3500 7775 50  0000 C CNN
+	1    3500 7775
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR037
+L +3V3 #PWR5
 U 1 1 5894FF9F
-P 6200 8925
-F 0 "#PWR037" H 6200 8775 50  0001 C CNN
-F 1 "+3V3" H 6200 9065 50  0000 C CNN
-F 2 "" H 6200 8925 50  0000 C CNN
-F 3 "" H 6200 8925 50  0000 C CNN
-	1    6200 8925
+P 4625 7575
+F 0 "#PWR5" H 4625 7425 50  0001 C CNN
+F 1 "+3V3" H 4625 7715 50  0000 C CNN
+F 2 "" H 4625 7575 50  0000 C CNN
+F 3 "" H 4625 7575 50  0000 C CNN
+	1    4625 7575
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 5895063D
-P 7325 9125
-F 0 "R4" H 7275 8975 50  0000 C CNN
-F 1 "10K" H 7225 9275 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 7255 9125 50  0001 C CNN
-F 3 "" H 7325 9125 50  0000 C CNN
-	1    7325 9125
+P 4625 7775
+F 0 "R4" H 4575 7625 50  0000 C CNN
+F 1 "10K" H 4525 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 4555 7775 50  0001 C CNN
+F 3 "" H 4625 7775 50  0000 C CNN
+	1    4625 7775
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR038
+L +3V3 #PWR10
 U 1 1 58950643
-P 7325 8925
-F 0 "#PWR038" H 7325 8775 50  0001 C CNN
-F 1 "+3V3" H 7325 9065 50  0000 C CNN
-F 2 "" H 7325 8925 50  0000 C CNN
-F 3 "" H 7325 8925 50  0000 C CNN
-	1    7325 8925
+P 5750 7575
+F 0 "#PWR10" H 5750 7425 50  0001 C CNN
+F 1 "+3V3" H 5750 7715 50  0000 C CNN
+F 2 "" H 5750 7575 50  0000 C CNN
+F 3 "" H 5750 7575 50  0000 C CNN
+	1    5750 7575
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 58950803
-P 8450 9125
-F 0 "R5" H 8400 8975 50  0000 C CNN
-F 1 "10K" H 8350 9275 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 8380 9125 50  0001 C CNN
-F 3 "" H 8450 9125 50  0000 C CNN
-	1    8450 9125
+P 5750 7775
+F 0 "R5" H 5700 7625 50  0000 C CNN
+F 1 "10K" H 5650 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 5680 7775 50  0001 C CNN
+F 3 "" H 5750 7775 50  0000 C CNN
+	1    5750 7775
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR039
+L +3V3 #PWR13
 U 1 1 58950809
-P 8450 8925
-F 0 "#PWR039" H 8450 8775 50  0001 C CNN
-F 1 "+3V3" H 8450 9065 50  0000 C CNN
-F 2 "" H 8450 8925 50  0000 C CNN
-F 3 "" H 8450 8925 50  0000 C CNN
-	1    8450 8925
+P 6875 7575
+F 0 "#PWR13" H 6875 7425 50  0001 C CNN
+F 1 "+3V3" H 6875 7715 50  0000 C CNN
+F 2 "" H 6875 7575 50  0000 C CNN
+F 3 "" H 6875 7575 50  0000 C CNN
+	1    6875 7575
 	1    0    0    -1  
 $EndComp
-Text Label 6425 9325 0    60   ~ 0
-BTN_1
-Text Label 7550 9325 0    60   ~ 0
+Text Label 7100 7975 0    60   ~ 0
+BTN_4
+Text Label 4850 7975 0    60   ~ 0
 BTN_2
-Text Label 8675 9325 0    60   ~ 0
+Text Label 5975 7975 0    60   ~ 0
 BTN_3
 NoConn ~ 3025 5050
 $Comp
-L CONN_01X04 P8
+L CONN_01X05 P8
 U 1 1 589D3AE4
-P 9025 9775
-F 0 "P8" H 9025 10025 50  0000 C CNN
-F 1 "CONN_01X04" V 9125 9775 50  0000 C CNN
-F 2 "Connectors_Phoenix:PhoenixContact_MC-G_04x5.08mm_Angled" H 9025 9775 50  0001 C CNN
-F 3 "" H 9025 9775 50  0000 C CNN
-	1    9025 9775
+P 7450 8475
+F 0 "P8" H 7450 8775 50  0000 C CNN
+F 1 "CONN_01X05" V 7550 8475 50  0000 C CNN
+F 2 "Connectors_Phoenix:PhoenixContact_MC-G_04x5.08mm_Angled" H 7450 8475 50  0001 C CNN
+F 3 "" H 7450 8475 50  0000 C CNN
+	1    7450 8475
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR16
 U 1 1 589D4B80
-P 8750 10000
-F 0 "#PWR040" H 8750 9750 50  0001 C CNN
-F 1 "GND" H 8750 9850 50  0000 C CNN
-F 2 "" H 8750 10000 50  0000 C CNN
-F 3 "" H 8750 10000 50  0000 C CNN
-	1    8750 10000
+P 7175 8750
+F 0 "#PWR16" H 7175 8500 50  0001 C CNN
+F 1 "GND" H 7175 8600 50  0000 C CNN
+F 2 "" H 7175 8750 50  0000 C CNN
+F 3 "" H 7175 8750 50  0000 C CNN
+	1    7175 8750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR17
 U 1 1 589EDA0C
 P 7300 3725
-F 0 "#PWR042" H 7300 3475 50  0001 C CNN
+F 0 "#PWR17" H 7300 3475 50  0001 C CNN
 F 1 "GND" H 7300 3575 50  0000 C CNN
 F 2 "" H 7300 3725 50  0000 C CNN
 F 3 "" H 7300 3725 50  0000 C CNN
@@ -769,21 +769,21 @@ F 3 "" H 7300 3725 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X05 P?
+L CONN_02X05 P6
 U 1 1 58AC71D2
 P 10675 3225
-F 0 "P?" H 10675 3525 50  0000 C CNN
+F 0 "P6" H 10675 3525 50  0000 C CNN
 F 1 "CONN_02X05" H 10675 2925 50  0000 C CNN
-F 2 "" H 10675 2025 50  0000 C CNN
+F 2 "Connectors_Multicomp:Multicomp_MC9A12-1034_2x05x2.54mm_Straight" H 10675 2025 50  0001 C CNN
 F 3 "" H 10675 2025 50  0000 C CNN
 	1    10675 3225
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR?
+L +3V3 #PWR28
 U 1 1 58AC9036
 P 10475 2900
-F 0 "#PWR?" H 10475 2750 50  0001 C CNN
+F 0 "#PWR28" H 10475 2750 50  0001 C CNN
 F 1 "+3V3" H 10475 3040 50  0000 C CNN
 F 2 "" H 10475 2900 50  0000 C CNN
 F 3 "" H 10475 2900 50  0000 C CNN
@@ -878,7 +878,7 @@ Wire Wire Line
 Wire Wire Line
 	4725 4300 4725 4450
 Wire Wire Line
-	3275 4450 4725 4450
+	4725 4450 3275 4450
 Wire Wire Line
 	3275 5350 3025 5350
 Wire Wire Line
@@ -907,16 +907,16 @@ Wire Wire Line
 	10875 5250 10975 5250
 Connection ~ 10975 5250
 Wire Wire Line
-	9625 5850 10625 5850
+	9625 5850 10725 5850
 Wire Wire Line
-	10625 5850 10625 6450
+	10725 5850 10725 6450
 Wire Wire Line
-	10625 6450 11425 6450
+	10725 6450 11525 6450
 Wire Wire Line
-	10825 6400 10825 6500
-Connection ~ 10825 6450
+	10925 6400 10925 6500
+Connection ~ 10925 6450
 Wire Wire Line
-	10825 6100 10825 6050
+	10925 6100 10925 6050
 Wire Wire Line
 	7725 5000 7625 5000
 Wire Wire Line
@@ -944,31 +944,31 @@ Wire Wire Line
 	6675 6400 6675 6500
 Connection ~ 6675 6500
 Wire Wire Line
-	9625 6100 10175 6100
+	9625 6100 10300 6100
 Wire Wire Line
-	10175 6100 10175 6200
+	10300 6100 10300 6200
 Wire Wire Line
-	9625 6000 10425 6000
+	9625 6000 10550 6000
 Wire Wire Line
-	10425 6000 10425 6200
+	10550 6000 10550 6200
 Wire Wire Line
 	6125 4950 7225 4950
 Wire Wire Line
 	7225 4950 7225 7100
 Wire Wire Line
-	7225 7100 10175 7100
+	7225 7100 10300 7100
 Wire Wire Line
-	10175 7100 10175 6500
+	10300 7100 10300 6500
 Wire Wire Line
-	10425 6500 10425 7200
+	10550 6500 10550 7200
 Wire Wire Line
-	10425 7200 7125 7200
+	10550 7200 7125 7200
 Wire Wire Line
 	7125 7200 7125 4850
 Wire Wire Line
 	7125 4850 6125 4850
 Wire Wire Line
-	10825 6900 10825 6950
+	10925 6900 10925 6950
 Wire Wire Line
 	6125 5250 6225 5250
 Wire Wire Line
@@ -1100,45 +1100,45 @@ Wire Wire Line
 Wire Wire Line
 	10050 4350 11125 4350
 Wire Wire Line
-	6200 9275 6200 9825
-Connection ~ 6200 9325
+	4625 7925 4625 8475
+Connection ~ 4625 7975
 Wire Wire Line
-	6200 8975 6200 8925
+	4625 7625 4625 7575
 Wire Wire Line
-	7325 9275 7325 9725
-Connection ~ 7325 9325
+	5750 7925 5750 8375
+Connection ~ 5750 7975
 Wire Wire Line
-	7325 8975 7325 8925
+	5750 7625 5750 7575
 Wire Wire Line
-	8450 9275 8450 9625
-Connection ~ 8450 9325
+	6875 7925 6875 8275
+Connection ~ 6875 7975
 Wire Wire Line
-	8450 8975 8450 8925
+	6875 7625 6875 7575
 Wire Wire Line
-	6200 9325 6750 9325
+	4625 7975 5175 7975
 Wire Wire Line
-	7325 9325 7875 9325
+	5750 7975 6300 7975
 Wire Wire Line
-	8450 9325 9000 9325
+	6875 7975 7425 7975
 Wire Wire Line
-	8450 9625 8825 9625
+	6875 8275 7250 8275
 Wire Wire Line
-	7325 9725 8825 9725
+	5750 8375 7250 8375
 Wire Wire Line
-	6200 9825 8825 9825
+	4625 8475 7250 8475
 Wire Wire Line
-	8825 9925 8750 9925
+	7250 8675 7175 8675
 Wire Wire Line
-	8750 9925 8750 10000
+	7175 8675 7175 8750
 Wire Wire Line
 	7300 3675 7300 3725
 Wire Wire Line
 	10475 2900 10475 2975
 $Comp
-L GND #PWR?
+L GND #PWR29
 U 1 1 58ACBA19
 P 10475 3550
-F 0 "#PWR?" H 10475 3300 50  0001 C CNN
+F 0 "#PWR29" H 10475 3300 50  0001 C CNN
 F 1 "GND" H 10475 3400 50  0000 C CNN
 F 2 "" H 10475 3550 50  0000 C CNN
 F 3 "" H 10475 3550 50  0000 C CNN
@@ -1179,77 +1179,190 @@ NoConn ~ 10575 3475
 NoConn ~ 10775 2975
 NoConn ~ 10575 2975
 Wire Wire Line
-	9625 5750 9850 5750
+	9625 5750 10125 5750
 Wire Wire Line
-	9850 5750 9850 7400
+	10125 5750 10125 7400
 Wire Wire Line
-	9850 7400 9625 7400
+	10125 7400 8425 7400
 $Comp
-L R R?
+L R R13
 U 1 1 58AE025B
-P 9475 7400
-F 0 "R?" V 9550 7450 50  0000 C CNN
-F 1 "330K" V 9375 7400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9375 7450 50  0001 C CNN
-F 3 "" H 9475 7400 50  0000 C CNN
-	1    9475 7400
+P 8275 7400
+F 0 "R13" V 8350 7450 50  0000 C CNN
+F 1 "330K" V 8175 7400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 8175 7450 50  0001 C CNN
+F 3 "" H 8275 7400 50  0000 C CNN
+	1    8275 7400
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	8850 7400 9325 7400
-Text Label 8875 7400 0    60   ~ 0
+	7650 7400 8125 7400
+Text Label 7675 7400 0    60   ~ 0
 VBatt
 $Comp
-L R R?
+L R R10
 U 1 1 58AE3757
-P 9200 7650
-F 0 "R?" H 9100 7725 50  0000 C CNN
-F 1 "36K" H 9325 7575 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9100 7700 50  0001 C CNN
-F 3 "" H 9200 7650 50  0000 C CNN
-	1    9200 7650
+P 8000 7650
+F 0 "R10" H 7900 7725 50  0000 C CNN
+F 1 "36K" H 8125 7575 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7900 7700 50  0001 C CNN
+F 3 "" H 8000 7650 50  0000 C CNN
+	1    8000 7650
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R11
 U 1 1 58AE393C
-P 9200 8025
-F 0 "R?" H 9100 8100 50  0000 C CNN
-F 1 "330R" H 9350 7950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9100 8075 50  0001 C CNN
-F 3 "" H 9200 8025 50  0000 C CNN
-	1    9200 8025
+P 8000 8025
+F 0 "R11" H 7900 8100 50  0000 C CNN
+F 1 "330R" H 8150 7950 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7900 8075 50  0001 C CNN
+F 3 "" H 8000 8025 50  0000 C CNN
+	1    8000 8025
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R12
 U 1 1 58AE3E88
-P 9200 8400
-F 0 "R?" H 9100 8475 50  0000 C CNN
-F 1 "330R" H 9350 8325 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 9100 8450 50  0001 C CNN
-F 3 "" H 9200 8400 50  0000 C CNN
-	1    9200 8400
+P 8000 8400
+F 0 "R12" H 7900 8475 50  0000 C CNN
+F 1 "330R" H 8150 8325 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7900 8450 50  0001 C CNN
+F 3 "" H 8000 8400 50  0000 C CNN
+	1    8000 8400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9200 7500 9200 7400
-Connection ~ 9200 7400
+	8000 7500 8000 7400
+Connection ~ 8000 7400
 Wire Wire Line
-	9200 7800 9200 7875
+	8000 7800 8000 7875
 $Comp
-L GND #PWR?
+L GND #PWR22
 U 1 1 58AE7333
-P 9200 8625
-F 0 "#PWR?" H 9200 8375 50  0001 C CNN
-F 1 "GND" H 9200 8475 50  0000 C CNN
-F 2 "" H 9200 8625 50  0000 C CNN
-F 3 "" H 9200 8625 50  0000 C CNN
-	1    9200 8625
+P 8000 8625
+F 0 "#PWR22" H 8000 8375 50  0001 C CNN
+F 1 "GND" H 8000 8475 50  0000 C CNN
+F 2 "" H 8000 8625 50  0000 C CNN
+F 3 "" H 8000 8625 50  0000 C CNN
+	1    8000 8625
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9200 8625 9200 8550
+	8000 8625 8000 8550
 Wire Wire Line
-	9200 8250 9200 8175
+	8000 8250 8000 8175
+$Comp
+L CONN_01X03 P2
+U 1 1 58AC3DF0
+P 10650 7625
+F 0 "P2" H 10650 7825 50  0000 C CNN
+F 1 "Serial 1" H 10850 7650 50  0000 C CNN
+F 2 "Connectors:PINHEAD1-3" H 10650 7625 50  0001 C CNN
+F 3 "" H 10650 7625 50  0000 C CNN
+	1    10650 7625
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9625 6700 9700 6700
+Wire Wire Line
+	9700 6700 9700 8250
+Wire Wire Line
+	9700 8250 10450 8250
+Wire Wire Line
+	9625 6600 9775 6600
+Wire Wire Line
+	9775 6600 9775 8150
+Wire Wire Line
+	9775 8150 10450 8150
+Wire Wire Line
+	9625 6400 10050 6400
+Wire Wire Line
+	10050 6400 10050 7525
+Wire Wire Line
+	10050 7525 10450 7525
+Wire Wire Line
+	9625 6500 9975 6500
+Wire Wire Line
+	9975 6500 9975 7625
+Wire Wire Line
+	9975 7625 10450 7625
+Wire Wire Line
+	10450 7725 10375 7725
+Wire Wire Line
+	10375 7725 10375 8425
+Wire Wire Line
+	10450 8350 10375 8350
+Connection ~ 10375 8350
+$Comp
+L GND #PWR27
+U 1 1 58AC7D39
+P 10375 8425
+F 0 "#PWR27" H 10375 8175 50  0001 C CNN
+F 1 "GND" H 10375 8275 50  0000 C CNN
+F 2 "" H 10375 8425 50  0000 C CNN
+F 3 "" H 10375 8425 50  0000 C CNN
+	1    10375 8425
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_01X03 P5
+U 1 1 58AC9EA0
+P 10650 8250
+F 0 "P5" H 10650 8450 50  0000 C CNN
+F 1 "Serial 2" H 10850 8275 50  0000 C CNN
+F 2 "Connectors:PINHEAD1-3" H 10650 8250 50  0001 C CNN
+F 3 "" H 10650 8250 50  0000 C CNN
+	1    10650 8250
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R6
+U 1 1 58AD148C
+P 6875 7775
+F 0 "R6" H 6825 7625 50  0000 C CNN
+F 1 "10K" H 6775 7925 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6805 7775 50  0001 C CNN
+F 3 "" H 6875 7775 50  0000 C CNN
+	1    6875 7775
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3500 7925 3500 8575
+Wire Wire Line
+	3500 8575 7250 8575
+Text Label 3725 7975 0    60   ~ 0
+BTN_1
+Wire Wire Line
+	4050 7975 3500 7975
+Connection ~ 3500 7975
+$Comp
+L +3V3 #PWR4
+U 1 1 58ADA9ED
+P 3500 7575
+F 0 "#PWR4" H 3500 7425 50  0001 C CNN
+F 1 "+3V3" H 3500 7715 50  0000 C CNN
+F 2 "" H 3500 7575 50  0000 C CNN
+F 3 "" H 3500 7575 50  0000 C CNN
+	1    3500 7575
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3500 7625 3500 7575
+Text Label 9700 5250 0    60   ~ 0
+BTN_1
+Text Label 9700 5350 0    60   ~ 0
+BTN_2
+Text Label 9700 5450 0    60   ~ 0
+BTN_3
+Text Label 9700 5550 0    60   ~ 0
+BTN_4
+Wire Wire Line
+	9625 5250 10025 5250
+Wire Wire Line
+	9625 5350 10025 5350
+Wire Wire Line
+	9625 5450 10025 5450
+Wire Wire Line
+	9625 5550 10025 5550
 $EndSCHEMATC