From aabcbba93b3c40850925020c4f9515a45c7240f7 Mon Sep 17 00:00:00 2001
From: Ricardo <ricardo@electropepper.org>
Date: Tue, 20 Nov 2018 12:27:42 +0000
Subject: [PATCH] Finished commenting v01 code, updated schematic to new Kicad
 5 version.

---
 NMM1_Kicad/rev_B/nmm1_B-cache.lib             |  210 ++-
 NMM1_Kicad/rev_B/nmm1_B-rescue.lib            |  473 +++++-
 NMM1_Kicad/rev_B/nmm1_B.bak                   |  162 +-
 NMM1_Kicad/rev_B/nmm1_B.pro                   |   40 +-
 NMM1_Kicad/rev_B/nmm1_B.sch                   |  349 ++--
 .../nmm1_B-2018-11-19-22-24-22.pro            |   64 +
 .../nmm1_B-2018-11-19-22-24-22.sch            | 1462 +++++++++++++++++
 .../nmm1_B-2018-11-20-11-04-32.pro            |   30 +
 .../nmm1_B-2018-11-20-11-04-32.sch            | 1462 +++++++++++++++++
 .../nmm1_B-cache-2018-11-19-22-24-22.lib      |  477 ++++++
 .../nmm1_B-cache-2018-11-20-11-04-32.lib      |  477 ++++++
 .../nmm1_B-rescue-2018-11-19-22-24-22.lib     |    4 +
 .../nmm1_B-rescue-2018-11-20-11-04-32.lib     |  347 ++++
 .../sym-lib-table-2018-11-20-11-04-32         |    4 +
 NMM1_Kicad/rev_B/sym-lib-table                |    3 +
 firmware/v01/v01.ino                          |  578 ++++---
 16 files changed, 5495 insertions(+), 647 deletions(-)
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.pro
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.sch
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.pro
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.sch
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-19-22-24-22.lib
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-20-11-04-32.lib
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-19-22-24-22.lib
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-20-11-04-32.lib
 create mode 100644 NMM1_Kicad/rev_B/rescue-backup/sym-lib-table-2018-11-20-11-04-32
 create mode 100644 NMM1_Kicad/rev_B/sym-lib-table

diff --git a/NMM1_Kicad/rev_B/nmm1_B-cache.lib b/NMM1_Kicad/rev_B/nmm1_B-cache.lib
index 61a52c6..d59724b 100644
--- a/NMM1_Kicad/rev_B/nmm1_B-cache.lib
+++ b/NMM1_Kicad/rev_B/nmm1_B-cache.lib
@@ -1,14 +1,13 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# +3V3
+# nmm1_B-rescue_+3V3
 #
-DEF +3V3 #PWR 0 0 Y Y 1 F P
+DEF nmm1_B-rescue_+3V3 #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+3V3" 0 140 50 H V C CNN
+F1 "nmm1_B-rescue_+3V3" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
 DRAW
 P 2 0 1 0 -30 50 0 100 N
 P 2 0 1 0 0 0 0 100 N
@@ -17,59 +16,58 @@ X +3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# ATMEGA168A-AU
+# nmm1_B-rescue_ATMEGA328P-AU
 #
-DEF ATMEGA168A-AU U 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_ATMEGA328P-AU U 0 40 Y Y 1 F N
 F0 "U" -750 1250 50 H V L BNN
-F1 "ATMEGA168A-AU" 400 -1400 50 H V L BNN
+F1 "nmm1_B-rescue_ATMEGA328P-AU" 400 -1400 50 H V L BNN
 F2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATMEGA48A-AU ATMEGA48PA-AU ATMEGA88A-AU ATMEGA88PA-AU ATMEGA168PA-AU ATMEGA328-AU ATMEGA328P-AU
 $FPLIST
  TQFP*7x7mm*Pitch0.8mm*
 $ENDFPLIST
 DRAW
 S -750 1200 850 -1300 0 1 10 f
 X (PCINT19/OC2B/INT1)PD3 1 1000 -800 150 L 40 40 1 1 B
+X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
+X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
+X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
+X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
+X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
+X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
+X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
+X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
+X AVCC 18 -900 800 150 R 40 40 1 1 W
+X ADC6 19 -900 -250 150 R 40 40 1 1 I
 X (PCINT20/XCK/T0)PD4 2 1000 -900 150 L 40 40 1 1 B
+X AREF 20 -900 500 150 R 40 40 1 1 B
+X GND 21 -900 -1000 150 R 40 40 1 1 W
+X ADC7 22 -900 -350 150 R 40 40 1 1 I
+X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
+X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
+X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
+X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
+X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
+X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
+X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
 X GND 3 -900 -1200 150 R 40 40 1 1 W
+X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
+X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
+X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
 X VCC 4 -900 1100 150 R 40 40 1 1 W
 X GND 5 -900 -1100 150 R 40 40 1 1 W
 X VCC 6 -900 1000 150 R 40 40 1 1 W
 X (PCINT6/XTAL1/TOSC1)PB6 7 1000 500 150 L 40 40 1 1 B
 X (PCINT7/XTAL2/TOSC2)PB7 8 1000 400 150 L 40 40 1 1 B
 X (PCINT21/OC0B/T1)PD5 9 1000 -1000 150 L 40 40 1 1 B
-X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
-X AREF 20 -900 500 150 R 40 40 1 1 B
-X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
-X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
-X GND 21 -900 -1000 150 R 40 40 1 1 W
-X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
-X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
-X ADC7 22 -900 -350 150 R 40 40 1 1 I
-X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
-X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
-X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
-X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
-X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
-X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
-X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
-X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
-X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
-X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
-X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
-X AVCC 18 -900 800 150 R 40 40 1 1 W
-X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
-X ADC6 19 -900 -250 150 R 40 40 1 1 I
-X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
 ENDDRAW
 ENDDEF
 #
-# C
+# nmm1_B-rescue_C
 #
-DEF C C 0 10 N Y 1 F N
+DEF nmm1_B-rescue_C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
+F1 "nmm1_B-rescue_C" 25 -100 50 H V L CNN
 F2 "" 38 -150 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -83,11 +81,11 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_01x02
+# nmm1_B-rescue_Conn_01x02
 #
-DEF Conn_01x02 J 0 40 Y N 1 F N
+DEF nmm1_B-rescue_Conn_01x02 J 0 40 Y N 1 F N
 F0 "J" 0 100 50 H V C CNN
-F1 "Conn_01x02" 0 -200 50 H V C CNN
+F1 "nmm1_B-rescue_Conn_01x02" 0 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -107,11 +105,11 @@ X Pin_2 2 -200 -100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_01x04
+# nmm1_B-rescue_Conn_01x04
 #
-DEF Conn_01x04 J 0 40 Y N 1 F N
+DEF nmm1_B-rescue_Conn_01x04 J 0 40 Y N 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "Conn_01x04" 0 -300 50 H V C CNN
+F1 "nmm1_B-rescue_Conn_01x04" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -135,11 +133,11 @@ X Pin_4 4 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_01x05
+# nmm1_B-rescue_Conn_01x05
 #
-DEF Conn_01x05 J 0 40 Y N 1 F N
+DEF nmm1_B-rescue_Conn_01x05 J 0 40 Y N 1 F N
 F0 "J" 0 300 50 H V C CNN
-F1 "Conn_01x05" 0 -300 50 H V C CNN
+F1 "nmm1_B-rescue_Conn_01x05" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -165,11 +163,11 @@ X Pin_5 5 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_02x03_Odd_Even
+# nmm1_B-rescue_Conn_02x03_Odd_Even
 #
-DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+DEF nmm1_B-rescue_Conn_02x03_Odd_Even J 0 40 Y N 1 F N
 F0 "J" 50 200 50 H V C CNN
-F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F1 "nmm1_B-rescue_Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -197,11 +195,11 @@ X Pin_6 6 300 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Crystal
+# nmm1_B-rescue_Crystal
 #
-DEF Crystal Y 0 40 N N 1 F N
+DEF nmm1_B-rescue_Crystal Y 0 40 N N 1 F N
 F0 "Y" 0 150 50 H V C CNN
-F1 "Crystal" 0 -150 50 H V C CNN
+F1 "nmm1_B-rescue_Crystal" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -218,11 +216,11 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D
+# nmm1_B-rescue_D
 #
-DEF D D 0 40 N N 1 F N
+DEF nmm1_B-rescue_D D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
+F1 "nmm1_B-rescue_D" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -241,11 +239,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# FT232RL
+# nmm1_B-rescue_FT232RL
 #
-DEF FT232RL U 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_FT232RL U 0 40 Y Y 1 F N
 F0 "U" -650 900 50 H V L CNN
-F1 "FT232RL" 400 900 50 H V L CNN
+F1 "nmm1_B-rescue_FT232RL" 400 900 50 H V L CNN
 F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -254,39 +252,39 @@ $ENDFPLIST
 DRAW
 S -650 850 650 -850 0 1 10 f
 X TXD 1 800 700 150 L 50 50 1 1 O
+X DCD 10 800 100 150 L 50 50 1 1 I L
+X CTS 11 800 400 150 L 50 50 1 1 I L
+X CBUS4 12 800 -700 150 L 50 50 1 1 B
+X CBUS2 13 800 -500 150 L 50 50 1 1 B
+X CBUS3 14 800 -600 150 L 50 50 1 1 B
+X USBD+ 15 -800 400 150 R 50 50 1 1 B
+X USBD- 16 -800 300 150 R 50 50 1 1 B
+X 3V3OUT 17 -800 700 150 R 50 50 1 1 I
+X GND 18 100 -1000 150 U 50 50 1 1 W
+X ~RESET~ 19 -800 0 150 R 50 50 1 1 I
 X DTR 2 800 300 150 L 50 50 1 1 O V
+X VCC 20 100 1000 150 D 50 50 1 1 W
+X GND 21 200 -1000 150 U 50 50 1 1 W
+X CBUS1 22 800 -400 150 L 50 50 1 1 O
+X CBUS0 23 800 -300 150 L 50 50 1 1 B
+X AGND 25 -200 -1000 150 U 50 50 1 1 W
+X TEST 26 -800 -700 150 R 50 50 1 1 W
+X OSCI 27 -800 -200 150 R 50 50 1 1 I
+X OSCO 28 -800 -400 150 R 50 50 1 1 O
 X RTS 3 800 500 150 L 50 50 1 1 O V
 X VCCIO 4 -100 1000 150 D 50 50 1 1 I
 X RXD 5 800 600 150 L 50 50 1 1 I
 X RI 6 800 0 150 L 50 50 1 1 I L
 X GND 7 0 -1000 150 U 50 50 1 1 W
 X DCR 9 800 200 150 L 50 50 1 1 I L
-X DCD 10 800 100 150 L 50 50 1 1 I L
-X VCC 20 100 1000 150 D 50 50 1 1 W
-X CTS 11 800 400 150 L 50 50 1 1 I L
-X GND 21 200 -1000 150 U 50 50 1 1 W
-X CBUS4 12 800 -700 150 L 50 50 1 1 B
-X CBUS1 22 800 -400 150 L 50 50 1 1 O
-X CBUS2 13 800 -500 150 L 50 50 1 1 B
-X CBUS0 23 800 -300 150 L 50 50 1 1 B
-X CBUS3 14 800 -600 150 L 50 50 1 1 B
-X USBD+ 15 -800 400 150 R 50 50 1 1 B
-X AGND 25 -200 -1000 150 U 50 50 1 1 W
-X USBD- 16 -800 300 150 R 50 50 1 1 B
-X TEST 26 -800 -700 150 R 50 50 1 1 W
-X 3V3OUT 17 -800 700 150 R 50 50 1 1 I
-X OSCI 27 -800 -200 150 R 50 50 1 1 I
-X GND 18 100 -1000 150 U 50 50 1 1 W
-X OSCO 28 -800 -400 150 R 50 50 1 1 O
-X ~RESET~ 19 -800 0 150 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# GND
+# nmm1_B-rescue_GND
 #
-DEF GND #PWR 0 0 Y Y 1 F P
+DEF nmm1_B-rescue_GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GND" 0 -150 50 H V C CNN
+F1 "nmm1_B-rescue_GND" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -295,11 +293,11 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# L
+# nmm1_B-rescue_L
 #
-DEF L L 0 40 N N 1 F N
+DEF nmm1_B-rescue_L L 0 40 N N 1 F N
 F0 "L" -50 0 50 V V C CNN
-F1 "L" 75 0 50 V V C CNN
+F1 "nmm1_B-rescue_L" 75 0 50 V V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -318,11 +316,11 @@ X 2 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED
+# nmm1_B-rescue_LED
 #
-DEF LED D 0 40 Y N 1 F N
+DEF nmm1_B-rescue_LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "LED" 0 -100 50 H V C CNN
+F1 "nmm1_B-rescue_LED" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -339,11 +337,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MAX3295
+# nmm1_B-rescue_MAX3295
 #
-DEF MAX3295 U 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_MAX3295 U 0 40 Y Y 1 F N
 F0 "U" -150 300 60 H V C CNN
-F1 "MAX3295" 225 -275 60 H V C CNN
+F1 "nmm1_B-rescue_MAX3295" 225 -275 60 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 DRAW
@@ -357,11 +355,11 @@ X Y 6 325 0 123 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# MCP73831
+# nmm1_B-rescue_MCP73831
 #
-DEF MCP73831 U 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_MCP73831 U 0 40 Y Y 1 F N
 F0 "U" -225 250 60 H V C CNN
-F1 "MCP73831" 50 -250 60 H V C CNN
+F1 "nmm1_B-rescue_MCP73831" 50 -250 60 H V C CNN
 F2 "" 0 75 60 H I C CNN
 F3 "" 0 75 60 H I C CNN
 DRAW
@@ -374,11 +372,11 @@ X PROG 5 475 0 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# R
+# nmm1_B-rescue_R
 #
-DEF R R 0 0 N Y 1 F N
+DEF nmm1_B-rescue_R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "nmm1_B-rescue_R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -392,11 +390,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# SW_Push
+# nmm1_B-rescue_SW_Push
 #
-DEF SW_Push SW 0 40 N N 1 F N
+DEF nmm1_B-rescue_SW_Push SW 0 40 N N 1 F N
 F0 "SW" 50 100 50 H V L CNN
-F1 "SW_Push" 0 -60 50 H V C CNN
+F1 "nmm1_B-rescue_SW_Push" 0 -60 50 H V C CNN
 F2 "" 0 200 50 H I C CNN
 F3 "" 0 200 50 H I C CNN
 DRAW
@@ -409,16 +407,18 @@ X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# TPS62046
+# nmm1_B-rescue_TPS62046
 #
-DEF TPS62046 U 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_TPS62046 U 0 40 Y Y 1 F N
 F0 "U" -225 300 60 H V C CNN
-F1 "TPS62046" 250 -300 60 H V C CNN
+F1 "nmm1_B-rescue_TPS62046" 250 -300 60 H V C CNN
 F2 "" 20 35 60 H I C CNN
 F3 "" 20 35 60 H I C CNN
 DRAW
 S -300 250 300 -250 1 1 0 f
 X EN 1 -500 0 200 R 50 50 1 1 I
+X PGND 10 500 -100 200 L 50 50 1 1 W
+X PGND 11 0 -450 200 U 50 50 1 1 I
 X VIN 2 -500 200 200 R 50 50 1 1 W
 X VIN 3 -500 100 200 R 50 50 1 1 W
 X GND 4 -500 -200 200 R 50 50 1 1 W
@@ -427,16 +427,14 @@ X MODE 6 -500 -100 200 R 50 50 1 1 I
 X SW 7 500 100 200 L 50 50 1 1 B
 X SW 8 500 200 200 L 50 50 1 1 B
 X PGND 9 500 -200 200 L 50 50 1 1 W
-X PGND 10 500 -100 200 L 50 50 1 1 W
-X PGND 11 0 -450 200 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# USB_OTG-Electropepper
+# nmm1_B-rescue_USB_OTG-Electropepper
 #
-DEF USB_OTG-Electropepper P 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_USB_OTG-Electropepper P 0 40 Y Y 1 F N
 F0 "P" 325 -125 50 H V C CNN
-F1 "USB_OTG-Electropepper" 0 200 50 H V C CNN
+F1 "nmm1_B-rescue_USB_OTG-Electropepper" 0 200 50 H V C CNN
 F2 "" -50 -100 50 V V C CNN
 F3 "" -50 -100 50 V V C CNN
 $FPLIST
@@ -458,11 +456,11 @@ X shield 6 400 100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VOS627A
+# nmm1_B-rescue_VOS627A
 #
-DEF VOS627A U 0 40 Y Y 1 F N
+DEF nmm1_B-rescue_VOS627A U 0 40 Y Y 1 F N
 F0 "U" -125 150 60 H V C CNN
-F1 "VOS627A" 0 -150 60 H V C CNN
+F1 "nmm1_B-rescue_VOS627A" 0 -150 60 H V C CNN
 F2 "" 0 -50 60 H I C CNN
 F3 "" 0 -50 60 H I C CNN
 DRAW
diff --git a/NMM1_Kicad/rev_B/nmm1_B-rescue.lib b/NMM1_Kicad/rev_B/nmm1_B-rescue.lib
index 2063b3a..fc46643 100644
--- a/NMM1_Kicad/rev_B/nmm1_B-rescue.lib
+++ b/NMM1_Kicad/rev_B/nmm1_B-rescue.lib
@@ -1,4 +1,475 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# +3V3
+#
+DEF +3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# ATMEGA328P-AU
+#
+DEF ATMEGA328P-AU U 0 40 Y Y 1 F N
+F0 "U" -750 1250 50 H V L BNN
+F1 "ATMEGA328P-AU" 400 -1400 50 H V L BNN
+F2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TQFP*7x7mm*Pitch0.8mm*
+$ENDFPLIST
+DRAW
+S -750 1200 850 -1300 0 1 10 f
+X (PCINT19/OC2B/INT1)PD3 1 1000 -800 150 L 40 40 1 1 B
+X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
+X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
+X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
+X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
+X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
+X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
+X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
+X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
+X AVCC 18 -900 800 150 R 40 40 1 1 W
+X ADC6 19 -900 -250 150 R 40 40 1 1 I
+X (PCINT20/XCK/T0)PD4 2 1000 -900 150 L 40 40 1 1 B
+X AREF 20 -900 500 150 R 40 40 1 1 B
+X GND 21 -900 -1000 150 R 40 40 1 1 W
+X ADC7 22 -900 -350 150 R 40 40 1 1 I
+X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
+X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
+X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
+X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
+X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
+X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
+X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
+X GND 3 -900 -1200 150 R 40 40 1 1 W
+X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
+X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
+X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
+X VCC 4 -900 1100 150 R 40 40 1 1 W
+X GND 5 -900 -1100 150 R 40 40 1 1 W
+X VCC 6 -900 1000 150 R 40 40 1 1 W
+X (PCINT6/XTAL1/TOSC1)PB6 7 1000 500 150 L 40 40 1 1 B
+X (PCINT7/XTAL2/TOSC2)PB7 8 1000 400 150 L 40 40 1 1 B
+X (PCINT21/OC0B/T1)PD5 9 1000 -1000 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x02
+#
+DEF Conn_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x04
+#
+DEF Conn_01x04 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Conn_01x04" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 50 -250 1 1 10 f
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x05
+#
+DEF Conn_01x05 J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Conn_01x05" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 50 -250 1 1 10 f
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_2 2 -200 100 150 R 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 -200 -100 150 R 50 50 1 1 P
+X Pin_5 5 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_02x03_Odd_Even
+#
+DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 200 50 H V C CNN
+F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*2x??x*mm*
+ Connector*:*2x???Pitch*
+ Pin_Header_Straight_2X*
+ Pin_Header_Angled_2X*
+ Socket_Strip_Straight_2X*
+ Socket_Strip_Angled_2X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 150 -150 1 1 10 f
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 300 100 150 L 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 300 0 150 L 50 50 1 1 P
+X Pin_5 5 -200 -100 150 R 50 50 1 1 P
+X Pin_6 6 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal
+#
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FT232RL
+#
+DEF FT232RL U 0 40 Y Y 1 F N
+F0 "U" -650 900 50 H V L CNN
+F1 "FT232RL" 400 900 50 H V L CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SSOP*5.3x10.2mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -650 850 650 -850 0 1 10 f
+X TXD 1 800 700 150 L 50 50 1 1 O
+X DCD 10 800 100 150 L 50 50 1 1 I L
+X CTS 11 800 400 150 L 50 50 1 1 I L
+X CBUS4 12 800 -700 150 L 50 50 1 1 B
+X CBUS2 13 800 -500 150 L 50 50 1 1 B
+X CBUS3 14 800 -600 150 L 50 50 1 1 B
+X USBD+ 15 -800 400 150 R 50 50 1 1 B
+X USBD- 16 -800 300 150 R 50 50 1 1 B
+X 3V3OUT 17 -800 700 150 R 50 50 1 1 I
+X GND 18 100 -1000 150 U 50 50 1 1 W
+X ~RESET~ 19 -800 0 150 R 50 50 1 1 I
+X DTR 2 800 300 150 L 50 50 1 1 O V
+X VCC 20 100 1000 150 D 50 50 1 1 W
+X GND 21 200 -1000 150 U 50 50 1 1 W
+X CBUS1 22 800 -400 150 L 50 50 1 1 O
+X CBUS0 23 800 -300 150 L 50 50 1 1 B
+X AGND 25 -200 -1000 150 U 50 50 1 1 W
+X TEST 26 -800 -700 150 R 50 50 1 1 W
+X OSCI 27 -800 -200 150 R 50 50 1 1 I
+X OSCO 28 -800 -400 150 R 50 50 1 1 O
+X RTS 3 800 500 150 L 50 50 1 1 O V
+X VCCIO 4 -100 1000 150 D 50 50 1 1 I
+X RXD 5 800 600 150 L 50 50 1 1 I
+X RI 6 800 0 150 L 50 50 1 1 I L
+X GND 7 0 -1000 150 U 50 50 1 1 W
+X DCR 9 800 200 150 L 50 50 1 1 I L
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# L
+#
+DEF L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MAX3295
+#
+DEF MAX3295 U 0 40 Y Y 1 F N
+F0 "U" -150 300 60 H V C CNN
+F1 "MAX3295" 225 -275 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -200 250 200 -225 0 1 0 f
+X DI 1 -325 125 123 R 50 50 1 1 I
+X VCC 2 0 375 123 D 50 50 1 1 W
+X DE 3 -325 -75 123 R 50 50 1 1 B
+X Z 4 325 125 123 L 50 50 1 1 B
+X GND 5 0 -350 123 U 50 50 1 1 B
+X Y 6 325 0 123 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# MCP73831
+#
+DEF MCP73831 U 0 40 Y Y 1 F N
+F0 "U" -225 250 60 H V C CNN
+F1 "MCP73831" 50 -250 60 H V C CNN
+F2 "" 0 75 60 H I C CNN
+F3 "" 0 75 60 H I C CNN
+DRAW
+S -275 200 275 -200 0 1 0 f
+X STAT 1 -475 -125 200 R 50 50 1 1 O
+X Vss 2 475 -125 200 L 50 50 1 1 W
+X Vbat 3 475 125 200 L 50 50 1 1 w
+X VDD 4 -475 125 200 R 50 50 1 1 W
+X PROG 5 475 0 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SW_Push
+#
+DEF SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# TPS62046
+#
+DEF TPS62046 U 0 40 Y Y 1 F N
+F0 "U" -225 300 60 H V C CNN
+F1 "TPS62046" 250 -300 60 H V C CNN
+F2 "" 20 35 60 H I C CNN
+F3 "" 20 35 60 H I C CNN
+DRAW
+S -300 250 300 -250 1 1 0 f
+X EN 1 -500 0 200 R 50 50 1 1 I
+X PGND 10 500 -100 200 L 50 50 1 1 W
+X PGND 11 0 -450 200 U 50 50 1 1 I
+X VIN 2 -500 200 200 R 50 50 1 1 W
+X VIN 3 -500 100 200 R 50 50 1 1 W
+X GND 4 -500 -200 200 R 50 50 1 1 W
+X FB 5 500 0 200 L 50 50 1 1 I
+X MODE 6 -500 -100 200 R 50 50 1 1 I
+X SW 7 500 100 200 L 50 50 1 1 B
+X SW 8 500 200 200 L 50 50 1 1 B
+X PGND 9 500 -200 200 L 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# USB_OTG-Electropepper
+#
+DEF USB_OTG-Electropepper P 0 40 Y Y 1 F N
+F0 "P" 325 -125 50 H V C CNN
+F1 "USB_OTG-Electropepper" 0 200 50 H V C CNN
+F2 "" -50 -100 50 V V C CNN
+F3 "" -50 -100 50 V V C CNN
+$FPLIST
+ USB*
+$ENDFPLIST
+DRAW
+S -250 -150 250 150 0 1 0 N
+S -205 -150 -195 -120 0 1 0 N
+S -105 -150 -95 -120 0 1 0 N
+S -5 -150 5 -120 0 1 0 N
+S 95 -150 105 -120 0 1 0 N
+S 195 -150 205 -120 0 1 0 N
+X VBUS 1 -200 -300 150 U 50 50 1 1 w
+X D- 2 -100 -300 150 U 50 50 1 1 P
+X D+ 3 0 -300 150 U 50 50 1 1 P
+X ID 4 100 -300 150 U 50 50 1 1 W
+X GND 5 200 -300 150 U 50 50 1 1 W
+X shield 6 400 100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VOS627A
+#
+DEF VOS627A U 0 40 Y Y 1 F N
+F0 "U" -125 150 60 H V C CNN
+F1 "VOS627A" 0 -150 60 H V C CNN
+F2 "" 0 -50 60 H I C CNN
+F3 "" 0 -50 60 H I C CNN
+DRAW
+S -175 100 175 -100 0 1 0 f
+X A/C 1 -300 50 123 R 50 50 1 1 B
+X C/A 2 -300 -50 123 R 50 50 1 1 B
+X E 3 300 -50 123 L 50 50 1 1 B
+X C 4 300 50 123 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/NMM1_Kicad/rev_B/nmm1_B.bak b/NMM1_Kicad/rev_B/nmm1_B.bak
index e45a26a..51cb083 100644
--- a/NMM1_Kicad/rev_B/nmm1_B.bak
+++ b/NMM1_Kicad/rev_B/nmm1_B.bak
@@ -59,10 +59,10 @@ F 3 "" H 9575 4725 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR34
+L GND #PWR01
 U 1 1 58800040
 P 11925 4525
-F 0 "#PWR34" H 11925 4275 50  0001 C CNN
+F 0 "#PWR01" H 11925 4275 50  0001 C CNN
 F 1 "GND" H 11925 4375 50  0000 C CNN
 F 2 "" H 11925 4525 50  0000 C CNN
 F 3 "" H 11925 4525 50  0000 C CNN
@@ -70,10 +70,10 @@ F 3 "" H 11925 4525 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR02
 U 1 1 58800BCC
 P 8575 6025
-F 0 "#PWR23" H 8575 5775 50  0001 C CNN
+F 0 "#PWR02" H 8575 5775 50  0001 C CNN
 F 1 "GND" H 8575 5875 50  0000 C CNN
 F 2 "" H 8575 6025 50  0000 C CNN
 F 3 "" H 8575 6025 50  0000 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 8575 6025 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR21
+L +3V3 #PWR03
 U 1 1 58800C5F
 P 8475 3425
-F 0 "#PWR21" H 8475 3275 50  0001 C CNN
+F 0 "#PWR03" H 8475 3275 50  0001 C CNN
 F 1 "+3V3" H 8475 3565 50  0000 C CNN
 F 2 "" H 8475 3425 50  0000 C CNN
 F 3 "" H 8475 3425 50  0000 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 8475 3425 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR9
+L GND #PWR04
 U 1 1 588017A5
 P 6375 5925
-F 0 "#PWR9" H 6375 5675 50  0001 C CNN
+F 0 "#PWR04" H 6375 5675 50  0001 C CNN
 F 1 "GND" H 6375 5775 50  0000 C CNN
 F 2 "" H 6375 5925 50  0000 C CNN
 F 3 "" H 6375 5925 50  0000 C CNN
@@ -125,10 +125,10 @@ F 3 "" V 3625 4275 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR05
 U 1 1 588157DF
 P 4075 4675
-F 0 "#PWR2" H 4075 4425 50  0001 C CNN
+F 0 "#PWR05" H 4075 4425 50  0001 C CNN
 F 1 "GND" H 4075 4525 50  0000 C CNN
 F 2 "" H 4075 4675 50  0000 C CNN
 F 3 "" H 4075 4675 50  0000 C CNN
@@ -147,10 +147,10 @@ F 3 "" H 4425 5225 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR3
+L GND #PWR06
 U 1 1 58815D7B
 P 4425 5425
-F 0 "#PWR3" H 4425 5175 50  0001 C CNN
+F 0 "#PWR06" H 4425 5175 50  0001 C CNN
 F 1 "GND" H 4425 5275 50  0000 C CNN
 F 2 "" H 4425 5425 50  0000 C CNN
 F 3 "" H 4425 5425 50  0000 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 11675 4475 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR35
+L +3V3 #PWR07
 U 1 1 5881BF45
 P 11925 5275
-F 0 "#PWR35" H 11925 5125 50  0001 C CNN
+F 0 "#PWR07" H 11925 5125 50  0001 C CNN
 F 1 "+3V3" H 11925 5415 50  0000 C CNN
 F 2 "" H 11925 5275 50  0000 C CNN
 F 3 "" H 11925 5275 50  0000 C CNN
@@ -204,10 +204,10 @@ $EndComp
 Text Label 12250 5675 0    60   ~ 0
 RESET
 $Comp
-L GND #PWR22
+L GND #PWR08
 U 1 1 5881D109
 P 8575 4625
-F 0 "#PWR22" H 8575 4375 50  0001 C CNN
+F 0 "#PWR08" H 8575 4375 50  0001 C CNN
 F 1 "GND" H 8575 4475 50  0000 C CNN
 F 2 "" H 8575 4625 50  0000 C CNN
 F 3 "" H 8575 4625 50  0000 C CNN
@@ -226,10 +226,10 @@ F 3 "" H 8100 5275 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR16
+L +3V3 #PWR09
 U 1 1 5881E300
 P 7475 4900
-F 0 "#PWR16" H 7475 4750 50  0001 C CNN
+F 0 "#PWR09" H 7475 4750 50  0001 C CNN
 F 1 "+3V3" H 7475 5040 50  0000 C CNN
 F 2 "" H 7475 4900 50  0000 C CNN
 F 3 "" H 7475 4900 50  0000 C CNN
@@ -245,16 +245,16 @@ U 1 1 58821233
 P 11925 5925
 F 0 "SW5" V 12025 6025 50  0000 L CNN
 F 1 "SW_Push" V 11925 5725 50  0000 C CNN
-F 2 "Electropepper parts:B3FS-10" H 11925 6125 50  0001 C CNN
+F 2 "electropepper:B3FS-10" H 11925 6125 50  0001 C CNN
 F 3 "" H 11925 6125 50  0000 C CNN
 	1    11925 5925
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR36
+L GND #PWR010
 U 1 1 58821A31
 P 11925 6175
-F 0 "#PWR36" H 11925 5925 50  0001 C CNN
+F 0 "#PWR010" H 11925 5925 50  0001 C CNN
 F 1 "GND" H 11925 6025 50  0000 C CNN
 F 2 "" H 11925 6175 50  0000 C CNN
 F 3 "" H 11925 6175 50  0000 C CNN
@@ -280,10 +280,10 @@ F 3 "" H 10300 1775 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR28
+L +3V3 #PWR011
 U 1 1 588241EB
 P 9875 2825
-F 0 "#PWR28" H 9875 2675 50  0001 C CNN
+F 0 "#PWR011" H 9875 2675 50  0001 C CNN
 F 1 "+3V3" H 9875 2965 50  0000 C CNN
 F 2 "" H 9875 2825 50  0000 C CNN
 F 3 "" H 9875 2825 50  0000 C CNN
@@ -291,10 +291,10 @@ F 3 "" H 9875 2825 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR29
+L GND #PWR012
 U 1 1 58824336
 P 9875 3150
-F 0 "#PWR29" H 9875 2900 50  0001 C CNN
+F 0 "#PWR012" H 9875 2900 50  0001 C CNN
 F 1 "GND" H 9875 3000 50  0000 C CNN
 F 2 "" H 9875 3150 50  0000 C CNN
 F 3 "" H 9875 3150 50  0000 C CNN
@@ -315,10 +315,10 @@ F 3 "" H 8225 3625 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR19
+L GND #PWR013
 U 1 1 588259C0
 P 8025 3775
-F 0 "#PWR19" H 8025 3525 50  0001 C CNN
+F 0 "#PWR013" H 8025 3525 50  0001 C CNN
 F 1 "GND" H 8025 3625 50  0000 C CNN
 F 2 "" H 8025 3775 50  0000 C CNN
 F 3 "" H 8025 3775 50  0000 C CNN
@@ -359,10 +359,10 @@ F 3 "" H 4050 2450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR1
+L GND #PWR014
 U 1 1 588868B7
 P 4050 2675
-F 0 "#PWR1" H 4050 2425 50  0001 C CNN
+F 0 "#PWR014" H 4050 2425 50  0001 C CNN
 F 1 "GND" H 4050 2525 50  0000 C CNN
 F 2 "" H 4050 2675 50  0000 C CNN
 F 3 "" H 4050 2675 50  0000 C CNN
@@ -392,10 +392,10 @@ F 3 "" H 6225 2375 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR10
+L GND #PWR015
 U 1 1 5888AE3C
 P 6425 2550
-F 0 "#PWR10" H 6425 2300 50  0001 C CNN
+F 0 "#PWR015" H 6425 2300 50  0001 C CNN
 F 1 "GND" H 6425 2400 50  0000 C CNN
 F 2 "" H 6425 2550 50  0000 C CNN
 F 3 "" H 6425 2550 50  0000 C CNN
@@ -403,10 +403,10 @@ F 3 "" H 6425 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR11
+L GND #PWR016
 U 1 1 5888BD3C
 P 6675 2675
-F 0 "#PWR11" H 6675 2425 50  0001 C CNN
+F 0 "#PWR016" H 6675 2425 50  0001 C CNN
 F 1 "GND" H 6675 2525 50  0000 C CNN
 F 2 "" H 6675 2675 50  0000 C CNN
 F 3 "" H 6675 2675 50  0000 C CNN
@@ -425,10 +425,10 @@ F 3 "" H 6975 1775 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR14
+L GND #PWR017
 U 1 1 58896C56
 P 7075 2025
-F 0 "#PWR14" H 7075 1775 50  0001 C CNN
+F 0 "#PWR017" H 7075 1775 50  0001 C CNN
 F 1 "GND" H 7075 1875 50  0000 C CNN
 F 2 "" H 7075 2025 50  0000 C CNN
 F 3 "" H 7075 2025 50  0000 C CNN
@@ -469,10 +469,10 @@ F 3 "" H 9450 2475 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR15
+L GND #PWR018
 U 1 1 58899DC7
 P 7350 2750
-F 0 "#PWR15" H 7350 2500 50  0001 C CNN
+F 0 "#PWR018" H 7350 2500 50  0001 C CNN
 F 1 "GND" H 7350 2600 50  0000 C CNN
 F 2 "" H 7350 2750 50  0000 C CNN
 F 3 "" H 7350 2750 50  0000 C CNN
@@ -480,10 +480,10 @@ F 3 "" H 7350 2750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR24
+L GND #PWR019
 U 1 1 5889C3E6
 P 8850 2750
-F 0 "#PWR24" H 8850 2500 50  0001 C CNN
+F 0 "#PWR019" H 8850 2500 50  0001 C CNN
 F 1 "GND" H 8850 2600 50  0000 C CNN
 F 2 "" H 8850 2750 50  0000 C CNN
 F 3 "" H 8850 2750 50  0000 C CNN
@@ -502,10 +502,10 @@ F 3 "" H 9025 2250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR26
+L GND #PWR020
 U 1 1 5889CDDE
 P 9450 2700
-F 0 "#PWR26" H 9450 2450 50  0001 C CNN
+F 0 "#PWR020" H 9450 2450 50  0001 C CNN
 F 1 "GND" H 9450 2550 50  0000 C CNN
 F 2 "" H 9450 2700 50  0000 C CNN
 F 3 "" H 9450 2700 50  0000 C CNN
@@ -513,10 +513,10 @@ F 3 "" H 9450 2700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR25
+L +3V3 #PWR021
 U 1 1 5889D9E5
 P 9450 2175
-F 0 "#PWR25" H 9450 2025 50  0001 C CNN
+F 0 "#PWR021" H 9450 2025 50  0001 C CNN
 F 1 "+3V3" H 9450 2315 50  0000 C CNN
 F 2 "" H 9450 2175 50  0000 C CNN
 F 3 "" H 9450 2175 50  0000 C CNN
@@ -581,10 +581,10 @@ F 3 "" H 4450 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR6
+L +3V3 #PWR022
 U 1 1 5894FF9F
 P 5575 6800
-F 0 "#PWR6" H 5575 6650 50  0001 C CNN
+F 0 "#PWR022" H 5575 6650 50  0001 C CNN
 F 1 "+3V3" H 5575 6940 50  0000 C CNN
 F 2 "" H 5575 6800 50  0000 C CNN
 F 3 "" H 5575 6800 50  0000 C CNN
@@ -603,10 +603,10 @@ F 3 "" H 5575 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR12
+L +3V3 #PWR023
 U 1 1 58950643
 P 6700 6800
-F 0 "#PWR12" H 6700 6650 50  0001 C CNN
+F 0 "#PWR023" H 6700 6650 50  0001 C CNN
 F 1 "+3V3" H 6700 6940 50  0000 C CNN
 F 2 "" H 6700 6800 50  0000 C CNN
 F 3 "" H 6700 6800 50  0000 C CNN
@@ -625,10 +625,10 @@ F 3 "" H 6700 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR17
+L +3V3 #PWR024
 U 1 1 58950809
 P 7825 6800
-F 0 "#PWR17" H 7825 6650 50  0001 C CNN
+F 0 "#PWR024" H 7825 6650 50  0001 C CNN
 F 1 "+3V3" H 7825 6940 50  0000 C CNN
 F 2 "" H 7825 6800 50  0000 C CNN
 F 3 "" H 7825 6800 50  0000 C CNN
@@ -643,10 +643,10 @@ Text Label 6925 7200 0    60   ~ 0
 BTN_3
 NoConn ~ 3975 4275
 $Comp
-L GND #PWR20
+L GND #PWR025
 U 1 1 589EDA0C
 P 8250 2950
-F 0 "#PWR20" H 8250 2700 50  0001 C CNN
+F 0 "#PWR025" H 8250 2700 50  0001 C CNN
 F 1 "GND" H 8250 2800 50  0000 C CNN
 F 2 "" H 8250 2950 50  0000 C CNN
 F 3 "" H 8250 2950 50  0000 C CNN
@@ -665,10 +665,10 @@ F 3 "" H 12500 3775 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR38
+L +3V3 #PWR026
 U 1 1 58AC9036
 P 12250 4675
-F 0 "#PWR38" H 12250 4525 50  0001 C CNN
+F 0 "#PWR026" H 12250 4525 50  0001 C CNN
 F 1 "+3V3" H 12250 4815 50  0000 C CNN
 F 2 "" H 12250 4675 50  0000 C CNN
 F 3 "" H 12250 4675 50  0000 C CNN
@@ -935,10 +935,10 @@ Wire Wire Line
 Wire Wire Line
 	8250 2900 8250 2950
 $Comp
-L GND #PWR37
+L GND #PWR027
 U 1 1 58ACBA19
 P 12125 5275
-F 0 "#PWR37" H 12125 5025 50  0001 C CNN
+F 0 "#PWR027" H 12125 5025 50  0001 C CNN
 F 1 "GND" H 12125 5125 50  0000 C CNN
 F 2 "" H 12125 5275 50  0000 C CNN
 F 3 "" H 12125 5275 50  0000 C CNN
@@ -1004,10 +1004,10 @@ Wire Wire Line
 Wire Wire Line
 	9615 7055 9615 7130
 $Comp
-L GND #PWR27
+L GND #PWR028
 U 1 1 58AE7333
 P 9615 7880
-F 0 "#PWR27" H 9615 7630 50  0001 C CNN
+F 0 "#PWR028" H 9615 7630 50  0001 C CNN
 F 1 "GND" H 9615 7730 50  0000 C CNN
 F 2 "" H 9615 7880 50  0000 C CNN
 F 3 "" H 9615 7880 50  0000 C CNN
@@ -1056,10 +1056,10 @@ Wire Wire Line
 	5000 7200 4450 7200
 Connection ~ 4450 7200
 $Comp
-L +3V3 #PWR4
+L +3V3 #PWR029
 U 1 1 58ADA9ED
 P 4450 6800
-F 0 "#PWR4" H 4450 6650 50  0001 C CNN
+F 0 "#PWR029" H 4450 6650 50  0001 C CNN
 F 1 "+3V3" H 4450 6940 50  0000 C CNN
 F 2 "" H 4450 6800 50  0000 C CNN
 F 3 "" H 4450 6800 50  0000 C CNN
@@ -1162,10 +1162,10 @@ Wire Wire Line
 Wire Wire Line
 	10975 7375 10975 7425
 $Comp
-L GND #PWR31
+L GND #PWR030
 U 1 1 58B4A6CC
 P 10975 7425
-F 0 "#PWR31" H 10975 7175 50  0001 C CNN
+F 0 "#PWR030" H 10975 7175 50  0001 C CNN
 F 1 "GND" H 10975 7275 50  0000 C CNN
 F 2 "" H 10975 7425 50  0000 C CNN
 F 3 "" H 10975 7425 50  0000 C CNN
@@ -1184,10 +1184,10 @@ F 3 "" H 10850 7075 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR30
+L +3V3 #PWR031
 U 1 1 58B4CA78
 P 10850 6875
-F 0 "#PWR30" H 10850 6725 50  0001 C CNN
+F 0 "#PWR031" H 10850 6725 50  0001 C CNN
 F 1 "+3V3" H 10850 7015 50  0000 C CNN
 F 2 "" H 10850 6875 50  0000 C CNN
 F 3 "" H 10850 6875 50  0000 C CNN
@@ -1225,10 +1225,10 @@ Wire Wire Line
 Wire Wire Line
 	11300 7825 11300 8075
 $Comp
-L GND #PWR33
+L GND #PWR032
 U 1 1 58B553F1
 P 11300 8925
-F 0 "#PWR33" H 11300 8675 50  0001 C CNN
+F 0 "#PWR032" H 11300 8675 50  0001 C CNN
 F 1 "GND" H 11300 8775 50  0000 C CNN
 F 2 "" H 11300 8925 50  0000 C CNN
 F 3 "" H 11300 8925 50  0000 C CNN
@@ -1238,10 +1238,10 @@ $EndComp
 Wire Wire Line
 	11300 8800 11300 8925
 $Comp
-L +3V3 #PWR32
+L +3V3 #PWR033
 U 1 1 58B55F48
 P 11300 7825
-F 0 "#PWR32" H 11300 7675 50  0001 C CNN
+F 0 "#PWR033" H 11300 7675 50  0001 C CNN
 F 1 "+3V3" H 11300 7965 50  0000 C CNN
 F 2 "" H 11300 7825 50  0000 C CNN
 F 3 "" H 11300 7825 50  0000 C CNN
@@ -1307,7 +1307,7 @@ U 1 1 58CBF91A
 P 4450 7475
 F 0 "SW1" V 4550 7575 50  0000 L CNN
 F 1 "SW_Push" V 4450 7275 50  0000 C CNN
-F 2 "Electropepper parts:B3FS-10" H 4450 7675 50  0001 C CNN
+F 2 "electropepper:B3FS-10" H 4450 7675 50  0001 C CNN
 F 3 "" H 4450 7675 50  0000 C CNN
 	1    4450 7475
 	0    -1   -1   0   
@@ -1318,7 +1318,7 @@ U 1 1 58CC7607
 P 5575 7475
 F 0 "SW2" V 5675 7575 50  0000 L CNN
 F 1 "SW_Push" V 5575 7275 50  0000 C CNN
-F 2 "Electropepper parts:B3FS-10" H 5575 7675 50  0001 C CNN
+F 2 "electropepper:B3FS-10" H 5575 7675 50  0001 C CNN
 F 3 "" H 5575 7675 50  0000 C CNN
 	1    5575 7475
 	0    -1   -1   0   
@@ -1329,7 +1329,7 @@ U 1 1 58CC76F8
 P 6700 7475
 F 0 "SW3" V 6800 7575 50  0000 L CNN
 F 1 "SW_Push" V 6700 7275 50  0000 C CNN
-F 2 "Electropepper parts:B3FS-10" H 6700 7675 50  0001 C CNN
+F 2 "electropepper:B3FS-10" H 6700 7675 50  0001 C CNN
 F 3 "" H 6700 7675 50  0000 C CNN
 	1    6700 7475
 	0    -1   -1   0   
@@ -1340,16 +1340,16 @@ U 1 1 58CC7DC4
 P 7825 7475
 F 0 "SW4" V 7925 7575 50  0000 L CNN
 F 1 "SW_Push" V 7825 7275 50  0000 C CNN
-F 2 "Electropepper parts:B3FS-10" H 7825 7675 50  0001 C CNN
+F 2 "electropepper:B3FS-10" H 7825 7675 50  0001 C CNN
 F 3 "" H 7825 7675 50  0000 C CNN
 	1    7825 7475
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR5
+L GND #PWR034
 U 1 1 58CC886D
 P 4450 7750
-F 0 "#PWR5" H 4450 7500 50  0001 C CNN
+F 0 "#PWR034" H 4450 7500 50  0001 C CNN
 F 1 "GND" H 4450 7600 50  0000 C CNN
 F 2 "" H 4450 7750 50  0000 C CNN
 F 3 "" H 4450 7750 50  0000 C CNN
@@ -1357,10 +1357,10 @@ F 3 "" H 4450 7750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR035
 U 1 1 58CC8F18
 P 5575 7750
-F 0 "#PWR7" H 5575 7500 50  0001 C CNN
+F 0 "#PWR035" H 5575 7500 50  0001 C CNN
 F 1 "GND" H 5575 7600 50  0000 C CNN
 F 2 "" H 5575 7750 50  0000 C CNN
 F 3 "" H 5575 7750 50  0000 C CNN
@@ -1368,10 +1368,10 @@ F 3 "" H 5575 7750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR13
+L GND #PWR036
 U 1 1 58CC97A0
 P 6700 7750
-F 0 "#PWR13" H 6700 7500 50  0001 C CNN
+F 0 "#PWR036" H 6700 7500 50  0001 C CNN
 F 1 "GND" H 6700 7600 50  0000 C CNN
 F 2 "" H 6700 7750 50  0000 C CNN
 F 3 "" H 6700 7750 50  0000 C CNN
@@ -1379,10 +1379,10 @@ F 3 "" H 6700 7750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR18
+L GND #PWR037
 U 1 1 58CCA30E
 P 7825 7750
-F 0 "#PWR18" H 7825 7500 50  0001 C CNN
+F 0 "#PWR037" H 7825 7500 50  0001 C CNN
 F 1 "GND" H 7825 7600 50  0000 C CNN
 F 2 "" H 7825 7750 50  0000 C CNN
 F 3 "" H 7825 7750 50  0000 C CNN
@@ -1426,10 +1426,10 @@ Wire Wire Line
 Wire Wire Line
 	6175 3725 6175 3775
 $Comp
-L +3V3 #PWR8
+L +3V3 #PWR038
 U 1 1 58818331
 P 6175 3725
-F 0 "#PWR8" H 6175 3575 50  0001 C CNN
+F 0 "#PWR038" H 6175 3575 50  0001 C CNN
 F 1 "+3V3" H 6175 3865 50  0000 C CNN
 F 2 "" H 6175 3725 50  0000 C CNN
 F 3 "" H 6175 3725 50  0000 C CNN
diff --git a/NMM1_Kicad/rev_B/nmm1_B.pro b/NMM1_Kicad/rev_B/nmm1_B.pro
index a944ab7..2f954d4 100755
--- a/NMM1_Kicad/rev_B/nmm1_B.pro
+++ b/NMM1_Kicad/rev_B/nmm1_B.pro
@@ -1,4 +1,4 @@
-update=Wed 07 Mar 2018 10:27:22 AM GMT
+update=Tue 20 Nov 2018 11:04:35 GMT
 version=1
 last_client=kicad
 [pcbnew]
@@ -27,40 +27,4 @@ NetIExt=net
 version=1
 [eeschema]
 version=1
-LibDir=/home/ricardo/Projects/Kicad
-[eeschema/libraries]
-LibName1=nmm1_B-rescue
-LibName2=power
-LibName3=device
-LibName4=transistors
-LibName5=conn
-LibName6=linear
-LibName7=regul
-LibName8=74xx
-LibName9=cmos4000
-LibName10=adc-dac
-LibName11=memory
-LibName12=xilinx
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=ftdi
-LibName32=switches
-LibName33=kicad-library-4.0.7/library/conn
-LibName34=kicad-library-4.0.7/library/atmel
-LibName35=Kicad_libs/electropepper_kicad
+LibDir=
diff --git a/NMM1_Kicad/rev_B/nmm1_B.sch b/NMM1_Kicad/rev_B/nmm1_B.sch
index 51cb083..cac3232 100644
--- a/NMM1_Kicad/rev_B/nmm1_B.sch
+++ b/NMM1_Kicad/rev_B/nmm1_B.sch
@@ -1,39 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:nmm1_B-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ftdi
-LIBS:switches
-LIBS:electropepper_kicad
+EESchema Schematic File Version 4
 LIBS:nmm1_B-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
@@ -48,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ATMEGA328P-AU U5
+L nmm1_B-rescue:ATMEGA328P-AU U5
 U 1 1 587FFE62
 P 9575 4725
 F 0 "U5" H 8825 5975 50  0000 L BNN
@@ -59,7 +26,7 @@ F 3 "" H 9575 4725 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L nmm1_B-rescue:GND #PWR01
 U 1 1 58800040
 P 11925 4525
 F 0 "#PWR01" H 11925 4275 50  0001 C CNN
@@ -70,7 +37,7 @@ F 3 "" H 11925 4525 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L nmm1_B-rescue:GND #PWR02
 U 1 1 58800BCC
 P 8575 6025
 F 0 "#PWR02" H 8575 5775 50  0001 C CNN
@@ -81,7 +48,7 @@ F 3 "" H 8575 6025 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR03
+L nmm1_B-rescue:+3V3 #PWR03
 U 1 1 58800C5F
 P 8475 3425
 F 0 "#PWR03" H 8475 3275 50  0001 C CNN
@@ -92,7 +59,7 @@ F 3 "" H 8475 3425 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L nmm1_B-rescue:GND #PWR04
 U 1 1 588017A5
 P 6375 5925
 F 0 "#PWR04" H 6375 5675 50  0001 C CNN
@@ -103,7 +70,7 @@ F 3 "" H 6375 5925 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R9
+L nmm1_B-rescue:R R9
 U 1 1 588021DF
 P 11925 5475
 F 0 "R9" H 12000 5325 50  0000 C CNN
@@ -114,7 +81,7 @@ F 3 "" H 11925 5475 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L USB_OTG-Electropepper P1
+L nmm1_B-rescue:USB_OTG-Electropepper P1
 U 1 1 58815603
 P 3675 4375
 F 0 "P1" V 3975 4325 50  0000 C CNN
@@ -125,7 +92,7 @@ F 3 "" V 3625 4275 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR05
+L nmm1_B-rescue:GND #PWR05
 U 1 1 588157DF
 P 4075 4675
 F 0 "#PWR05" H 4075 4425 50  0001 C CNN
@@ -136,7 +103,7 @@ F 3 "" H 4075 4675 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C2
+L nmm1_B-rescue:C C2
 U 1 1 58815C2D
 P 4425 5225
 F 0 "C2" H 4450 5325 50  0000 L CNN
@@ -147,7 +114,7 @@ F 3 "" H 4425 5225 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L nmm1_B-rescue:GND #PWR06
 U 1 1 58815D7B
 P 4425 5425
 F 0 "#PWR06" H 4425 5175 50  0001 C CNN
@@ -158,7 +125,7 @@ F 3 "" H 4425 5425 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal X1
+L nmm1_B-rescue:Crystal X1
 U 1 1 588196A3
 P 11325 4275
 F 0 "X1" V 11175 4175 50  0000 C CNN
@@ -169,7 +136,7 @@ F 3 "" H 11325 4275 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C10
+L nmm1_B-rescue:C C10
 U 1 1 58819B31
 P 11675 4075
 F 0 "C10" V 11525 4000 50  0000 L CNN
@@ -180,7 +147,7 @@ F 3 "" H 11675 4075 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C11
+L nmm1_B-rescue:C C11
 U 1 1 58819C1C
 P 11675 4475
 F 0 "C11" V 11625 4275 50  0000 L CNN
@@ -191,7 +158,7 @@ F 3 "" H 11675 4475 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR07
+L nmm1_B-rescue:+3V3 #PWR07
 U 1 1 5881BF45
 P 11925 5275
 F 0 "#PWR07" H 11925 5125 50  0001 C CNN
@@ -204,7 +171,7 @@ $EndComp
 Text Label 12250 5675 0    60   ~ 0
 RESET
 $Comp
-L GND #PWR08
+L nmm1_B-rescue:GND #PWR08
 U 1 1 5881D109
 P 8575 4625
 F 0 "#PWR08" H 8575 4375 50  0001 C CNN
@@ -215,7 +182,7 @@ F 3 "" H 8575 4625 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D2
+L nmm1_B-rescue:LED D2
 U 1 1 5881DC19
 P 8100 5275
 F 0 "D2" H 8100 5175 50  0000 C CNN
@@ -226,7 +193,7 @@ F 3 "" H 8100 5275 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR09
+L nmm1_B-rescue:+3V3 #PWR09
 U 1 1 5881E300
 P 7475 4900
 F 0 "#PWR09" H 7475 4750 50  0001 C CNN
@@ -240,7 +207,7 @@ NoConn ~ 7075 5475
 NoConn ~ 7075 5375
 NoConn ~ 7075 5275
 $Comp
-L SW_Push SW5
+L nmm1_B-rescue:SW_Push SW5
 U 1 1 58821233
 P 11925 5925
 F 0 "SW5" V 12025 6025 50  0000 L CNN
@@ -251,7 +218,7 @@ F 3 "" H 11925 6125 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR010
+L nmm1_B-rescue:GND #PWR010
 U 1 1 58821A31
 P 11925 6175
 F 0 "#PWR010" H 11925 5925 50  0001 C CNN
@@ -269,7 +236,7 @@ NoConn ~ 7075 4575
 NoConn ~ 7075 4675
 NoConn ~ 7075 4775
 $Comp
-L Conn_02x03_Odd_Even P4
+L nmm1_B-rescue:Conn_02x03_Odd_Even P4
 U 1 1 58823534
 P 10300 2975
 F 0 "P4" H 10300 3175 50  0000 C CNN
@@ -280,7 +247,7 @@ F 3 "" H 10300 1775 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR011
+L nmm1_B-rescue:+3V3 #PWR011
 U 1 1 588241EB
 P 9875 2825
 F 0 "#PWR011" H 9875 2675 50  0001 C CNN
@@ -291,7 +258,7 @@ F 3 "" H 9875 2825 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR012
+L nmm1_B-rescue:GND #PWR012
 U 1 1 58824336
 P 9875 3150
 F 0 "#PWR012" H 9875 2900 50  0001 C CNN
@@ -304,7 +271,7 @@ $EndComp
 Text Label 9775 2975 0    60   ~ 0
 RESET
 $Comp
-L C C7
+L nmm1_B-rescue:C C7
 U 1 1 58825549
 P 8225 3625
 F 0 "C7" V 8325 3725 50  0000 L CNN
@@ -315,7 +282,7 @@ F 3 "" H 8225 3625 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR013
+L nmm1_B-rescue:GND #PWR013
 U 1 1 588259C0
 P 8025 3775
 F 0 "#PWR013" H 8025 3525 50  0001 C CNN
@@ -326,7 +293,7 @@ F 3 "" H 8025 3775 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MCP73831 U1
+L nmm1_B-rescue:MCP73831 U1
 U 1 1 5887F26B
 P 5525 2375
 F 0 "U1" H 5300 2625 60  0000 C CNN
@@ -337,7 +304,7 @@ F 3 "" H 5525 2450 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L nmm1_B-rescue:R R1
 U 1 1 58883862
 P 4825 2500
 F 0 "R1" V 4750 2450 50  0000 C CNN
@@ -348,7 +315,7 @@ F 3 "" H 4825 2500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C1
+L nmm1_B-rescue:C C1
 U 1 1 58885F04
 P 4050 2450
 F 0 "C1" H 3925 2575 50  0000 L CNN
@@ -359,7 +326,7 @@ F 3 "" H 4050 2450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L nmm1_B-rescue:GND #PWR014
 U 1 1 588868B7
 P 4050 2675
 F 0 "#PWR014" H 4050 2425 50  0001 C CNN
@@ -370,7 +337,7 @@ F 3 "" H 4050 2675 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C4
+L nmm1_B-rescue:C C4
 U 1 1 5888837D
 P 6675 2450
 F 0 "C4" H 6550 2575 50  0000 L CNN
@@ -381,7 +348,7 @@ F 3 "" H 6675 2450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R2
+L nmm1_B-rescue:R R2
 U 1 1 5888A417
 P 6225 2375
 F 0 "R2" V 6150 2325 50  0000 C CNN
@@ -392,7 +359,7 @@ F 3 "" H 6225 2375 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR015
+L nmm1_B-rescue:GND #PWR015
 U 1 1 5888AE3C
 P 6425 2550
 F 0 "#PWR015" H 6425 2300 50  0001 C CNN
@@ -403,7 +370,7 @@ F 3 "" H 6425 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L nmm1_B-rescue:GND #PWR016
 U 1 1 5888BD3C
 P 6675 2675
 F 0 "#PWR016" H 6675 2425 50  0001 C CNN
@@ -414,7 +381,7 @@ F 3 "" H 6675 2675 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x02 P3
+L nmm1_B-rescue:Conn_01x02 P3
 U 1 1 58896012
 P 6975 1775
 F 0 "P3" V 6950 1950 50  0000 C CNN
@@ -425,7 +392,7 @@ F 3 "" H 6975 1775 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR017
+L nmm1_B-rescue:GND #PWR017
 U 1 1 58896C56
 P 7075 2025
 F 0 "#PWR017" H 7075 1775 50  0001 C CNN
@@ -436,7 +403,7 @@ F 3 "" H 7075 2025 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TPS62046 U3
+L nmm1_B-rescue:TPS62046 U3
 U 1 1 58897588
 P 8250 2450
 F 0 "U3" H 8050 2750 60  0000 C CNN
@@ -447,7 +414,7 @@ F 3 "" H 8270 2460 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L nmm1_B-rescue:C C6
 U 1 1 588996E9
 P 7350 2450
 F 0 "C6" H 7375 2550 50  0000 L CNN
@@ -458,7 +425,7 @@ F 3 "" H 7350 2450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C9
+L nmm1_B-rescue:C C9
 U 1 1 5889990B
 P 9450 2475
 F 0 "C9" H 9475 2575 50  0000 L CNN
@@ -469,7 +436,7 @@ F 3 "" H 9450 2475 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L nmm1_B-rescue:GND #PWR018
 U 1 1 58899DC7
 P 7350 2750
 F 0 "#PWR018" H 7350 2500 50  0001 C CNN
@@ -480,7 +447,7 @@ F 3 "" H 7350 2750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L nmm1_B-rescue:GND #PWR019
 U 1 1 5889C3E6
 P 8850 2750
 F 0 "#PWR019" H 8850 2500 50  0001 C CNN
@@ -491,7 +458,7 @@ F 3 "" H 8850 2750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L1
+L nmm1_B-rescue:L L1
 U 1 1 5889C7D1
 P 9025 2250
 F 0 "L1" V 9100 2275 50  0000 C CNN
@@ -502,7 +469,7 @@ F 3 "" H 9025 2250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR020
+L nmm1_B-rescue:GND #PWR020
 U 1 1 5889CDDE
 P 9450 2700
 F 0 "#PWR020" H 9450 2450 50  0001 C CNN
@@ -513,7 +480,7 @@ F 3 "" H 9450 2700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR021
+L nmm1_B-rescue:+3V3 #PWR021
 U 1 1 5889D9E5
 P 9450 2175
 F 0 "#PWR021" H 9450 2025 50  0001 C CNN
@@ -526,7 +493,7 @@ $EndComp
 Text Label 6325 2250 0    60   ~ 0
 VBatt
 $Comp
-L LED D3
+L nmm1_B-rescue:LED D3
 U 1 1 58912C50
 P 8100 4975
 F 0 "D3" H 8100 4875 50  0000 C CNN
@@ -537,7 +504,7 @@ F 3 "" H 8100 4975 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L LED D1
+L nmm1_B-rescue:LED D1
 U 1 1 589137FD
 P 4450 2500
 F 0 "D1" H 4450 2425 50  0000 C CNN
@@ -548,7 +515,7 @@ F 3 "" H 4450 2500 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C8
+L nmm1_B-rescue:C C8
 U 1 1 5891C141
 P 8575 4425
 F 0 "C8" H 8600 4525 50  0000 L CNN
@@ -559,7 +526,7 @@ F 3 "" H 8575 4425 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C5
+L nmm1_B-rescue:C C5
 U 1 1 5891E9F8
 P 7325 4475
 F 0 "C5" V 7175 4400 50  0000 L CNN
@@ -570,7 +537,7 @@ F 3 "" H 7325 4475 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R3
+L nmm1_B-rescue:R R3
 U 1 1 5894FF99
 P 4450 7000
 F 0 "R3" H 4400 6850 50  0000 C CNN
@@ -581,7 +548,7 @@ F 3 "" H 4450 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR022
+L nmm1_B-rescue:+3V3 #PWR022
 U 1 1 5894FF9F
 P 5575 6800
 F 0 "#PWR022" H 5575 6650 50  0001 C CNN
@@ -592,7 +559,7 @@ F 3 "" H 5575 6800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R4
+L nmm1_B-rescue:R R4
 U 1 1 5895063D
 P 5575 7000
 F 0 "R4" H 5525 6850 50  0000 C CNN
@@ -603,7 +570,7 @@ F 3 "" H 5575 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR023
+L nmm1_B-rescue:+3V3 #PWR023
 U 1 1 58950643
 P 6700 6800
 F 0 "#PWR023" H 6700 6650 50  0001 C CNN
@@ -614,7 +581,7 @@ F 3 "" H 6700 6800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
+L nmm1_B-rescue:R R5
 U 1 1 58950803
 P 6700 7000
 F 0 "R5" H 6650 6850 50  0000 C CNN
@@ -625,7 +592,7 @@ F 3 "" H 6700 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR024
+L nmm1_B-rescue:+3V3 #PWR024
 U 1 1 58950809
 P 7825 6800
 F 0 "#PWR024" H 7825 6650 50  0001 C CNN
@@ -643,7 +610,7 @@ Text Label 6925 7200 0    60   ~ 0
 BTN_3
 NoConn ~ 3975 4275
 $Comp
-L GND #PWR025
+L nmm1_B-rescue:GND #PWR025
 U 1 1 589EDA0C
 P 8250 2950
 F 0 "#PWR025" H 8250 2700 50  0001 C CNN
@@ -654,7 +621,7 @@ F 3 "" H 8250 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x05 P6
+L nmm1_B-rescue:Conn_01x05 P6
 U 1 1 58AC71D2
 P 12500 4975
 F 0 "P6" H 12500 5275 50  0000 C CNN
@@ -665,7 +632,7 @@ F 3 "" H 12500 3775 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR026
+L nmm1_B-rescue:+3V3 #PWR026
 U 1 1 58AC9036
 P 12250 4675
 F 0 "#PWR026" H 12250 4525 50  0001 C CNN
@@ -678,7 +645,7 @@ $EndComp
 Wire Wire Line
 	8675 5725 8575 5725
 Wire Wire Line
-	8575 5725 8575 6025
+	8575 5725 8575 5825
 Wire Wire Line
 	8675 5825 8575 5825
 Connection ~ 8575 5825
@@ -686,20 +653,20 @@ Wire Wire Line
 	8675 5925 8575 5925
 Connection ~ 8575 5925
 Wire Wire Line
-	8475 3425 8475 3925
+	8475 3425 8475 3625
 Wire Wire Line
 	8475 3725 8675 3725
 Wire Wire Line
-	8375 3625 8675 3625
+	8375 3625 8475 3625
 Connection ~ 8475 3625
 Wire Wire Line
 	6075 5775 6075 5875
 Wire Wire Line
-	5375 5875 6475 5875
+	5375 5875 6075 5875
 Wire Wire Line
 	6475 5875 6475 5775
 Wire Wire Line
-	6375 5775 6375 5925
+	6375 5775 6375 5875
 Connection ~ 6375 5875
 Wire Wire Line
 	6275 5775 6275 5875
@@ -714,7 +681,7 @@ Wire Wire Line
 Wire Wire Line
 	3575 3925 4075 3925
 Wire Wire Line
-	4075 3925 4075 4675
+	4075 3925 4075 4175
 Wire Wire Line
 	3975 4175 4075 4175
 Connection ~ 4075 4175
@@ -731,13 +698,13 @@ Wire Wire Line
 Wire Wire Line
 	11125 4225 11125 4075
 Wire Wire Line
-	11125 4075 11525 4075
+	11125 4075 11325 4075
 Wire Wire Line
 	10575 4325 11125 4325
 Wire Wire Line
 	11125 4325 11125 4475
 Wire Wire Line
-	11125 4475 11525 4475
+	11125 4475 11325 4475
 Wire Wire Line
 	11325 4425 11325 4475
 Connection ~ 11325 4475
@@ -747,7 +714,7 @@ Connection ~ 11325 4075
 Wire Wire Line
 	11825 4075 11925 4075
 Wire Wire Line
-	11925 4075 11925 4525
+	11925 4075 11925 4475
 Wire Wire Line
 	11825 4475 11925 4475
 Connection ~ 11925 4475
@@ -756,9 +723,9 @@ Wire Wire Line
 Wire Wire Line
 	11750 5075 11750 5675
 Wire Wire Line
-	11750 5675 12550 5675
+	11750 5675 11925 5675
 Wire Wire Line
-	11925 5625 11925 5725
+	11925 5625 11925 5675
 Connection ~ 11925 5675
 Wire Wire Line
 	11925 5325 11925 5275
@@ -828,9 +795,9 @@ Wire Wire Line
 Wire Wire Line
 	8025 3625 8075 3625
 Wire Wire Line
-	4225 2250 4225 4575
+	4225 2250 4225 2500
 Wire Wire Line
-	4050 2250 5050 2250
+	4050 2250 4225 2250
 Wire Wire Line
 	4975 2500 5050 2500
 Wire Wire Line
@@ -848,12 +815,12 @@ Wire Wire Line
 Wire Wire Line
 	6375 2375 6425 2375
 Wire Wire Line
-	6425 2375 6425 2550
+	6425 2375 6425 2500
 Wire Wire Line
 	6000 2500 6425 2500
 Connection ~ 6425 2500
 Wire Wire Line
-	6000 2250 7750 2250
+	6000 2250 6675 2250
 Wire Wire Line
 	6675 2300 6675 2250
 Connection ~ 6675 2250
@@ -865,12 +832,12 @@ Wire Wire Line
 	7075 1975 7075 2025
 Connection ~ 6975 2250
 Wire Wire Line
-	7350 2600 7350 2750
+	7350 2600 7350 2650
 Wire Wire Line
 	7350 2300 7350 2250
 Connection ~ 7350 2250
 Wire Wire Line
-	7350 2650 7750 2650
+	7350 2650 7700 2650
 Connection ~ 7350 2650
 Wire Wire Line
 	7750 2550 7700 2550
@@ -880,7 +847,7 @@ Connection ~ 7700 2650
 Wire Wire Line
 	7750 2350 7700 2350
 Wire Wire Line
-	7700 2250 7700 2450
+	7700 2250 7700 2350
 Connection ~ 7700 2250
 Wire Wire Line
 	7700 2450 7750 2450
@@ -888,12 +855,12 @@ Connection ~ 7700 2350
 Wire Wire Line
 	8750 2550 8850 2550
 Wire Wire Line
-	8850 2550 8850 2750
+	8850 2550 8850 2650
 Wire Wire Line
 	8750 2650 8850 2650
 Connection ~ 8850 2650
 Wire Wire Line
-	8750 2250 8875 2250
+	8750 2250 8800 2250
 Wire Wire Line
 	8750 2350 8800 2350
 Wire Wire Line
@@ -902,9 +869,9 @@ Connection ~ 8800 2250
 Wire Wire Line
 	9450 2625 9450 2700
 Wire Wire Line
-	9450 2175 9450 2325
+	9450 2175 9450 2250
 Wire Wire Line
-	9175 2250 9450 2250
+	9175 2250 9275 2250
 Connection ~ 9450 2250
 Wire Wire Line
 	8750 2450 9275 2450
@@ -912,17 +879,17 @@ Wire Wire Line
 	9275 2450 9275 2250
 Connection ~ 9275 2250
 Wire Wire Line
-	5575 7150 5575 7275
+	5575 7150 5575 7200
 Connection ~ 5575 7200
 Wire Wire Line
 	5575 6850 5575 6800
 Wire Wire Line
-	6700 7150 6700 7275
+	6700 7150 6700 7200
 Connection ~ 6700 7200
 Wire Wire Line
 	6700 6850 6700 6800
 Wire Wire Line
-	7825 7150 7825 7275
+	7825 7150 7825 7200
 Connection ~ 7825 7200
 Wire Wire Line
 	7825 6850 7825 6800
@@ -935,7 +902,7 @@ Wire Wire Line
 Wire Wire Line
 	8250 2900 8250 2950
 $Comp
-L GND #PWR027
+L nmm1_B-rescue:GND #PWR027
 U 1 1 58ACBA19
 P 12125 5275
 F 0 "#PWR027" H 12125 5025 50  0001 C CNN
@@ -950,9 +917,9 @@ Wire Wire Line
 Wire Wire Line
 	11150 4775 11150 6625
 Wire Wire Line
-	11150 6625 9455 6625
+	11150 6625 9615 6625
 $Comp
-L R R13
+L nmm1_B-rescue:R R13
 U 1 1 58AE025B
 P 9305 6625
 F 0 "R13" V 9380 6675 50  0000 C CNN
@@ -967,7 +934,7 @@ Wire Wire Line
 Text Label 8625 6625 0    60   ~ 0
 VBatt
 $Comp
-L R R10
+L nmm1_B-rescue:R R10
 U 1 1 58AE3757
 P 9615 6905
 F 0 "R10" H 9490 6980 50  0000 C CNN
@@ -978,7 +945,7 @@ F 3 "" H 9615 6905 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R11
+L nmm1_B-rescue:R R11
 U 1 1 58AE393C
 P 9615 7280
 F 0 "R11" H 9490 7355 50  0000 C CNN
@@ -989,7 +956,7 @@ F 3 "" H 9615 7280 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R12
+L nmm1_B-rescue:R R12
 U 1 1 58AE3E88
 P 9615 7655
 F 0 "R12" H 9490 7730 50  0000 C CNN
@@ -1004,7 +971,7 @@ Wire Wire Line
 Wire Wire Line
 	9615 7055 9615 7130
 $Comp
-L GND #PWR028
+L nmm1_B-rescue:GND #PWR028
 U 1 1 58AE7333
 P 9615 7880
 F 0 "#PWR028" H 9615 7630 50  0001 C CNN
@@ -1019,7 +986,7 @@ Wire Wire Line
 Wire Wire Line
 	9615 7505 9615 7430
 $Comp
-L Conn_01x04 P2
+L nmm1_B-rescue:Conn_01x04 P2
 U 1 1 58AC3DF0
 P 12235 7375
 F 0 "P2" H 12235 7585 50  0000 C CNN
@@ -1032,13 +999,13 @@ $EndComp
 Wire Wire Line
 	10725 5825 10725 7275
 Wire Wire Line
-	10725 7275 11025 7275
+	10725 7275 10850 7275
 Wire Wire Line
 	10650 5925 10650 8325
 Wire Wire Line
 	10650 8325 10975 8325
 $Comp
-L R R6
+L nmm1_B-rescue:R R6
 U 1 1 58AD148C
 P 7825 7000
 F 0 "R6" H 7775 6850 50  0000 C CNN
@@ -1049,14 +1016,14 @@ F 3 "" H 7825 7000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	4450 7150 4450 7275
+	4450 7150 4450 7200
 Text Label 4675 7200 0    60   ~ 0
 BTN_1
 Wire Wire Line
 	5000 7200 4450 7200
 Connection ~ 4450 7200
 $Comp
-L +3V3 #PWR029
+L nmm1_B-rescue:+3V3 #PWR029
 U 1 1 58ADA9ED
 P 4450 6800
 F 0 "#PWR029" H 4450 6650 50  0001 C CNN
@@ -1089,7 +1056,7 @@ NoConn ~ 10575 3625
 NoConn ~ 7075 5175
 NoConn ~ 7075 5075
 $Comp
-L R R14
+L nmm1_B-rescue:R R14
 U 1 1 58ACCCE1
 P 7725 4975
 F 0 "R14" V 7650 4925 50  0000 C CNN
@@ -1100,7 +1067,7 @@ F 3 "" H 7725 4975 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R15
+L nmm1_B-rescue:R R15
 U 1 1 58ACD105
 P 7725 5275
 F 0 "R15" V 7650 5225 50  0000 C CNN
@@ -1111,7 +1078,7 @@ F 3 "" H 7725 5275 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	7475 4900 7475 5275
+	7475 4900 7475 4975
 Wire Wire Line
 	7475 5275 7575 5275
 Wire Wire Line
@@ -1134,7 +1101,7 @@ Wire Wire Line
 Wire Wire Line
 	10575 5825 10725 5825
 $Comp
-L VOS627A U6
+L nmm1_B-rescue:VOS627A U6
 U 1 1 58B4533F
 P 11325 7325
 F 0 "U6" H 11200 7475 60  0000 C CNN
@@ -1147,7 +1114,7 @@ $EndComp
 Wire Wire Line
 	11625 7375 12035 7375
 $Comp
-L R R18
+L nmm1_B-rescue:R R18
 U 1 1 58B47C35
 P 11725 7050
 F 0 "R18" H 11620 7195 50  0000 C CNN
@@ -1162,7 +1129,7 @@ Wire Wire Line
 Wire Wire Line
 	10975 7375 10975 7425
 $Comp
-L GND #PWR030
+L nmm1_B-rescue:GND #PWR030
 U 1 1 58B4A6CC
 P 10975 7425
 F 0 "#PWR030" H 10975 7175 50  0001 C CNN
@@ -1173,7 +1140,7 @@ F 3 "" H 10975 7425 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R17
+L nmm1_B-rescue:R R17
 U 1 1 58B4BD0A
 P 10850 7075
 F 0 "R17" H 10925 7225 50  0000 C CNN
@@ -1184,7 +1151,7 @@ F 3 "" H 10850 7075 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR031
+L nmm1_B-rescue:+3V3 #PWR031
 U 1 1 58B4CA78
 P 10850 6875
 F 0 "#PWR031" H 10850 6725 50  0001 C CNN
@@ -1200,7 +1167,7 @@ Connection ~ 10850 7275
 Wire Wire Line
 	10850 6875 10850 6925
 $Comp
-L MAX3295 U4
+L nmm1_B-rescue:MAX3295 U4
 U 1 1 58B4FEA4
 P 11300 8450
 F 0 "U4" H 11150 8750 60  0000 C CNN
@@ -1223,9 +1190,9 @@ Wire Wire Line
 Wire Wire Line
 	11825 7575 12035 7575
 Wire Wire Line
-	11300 7825 11300 8075
+	11300 7825 11300 7875
 $Comp
-L GND #PWR032
+L nmm1_B-rescue:GND #PWR032
 U 1 1 58B553F1
 P 11300 8925
 F 0 "#PWR032" H 11300 8675 50  0001 C CNN
@@ -1238,7 +1205,7 @@ $EndComp
 Wire Wire Line
 	11300 8800 11300 8925
 $Comp
-L +3V3 #PWR033
+L nmm1_B-rescue:+3V3 #PWR033
 U 1 1 58B55F48
 P 11300 7825
 F 0 "#PWR033" H 11300 7675 50  0001 C CNN
@@ -1249,7 +1216,7 @@ F 3 "" H 11300 7825 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R16
+L nmm1_B-rescue:R R16
 U 1 1 58B57DAA
 P 10825 8100
 F 0 "R16" H 10750 8250 50  0000 C CNN
@@ -1287,7 +1254,7 @@ Wire Wire Line
 Wire Wire Line
 	12300 4775 12125 4775
 Wire Wire Line
-	12125 4775 12125 5275
+	12125 4775 12125 5175
 Wire Wire Line
 	10575 4875 12200 4875
 Wire Wire Line
@@ -1302,7 +1269,7 @@ Wire Wire Line
 	12300 5175 12125 5175
 Connection ~ 12125 5175
 $Comp
-L SW_Push SW1
+L nmm1_B-rescue:SW_Push SW1
 U 1 1 58CBF91A
 P 4450 7475
 F 0 "SW1" V 4550 7575 50  0000 L CNN
@@ -1313,7 +1280,7 @@ F 3 "" H 4450 7675 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L SW_Push SW2
+L nmm1_B-rescue:SW_Push SW2
 U 1 1 58CC7607
 P 5575 7475
 F 0 "SW2" V 5675 7575 50  0000 L CNN
@@ -1324,7 +1291,7 @@ F 3 "" H 5575 7675 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L SW_Push SW3
+L nmm1_B-rescue:SW_Push SW3
 U 1 1 58CC76F8
 P 6700 7475
 F 0 "SW3" V 6800 7575 50  0000 L CNN
@@ -1335,7 +1302,7 @@ F 3 "" H 6700 7675 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L SW_Push SW4
+L nmm1_B-rescue:SW_Push SW4
 U 1 1 58CC7DC4
 P 7825 7475
 F 0 "SW4" V 7925 7575 50  0000 L CNN
@@ -1346,7 +1313,7 @@ F 3 "" H 7825 7675 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR034
+L nmm1_B-rescue:GND #PWR034
 U 1 1 58CC886D
 P 4450 7750
 F 0 "#PWR034" H 4450 7500 50  0001 C CNN
@@ -1357,7 +1324,7 @@ F 3 "" H 4450 7750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L nmm1_B-rescue:GND #PWR035
 U 1 1 58CC8F18
 P 5575 7750
 F 0 "#PWR035" H 5575 7500 50  0001 C CNN
@@ -1368,7 +1335,7 @@ F 3 "" H 5575 7750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR036
+L nmm1_B-rescue:GND #PWR036
 U 1 1 58CC97A0
 P 6700 7750
 F 0 "#PWR036" H 6700 7500 50  0001 C CNN
@@ -1379,7 +1346,7 @@ F 3 "" H 6700 7750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L nmm1_B-rescue:GND #PWR037
 U 1 1 58CCA30E
 P 7825 7750
 F 0 "#PWR037" H 7825 7500 50  0001 C CNN
@@ -1399,7 +1366,7 @@ Wire Wire Line
 	4450 7675 4450 7750
 Connection ~ 9615 6625
 $Comp
-L D D4
+L nmm1_B-rescue:D D4
 U 1 1 5A99F1FC
 P 11930 7050
 F 0 "D4" V 11795 7115 50  0000 C CNN
@@ -1426,7 +1393,7 @@ Wire Wire Line
 Wire Wire Line
 	6175 3725 6175 3775
 $Comp
-L +3V3 #PWR038
+L nmm1_B-rescue:+3V3 #PWR038
 U 1 1 58818331
 P 6175 3725
 F 0 "#PWR038" H 6175 3575 50  0001 C CNN
@@ -1442,7 +1409,7 @@ Wire Wire Line
 	6375 3425 4225 3425
 Connection ~ 4225 3425
 $Comp
-L FT232RL U2
+L nmm1_B-rescue:FT232RL U2
 U 1 1 588015E2
 P 6275 4775
 F 0 "U2" H 5625 5675 50  0000 L CNN
@@ -1459,4 +1426,82 @@ Wire Wire Line
 NoConn ~ 5475 5175
 NoConn ~ 5475 4975
 NoConn ~ 5475 4775
+Wire Wire Line
+	8575 5825 8575 5925
+Wire Wire Line
+	8575 5925 8575 6025
+Wire Wire Line
+	8475 3625 8475 3725
+Wire Wire Line
+	8475 3625 8675 3625
+Wire Wire Line
+	6375 5875 6475 5875
+Wire Wire Line
+	6375 5875 6375 5925
+Wire Wire Line
+	6275 5875 6375 5875
+Wire Wire Line
+	6075 5875 6275 5875
+Wire Wire Line
+	4075 4175 4075 4675
+Wire Wire Line
+	11325 4475 11525 4475
+Wire Wire Line
+	11325 4075 11525 4075
+Wire Wire Line
+	11925 4475 11925 4525
+Wire Wire Line
+	11925 5675 12550 5675
+Wire Wire Line
+	11925 5675 11925 5725
+Wire Wire Line
+	8475 3725 8475 3925
+Wire Wire Line
+	4225 2500 4225 3425
+Wire Wire Line
+	4225 2250 5050 2250
+Wire Wire Line
+	6425 2500 6425 2550
+Wire Wire Line
+	6675 2250 6975 2250
+Wire Wire Line
+	6975 2250 7350 2250
+Wire Wire Line
+	7350 2250 7700 2250
+Wire Wire Line
+	7350 2650 7350 2750
+Wire Wire Line
+	7700 2650 7750 2650
+Wire Wire Line
+	7700 2250 7750 2250
+Wire Wire Line
+	7700 2350 7700 2450
+Wire Wire Line
+	8850 2650 8850 2750
+Wire Wire Line
+	8800 2250 8875 2250
+Wire Wire Line
+	9450 2250 9450 2325
+Wire Wire Line
+	9275 2250 9450 2250
+Wire Wire Line
+	5575 7200 5575 7275
+Wire Wire Line
+	6700 7200 6700 7275
+Wire Wire Line
+	7825 7200 7825 7275
+Wire Wire Line
+	4450 7200 4450 7275
+Wire Wire Line
+	7475 4975 7475 5275
+Wire Wire Line
+	10850 7275 11025 7275
+Wire Wire Line
+	11300 7875 11300 8075
+Wire Wire Line
+	12125 5175 12125 5275
+Wire Wire Line
+	9615 6625 9455 6625
+Wire Wire Line
+	4225 3425 4225 4575
 $EndSCHEMATC
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.pro b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.pro
new file mode 100644
index 0000000..45287f3
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.pro
@@ -0,0 +1,64 @@
+update=Mon 02 Jul 2018 18:50:18 GMT
+version=1
+last_client=kicad
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[general]
+version=1
+[eeschema]
+version=1
+LibDir=/home/ricardo/Projects/Kicad/libs/electropepper.pretty
+[eeschema/libraries]
+LibName1=nmm1_B-rescue
+LibName2=power
+LibName3=device
+LibName4=transistors
+LibName5=conn
+LibName6=linear
+LibName7=regul
+LibName8=74xx
+LibName9=cmos4000
+LibName10=adc-dac
+LibName11=memory
+LibName12=xilinx
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
+LibName31=ftdi
+LibName32=switches
+LibName33=/home/ricardo/Projects/Kicad/Kicad_libs/electropepper_kicad
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.sch b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.sch
new file mode 100644
index 0000000..51cb083
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-19-22-24-22.sch
@@ -0,0 +1,1462 @@
+EESchema Schematic File Version 2
+LIBS:nmm1_B-rescue
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:ftdi
+LIBS:switches
+LIBS:electropepper_kicad
+LIBS:nmm1_B-cache
+EELAYER 25 0
+EELAYER END
+$Descr A3 16535 11693
+encoding utf-8
+Sheet 1 1
+Title "NMM-1"
+Date ""
+Rev "A"
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L ATMEGA328P-AU U5
+U 1 1 587FFE62
+P 9575 4725
+F 0 "U5" H 8825 5975 50  0000 L BNN
+F 1 "ATMEGA328P-A" H 9825 3325 50  0000 L BNN
+F 2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" H 9575 4725 50  0001 C CIN
+F 3 "" H 9575 4725 50  0000 C CNN
+	1    9575 4725
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR01
+U 1 1 58800040
+P 11925 4525
+F 0 "#PWR01" H 11925 4275 50  0001 C CNN
+F 1 "GND" H 11925 4375 50  0000 C CNN
+F 2 "" H 11925 4525 50  0000 C CNN
+F 3 "" H 11925 4525 50  0000 C CNN
+	1    11925 4525
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 58800BCC
+P 8575 6025
+F 0 "#PWR02" H 8575 5775 50  0001 C CNN
+F 1 "GND" H 8575 5875 50  0000 C CNN
+F 2 "" H 8575 6025 50  0000 C CNN
+F 3 "" H 8575 6025 50  0000 C CNN
+	1    8575 6025
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR03
+U 1 1 58800C5F
+P 8475 3425
+F 0 "#PWR03" H 8475 3275 50  0001 C CNN
+F 1 "+3V3" H 8475 3565 50  0000 C CNN
+F 2 "" H 8475 3425 50  0000 C CNN
+F 3 "" H 8475 3425 50  0000 C CNN
+	1    8475 3425
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR04
+U 1 1 588017A5
+P 6375 5925
+F 0 "#PWR04" H 6375 5675 50  0001 C CNN
+F 1 "GND" H 6375 5775 50  0000 C CNN
+F 2 "" H 6375 5925 50  0000 C CNN
+F 3 "" H 6375 5925 50  0000 C CNN
+	1    6375 5925
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R9
+U 1 1 588021DF
+P 11925 5475
+F 0 "R9" H 12000 5325 50  0000 C CNN
+F 1 "10K" H 11825 5625 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 11855 5475 50  0001 C CNN
+F 3 "" H 11925 5475 50  0000 C CNN
+	1    11925 5475
+	-1   0    0    1   
+$EndComp
+$Comp
+L USB_OTG-Electropepper P1
+U 1 1 58815603
+P 3675 4375
+F 0 "P1" V 3975 4325 50  0000 C CNN
+F 1 "USB_OTG" V 3375 4375 50  0000 C CNN
+F 2 "Connectors:USB_Mini-B" V 3625 4275 50  0001 C CNN
+F 3 "" V 3625 4275 50  0000 C CNN
+	1    3675 4375
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR05
+U 1 1 588157DF
+P 4075 4675
+F 0 "#PWR05" H 4075 4425 50  0001 C CNN
+F 1 "GND" H 4075 4525 50  0000 C CNN
+F 2 "" H 4075 4675 50  0000 C CNN
+F 3 "" H 4075 4675 50  0000 C CNN
+	1    4075 4675
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C2
+U 1 1 58815C2D
+P 4425 5225
+F 0 "C2" H 4450 5325 50  0000 L CNN
+F 1 "100nF" H 4450 5125 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4463 5075 50  0001 C CNN
+F 3 "" H 4425 5225 50  0000 C CNN
+	1    4425 5225
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR06
+U 1 1 58815D7B
+P 4425 5425
+F 0 "#PWR06" H 4425 5175 50  0001 C CNN
+F 1 "GND" H 4425 5275 50  0000 C CNN
+F 2 "" H 4425 5425 50  0000 C CNN
+F 3 "" H 4425 5425 50  0000 C CNN
+	1    4425 5425
+	1    0    0    -1  
+$EndComp
+$Comp
+L Crystal X1
+U 1 1 588196A3
+P 11325 4275
+F 0 "X1" V 11175 4175 50  0000 C CNN
+F 1 "8Mhz" V 11575 4275 50  0000 C CNN
+F 2 "Crystals:Crystal_SMD_HC49-SD" H 11325 4275 50  0001 C CNN
+F 3 "" H 11325 4275 50  0000 C CNN
+	1    11325 4275
+	0    1    1    0   
+$EndComp
+$Comp
+L C C10
+U 1 1 58819B31
+P 11675 4075
+F 0 "C10" V 11525 4000 50  0000 L CNN
+F 1 "22pF" V 11825 3975 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 11713 3925 50  0001 C CNN
+F 3 "" H 11675 4075 50  0000 C CNN
+	1    11675 4075
+	0    1    1    0   
+$EndComp
+$Comp
+L C C11
+U 1 1 58819C1C
+P 11675 4475
+F 0 "C11" V 11625 4275 50  0000 L CNN
+F 1 "22pF" V 11825 4375 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 11713 4325 50  0001 C CNN
+F 3 "" H 11675 4475 50  0000 C CNN
+	1    11675 4475
+	0    1    1    0   
+$EndComp
+$Comp
+L +3V3 #PWR07
+U 1 1 5881BF45
+P 11925 5275
+F 0 "#PWR07" H 11925 5125 50  0001 C CNN
+F 1 "+3V3" H 11925 5415 50  0000 C CNN
+F 2 "" H 11925 5275 50  0000 C CNN
+F 3 "" H 11925 5275 50  0000 C CNN
+	1    11925 5275
+	1    0    0    -1  
+$EndComp
+Text Label 12250 5675 0    60   ~ 0
+RESET
+$Comp
+L GND #PWR08
+U 1 1 5881D109
+P 8575 4625
+F 0 "#PWR08" H 8575 4375 50  0001 C CNN
+F 1 "GND" H 8575 4475 50  0000 C CNN
+F 2 "" H 8575 4625 50  0000 C CNN
+F 3 "" H 8575 4625 50  0000 C CNN
+	1    8575 4625
+	1    0    0    -1  
+$EndComp
+$Comp
+L LED D2
+U 1 1 5881DC19
+P 8100 5275
+F 0 "D2" H 8100 5175 50  0000 C CNN
+F 1 "LED" H 7975 5325 50  0000 C CNN
+F 2 "LEDs:LED_PLCC-2" H 8100 5275 50  0001 C CNN
+F 3 "" H 8100 5275 50  0000 C CNN
+	1    8100 5275
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR09
+U 1 1 5881E300
+P 7475 4900
+F 0 "#PWR09" H 7475 4750 50  0001 C CNN
+F 1 "+3V3" H 7475 5040 50  0000 C CNN
+F 2 "" H 7475 4900 50  0000 C CNN
+F 3 "" H 7475 4900 50  0000 C CNN
+	1    7475 4900
+	1    0    0    -1  
+$EndComp
+NoConn ~ 7075 5475
+NoConn ~ 7075 5375
+NoConn ~ 7075 5275
+$Comp
+L SW_Push SW5
+U 1 1 58821233
+P 11925 5925
+F 0 "SW5" V 12025 6025 50  0000 L CNN
+F 1 "SW_Push" V 11925 5725 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 11925 6125 50  0001 C CNN
+F 3 "" H 11925 6125 50  0000 C CNN
+	1    11925 5925
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR010
+U 1 1 58821A31
+P 11925 6175
+F 0 "#PWR010" H 11925 5925 50  0001 C CNN
+F 1 "GND" H 11925 6025 50  0000 C CNN
+F 2 "" H 11925 6175 50  0000 C CNN
+F 3 "" H 11925 6175 50  0000 C CNN
+	1    11925 6175
+	1    0    0    -1  
+$EndComp
+Text Label 7575 4475 0    60   ~ 0
+RESET
+NoConn ~ 7075 4275
+NoConn ~ 7075 4375
+NoConn ~ 7075 4575
+NoConn ~ 7075 4675
+NoConn ~ 7075 4775
+$Comp
+L Conn_02x03_Odd_Even P4
+U 1 1 58823534
+P 10300 2975
+F 0 "P4" H 10300 3175 50  0000 C CNN
+F 1 "CONN_02X03" H 10300 2775 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x03_Pitch2.54mm" H 10350 2925 50  0001 C CNN
+F 3 "" H 10300 1775 50  0000 C CNN
+	1    10300 2975
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR011
+U 1 1 588241EB
+P 9875 2825
+F 0 "#PWR011" H 9875 2675 50  0001 C CNN
+F 1 "+3V3" H 9875 2965 50  0000 C CNN
+F 2 "" H 9875 2825 50  0000 C CNN
+F 3 "" H 9875 2825 50  0000 C CNN
+	1    9875 2825
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR012
+U 1 1 58824336
+P 9875 3150
+F 0 "#PWR012" H 9875 2900 50  0001 C CNN
+F 1 "GND" H 9875 3000 50  0000 C CNN
+F 2 "" H 9875 3150 50  0000 C CNN
+F 3 "" H 9875 3150 50  0000 C CNN
+	1    9875 3150
+	1    0    0    -1  
+$EndComp
+Text Label 9775 2975 0    60   ~ 0
+RESET
+$Comp
+L C C7
+U 1 1 58825549
+P 8225 3625
+F 0 "C7" V 8325 3725 50  0000 L CNN
+F 1 "100nF" V 8075 3475 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 8263 3475 50  0001 C CNN
+F 3 "" H 8225 3625 50  0000 C CNN
+	1    8225 3625
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR013
+U 1 1 588259C0
+P 8025 3775
+F 0 "#PWR013" H 8025 3525 50  0001 C CNN
+F 1 "GND" H 8025 3625 50  0000 C CNN
+F 2 "" H 8025 3775 50  0000 C CNN
+F 3 "" H 8025 3775 50  0000 C CNN
+	1    8025 3775
+	1    0    0    -1  
+$EndComp
+$Comp
+L MCP73831 U1
+U 1 1 5887F26B
+P 5525 2375
+F 0 "U1" H 5300 2625 60  0000 C CNN
+F 1 "MCP73831" H 5575 2125 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-5" H 5525 2450 60  0001 C CNN
+F 3 "" H 5525 2450 60  0001 C CNN
+	1    5525 2375
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R1
+U 1 1 58883862
+P 4825 2500
+F 0 "R1" V 4750 2450 50  0000 C CNN
+F 1 "470R" V 4900 2500 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 4755 2500 50  0001 C CNN
+F 3 "" H 4825 2500 50  0000 C CNN
+	1    4825 2500
+	0    1    1    0   
+$EndComp
+$Comp
+L C C1
+U 1 1 58885F04
+P 4050 2450
+F 0 "C1" H 3925 2575 50  0000 L CNN
+F 1 "4.7uF" H 3825 2325 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4088 2300 50  0001 C CNN
+F 3 "" H 4050 2450 50  0000 C CNN
+	1    4050 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR014
+U 1 1 588868B7
+P 4050 2675
+F 0 "#PWR014" H 4050 2425 50  0001 C CNN
+F 1 "GND" H 4050 2525 50  0000 C CNN
+F 2 "" H 4050 2675 50  0000 C CNN
+F 3 "" H 4050 2675 50  0000 C CNN
+	1    4050 2675
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C4
+U 1 1 5888837D
+P 6675 2450
+F 0 "C4" H 6550 2575 50  0000 L CNN
+F 1 "4.7uF" H 6450 2325 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 6713 2300 50  0001 C CNN
+F 3 "" H 6675 2450 50  0000 C CNN
+	1    6675 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R2
+U 1 1 5888A417
+P 6225 2375
+F 0 "R2" V 6150 2325 50  0000 C CNN
+F 1 "2K" V 6300 2375 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6155 2375 50  0001 C CNN
+F 3 "" H 6225 2375 50  0000 C CNN
+	1    6225 2375
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR015
+U 1 1 5888AE3C
+P 6425 2550
+F 0 "#PWR015" H 6425 2300 50  0001 C CNN
+F 1 "GND" H 6425 2400 50  0000 C CNN
+F 2 "" H 6425 2550 50  0000 C CNN
+F 3 "" H 6425 2550 50  0000 C CNN
+	1    6425 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR016
+U 1 1 5888BD3C
+P 6675 2675
+F 0 "#PWR016" H 6675 2425 50  0001 C CNN
+F 1 "GND" H 6675 2525 50  0000 C CNN
+F 2 "" H 6675 2675 50  0000 C CNN
+F 3 "" H 6675 2675 50  0000 C CNN
+	1    6675 2675
+	1    0    0    -1  
+$EndComp
+$Comp
+L Conn_01x02 P3
+U 1 1 58896012
+P 6975 1775
+F 0 "P3" V 6950 1950 50  0000 C CNN
+F 1 "Battery" V 7075 1775 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 6975 1775 50  0001 C CNN
+F 3 "" H 6975 1775 50  0000 C CNN
+	1    6975 1775
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR017
+U 1 1 58896C56
+P 7075 2025
+F 0 "#PWR017" H 7075 1775 50  0001 C CNN
+F 1 "GND" H 7075 1875 50  0000 C CNN
+F 2 "" H 7075 2025 50  0000 C CNN
+F 3 "" H 7075 2025 50  0000 C CNN
+	1    7075 2025
+	1    0    0    -1  
+$EndComp
+$Comp
+L TPS62046 U3
+U 1 1 58897588
+P 8250 2450
+F 0 "U3" H 8050 2750 60  0000 C CNN
+F 1 "TPS62046" H 8500 2150 60  0000 C CNN
+F 2 "Housings_SSOP:MSOP-10-1EP_3x3mm_Pitch0.5mm" H 8270 2460 60  0001 C CNN
+F 3 "" H 8270 2460 60  0001 C CNN
+	1    8250 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C6
+U 1 1 588996E9
+P 7350 2450
+F 0 "C6" H 7375 2550 50  0000 L CNN
+F 1 "22uF" H 7375 2350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" H 7388 2300 50  0001 C CNN
+F 3 "" H 7350 2450 50  0000 C CNN
+	1    7350 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C9
+U 1 1 5889990B
+P 9450 2475
+F 0 "C9" H 9475 2575 50  0000 L CNN
+F 1 "22uF" H 9475 2375 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" H 9488 2325 50  0001 C CNN
+F 3 "" H 9450 2475 50  0000 C CNN
+	1    9450 2475
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR018
+U 1 1 58899DC7
+P 7350 2750
+F 0 "#PWR018" H 7350 2500 50  0001 C CNN
+F 1 "GND" H 7350 2600 50  0000 C CNN
+F 2 "" H 7350 2750 50  0000 C CNN
+F 3 "" H 7350 2750 50  0000 C CNN
+	1    7350 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR019
+U 1 1 5889C3E6
+P 8850 2750
+F 0 "#PWR019" H 8850 2500 50  0001 C CNN
+F 1 "GND" H 8850 2600 50  0000 C CNN
+F 2 "" H 8850 2750 50  0000 C CNN
+F 3 "" H 8850 2750 50  0000 C CNN
+	1    8850 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L L L1
+U 1 1 5889C7D1
+P 9025 2250
+F 0 "L1" V 9100 2275 50  0000 C CNN
+F 1 "6.2uH" V 8975 2250 50  0000 C CNN
+F 2 "Electropepper parts:SRN6028" H 9025 2250 50  0001 C CNN
+F 3 "" H 9025 2250 50  0000 C CNN
+	1    9025 2250
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR020
+U 1 1 5889CDDE
+P 9450 2700
+F 0 "#PWR020" H 9450 2450 50  0001 C CNN
+F 1 "GND" H 9450 2550 50  0000 C CNN
+F 2 "" H 9450 2700 50  0000 C CNN
+F 3 "" H 9450 2700 50  0000 C CNN
+	1    9450 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR021
+U 1 1 5889D9E5
+P 9450 2175
+F 0 "#PWR021" H 9450 2025 50  0001 C CNN
+F 1 "+3V3" H 9450 2315 50  0000 C CNN
+F 2 "" H 9450 2175 50  0000 C CNN
+F 3 "" H 9450 2175 50  0000 C CNN
+	1    9450 2175
+	1    0    0    -1  
+$EndComp
+Text Label 6325 2250 0    60   ~ 0
+VBatt
+$Comp
+L LED D3
+U 1 1 58912C50
+P 8100 4975
+F 0 "D3" H 8100 4875 50  0000 C CNN
+F 1 "LED" H 7975 5025 50  0000 C CNN
+F 2 "LEDs:LED_PLCC-2" H 8100 4975 50  0001 C CNN
+F 3 "" H 8100 4975 50  0000 C CNN
+	1    8100 4975
+	-1   0    0    1   
+$EndComp
+$Comp
+L LED D1
+U 1 1 589137FD
+P 4450 2500
+F 0 "D1" H 4450 2425 50  0000 C CNN
+F 1 "LED" H 4400 2600 50  0000 C CNN
+F 2 "LEDs:LED_PLCC-2" H 4450 2500 50  0001 C CNN
+F 3 "" H 4450 2500 50  0000 C CNN
+	1    4450 2500
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C8
+U 1 1 5891C141
+P 8575 4425
+F 0 "C8" H 8600 4525 50  0000 L CNN
+F 1 "100nF" H 8600 4325 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 8613 4275 50  0001 C CNN
+F 3 "" H 8575 4425 50  0000 C CNN
+	1    8575 4425
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C5
+U 1 1 5891E9F8
+P 7325 4475
+F 0 "C5" V 7175 4400 50  0000 L CNN
+F 1 "100nF" V 7450 4425 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 7363 4325 50  0001 C CNN
+F 3 "" H 7325 4475 50  0000 C CNN
+	1    7325 4475
+	0    1    1    0   
+$EndComp
+$Comp
+L R R3
+U 1 1 5894FF99
+P 4450 7000
+F 0 "R3" H 4400 6850 50  0000 C CNN
+F 1 "10K" H 4350 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 4380 7000 50  0001 C CNN
+F 3 "" H 4450 7000 50  0000 C CNN
+	1    4450 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR022
+U 1 1 5894FF9F
+P 5575 6800
+F 0 "#PWR022" H 5575 6650 50  0001 C CNN
+F 1 "+3V3" H 5575 6940 50  0000 C CNN
+F 2 "" H 5575 6800 50  0000 C CNN
+F 3 "" H 5575 6800 50  0000 C CNN
+	1    5575 6800
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R4
+U 1 1 5895063D
+P 5575 7000
+F 0 "R4" H 5525 6850 50  0000 C CNN
+F 1 "10K" H 5475 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 5505 7000 50  0001 C CNN
+F 3 "" H 5575 7000 50  0000 C CNN
+	1    5575 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR023
+U 1 1 58950643
+P 6700 6800
+F 0 "#PWR023" H 6700 6650 50  0001 C CNN
+F 1 "+3V3" H 6700 6940 50  0000 C CNN
+F 2 "" H 6700 6800 50  0000 C CNN
+F 3 "" H 6700 6800 50  0000 C CNN
+	1    6700 6800
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R5
+U 1 1 58950803
+P 6700 7000
+F 0 "R5" H 6650 6850 50  0000 C CNN
+F 1 "10K" H 6600 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6630 7000 50  0001 C CNN
+F 3 "" H 6700 7000 50  0000 C CNN
+	1    6700 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR024
+U 1 1 58950809
+P 7825 6800
+F 0 "#PWR024" H 7825 6650 50  0001 C CNN
+F 1 "+3V3" H 7825 6940 50  0000 C CNN
+F 2 "" H 7825 6800 50  0000 C CNN
+F 3 "" H 7825 6800 50  0000 C CNN
+	1    7825 6800
+	1    0    0    -1  
+$EndComp
+Text Label 8050 7200 0    60   ~ 0
+BTN_4
+Text Label 5800 7200 0    60   ~ 0
+BTN_2
+Text Label 6925 7200 0    60   ~ 0
+BTN_3
+NoConn ~ 3975 4275
+$Comp
+L GND #PWR025
+U 1 1 589EDA0C
+P 8250 2950
+F 0 "#PWR025" H 8250 2700 50  0001 C CNN
+F 1 "GND" H 8250 2800 50  0000 C CNN
+F 2 "" H 8250 2950 50  0000 C CNN
+F 3 "" H 8250 2950 50  0000 C CNN
+	1    8250 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Conn_01x05 P6
+U 1 1 58AC71D2
+P 12500 4975
+F 0 "P6" H 12500 5275 50  0000 C CNN
+F 1 "Display" H 12500 4675 50  0000 C CNN
+F 2 "Electropepper parts:OLED-ARDUINO-IIC-ALI" H 12500 3775 50  0001 C CNN
+F 3 "" H 12500 3775 50  0000 C CNN
+	1    12500 4975
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR026
+U 1 1 58AC9036
+P 12250 4675
+F 0 "#PWR026" H 12250 4525 50  0001 C CNN
+F 1 "+3V3" H 12250 4815 50  0000 C CNN
+F 2 "" H 12250 4675 50  0000 C CNN
+F 3 "" H 12250 4675 50  0000 C CNN
+	1    12250 4675
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8675 5725 8575 5725
+Wire Wire Line
+	8575 5725 8575 6025
+Wire Wire Line
+	8675 5825 8575 5825
+Connection ~ 8575 5825
+Wire Wire Line
+	8675 5925 8575 5925
+Connection ~ 8575 5925
+Wire Wire Line
+	8475 3425 8475 3925
+Wire Wire Line
+	8475 3725 8675 3725
+Wire Wire Line
+	8375 3625 8675 3625
+Connection ~ 8475 3625
+Wire Wire Line
+	6075 5775 6075 5875
+Wire Wire Line
+	5375 5875 6475 5875
+Wire Wire Line
+	6475 5875 6475 5775
+Wire Wire Line
+	6375 5775 6375 5925
+Connection ~ 6375 5875
+Wire Wire Line
+	6275 5775 6275 5875
+Connection ~ 6275 5875
+Connection ~ 6075 5875
+Wire Wire Line
+	3975 4375 5475 4375
+Wire Wire Line
+	5475 4475 3975 4475
+Wire Wire Line
+	3575 3975 3575 3925
+Wire Wire Line
+	3575 3925 4075 3925
+Wire Wire Line
+	4075 3925 4075 4675
+Wire Wire Line
+	3975 4175 4075 4175
+Connection ~ 4075 4175
+Wire Wire Line
+	4425 5375 4425 5425
+Wire Wire Line
+	4425 5075 4425 4075
+Wire Wire Line
+	4425 4075 5475 4075
+Wire Wire Line
+	4225 4575 3975 4575
+Wire Wire Line
+	10575 4225 11125 4225
+Wire Wire Line
+	11125 4225 11125 4075
+Wire Wire Line
+	11125 4075 11525 4075
+Wire Wire Line
+	10575 4325 11125 4325
+Wire Wire Line
+	11125 4325 11125 4475
+Wire Wire Line
+	11125 4475 11525 4475
+Wire Wire Line
+	11325 4425 11325 4475
+Connection ~ 11325 4475
+Wire Wire Line
+	11325 4125 11325 4075
+Connection ~ 11325 4075
+Wire Wire Line
+	11825 4075 11925 4075
+Wire Wire Line
+	11925 4075 11925 4525
+Wire Wire Line
+	11825 4475 11925 4475
+Connection ~ 11925 4475
+Wire Wire Line
+	10575 5075 11750 5075
+Wire Wire Line
+	11750 5075 11750 5675
+Wire Wire Line
+	11750 5675 12550 5675
+Wire Wire Line
+	11925 5625 11925 5725
+Connection ~ 11925 5675
+Wire Wire Line
+	11925 5325 11925 5275
+Wire Wire Line
+	8675 4225 8575 4225
+Wire Wire Line
+	8575 4225 8575 4275
+Wire Wire Line
+	8575 4575 8575 4625
+Wire Wire Line
+	8475 3925 8675 3925
+Connection ~ 8475 3725
+Wire Wire Line
+	10575 5325 11400 5325
+Wire Wire Line
+	10575 5225 11500 5225
+Wire Wire Line
+	7075 4175 8425 4175
+Wire Wire Line
+	8425 4175 8425 6325
+Wire Wire Line
+	8425 6325 11400 6325
+Wire Wire Line
+	11400 6325 11400 5325
+Wire Wire Line
+	11500 5225 11500 6425
+Wire Wire Line
+	11500 6425 8325 6425
+Wire Wire Line
+	8325 6425 8325 4075
+Wire Wire Line
+	8325 4075 7075 4075
+Wire Wire Line
+	11925 6125 11925 6175
+Wire Wire Line
+	7075 4475 7175 4475
+Wire Wire Line
+	7475 4475 7825 4475
+Wire Wire Line
+	10900 3925 10575 3925
+Wire Wire Line
+	10900 3075 10900 3925
+Wire Wire Line
+	10900 3075 10600 3075
+Wire Wire Line
+	10600 2975 10950 2975
+Wire Wire Line
+	10950 4025 10575 4025
+Wire Wire Line
+	11000 4125 10575 4125
+Wire Wire Line
+	11000 2875 11000 4125
+Wire Wire Line
+	11000 2875 10600 2875
+Wire Wire Line
+	10100 2875 9875 2875
+Wire Wire Line
+	9875 2875 9875 2825
+Wire Wire Line
+	10100 3075 9875 3075
+Wire Wire Line
+	9875 3075 9875 3150
+Wire Wire Line
+	10100 2975 9775 2975
+Wire Wire Line
+	8025 3775 8025 3625
+Wire Wire Line
+	8025 3625 8075 3625
+Wire Wire Line
+	4225 2250 4225 4575
+Wire Wire Line
+	4050 2250 5050 2250
+Wire Wire Line
+	4975 2500 5050 2500
+Wire Wire Line
+	4675 2500 4600 2500
+Wire Wire Line
+	4225 2500 4300 2500
+Connection ~ 4225 2500
+Wire Wire Line
+	4050 2600 4050 2675
+Wire Wire Line
+	4050 2300 4050 2250
+Connection ~ 4225 2250
+Wire Wire Line
+	6000 2375 6075 2375
+Wire Wire Line
+	6375 2375 6425 2375
+Wire Wire Line
+	6425 2375 6425 2550
+Wire Wire Line
+	6000 2500 6425 2500
+Connection ~ 6425 2500
+Wire Wire Line
+	6000 2250 7750 2250
+Wire Wire Line
+	6675 2300 6675 2250
+Connection ~ 6675 2250
+Wire Wire Line
+	6675 2600 6675 2675
+Wire Wire Line
+	6975 2250 6975 1975
+Wire Wire Line
+	7075 1975 7075 2025
+Connection ~ 6975 2250
+Wire Wire Line
+	7350 2600 7350 2750
+Wire Wire Line
+	7350 2300 7350 2250
+Connection ~ 7350 2250
+Wire Wire Line
+	7350 2650 7750 2650
+Connection ~ 7350 2650
+Wire Wire Line
+	7750 2550 7700 2550
+Wire Wire Line
+	7700 2550 7700 2650
+Connection ~ 7700 2650
+Wire Wire Line
+	7750 2350 7700 2350
+Wire Wire Line
+	7700 2250 7700 2450
+Connection ~ 7700 2250
+Wire Wire Line
+	7700 2450 7750 2450
+Connection ~ 7700 2350
+Wire Wire Line
+	8750 2550 8850 2550
+Wire Wire Line
+	8850 2550 8850 2750
+Wire Wire Line
+	8750 2650 8850 2650
+Connection ~ 8850 2650
+Wire Wire Line
+	8750 2250 8875 2250
+Wire Wire Line
+	8750 2350 8800 2350
+Wire Wire Line
+	8800 2350 8800 2250
+Connection ~ 8800 2250
+Wire Wire Line
+	9450 2625 9450 2700
+Wire Wire Line
+	9450 2175 9450 2325
+Wire Wire Line
+	9175 2250 9450 2250
+Connection ~ 9450 2250
+Wire Wire Line
+	8750 2450 9275 2450
+Wire Wire Line
+	9275 2450 9275 2250
+Connection ~ 9275 2250
+Wire Wire Line
+	5575 7150 5575 7275
+Connection ~ 5575 7200
+Wire Wire Line
+	5575 6850 5575 6800
+Wire Wire Line
+	6700 7150 6700 7275
+Connection ~ 6700 7200
+Wire Wire Line
+	6700 6850 6700 6800
+Wire Wire Line
+	7825 7150 7825 7275
+Connection ~ 7825 7200
+Wire Wire Line
+	7825 6850 7825 6800
+Wire Wire Line
+	5575 7200 6125 7200
+Wire Wire Line
+	6700 7200 7250 7200
+Wire Wire Line
+	7825 7200 8375 7200
+Wire Wire Line
+	8250 2900 8250 2950
+$Comp
+L GND #PWR027
+U 1 1 58ACBA19
+P 12125 5275
+F 0 "#PWR027" H 12125 5025 50  0001 C CNN
+F 1 "GND" H 12125 5125 50  0000 C CNN
+F 2 "" H 12125 5275 50  0000 C CNN
+F 3 "" H 12125 5275 50  0000 C CNN
+	1    12125 5275
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10575 4775 11150 4775
+Wire Wire Line
+	11150 4775 11150 6625
+Wire Wire Line
+	11150 6625 9455 6625
+$Comp
+L R R13
+U 1 1 58AE025B
+P 9305 6625
+F 0 "R13" V 9380 6675 50  0000 C CNN
+F 1 "330K" V 9205 6625 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9205 6675 50  0001 C CNN
+F 3 "" H 9305 6625 50  0000 C CNN
+	1    9305 6625
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	8600 6625 9155 6625
+Text Label 8625 6625 0    60   ~ 0
+VBatt
+$Comp
+L R R10
+U 1 1 58AE3757
+P 9615 6905
+F 0 "R10" H 9490 6980 50  0000 C CNN
+F 1 "36K" H 9740 6830 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9515 6955 50  0001 C CNN
+F 3 "" H 9615 6905 50  0000 C CNN
+	1    9615 6905
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R11
+U 1 1 58AE393C
+P 9615 7280
+F 0 "R11" H 9490 7355 50  0000 C CNN
+F 1 "330R" H 9765 7205 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9515 7330 50  0001 C CNN
+F 3 "" H 9615 7280 50  0000 C CNN
+	1    9615 7280
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R12
+U 1 1 58AE3E88
+P 9615 7655
+F 0 "R12" H 9490 7730 50  0000 C CNN
+F 1 "330R" H 9765 7580 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9515 7705 50  0001 C CNN
+F 3 "" H 9615 7655 50  0000 C CNN
+	1    9615 7655
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9615 6755 9615 6625
+Wire Wire Line
+	9615 7055 9615 7130
+$Comp
+L GND #PWR028
+U 1 1 58AE7333
+P 9615 7880
+F 0 "#PWR028" H 9615 7630 50  0001 C CNN
+F 1 "GND" H 9615 7730 50  0000 C CNN
+F 2 "" H 9615 7880 50  0000 C CNN
+F 3 "" H 9615 7880 50  0000 C CNN
+	1    9615 7880
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9615 7880 9615 7805
+Wire Wire Line
+	9615 7505 9615 7430
+$Comp
+L Conn_01x04 P2
+U 1 1 58AC3DF0
+P 12235 7375
+F 0 "P2" H 12235 7585 50  0000 C CNN
+F 1 "RS422" H 12240 7075 50  0000 C CNN
+F 2 "Connectors_Phoenix:PhoenixContact_MC-G_04x3.81mm_Angled" H 12235 7375 50  0001 C CNN
+F 3 "" H 12235 7375 50  0000 C CNN
+	1    12235 7375
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10725 5825 10725 7275
+Wire Wire Line
+	10725 7275 11025 7275
+Wire Wire Line
+	10650 5925 10650 8325
+Wire Wire Line
+	10650 8325 10975 8325
+$Comp
+L R R6
+U 1 1 58AD148C
+P 7825 7000
+F 0 "R6" H 7775 6850 50  0000 C CNN
+F 1 "10K" H 7725 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7755 7000 50  0001 C CNN
+F 3 "" H 7825 7000 50  0000 C CNN
+	1    7825 7000
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	4450 7150 4450 7275
+Text Label 4675 7200 0    60   ~ 0
+BTN_1
+Wire Wire Line
+	5000 7200 4450 7200
+Connection ~ 4450 7200
+$Comp
+L +3V3 #PWR029
+U 1 1 58ADA9ED
+P 4450 6800
+F 0 "#PWR029" H 4450 6650 50  0001 C CNN
+F 1 "+3V3" H 4450 6940 50  0000 C CNN
+F 2 "" H 4450 6800 50  0000 C CNN
+F 3 "" H 4450 6800 50  0000 C CNN
+	1    4450 6800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4450 6850 4450 6800
+Text Label 10650 5425 0    60   ~ 0
+BTN_1
+Text Label 10650 5525 0    60   ~ 0
+BTN_2
+Text Label 10650 5625 0    60   ~ 0
+BTN_3
+Text Label 10650 5725 0    60   ~ 0
+BTN_4
+Wire Wire Line
+	10575 5425 10975 5425
+Wire Wire Line
+	10575 5525 10975 5525
+Wire Wire Line
+	10575 5625 10975 5625
+Wire Wire Line
+	10575 5725 10975 5725
+NoConn ~ 10575 4675
+NoConn ~ 10575 3625
+NoConn ~ 7075 5175
+NoConn ~ 7075 5075
+$Comp
+L R R14
+U 1 1 58ACCCE1
+P 7725 4975
+F 0 "R14" V 7650 4925 50  0000 C CNN
+F 1 "330R" V 7800 5100 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7625 5025 50  0001 C CNN
+F 3 "" H 7725 4975 50  0000 C CNN
+	1    7725 4975
+	0    1    1    0   
+$EndComp
+$Comp
+L R R15
+U 1 1 58ACD105
+P 7725 5275
+F 0 "R15" V 7650 5225 50  0000 C CNN
+F 1 "330R" V 7800 5400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7625 5325 50  0001 C CNN
+F 3 "" H 7725 5275 50  0000 C CNN
+	1    7725 5275
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7475 4900 7475 5275
+Wire Wire Line
+	7475 5275 7575 5275
+Wire Wire Line
+	7575 4975 7475 4975
+Connection ~ 7475 4975
+Wire Wire Line
+	7875 4975 7950 4975
+Wire Wire Line
+	7875 5275 7950 5275
+Wire Wire Line
+	8250 4975 8675 4975
+Wire Wire Line
+	8250 5275 8525 5275
+Wire Wire Line
+	8525 5275 8525 5075
+Wire Wire Line
+	8525 5075 8675 5075
+Wire Wire Line
+	10650 5925 10575 5925
+Wire Wire Line
+	10575 5825 10725 5825
+$Comp
+L VOS627A U6
+U 1 1 58B4533F
+P 11325 7325
+F 0 "U6" H 11200 7475 60  0000 C CNN
+F 1 "VOS627A" H 11325 7175 60  0000 C CNN
+F 2 "Housings_SSOP:SOP-4_4.4x2.8mm_Pitch1.27mm" H 11325 7275 60  0001 C CNN
+F 3 "" H 11325 7275 60  0001 C CNN
+	1    11325 7325
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	11625 7375 12035 7375
+$Comp
+L R R18
+U 1 1 58B47C35
+P 11725 7050
+F 0 "R18" H 11620 7195 50  0000 C CNN
+F 1 "1K" H 11630 7060 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 11625 7100 50  0001 C CNN
+F 3 "" H 11725 7050 50  0000 C CNN
+	1    11725 7050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11025 7375 10975 7375
+Wire Wire Line
+	10975 7375 10975 7425
+$Comp
+L GND #PWR030
+U 1 1 58B4A6CC
+P 10975 7425
+F 0 "#PWR030" H 10975 7175 50  0001 C CNN
+F 1 "GND" H 10975 7275 50  0000 C CNN
+F 2 "" H 10975 7425 50  0000 C CNN
+F 3 "" H 10975 7425 50  0000 C CNN
+	1    10975 7425
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R17
+U 1 1 58B4BD0A
+P 10850 7075
+F 0 "R17" H 10925 7225 50  0000 C CNN
+F 1 "1K" H 10950 7000 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10750 7125 50  0001 C CNN
+F 3 "" H 10850 7075 50  0000 C CNN
+	1    10850 7075
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR031
+U 1 1 58B4CA78
+P 10850 6875
+F 0 "#PWR031" H 10850 6725 50  0001 C CNN
+F 1 "+3V3" H 10850 7015 50  0000 C CNN
+F 2 "" H 10850 6875 50  0000 C CNN
+F 3 "" H 10850 6875 50  0000 C CNN
+	1    10850 6875
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10850 7225 10850 7275
+Connection ~ 10850 7275
+Wire Wire Line
+	10850 6875 10850 6925
+$Comp
+L MAX3295 U4
+U 1 1 58B4FEA4
+P 11300 8450
+F 0 "U4" H 11150 8750 60  0000 C CNN
+F 1 "MAX3295" H 11525 8175 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 11300 8450 60  0001 C CNN
+F 3 "" H 11300 8450 60  0001 C CNN
+	1    11300 8450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	12035 7475 11750 7475
+Wire Wire Line
+	11750 7475 11750 8325
+Wire Wire Line
+	11750 8325 11625 8325
+Wire Wire Line
+	11625 8450 11825 8450
+Wire Wire Line
+	11825 8450 11825 7575
+Wire Wire Line
+	11825 7575 12035 7575
+Wire Wire Line
+	11300 7825 11300 8075
+$Comp
+L GND #PWR032
+U 1 1 58B553F1
+P 11300 8925
+F 0 "#PWR032" H 11300 8675 50  0001 C CNN
+F 1 "GND" H 11300 8775 50  0000 C CNN
+F 2 "" H 11300 8925 50  0000 C CNN
+F 3 "" H 11300 8925 50  0000 C CNN
+	1    11300 8925
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11300 8800 11300 8925
+$Comp
+L +3V3 #PWR033
+U 1 1 58B55F48
+P 11300 7825
+F 0 "#PWR033" H 11300 7675 50  0001 C CNN
+F 1 "+3V3" H 11300 7965 50  0000 C CNN
+F 2 "" H 11300 7825 50  0000 C CNN
+F 3 "" H 11300 7825 50  0000 C CNN
+	1    11300 7825
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R16
+U 1 1 58B57DAA
+P 10825 8100
+F 0 "R16" H 10750 8250 50  0000 C CNN
+F 1 "1K" H 10925 8025 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10725 8150 50  0001 C CNN
+F 3 "" H 10825 8100 50  0000 C CNN
+	1    10825 8100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10825 7950 10825 7875
+Wire Wire Line
+	10825 7875 11300 7875
+Connection ~ 11300 7875
+Wire Wire Line
+	10825 8250 10825 8525
+Wire Wire Line
+	10825 8525 10975 8525
+Text Notes 12295 7315 0    60   ~ 0
+RX- / B
+Text Notes 12295 7400 0    60   ~ 0
+RX+ / A
+Text Notes 12300 7625 0    60   ~ 0
+TX+ / A
+Text Notes 12300 7540 0    60   ~ 0
+TX- / B
+NoConn ~ 10575 4575
+NoConn ~ 10575 4475
+Wire Wire Line
+	10950 2975 10950 4025
+NoConn ~ 10575 3725
+NoConn ~ 10575 3825
+Wire Wire Line
+	10575 4975 12300 4975
+Wire Wire Line
+	12300 4775 12125 4775
+Wire Wire Line
+	12125 4775 12125 5275
+Wire Wire Line
+	10575 4875 12200 4875
+Wire Wire Line
+	12200 4875 12200 5075
+Wire Wire Line
+	12200 5075 12300 5075
+Wire Wire Line
+	12300 4875 12250 4875
+Wire Wire Line
+	12250 4875 12250 4675
+Wire Wire Line
+	12300 5175 12125 5175
+Connection ~ 12125 5175
+$Comp
+L SW_Push SW1
+U 1 1 58CBF91A
+P 4450 7475
+F 0 "SW1" V 4550 7575 50  0000 L CNN
+F 1 "SW_Push" V 4450 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 4450 7675 50  0001 C CNN
+F 3 "" H 4450 7675 50  0000 C CNN
+	1    4450 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SW_Push SW2
+U 1 1 58CC7607
+P 5575 7475
+F 0 "SW2" V 5675 7575 50  0000 L CNN
+F 1 "SW_Push" V 5575 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 5575 7675 50  0001 C CNN
+F 3 "" H 5575 7675 50  0000 C CNN
+	1    5575 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SW_Push SW3
+U 1 1 58CC76F8
+P 6700 7475
+F 0 "SW3" V 6800 7575 50  0000 L CNN
+F 1 "SW_Push" V 6700 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 6700 7675 50  0001 C CNN
+F 3 "" H 6700 7675 50  0000 C CNN
+	1    6700 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SW_Push SW4
+U 1 1 58CC7DC4
+P 7825 7475
+F 0 "SW4" V 7925 7575 50  0000 L CNN
+F 1 "SW_Push" V 7825 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 7825 7675 50  0001 C CNN
+F 3 "" H 7825 7675 50  0000 C CNN
+	1    7825 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR034
+U 1 1 58CC886D
+P 4450 7750
+F 0 "#PWR034" H 4450 7500 50  0001 C CNN
+F 1 "GND" H 4450 7600 50  0000 C CNN
+F 2 "" H 4450 7750 50  0000 C CNN
+F 3 "" H 4450 7750 50  0000 C CNN
+	1    4450 7750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR035
+U 1 1 58CC8F18
+P 5575 7750
+F 0 "#PWR035" H 5575 7500 50  0001 C CNN
+F 1 "GND" H 5575 7600 50  0000 C CNN
+F 2 "" H 5575 7750 50  0000 C CNN
+F 3 "" H 5575 7750 50  0000 C CNN
+	1    5575 7750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR036
+U 1 1 58CC97A0
+P 6700 7750
+F 0 "#PWR036" H 6700 7500 50  0001 C CNN
+F 1 "GND" H 6700 7600 50  0000 C CNN
+F 2 "" H 6700 7750 50  0000 C CNN
+F 3 "" H 6700 7750 50  0000 C CNN
+	1    6700 7750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR037
+U 1 1 58CCA30E
+P 7825 7750
+F 0 "#PWR037" H 7825 7500 50  0001 C CNN
+F 1 "GND" H 7825 7600 50  0000 C CNN
+F 2 "" H 7825 7750 50  0000 C CNN
+F 3 "" H 7825 7750 50  0000 C CNN
+	1    7825 7750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7825 7675 7825 7750
+Wire Wire Line
+	6700 7675 6700 7750
+Wire Wire Line
+	5575 7675 5575 7750
+Wire Wire Line
+	4450 7675 4450 7750
+Connection ~ 9615 6625
+$Comp
+L D D4
+U 1 1 5A99F1FC
+P 11930 7050
+F 0 "D4" V 11795 7115 50  0000 C CNN
+F 1 "1N4148" V 11910 7240 50  0000 C CNN
+F 2 "Diodes_SMD:D_MELF" H 11930 7050 50  0001 C CNN
+F 3 "" H 11930 7050 50  0001 C CNN
+	1    11930 7050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	11725 6900 11725 6820
+Wire Wire Line
+	11725 6820 11930 6820
+Wire Wire Line
+	11930 6820 11930 6900
+Wire Wire Line
+	11625 7275 11725 7275
+Wire Wire Line
+	11725 7275 11725 7200
+Wire Wire Line
+	11930 7200 11930 7275
+Wire Wire Line
+	11930 7275 12035 7275
+Wire Wire Line
+	6175 3725 6175 3775
+$Comp
+L +3V3 #PWR038
+U 1 1 58818331
+P 6175 3725
+F 0 "#PWR038" H 6175 3575 50  0001 C CNN
+F 1 "+3V3" H 6175 3865 50  0000 C CNN
+F 2 "" H 6175 3725 50  0000 C CNN
+F 3 "" H 6175 3725 50  0000 C CNN
+	1    6175 3725
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6375 3775 6375 3425
+Wire Wire Line
+	6375 3425 4225 3425
+Connection ~ 4225 3425
+$Comp
+L FT232RL U2
+U 1 1 588015E2
+P 6275 4775
+F 0 "U2" H 5625 5675 50  0000 L CNN
+F 1 "FT232RL" H 6575 3875 50  0000 L CNN
+F 2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" H 6275 4775 50  0001 C CNN
+F 3 "" H 6275 4775 50  0000 C CNN
+	1    6275 4775
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5375 5875 5375 5475
+Wire Wire Line
+	5375 5475 5475 5475
+NoConn ~ 5475 5175
+NoConn ~ 5475 4975
+NoConn ~ 5475 4775
+$EndSCHEMATC
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.pro b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.pro
new file mode 100644
index 0000000..e2d65dc
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.pro
@@ -0,0 +1,30 @@
+update=Mon 19 Nov 2018 22:24:24 GMT
+version=1
+last_client=kicad
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[general]
+version=1
+[eeschema]
+version=1
+LibDir=
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.sch b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.sch
new file mode 100644
index 0000000..51cb083
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-2018-11-20-11-04-32.sch
@@ -0,0 +1,1462 @@
+EESchema Schematic File Version 2
+LIBS:nmm1_B-rescue
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:ftdi
+LIBS:switches
+LIBS:electropepper_kicad
+LIBS:nmm1_B-cache
+EELAYER 25 0
+EELAYER END
+$Descr A3 16535 11693
+encoding utf-8
+Sheet 1 1
+Title "NMM-1"
+Date ""
+Rev "A"
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L ATMEGA328P-AU U5
+U 1 1 587FFE62
+P 9575 4725
+F 0 "U5" H 8825 5975 50  0000 L BNN
+F 1 "ATMEGA328P-A" H 9825 3325 50  0000 L BNN
+F 2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" H 9575 4725 50  0001 C CIN
+F 3 "" H 9575 4725 50  0000 C CNN
+	1    9575 4725
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR01
+U 1 1 58800040
+P 11925 4525
+F 0 "#PWR01" H 11925 4275 50  0001 C CNN
+F 1 "GND" H 11925 4375 50  0000 C CNN
+F 2 "" H 11925 4525 50  0000 C CNN
+F 3 "" H 11925 4525 50  0000 C CNN
+	1    11925 4525
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 58800BCC
+P 8575 6025
+F 0 "#PWR02" H 8575 5775 50  0001 C CNN
+F 1 "GND" H 8575 5875 50  0000 C CNN
+F 2 "" H 8575 6025 50  0000 C CNN
+F 3 "" H 8575 6025 50  0000 C CNN
+	1    8575 6025
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR03
+U 1 1 58800C5F
+P 8475 3425
+F 0 "#PWR03" H 8475 3275 50  0001 C CNN
+F 1 "+3V3" H 8475 3565 50  0000 C CNN
+F 2 "" H 8475 3425 50  0000 C CNN
+F 3 "" H 8475 3425 50  0000 C CNN
+	1    8475 3425
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR04
+U 1 1 588017A5
+P 6375 5925
+F 0 "#PWR04" H 6375 5675 50  0001 C CNN
+F 1 "GND" H 6375 5775 50  0000 C CNN
+F 2 "" H 6375 5925 50  0000 C CNN
+F 3 "" H 6375 5925 50  0000 C CNN
+	1    6375 5925
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R9
+U 1 1 588021DF
+P 11925 5475
+F 0 "R9" H 12000 5325 50  0000 C CNN
+F 1 "10K" H 11825 5625 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 11855 5475 50  0001 C CNN
+F 3 "" H 11925 5475 50  0000 C CNN
+	1    11925 5475
+	-1   0    0    1   
+$EndComp
+$Comp
+L USB_OTG-Electropepper P1
+U 1 1 58815603
+P 3675 4375
+F 0 "P1" V 3975 4325 50  0000 C CNN
+F 1 "USB_OTG" V 3375 4375 50  0000 C CNN
+F 2 "Connectors:USB_Mini-B" V 3625 4275 50  0001 C CNN
+F 3 "" V 3625 4275 50  0000 C CNN
+	1    3675 4375
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR05
+U 1 1 588157DF
+P 4075 4675
+F 0 "#PWR05" H 4075 4425 50  0001 C CNN
+F 1 "GND" H 4075 4525 50  0000 C CNN
+F 2 "" H 4075 4675 50  0000 C CNN
+F 3 "" H 4075 4675 50  0000 C CNN
+	1    4075 4675
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C2
+U 1 1 58815C2D
+P 4425 5225
+F 0 "C2" H 4450 5325 50  0000 L CNN
+F 1 "100nF" H 4450 5125 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4463 5075 50  0001 C CNN
+F 3 "" H 4425 5225 50  0000 C CNN
+	1    4425 5225
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR06
+U 1 1 58815D7B
+P 4425 5425
+F 0 "#PWR06" H 4425 5175 50  0001 C CNN
+F 1 "GND" H 4425 5275 50  0000 C CNN
+F 2 "" H 4425 5425 50  0000 C CNN
+F 3 "" H 4425 5425 50  0000 C CNN
+	1    4425 5425
+	1    0    0    -1  
+$EndComp
+$Comp
+L Crystal X1
+U 1 1 588196A3
+P 11325 4275
+F 0 "X1" V 11175 4175 50  0000 C CNN
+F 1 "8Mhz" V 11575 4275 50  0000 C CNN
+F 2 "Crystals:Crystal_SMD_HC49-SD" H 11325 4275 50  0001 C CNN
+F 3 "" H 11325 4275 50  0000 C CNN
+	1    11325 4275
+	0    1    1    0   
+$EndComp
+$Comp
+L C C10
+U 1 1 58819B31
+P 11675 4075
+F 0 "C10" V 11525 4000 50  0000 L CNN
+F 1 "22pF" V 11825 3975 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 11713 3925 50  0001 C CNN
+F 3 "" H 11675 4075 50  0000 C CNN
+	1    11675 4075
+	0    1    1    0   
+$EndComp
+$Comp
+L C C11
+U 1 1 58819C1C
+P 11675 4475
+F 0 "C11" V 11625 4275 50  0000 L CNN
+F 1 "22pF" V 11825 4375 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 11713 4325 50  0001 C CNN
+F 3 "" H 11675 4475 50  0000 C CNN
+	1    11675 4475
+	0    1    1    0   
+$EndComp
+$Comp
+L +3V3 #PWR07
+U 1 1 5881BF45
+P 11925 5275
+F 0 "#PWR07" H 11925 5125 50  0001 C CNN
+F 1 "+3V3" H 11925 5415 50  0000 C CNN
+F 2 "" H 11925 5275 50  0000 C CNN
+F 3 "" H 11925 5275 50  0000 C CNN
+	1    11925 5275
+	1    0    0    -1  
+$EndComp
+Text Label 12250 5675 0    60   ~ 0
+RESET
+$Comp
+L GND #PWR08
+U 1 1 5881D109
+P 8575 4625
+F 0 "#PWR08" H 8575 4375 50  0001 C CNN
+F 1 "GND" H 8575 4475 50  0000 C CNN
+F 2 "" H 8575 4625 50  0000 C CNN
+F 3 "" H 8575 4625 50  0000 C CNN
+	1    8575 4625
+	1    0    0    -1  
+$EndComp
+$Comp
+L LED D2
+U 1 1 5881DC19
+P 8100 5275
+F 0 "D2" H 8100 5175 50  0000 C CNN
+F 1 "LED" H 7975 5325 50  0000 C CNN
+F 2 "LEDs:LED_PLCC-2" H 8100 5275 50  0001 C CNN
+F 3 "" H 8100 5275 50  0000 C CNN
+	1    8100 5275
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR09
+U 1 1 5881E300
+P 7475 4900
+F 0 "#PWR09" H 7475 4750 50  0001 C CNN
+F 1 "+3V3" H 7475 5040 50  0000 C CNN
+F 2 "" H 7475 4900 50  0000 C CNN
+F 3 "" H 7475 4900 50  0000 C CNN
+	1    7475 4900
+	1    0    0    -1  
+$EndComp
+NoConn ~ 7075 5475
+NoConn ~ 7075 5375
+NoConn ~ 7075 5275
+$Comp
+L SW_Push SW5
+U 1 1 58821233
+P 11925 5925
+F 0 "SW5" V 12025 6025 50  0000 L CNN
+F 1 "SW_Push" V 11925 5725 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 11925 6125 50  0001 C CNN
+F 3 "" H 11925 6125 50  0000 C CNN
+	1    11925 5925
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR010
+U 1 1 58821A31
+P 11925 6175
+F 0 "#PWR010" H 11925 5925 50  0001 C CNN
+F 1 "GND" H 11925 6025 50  0000 C CNN
+F 2 "" H 11925 6175 50  0000 C CNN
+F 3 "" H 11925 6175 50  0000 C CNN
+	1    11925 6175
+	1    0    0    -1  
+$EndComp
+Text Label 7575 4475 0    60   ~ 0
+RESET
+NoConn ~ 7075 4275
+NoConn ~ 7075 4375
+NoConn ~ 7075 4575
+NoConn ~ 7075 4675
+NoConn ~ 7075 4775
+$Comp
+L Conn_02x03_Odd_Even P4
+U 1 1 58823534
+P 10300 2975
+F 0 "P4" H 10300 3175 50  0000 C CNN
+F 1 "CONN_02X03" H 10300 2775 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x03_Pitch2.54mm" H 10350 2925 50  0001 C CNN
+F 3 "" H 10300 1775 50  0000 C CNN
+	1    10300 2975
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR011
+U 1 1 588241EB
+P 9875 2825
+F 0 "#PWR011" H 9875 2675 50  0001 C CNN
+F 1 "+3V3" H 9875 2965 50  0000 C CNN
+F 2 "" H 9875 2825 50  0000 C CNN
+F 3 "" H 9875 2825 50  0000 C CNN
+	1    9875 2825
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR012
+U 1 1 58824336
+P 9875 3150
+F 0 "#PWR012" H 9875 2900 50  0001 C CNN
+F 1 "GND" H 9875 3000 50  0000 C CNN
+F 2 "" H 9875 3150 50  0000 C CNN
+F 3 "" H 9875 3150 50  0000 C CNN
+	1    9875 3150
+	1    0    0    -1  
+$EndComp
+Text Label 9775 2975 0    60   ~ 0
+RESET
+$Comp
+L C C7
+U 1 1 58825549
+P 8225 3625
+F 0 "C7" V 8325 3725 50  0000 L CNN
+F 1 "100nF" V 8075 3475 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 8263 3475 50  0001 C CNN
+F 3 "" H 8225 3625 50  0000 C CNN
+	1    8225 3625
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR013
+U 1 1 588259C0
+P 8025 3775
+F 0 "#PWR013" H 8025 3525 50  0001 C CNN
+F 1 "GND" H 8025 3625 50  0000 C CNN
+F 2 "" H 8025 3775 50  0000 C CNN
+F 3 "" H 8025 3775 50  0000 C CNN
+	1    8025 3775
+	1    0    0    -1  
+$EndComp
+$Comp
+L MCP73831 U1
+U 1 1 5887F26B
+P 5525 2375
+F 0 "U1" H 5300 2625 60  0000 C CNN
+F 1 "MCP73831" H 5575 2125 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-5" H 5525 2450 60  0001 C CNN
+F 3 "" H 5525 2450 60  0001 C CNN
+	1    5525 2375
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R1
+U 1 1 58883862
+P 4825 2500
+F 0 "R1" V 4750 2450 50  0000 C CNN
+F 1 "470R" V 4900 2500 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 4755 2500 50  0001 C CNN
+F 3 "" H 4825 2500 50  0000 C CNN
+	1    4825 2500
+	0    1    1    0   
+$EndComp
+$Comp
+L C C1
+U 1 1 58885F04
+P 4050 2450
+F 0 "C1" H 3925 2575 50  0000 L CNN
+F 1 "4.7uF" H 3825 2325 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4088 2300 50  0001 C CNN
+F 3 "" H 4050 2450 50  0000 C CNN
+	1    4050 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR014
+U 1 1 588868B7
+P 4050 2675
+F 0 "#PWR014" H 4050 2425 50  0001 C CNN
+F 1 "GND" H 4050 2525 50  0000 C CNN
+F 2 "" H 4050 2675 50  0000 C CNN
+F 3 "" H 4050 2675 50  0000 C CNN
+	1    4050 2675
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C4
+U 1 1 5888837D
+P 6675 2450
+F 0 "C4" H 6550 2575 50  0000 L CNN
+F 1 "4.7uF" H 6450 2325 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 6713 2300 50  0001 C CNN
+F 3 "" H 6675 2450 50  0000 C CNN
+	1    6675 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R2
+U 1 1 5888A417
+P 6225 2375
+F 0 "R2" V 6150 2325 50  0000 C CNN
+F 1 "2K" V 6300 2375 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6155 2375 50  0001 C CNN
+F 3 "" H 6225 2375 50  0000 C CNN
+	1    6225 2375
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR015
+U 1 1 5888AE3C
+P 6425 2550
+F 0 "#PWR015" H 6425 2300 50  0001 C CNN
+F 1 "GND" H 6425 2400 50  0000 C CNN
+F 2 "" H 6425 2550 50  0000 C CNN
+F 3 "" H 6425 2550 50  0000 C CNN
+	1    6425 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR016
+U 1 1 5888BD3C
+P 6675 2675
+F 0 "#PWR016" H 6675 2425 50  0001 C CNN
+F 1 "GND" H 6675 2525 50  0000 C CNN
+F 2 "" H 6675 2675 50  0000 C CNN
+F 3 "" H 6675 2675 50  0000 C CNN
+	1    6675 2675
+	1    0    0    -1  
+$EndComp
+$Comp
+L Conn_01x02 P3
+U 1 1 58896012
+P 6975 1775
+F 0 "P3" V 6950 1950 50  0000 C CNN
+F 1 "Battery" V 7075 1775 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 6975 1775 50  0001 C CNN
+F 3 "" H 6975 1775 50  0000 C CNN
+	1    6975 1775
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR017
+U 1 1 58896C56
+P 7075 2025
+F 0 "#PWR017" H 7075 1775 50  0001 C CNN
+F 1 "GND" H 7075 1875 50  0000 C CNN
+F 2 "" H 7075 2025 50  0000 C CNN
+F 3 "" H 7075 2025 50  0000 C CNN
+	1    7075 2025
+	1    0    0    -1  
+$EndComp
+$Comp
+L TPS62046 U3
+U 1 1 58897588
+P 8250 2450
+F 0 "U3" H 8050 2750 60  0000 C CNN
+F 1 "TPS62046" H 8500 2150 60  0000 C CNN
+F 2 "Housings_SSOP:MSOP-10-1EP_3x3mm_Pitch0.5mm" H 8270 2460 60  0001 C CNN
+F 3 "" H 8270 2460 60  0001 C CNN
+	1    8250 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C6
+U 1 1 588996E9
+P 7350 2450
+F 0 "C6" H 7375 2550 50  0000 L CNN
+F 1 "22uF" H 7375 2350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" H 7388 2300 50  0001 C CNN
+F 3 "" H 7350 2450 50  0000 C CNN
+	1    7350 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C9
+U 1 1 5889990B
+P 9450 2475
+F 0 "C9" H 9475 2575 50  0000 L CNN
+F 1 "22uF" H 9475 2375 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1206" H 9488 2325 50  0001 C CNN
+F 3 "" H 9450 2475 50  0000 C CNN
+	1    9450 2475
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR018
+U 1 1 58899DC7
+P 7350 2750
+F 0 "#PWR018" H 7350 2500 50  0001 C CNN
+F 1 "GND" H 7350 2600 50  0000 C CNN
+F 2 "" H 7350 2750 50  0000 C CNN
+F 3 "" H 7350 2750 50  0000 C CNN
+	1    7350 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR019
+U 1 1 5889C3E6
+P 8850 2750
+F 0 "#PWR019" H 8850 2500 50  0001 C CNN
+F 1 "GND" H 8850 2600 50  0000 C CNN
+F 2 "" H 8850 2750 50  0000 C CNN
+F 3 "" H 8850 2750 50  0000 C CNN
+	1    8850 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L L L1
+U 1 1 5889C7D1
+P 9025 2250
+F 0 "L1" V 9100 2275 50  0000 C CNN
+F 1 "6.2uH" V 8975 2250 50  0000 C CNN
+F 2 "Electropepper parts:SRN6028" H 9025 2250 50  0001 C CNN
+F 3 "" H 9025 2250 50  0000 C CNN
+	1    9025 2250
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR020
+U 1 1 5889CDDE
+P 9450 2700
+F 0 "#PWR020" H 9450 2450 50  0001 C CNN
+F 1 "GND" H 9450 2550 50  0000 C CNN
+F 2 "" H 9450 2700 50  0000 C CNN
+F 3 "" H 9450 2700 50  0000 C CNN
+	1    9450 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR021
+U 1 1 5889D9E5
+P 9450 2175
+F 0 "#PWR021" H 9450 2025 50  0001 C CNN
+F 1 "+3V3" H 9450 2315 50  0000 C CNN
+F 2 "" H 9450 2175 50  0000 C CNN
+F 3 "" H 9450 2175 50  0000 C CNN
+	1    9450 2175
+	1    0    0    -1  
+$EndComp
+Text Label 6325 2250 0    60   ~ 0
+VBatt
+$Comp
+L LED D3
+U 1 1 58912C50
+P 8100 4975
+F 0 "D3" H 8100 4875 50  0000 C CNN
+F 1 "LED" H 7975 5025 50  0000 C CNN
+F 2 "LEDs:LED_PLCC-2" H 8100 4975 50  0001 C CNN
+F 3 "" H 8100 4975 50  0000 C CNN
+	1    8100 4975
+	-1   0    0    1   
+$EndComp
+$Comp
+L LED D1
+U 1 1 589137FD
+P 4450 2500
+F 0 "D1" H 4450 2425 50  0000 C CNN
+F 1 "LED" H 4400 2600 50  0000 C CNN
+F 2 "LEDs:LED_PLCC-2" H 4450 2500 50  0001 C CNN
+F 3 "" H 4450 2500 50  0000 C CNN
+	1    4450 2500
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C8
+U 1 1 5891C141
+P 8575 4425
+F 0 "C8" H 8600 4525 50  0000 L CNN
+F 1 "100nF" H 8600 4325 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 8613 4275 50  0001 C CNN
+F 3 "" H 8575 4425 50  0000 C CNN
+	1    8575 4425
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C5
+U 1 1 5891E9F8
+P 7325 4475
+F 0 "C5" V 7175 4400 50  0000 L CNN
+F 1 "100nF" V 7450 4425 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 7363 4325 50  0001 C CNN
+F 3 "" H 7325 4475 50  0000 C CNN
+	1    7325 4475
+	0    1    1    0   
+$EndComp
+$Comp
+L R R3
+U 1 1 5894FF99
+P 4450 7000
+F 0 "R3" H 4400 6850 50  0000 C CNN
+F 1 "10K" H 4350 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 4380 7000 50  0001 C CNN
+F 3 "" H 4450 7000 50  0000 C CNN
+	1    4450 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR022
+U 1 1 5894FF9F
+P 5575 6800
+F 0 "#PWR022" H 5575 6650 50  0001 C CNN
+F 1 "+3V3" H 5575 6940 50  0000 C CNN
+F 2 "" H 5575 6800 50  0000 C CNN
+F 3 "" H 5575 6800 50  0000 C CNN
+	1    5575 6800
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R4
+U 1 1 5895063D
+P 5575 7000
+F 0 "R4" H 5525 6850 50  0000 C CNN
+F 1 "10K" H 5475 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 5505 7000 50  0001 C CNN
+F 3 "" H 5575 7000 50  0000 C CNN
+	1    5575 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR023
+U 1 1 58950643
+P 6700 6800
+F 0 "#PWR023" H 6700 6650 50  0001 C CNN
+F 1 "+3V3" H 6700 6940 50  0000 C CNN
+F 2 "" H 6700 6800 50  0000 C CNN
+F 3 "" H 6700 6800 50  0000 C CNN
+	1    6700 6800
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R5
+U 1 1 58950803
+P 6700 7000
+F 0 "R5" H 6650 6850 50  0000 C CNN
+F 1 "10K" H 6600 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6630 7000 50  0001 C CNN
+F 3 "" H 6700 7000 50  0000 C CNN
+	1    6700 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR024
+U 1 1 58950809
+P 7825 6800
+F 0 "#PWR024" H 7825 6650 50  0001 C CNN
+F 1 "+3V3" H 7825 6940 50  0000 C CNN
+F 2 "" H 7825 6800 50  0000 C CNN
+F 3 "" H 7825 6800 50  0000 C CNN
+	1    7825 6800
+	1    0    0    -1  
+$EndComp
+Text Label 8050 7200 0    60   ~ 0
+BTN_4
+Text Label 5800 7200 0    60   ~ 0
+BTN_2
+Text Label 6925 7200 0    60   ~ 0
+BTN_3
+NoConn ~ 3975 4275
+$Comp
+L GND #PWR025
+U 1 1 589EDA0C
+P 8250 2950
+F 0 "#PWR025" H 8250 2700 50  0001 C CNN
+F 1 "GND" H 8250 2800 50  0000 C CNN
+F 2 "" H 8250 2950 50  0000 C CNN
+F 3 "" H 8250 2950 50  0000 C CNN
+	1    8250 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Conn_01x05 P6
+U 1 1 58AC71D2
+P 12500 4975
+F 0 "P6" H 12500 5275 50  0000 C CNN
+F 1 "Display" H 12500 4675 50  0000 C CNN
+F 2 "Electropepper parts:OLED-ARDUINO-IIC-ALI" H 12500 3775 50  0001 C CNN
+F 3 "" H 12500 3775 50  0000 C CNN
+	1    12500 4975
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR026
+U 1 1 58AC9036
+P 12250 4675
+F 0 "#PWR026" H 12250 4525 50  0001 C CNN
+F 1 "+3V3" H 12250 4815 50  0000 C CNN
+F 2 "" H 12250 4675 50  0000 C CNN
+F 3 "" H 12250 4675 50  0000 C CNN
+	1    12250 4675
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8675 5725 8575 5725
+Wire Wire Line
+	8575 5725 8575 6025
+Wire Wire Line
+	8675 5825 8575 5825
+Connection ~ 8575 5825
+Wire Wire Line
+	8675 5925 8575 5925
+Connection ~ 8575 5925
+Wire Wire Line
+	8475 3425 8475 3925
+Wire Wire Line
+	8475 3725 8675 3725
+Wire Wire Line
+	8375 3625 8675 3625
+Connection ~ 8475 3625
+Wire Wire Line
+	6075 5775 6075 5875
+Wire Wire Line
+	5375 5875 6475 5875
+Wire Wire Line
+	6475 5875 6475 5775
+Wire Wire Line
+	6375 5775 6375 5925
+Connection ~ 6375 5875
+Wire Wire Line
+	6275 5775 6275 5875
+Connection ~ 6275 5875
+Connection ~ 6075 5875
+Wire Wire Line
+	3975 4375 5475 4375
+Wire Wire Line
+	5475 4475 3975 4475
+Wire Wire Line
+	3575 3975 3575 3925
+Wire Wire Line
+	3575 3925 4075 3925
+Wire Wire Line
+	4075 3925 4075 4675
+Wire Wire Line
+	3975 4175 4075 4175
+Connection ~ 4075 4175
+Wire Wire Line
+	4425 5375 4425 5425
+Wire Wire Line
+	4425 5075 4425 4075
+Wire Wire Line
+	4425 4075 5475 4075
+Wire Wire Line
+	4225 4575 3975 4575
+Wire Wire Line
+	10575 4225 11125 4225
+Wire Wire Line
+	11125 4225 11125 4075
+Wire Wire Line
+	11125 4075 11525 4075
+Wire Wire Line
+	10575 4325 11125 4325
+Wire Wire Line
+	11125 4325 11125 4475
+Wire Wire Line
+	11125 4475 11525 4475
+Wire Wire Line
+	11325 4425 11325 4475
+Connection ~ 11325 4475
+Wire Wire Line
+	11325 4125 11325 4075
+Connection ~ 11325 4075
+Wire Wire Line
+	11825 4075 11925 4075
+Wire Wire Line
+	11925 4075 11925 4525
+Wire Wire Line
+	11825 4475 11925 4475
+Connection ~ 11925 4475
+Wire Wire Line
+	10575 5075 11750 5075
+Wire Wire Line
+	11750 5075 11750 5675
+Wire Wire Line
+	11750 5675 12550 5675
+Wire Wire Line
+	11925 5625 11925 5725
+Connection ~ 11925 5675
+Wire Wire Line
+	11925 5325 11925 5275
+Wire Wire Line
+	8675 4225 8575 4225
+Wire Wire Line
+	8575 4225 8575 4275
+Wire Wire Line
+	8575 4575 8575 4625
+Wire Wire Line
+	8475 3925 8675 3925
+Connection ~ 8475 3725
+Wire Wire Line
+	10575 5325 11400 5325
+Wire Wire Line
+	10575 5225 11500 5225
+Wire Wire Line
+	7075 4175 8425 4175
+Wire Wire Line
+	8425 4175 8425 6325
+Wire Wire Line
+	8425 6325 11400 6325
+Wire Wire Line
+	11400 6325 11400 5325
+Wire Wire Line
+	11500 5225 11500 6425
+Wire Wire Line
+	11500 6425 8325 6425
+Wire Wire Line
+	8325 6425 8325 4075
+Wire Wire Line
+	8325 4075 7075 4075
+Wire Wire Line
+	11925 6125 11925 6175
+Wire Wire Line
+	7075 4475 7175 4475
+Wire Wire Line
+	7475 4475 7825 4475
+Wire Wire Line
+	10900 3925 10575 3925
+Wire Wire Line
+	10900 3075 10900 3925
+Wire Wire Line
+	10900 3075 10600 3075
+Wire Wire Line
+	10600 2975 10950 2975
+Wire Wire Line
+	10950 4025 10575 4025
+Wire Wire Line
+	11000 4125 10575 4125
+Wire Wire Line
+	11000 2875 11000 4125
+Wire Wire Line
+	11000 2875 10600 2875
+Wire Wire Line
+	10100 2875 9875 2875
+Wire Wire Line
+	9875 2875 9875 2825
+Wire Wire Line
+	10100 3075 9875 3075
+Wire Wire Line
+	9875 3075 9875 3150
+Wire Wire Line
+	10100 2975 9775 2975
+Wire Wire Line
+	8025 3775 8025 3625
+Wire Wire Line
+	8025 3625 8075 3625
+Wire Wire Line
+	4225 2250 4225 4575
+Wire Wire Line
+	4050 2250 5050 2250
+Wire Wire Line
+	4975 2500 5050 2500
+Wire Wire Line
+	4675 2500 4600 2500
+Wire Wire Line
+	4225 2500 4300 2500
+Connection ~ 4225 2500
+Wire Wire Line
+	4050 2600 4050 2675
+Wire Wire Line
+	4050 2300 4050 2250
+Connection ~ 4225 2250
+Wire Wire Line
+	6000 2375 6075 2375
+Wire Wire Line
+	6375 2375 6425 2375
+Wire Wire Line
+	6425 2375 6425 2550
+Wire Wire Line
+	6000 2500 6425 2500
+Connection ~ 6425 2500
+Wire Wire Line
+	6000 2250 7750 2250
+Wire Wire Line
+	6675 2300 6675 2250
+Connection ~ 6675 2250
+Wire Wire Line
+	6675 2600 6675 2675
+Wire Wire Line
+	6975 2250 6975 1975
+Wire Wire Line
+	7075 1975 7075 2025
+Connection ~ 6975 2250
+Wire Wire Line
+	7350 2600 7350 2750
+Wire Wire Line
+	7350 2300 7350 2250
+Connection ~ 7350 2250
+Wire Wire Line
+	7350 2650 7750 2650
+Connection ~ 7350 2650
+Wire Wire Line
+	7750 2550 7700 2550
+Wire Wire Line
+	7700 2550 7700 2650
+Connection ~ 7700 2650
+Wire Wire Line
+	7750 2350 7700 2350
+Wire Wire Line
+	7700 2250 7700 2450
+Connection ~ 7700 2250
+Wire Wire Line
+	7700 2450 7750 2450
+Connection ~ 7700 2350
+Wire Wire Line
+	8750 2550 8850 2550
+Wire Wire Line
+	8850 2550 8850 2750
+Wire Wire Line
+	8750 2650 8850 2650
+Connection ~ 8850 2650
+Wire Wire Line
+	8750 2250 8875 2250
+Wire Wire Line
+	8750 2350 8800 2350
+Wire Wire Line
+	8800 2350 8800 2250
+Connection ~ 8800 2250
+Wire Wire Line
+	9450 2625 9450 2700
+Wire Wire Line
+	9450 2175 9450 2325
+Wire Wire Line
+	9175 2250 9450 2250
+Connection ~ 9450 2250
+Wire Wire Line
+	8750 2450 9275 2450
+Wire Wire Line
+	9275 2450 9275 2250
+Connection ~ 9275 2250
+Wire Wire Line
+	5575 7150 5575 7275
+Connection ~ 5575 7200
+Wire Wire Line
+	5575 6850 5575 6800
+Wire Wire Line
+	6700 7150 6700 7275
+Connection ~ 6700 7200
+Wire Wire Line
+	6700 6850 6700 6800
+Wire Wire Line
+	7825 7150 7825 7275
+Connection ~ 7825 7200
+Wire Wire Line
+	7825 6850 7825 6800
+Wire Wire Line
+	5575 7200 6125 7200
+Wire Wire Line
+	6700 7200 7250 7200
+Wire Wire Line
+	7825 7200 8375 7200
+Wire Wire Line
+	8250 2900 8250 2950
+$Comp
+L GND #PWR027
+U 1 1 58ACBA19
+P 12125 5275
+F 0 "#PWR027" H 12125 5025 50  0001 C CNN
+F 1 "GND" H 12125 5125 50  0000 C CNN
+F 2 "" H 12125 5275 50  0000 C CNN
+F 3 "" H 12125 5275 50  0000 C CNN
+	1    12125 5275
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10575 4775 11150 4775
+Wire Wire Line
+	11150 4775 11150 6625
+Wire Wire Line
+	11150 6625 9455 6625
+$Comp
+L R R13
+U 1 1 58AE025B
+P 9305 6625
+F 0 "R13" V 9380 6675 50  0000 C CNN
+F 1 "330K" V 9205 6625 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9205 6675 50  0001 C CNN
+F 3 "" H 9305 6625 50  0000 C CNN
+	1    9305 6625
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	8600 6625 9155 6625
+Text Label 8625 6625 0    60   ~ 0
+VBatt
+$Comp
+L R R10
+U 1 1 58AE3757
+P 9615 6905
+F 0 "R10" H 9490 6980 50  0000 C CNN
+F 1 "36K" H 9740 6830 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9515 6955 50  0001 C CNN
+F 3 "" H 9615 6905 50  0000 C CNN
+	1    9615 6905
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R11
+U 1 1 58AE393C
+P 9615 7280
+F 0 "R11" H 9490 7355 50  0000 C CNN
+F 1 "330R" H 9765 7205 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9515 7330 50  0001 C CNN
+F 3 "" H 9615 7280 50  0000 C CNN
+	1    9615 7280
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R12
+U 1 1 58AE3E88
+P 9615 7655
+F 0 "R12" H 9490 7730 50  0000 C CNN
+F 1 "330R" H 9765 7580 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9515 7705 50  0001 C CNN
+F 3 "" H 9615 7655 50  0000 C CNN
+	1    9615 7655
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9615 6755 9615 6625
+Wire Wire Line
+	9615 7055 9615 7130
+$Comp
+L GND #PWR028
+U 1 1 58AE7333
+P 9615 7880
+F 0 "#PWR028" H 9615 7630 50  0001 C CNN
+F 1 "GND" H 9615 7730 50  0000 C CNN
+F 2 "" H 9615 7880 50  0000 C CNN
+F 3 "" H 9615 7880 50  0000 C CNN
+	1    9615 7880
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9615 7880 9615 7805
+Wire Wire Line
+	9615 7505 9615 7430
+$Comp
+L Conn_01x04 P2
+U 1 1 58AC3DF0
+P 12235 7375
+F 0 "P2" H 12235 7585 50  0000 C CNN
+F 1 "RS422" H 12240 7075 50  0000 C CNN
+F 2 "Connectors_Phoenix:PhoenixContact_MC-G_04x3.81mm_Angled" H 12235 7375 50  0001 C CNN
+F 3 "" H 12235 7375 50  0000 C CNN
+	1    12235 7375
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10725 5825 10725 7275
+Wire Wire Line
+	10725 7275 11025 7275
+Wire Wire Line
+	10650 5925 10650 8325
+Wire Wire Line
+	10650 8325 10975 8325
+$Comp
+L R R6
+U 1 1 58AD148C
+P 7825 7000
+F 0 "R6" H 7775 6850 50  0000 C CNN
+F 1 "10K" H 7725 7150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7755 7000 50  0001 C CNN
+F 3 "" H 7825 7000 50  0000 C CNN
+	1    7825 7000
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	4450 7150 4450 7275
+Text Label 4675 7200 0    60   ~ 0
+BTN_1
+Wire Wire Line
+	5000 7200 4450 7200
+Connection ~ 4450 7200
+$Comp
+L +3V3 #PWR029
+U 1 1 58ADA9ED
+P 4450 6800
+F 0 "#PWR029" H 4450 6650 50  0001 C CNN
+F 1 "+3V3" H 4450 6940 50  0000 C CNN
+F 2 "" H 4450 6800 50  0000 C CNN
+F 3 "" H 4450 6800 50  0000 C CNN
+	1    4450 6800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4450 6850 4450 6800
+Text Label 10650 5425 0    60   ~ 0
+BTN_1
+Text Label 10650 5525 0    60   ~ 0
+BTN_2
+Text Label 10650 5625 0    60   ~ 0
+BTN_3
+Text Label 10650 5725 0    60   ~ 0
+BTN_4
+Wire Wire Line
+	10575 5425 10975 5425
+Wire Wire Line
+	10575 5525 10975 5525
+Wire Wire Line
+	10575 5625 10975 5625
+Wire Wire Line
+	10575 5725 10975 5725
+NoConn ~ 10575 4675
+NoConn ~ 10575 3625
+NoConn ~ 7075 5175
+NoConn ~ 7075 5075
+$Comp
+L R R14
+U 1 1 58ACCCE1
+P 7725 4975
+F 0 "R14" V 7650 4925 50  0000 C CNN
+F 1 "330R" V 7800 5100 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7625 5025 50  0001 C CNN
+F 3 "" H 7725 4975 50  0000 C CNN
+	1    7725 4975
+	0    1    1    0   
+$EndComp
+$Comp
+L R R15
+U 1 1 58ACD105
+P 7725 5275
+F 0 "R15" V 7650 5225 50  0000 C CNN
+F 1 "330R" V 7800 5400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 7625 5325 50  0001 C CNN
+F 3 "" H 7725 5275 50  0000 C CNN
+	1    7725 5275
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7475 4900 7475 5275
+Wire Wire Line
+	7475 5275 7575 5275
+Wire Wire Line
+	7575 4975 7475 4975
+Connection ~ 7475 4975
+Wire Wire Line
+	7875 4975 7950 4975
+Wire Wire Line
+	7875 5275 7950 5275
+Wire Wire Line
+	8250 4975 8675 4975
+Wire Wire Line
+	8250 5275 8525 5275
+Wire Wire Line
+	8525 5275 8525 5075
+Wire Wire Line
+	8525 5075 8675 5075
+Wire Wire Line
+	10650 5925 10575 5925
+Wire Wire Line
+	10575 5825 10725 5825
+$Comp
+L VOS627A U6
+U 1 1 58B4533F
+P 11325 7325
+F 0 "U6" H 11200 7475 60  0000 C CNN
+F 1 "VOS627A" H 11325 7175 60  0000 C CNN
+F 2 "Housings_SSOP:SOP-4_4.4x2.8mm_Pitch1.27mm" H 11325 7275 60  0001 C CNN
+F 3 "" H 11325 7275 60  0001 C CNN
+	1    11325 7325
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	11625 7375 12035 7375
+$Comp
+L R R18
+U 1 1 58B47C35
+P 11725 7050
+F 0 "R18" H 11620 7195 50  0000 C CNN
+F 1 "1K" H 11630 7060 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 11625 7100 50  0001 C CNN
+F 3 "" H 11725 7050 50  0000 C CNN
+	1    11725 7050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11025 7375 10975 7375
+Wire Wire Line
+	10975 7375 10975 7425
+$Comp
+L GND #PWR030
+U 1 1 58B4A6CC
+P 10975 7425
+F 0 "#PWR030" H 10975 7175 50  0001 C CNN
+F 1 "GND" H 10975 7275 50  0000 C CNN
+F 2 "" H 10975 7425 50  0000 C CNN
+F 3 "" H 10975 7425 50  0000 C CNN
+	1    10975 7425
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R17
+U 1 1 58B4BD0A
+P 10850 7075
+F 0 "R17" H 10925 7225 50  0000 C CNN
+F 1 "1K" H 10950 7000 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10750 7125 50  0001 C CNN
+F 3 "" H 10850 7075 50  0000 C CNN
+	1    10850 7075
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR031
+U 1 1 58B4CA78
+P 10850 6875
+F 0 "#PWR031" H 10850 6725 50  0001 C CNN
+F 1 "+3V3" H 10850 7015 50  0000 C CNN
+F 2 "" H 10850 6875 50  0000 C CNN
+F 3 "" H 10850 6875 50  0000 C CNN
+	1    10850 6875
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10850 7225 10850 7275
+Connection ~ 10850 7275
+Wire Wire Line
+	10850 6875 10850 6925
+$Comp
+L MAX3295 U4
+U 1 1 58B4FEA4
+P 11300 8450
+F 0 "U4" H 11150 8750 60  0000 C CNN
+F 1 "MAX3295" H 11525 8175 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 11300 8450 60  0001 C CNN
+F 3 "" H 11300 8450 60  0001 C CNN
+	1    11300 8450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	12035 7475 11750 7475
+Wire Wire Line
+	11750 7475 11750 8325
+Wire Wire Line
+	11750 8325 11625 8325
+Wire Wire Line
+	11625 8450 11825 8450
+Wire Wire Line
+	11825 8450 11825 7575
+Wire Wire Line
+	11825 7575 12035 7575
+Wire Wire Line
+	11300 7825 11300 8075
+$Comp
+L GND #PWR032
+U 1 1 58B553F1
+P 11300 8925
+F 0 "#PWR032" H 11300 8675 50  0001 C CNN
+F 1 "GND" H 11300 8775 50  0000 C CNN
+F 2 "" H 11300 8925 50  0000 C CNN
+F 3 "" H 11300 8925 50  0000 C CNN
+	1    11300 8925
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11300 8800 11300 8925
+$Comp
+L +3V3 #PWR033
+U 1 1 58B55F48
+P 11300 7825
+F 0 "#PWR033" H 11300 7675 50  0001 C CNN
+F 1 "+3V3" H 11300 7965 50  0000 C CNN
+F 2 "" H 11300 7825 50  0000 C CNN
+F 3 "" H 11300 7825 50  0000 C CNN
+	1    11300 7825
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R16
+U 1 1 58B57DAA
+P 10825 8100
+F 0 "R16" H 10750 8250 50  0000 C CNN
+F 1 "1K" H 10925 8025 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10725 8150 50  0001 C CNN
+F 3 "" H 10825 8100 50  0000 C CNN
+	1    10825 8100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10825 7950 10825 7875
+Wire Wire Line
+	10825 7875 11300 7875
+Connection ~ 11300 7875
+Wire Wire Line
+	10825 8250 10825 8525
+Wire Wire Line
+	10825 8525 10975 8525
+Text Notes 12295 7315 0    60   ~ 0
+RX- / B
+Text Notes 12295 7400 0    60   ~ 0
+RX+ / A
+Text Notes 12300 7625 0    60   ~ 0
+TX+ / A
+Text Notes 12300 7540 0    60   ~ 0
+TX- / B
+NoConn ~ 10575 4575
+NoConn ~ 10575 4475
+Wire Wire Line
+	10950 2975 10950 4025
+NoConn ~ 10575 3725
+NoConn ~ 10575 3825
+Wire Wire Line
+	10575 4975 12300 4975
+Wire Wire Line
+	12300 4775 12125 4775
+Wire Wire Line
+	12125 4775 12125 5275
+Wire Wire Line
+	10575 4875 12200 4875
+Wire Wire Line
+	12200 4875 12200 5075
+Wire Wire Line
+	12200 5075 12300 5075
+Wire Wire Line
+	12300 4875 12250 4875
+Wire Wire Line
+	12250 4875 12250 4675
+Wire Wire Line
+	12300 5175 12125 5175
+Connection ~ 12125 5175
+$Comp
+L SW_Push SW1
+U 1 1 58CBF91A
+P 4450 7475
+F 0 "SW1" V 4550 7575 50  0000 L CNN
+F 1 "SW_Push" V 4450 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 4450 7675 50  0001 C CNN
+F 3 "" H 4450 7675 50  0000 C CNN
+	1    4450 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SW_Push SW2
+U 1 1 58CC7607
+P 5575 7475
+F 0 "SW2" V 5675 7575 50  0000 L CNN
+F 1 "SW_Push" V 5575 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 5575 7675 50  0001 C CNN
+F 3 "" H 5575 7675 50  0000 C CNN
+	1    5575 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SW_Push SW3
+U 1 1 58CC76F8
+P 6700 7475
+F 0 "SW3" V 6800 7575 50  0000 L CNN
+F 1 "SW_Push" V 6700 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 6700 7675 50  0001 C CNN
+F 3 "" H 6700 7675 50  0000 C CNN
+	1    6700 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SW_Push SW4
+U 1 1 58CC7DC4
+P 7825 7475
+F 0 "SW4" V 7925 7575 50  0000 L CNN
+F 1 "SW_Push" V 7825 7275 50  0000 C CNN
+F 2 "electropepper:B3FS-10" H 7825 7675 50  0001 C CNN
+F 3 "" H 7825 7675 50  0000 C CNN
+	1    7825 7475
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR034
+U 1 1 58CC886D
+P 4450 7750
+F 0 "#PWR034" H 4450 7500 50  0001 C CNN
+F 1 "GND" H 4450 7600 50  0000 C CNN
+F 2 "" H 4450 7750 50  0000 C CNN
+F 3 "" H 4450 7750 50  0000 C CNN
+	1    4450 7750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR035
+U 1 1 58CC8F18
+P 5575 7750
+F 0 "#PWR035" H 5575 7500 50  0001 C CNN
+F 1 "GND" H 5575 7600 50  0000 C CNN
+F 2 "" H 5575 7750 50  0000 C CNN
+F 3 "" H 5575 7750 50  0000 C CNN
+	1    5575 7750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR036
+U 1 1 58CC97A0
+P 6700 7750
+F 0 "#PWR036" H 6700 7500 50  0001 C CNN
+F 1 "GND" H 6700 7600 50  0000 C CNN
+F 2 "" H 6700 7750 50  0000 C CNN
+F 3 "" H 6700 7750 50  0000 C CNN
+	1    6700 7750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR037
+U 1 1 58CCA30E
+P 7825 7750
+F 0 "#PWR037" H 7825 7500 50  0001 C CNN
+F 1 "GND" H 7825 7600 50  0000 C CNN
+F 2 "" H 7825 7750 50  0000 C CNN
+F 3 "" H 7825 7750 50  0000 C CNN
+	1    7825 7750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7825 7675 7825 7750
+Wire Wire Line
+	6700 7675 6700 7750
+Wire Wire Line
+	5575 7675 5575 7750
+Wire Wire Line
+	4450 7675 4450 7750
+Connection ~ 9615 6625
+$Comp
+L D D4
+U 1 1 5A99F1FC
+P 11930 7050
+F 0 "D4" V 11795 7115 50  0000 C CNN
+F 1 "1N4148" V 11910 7240 50  0000 C CNN
+F 2 "Diodes_SMD:D_MELF" H 11930 7050 50  0001 C CNN
+F 3 "" H 11930 7050 50  0001 C CNN
+	1    11930 7050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	11725 6900 11725 6820
+Wire Wire Line
+	11725 6820 11930 6820
+Wire Wire Line
+	11930 6820 11930 6900
+Wire Wire Line
+	11625 7275 11725 7275
+Wire Wire Line
+	11725 7275 11725 7200
+Wire Wire Line
+	11930 7200 11930 7275
+Wire Wire Line
+	11930 7275 12035 7275
+Wire Wire Line
+	6175 3725 6175 3775
+$Comp
+L +3V3 #PWR038
+U 1 1 58818331
+P 6175 3725
+F 0 "#PWR038" H 6175 3575 50  0001 C CNN
+F 1 "+3V3" H 6175 3865 50  0000 C CNN
+F 2 "" H 6175 3725 50  0000 C CNN
+F 3 "" H 6175 3725 50  0000 C CNN
+	1    6175 3725
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6375 3775 6375 3425
+Wire Wire Line
+	6375 3425 4225 3425
+Connection ~ 4225 3425
+$Comp
+L FT232RL U2
+U 1 1 588015E2
+P 6275 4775
+F 0 "U2" H 5625 5675 50  0000 L CNN
+F 1 "FT232RL" H 6575 3875 50  0000 L CNN
+F 2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" H 6275 4775 50  0001 C CNN
+F 3 "" H 6275 4775 50  0000 C CNN
+	1    6275 4775
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5375 5875 5375 5475
+Wire Wire Line
+	5375 5475 5475 5475
+NoConn ~ 5475 5175
+NoConn ~ 5475 4975
+NoConn ~ 5475 4775
+$EndSCHEMATC
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-19-22-24-22.lib b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-19-22-24-22.lib
new file mode 100644
index 0000000..61a52c6
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-19-22-24-22.lib
@@ -0,0 +1,477 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +3V3
+#
+DEF +3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# ATMEGA168A-AU
+#
+DEF ATMEGA168A-AU U 0 40 Y Y 1 F N
+F0 "U" -750 1250 50 H V L BNN
+F1 "ATMEGA168A-AU" 400 -1400 50 H V L BNN
+F2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATMEGA48A-AU ATMEGA48PA-AU ATMEGA88A-AU ATMEGA88PA-AU ATMEGA168PA-AU ATMEGA328-AU ATMEGA328P-AU
+$FPLIST
+ TQFP*7x7mm*Pitch0.8mm*
+$ENDFPLIST
+DRAW
+S -750 1200 850 -1300 0 1 10 f
+X (PCINT19/OC2B/INT1)PD3 1 1000 -800 150 L 40 40 1 1 B
+X (PCINT20/XCK/T0)PD4 2 1000 -900 150 L 40 40 1 1 B
+X GND 3 -900 -1200 150 R 40 40 1 1 W
+X VCC 4 -900 1100 150 R 40 40 1 1 W
+X GND 5 -900 -1100 150 R 40 40 1 1 W
+X VCC 6 -900 1000 150 R 40 40 1 1 W
+X (PCINT6/XTAL1/TOSC1)PB6 7 1000 500 150 L 40 40 1 1 B
+X (PCINT7/XTAL2/TOSC2)PB7 8 1000 400 150 L 40 40 1 1 B
+X (PCINT21/OC0B/T1)PD5 9 1000 -1000 150 L 40 40 1 1 B
+X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
+X AREF 20 -900 500 150 R 40 40 1 1 B
+X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
+X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
+X GND 21 -900 -1000 150 R 40 40 1 1 W
+X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
+X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
+X ADC7 22 -900 -350 150 R 40 40 1 1 I
+X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
+X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
+X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
+X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
+X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
+X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
+X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
+X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
+X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
+X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
+X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
+X AVCC 18 -900 800 150 R 40 40 1 1 W
+X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
+X ADC6 19 -900 -250 150 R 40 40 1 1 I
+X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x02
+#
+DEF Conn_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x04
+#
+DEF Conn_01x04 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Conn_01x04" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 50 -250 1 1 10 f
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x05
+#
+DEF Conn_01x05 J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Conn_01x05" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 50 -250 1 1 10 f
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_2 2 -200 100 150 R 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 -200 -100 150 R 50 50 1 1 P
+X Pin_5 5 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_02x03_Odd_Even
+#
+DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 200 50 H V C CNN
+F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*2x??x*mm*
+ Connector*:*2x???Pitch*
+ Pin_Header_Straight_2X*
+ Pin_Header_Angled_2X*
+ Socket_Strip_Straight_2X*
+ Socket_Strip_Angled_2X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 150 -150 1 1 10 f
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 300 100 150 L 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 300 0 150 L 50 50 1 1 P
+X Pin_5 5 -200 -100 150 R 50 50 1 1 P
+X Pin_6 6 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal
+#
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FT232RL
+#
+DEF FT232RL U 0 40 Y Y 1 F N
+F0 "U" -650 900 50 H V L CNN
+F1 "FT232RL" 400 900 50 H V L CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SSOP*5.3x10.2mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -650 850 650 -850 0 1 10 f
+X TXD 1 800 700 150 L 50 50 1 1 O
+X DTR 2 800 300 150 L 50 50 1 1 O V
+X RTS 3 800 500 150 L 50 50 1 1 O V
+X VCCIO 4 -100 1000 150 D 50 50 1 1 I
+X RXD 5 800 600 150 L 50 50 1 1 I
+X RI 6 800 0 150 L 50 50 1 1 I L
+X GND 7 0 -1000 150 U 50 50 1 1 W
+X DCR 9 800 200 150 L 50 50 1 1 I L
+X DCD 10 800 100 150 L 50 50 1 1 I L
+X VCC 20 100 1000 150 D 50 50 1 1 W
+X CTS 11 800 400 150 L 50 50 1 1 I L
+X GND 21 200 -1000 150 U 50 50 1 1 W
+X CBUS4 12 800 -700 150 L 50 50 1 1 B
+X CBUS1 22 800 -400 150 L 50 50 1 1 O
+X CBUS2 13 800 -500 150 L 50 50 1 1 B
+X CBUS0 23 800 -300 150 L 50 50 1 1 B
+X CBUS3 14 800 -600 150 L 50 50 1 1 B
+X USBD+ 15 -800 400 150 R 50 50 1 1 B
+X AGND 25 -200 -1000 150 U 50 50 1 1 W
+X USBD- 16 -800 300 150 R 50 50 1 1 B
+X TEST 26 -800 -700 150 R 50 50 1 1 W
+X 3V3OUT 17 -800 700 150 R 50 50 1 1 I
+X OSCI 27 -800 -200 150 R 50 50 1 1 I
+X GND 18 100 -1000 150 U 50 50 1 1 W
+X OSCO 28 -800 -400 150 R 50 50 1 1 O
+X ~RESET~ 19 -800 0 150 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# L
+#
+DEF L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MAX3295
+#
+DEF MAX3295 U 0 40 Y Y 1 F N
+F0 "U" -150 300 60 H V C CNN
+F1 "MAX3295" 225 -275 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -200 250 200 -225 0 1 0 f
+X DI 1 -325 125 123 R 50 50 1 1 I
+X VCC 2 0 375 123 D 50 50 1 1 W
+X DE 3 -325 -75 123 R 50 50 1 1 B
+X Z 4 325 125 123 L 50 50 1 1 B
+X GND 5 0 -350 123 U 50 50 1 1 B
+X Y 6 325 0 123 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# MCP73831
+#
+DEF MCP73831 U 0 40 Y Y 1 F N
+F0 "U" -225 250 60 H V C CNN
+F1 "MCP73831" 50 -250 60 H V C CNN
+F2 "" 0 75 60 H I C CNN
+F3 "" 0 75 60 H I C CNN
+DRAW
+S -275 200 275 -200 0 1 0 f
+X STAT 1 -475 -125 200 R 50 50 1 1 O
+X Vss 2 475 -125 200 L 50 50 1 1 W
+X Vbat 3 475 125 200 L 50 50 1 1 w
+X VDD 4 -475 125 200 R 50 50 1 1 W
+X PROG 5 475 0 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SW_Push
+#
+DEF SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# TPS62046
+#
+DEF TPS62046 U 0 40 Y Y 1 F N
+F0 "U" -225 300 60 H V C CNN
+F1 "TPS62046" 250 -300 60 H V C CNN
+F2 "" 20 35 60 H I C CNN
+F3 "" 20 35 60 H I C CNN
+DRAW
+S -300 250 300 -250 1 1 0 f
+X EN 1 -500 0 200 R 50 50 1 1 I
+X VIN 2 -500 200 200 R 50 50 1 1 W
+X VIN 3 -500 100 200 R 50 50 1 1 W
+X GND 4 -500 -200 200 R 50 50 1 1 W
+X FB 5 500 0 200 L 50 50 1 1 I
+X MODE 6 -500 -100 200 R 50 50 1 1 I
+X SW 7 500 100 200 L 50 50 1 1 B
+X SW 8 500 200 200 L 50 50 1 1 B
+X PGND 9 500 -200 200 L 50 50 1 1 W
+X PGND 10 500 -100 200 L 50 50 1 1 W
+X PGND 11 0 -450 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# USB_OTG-Electropepper
+#
+DEF USB_OTG-Electropepper P 0 40 Y Y 1 F N
+F0 "P" 325 -125 50 H V C CNN
+F1 "USB_OTG-Electropepper" 0 200 50 H V C CNN
+F2 "" -50 -100 50 V V C CNN
+F3 "" -50 -100 50 V V C CNN
+$FPLIST
+ USB*
+$ENDFPLIST
+DRAW
+S -250 -150 250 150 0 1 0 N
+S -205 -150 -195 -120 0 1 0 N
+S -105 -150 -95 -120 0 1 0 N
+S -5 -150 5 -120 0 1 0 N
+S 95 -150 105 -120 0 1 0 N
+S 195 -150 205 -120 0 1 0 N
+X VBUS 1 -200 -300 150 U 50 50 1 1 w
+X D- 2 -100 -300 150 U 50 50 1 1 P
+X D+ 3 0 -300 150 U 50 50 1 1 P
+X ID 4 100 -300 150 U 50 50 1 1 W
+X GND 5 200 -300 150 U 50 50 1 1 W
+X shield 6 400 100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VOS627A
+#
+DEF VOS627A U 0 40 Y Y 1 F N
+F0 "U" -125 150 60 H V C CNN
+F1 "VOS627A" 0 -150 60 H V C CNN
+F2 "" 0 -50 60 H I C CNN
+F3 "" 0 -50 60 H I C CNN
+DRAW
+S -175 100 175 -100 0 1 0 f
+X A/C 1 -300 50 123 R 50 50 1 1 B
+X C/A 2 -300 -50 123 R 50 50 1 1 B
+X E 3 300 -50 123 L 50 50 1 1 B
+X C 4 300 50 123 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-20-11-04-32.lib b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-20-11-04-32.lib
new file mode 100644
index 0000000..61a52c6
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-cache-2018-11-20-11-04-32.lib
@@ -0,0 +1,477 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +3V3
+#
+DEF +3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# ATMEGA168A-AU
+#
+DEF ATMEGA168A-AU U 0 40 Y Y 1 F N
+F0 "U" -750 1250 50 H V L BNN
+F1 "ATMEGA168A-AU" 400 -1400 50 H V L BNN
+F2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATMEGA48A-AU ATMEGA48PA-AU ATMEGA88A-AU ATMEGA88PA-AU ATMEGA168PA-AU ATMEGA328-AU ATMEGA328P-AU
+$FPLIST
+ TQFP*7x7mm*Pitch0.8mm*
+$ENDFPLIST
+DRAW
+S -750 1200 850 -1300 0 1 10 f
+X (PCINT19/OC2B/INT1)PD3 1 1000 -800 150 L 40 40 1 1 B
+X (PCINT20/XCK/T0)PD4 2 1000 -900 150 L 40 40 1 1 B
+X GND 3 -900 -1200 150 R 40 40 1 1 W
+X VCC 4 -900 1100 150 R 40 40 1 1 W
+X GND 5 -900 -1100 150 R 40 40 1 1 W
+X VCC 6 -900 1000 150 R 40 40 1 1 W
+X (PCINT6/XTAL1/TOSC1)PB6 7 1000 500 150 L 40 40 1 1 B
+X (PCINT7/XTAL2/TOSC2)PB7 8 1000 400 150 L 40 40 1 1 B
+X (PCINT21/OC0B/T1)PD5 9 1000 -1000 150 L 40 40 1 1 B
+X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
+X AREF 20 -900 500 150 R 40 40 1 1 B
+X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
+X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
+X GND 21 -900 -1000 150 R 40 40 1 1 W
+X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
+X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
+X ADC7 22 -900 -350 150 R 40 40 1 1 I
+X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
+X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
+X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
+X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
+X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
+X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
+X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
+X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
+X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
+X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
+X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
+X AVCC 18 -900 800 150 R 40 40 1 1 W
+X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
+X ADC6 19 -900 -250 150 R 40 40 1 1 I
+X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x02
+#
+DEF Conn_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x04
+#
+DEF Conn_01x04 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Conn_01x04" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 50 -250 1 1 10 f
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x05
+#
+DEF Conn_01x05 J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Conn_01x05" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 50 -250 1 1 10 f
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_2 2 -200 100 150 R 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 -200 -100 150 R 50 50 1 1 P
+X Pin_5 5 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_02x03_Odd_Even
+#
+DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 200 50 H V C CNN
+F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*2x??x*mm*
+ Connector*:*2x???Pitch*
+ Pin_Header_Straight_2X*
+ Pin_Header_Angled_2X*
+ Socket_Strip_Straight_2X*
+ Socket_Strip_Angled_2X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 150 -150 1 1 10 f
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 300 100 150 L 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 300 0 150 L 50 50 1 1 P
+X Pin_5 5 -200 -100 150 R 50 50 1 1 P
+X Pin_6 6 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal
+#
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FT232RL
+#
+DEF FT232RL U 0 40 Y Y 1 F N
+F0 "U" -650 900 50 H V L CNN
+F1 "FT232RL" 400 900 50 H V L CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SSOP*5.3x10.2mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -650 850 650 -850 0 1 10 f
+X TXD 1 800 700 150 L 50 50 1 1 O
+X DTR 2 800 300 150 L 50 50 1 1 O V
+X RTS 3 800 500 150 L 50 50 1 1 O V
+X VCCIO 4 -100 1000 150 D 50 50 1 1 I
+X RXD 5 800 600 150 L 50 50 1 1 I
+X RI 6 800 0 150 L 50 50 1 1 I L
+X GND 7 0 -1000 150 U 50 50 1 1 W
+X DCR 9 800 200 150 L 50 50 1 1 I L
+X DCD 10 800 100 150 L 50 50 1 1 I L
+X VCC 20 100 1000 150 D 50 50 1 1 W
+X CTS 11 800 400 150 L 50 50 1 1 I L
+X GND 21 200 -1000 150 U 50 50 1 1 W
+X CBUS4 12 800 -700 150 L 50 50 1 1 B
+X CBUS1 22 800 -400 150 L 50 50 1 1 O
+X CBUS2 13 800 -500 150 L 50 50 1 1 B
+X CBUS0 23 800 -300 150 L 50 50 1 1 B
+X CBUS3 14 800 -600 150 L 50 50 1 1 B
+X USBD+ 15 -800 400 150 R 50 50 1 1 B
+X AGND 25 -200 -1000 150 U 50 50 1 1 W
+X USBD- 16 -800 300 150 R 50 50 1 1 B
+X TEST 26 -800 -700 150 R 50 50 1 1 W
+X 3V3OUT 17 -800 700 150 R 50 50 1 1 I
+X OSCI 27 -800 -200 150 R 50 50 1 1 I
+X GND 18 100 -1000 150 U 50 50 1 1 W
+X OSCO 28 -800 -400 150 R 50 50 1 1 O
+X ~RESET~ 19 -800 0 150 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# L
+#
+DEF L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MAX3295
+#
+DEF MAX3295 U 0 40 Y Y 1 F N
+F0 "U" -150 300 60 H V C CNN
+F1 "MAX3295" 225 -275 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -200 250 200 -225 0 1 0 f
+X DI 1 -325 125 123 R 50 50 1 1 I
+X VCC 2 0 375 123 D 50 50 1 1 W
+X DE 3 -325 -75 123 R 50 50 1 1 B
+X Z 4 325 125 123 L 50 50 1 1 B
+X GND 5 0 -350 123 U 50 50 1 1 B
+X Y 6 325 0 123 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# MCP73831
+#
+DEF MCP73831 U 0 40 Y Y 1 F N
+F0 "U" -225 250 60 H V C CNN
+F1 "MCP73831" 50 -250 60 H V C CNN
+F2 "" 0 75 60 H I C CNN
+F3 "" 0 75 60 H I C CNN
+DRAW
+S -275 200 275 -200 0 1 0 f
+X STAT 1 -475 -125 200 R 50 50 1 1 O
+X Vss 2 475 -125 200 L 50 50 1 1 W
+X Vbat 3 475 125 200 L 50 50 1 1 w
+X VDD 4 -475 125 200 R 50 50 1 1 W
+X PROG 5 475 0 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SW_Push
+#
+DEF SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# TPS62046
+#
+DEF TPS62046 U 0 40 Y Y 1 F N
+F0 "U" -225 300 60 H V C CNN
+F1 "TPS62046" 250 -300 60 H V C CNN
+F2 "" 20 35 60 H I C CNN
+F3 "" 20 35 60 H I C CNN
+DRAW
+S -300 250 300 -250 1 1 0 f
+X EN 1 -500 0 200 R 50 50 1 1 I
+X VIN 2 -500 200 200 R 50 50 1 1 W
+X VIN 3 -500 100 200 R 50 50 1 1 W
+X GND 4 -500 -200 200 R 50 50 1 1 W
+X FB 5 500 0 200 L 50 50 1 1 I
+X MODE 6 -500 -100 200 R 50 50 1 1 I
+X SW 7 500 100 200 L 50 50 1 1 B
+X SW 8 500 200 200 L 50 50 1 1 B
+X PGND 9 500 -200 200 L 50 50 1 1 W
+X PGND 10 500 -100 200 L 50 50 1 1 W
+X PGND 11 0 -450 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# USB_OTG-Electropepper
+#
+DEF USB_OTG-Electropepper P 0 40 Y Y 1 F N
+F0 "P" 325 -125 50 H V C CNN
+F1 "USB_OTG-Electropepper" 0 200 50 H V C CNN
+F2 "" -50 -100 50 V V C CNN
+F3 "" -50 -100 50 V V C CNN
+$FPLIST
+ USB*
+$ENDFPLIST
+DRAW
+S -250 -150 250 150 0 1 0 N
+S -205 -150 -195 -120 0 1 0 N
+S -105 -150 -95 -120 0 1 0 N
+S -5 -150 5 -120 0 1 0 N
+S 95 -150 105 -120 0 1 0 N
+S 195 -150 205 -120 0 1 0 N
+X VBUS 1 -200 -300 150 U 50 50 1 1 w
+X D- 2 -100 -300 150 U 50 50 1 1 P
+X D+ 3 0 -300 150 U 50 50 1 1 P
+X ID 4 100 -300 150 U 50 50 1 1 W
+X GND 5 200 -300 150 U 50 50 1 1 W
+X shield 6 400 100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VOS627A
+#
+DEF VOS627A U 0 40 Y Y 1 F N
+F0 "U" -125 150 60 H V C CNN
+F1 "VOS627A" 0 -150 60 H V C CNN
+F2 "" 0 -50 60 H I C CNN
+F3 "" 0 -50 60 H I C CNN
+DRAW
+S -175 100 175 -100 0 1 0 f
+X A/C 1 -300 50 123 R 50 50 1 1 B
+X C/A 2 -300 -50 123 R 50 50 1 1 B
+X E 3 300 -50 123 L 50 50 1 1 B
+X C 4 300 50 123 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-19-22-24-22.lib b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-19-22-24-22.lib
new file mode 100644
index 0000000..2063b3a
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-19-22-24-22.lib
@@ -0,0 +1,4 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+#End Library
diff --git a/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-20-11-04-32.lib b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-20-11-04-32.lib
new file mode 100644
index 0000000..9e779ec
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/nmm1_B-rescue-2018-11-20-11-04-32.lib
@@ -0,0 +1,347 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# ATMEGA328P-AU
+#
+DEF ATMEGA328P-AU U 0 40 Y Y 1 F N
+F0 "U" -750 1250 50 H V L BNN
+F1 "ATMEGA328P-AU" 400 -1400 50 H V L BNN
+F2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TQFP*7x7mm*Pitch0.8mm*
+$ENDFPLIST
+DRAW
+S -750 1200 850 -1300 0 1 10 f
+X (PCINT19/OC2B/INT1)PD3 1 1000 -800 150 L 40 40 1 1 B
+X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
+X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
+X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
+X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
+X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
+X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
+X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
+X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
+X AVCC 18 -900 800 150 R 40 40 1 1 W
+X ADC6 19 -900 -250 150 R 40 40 1 1 I
+X (PCINT20/XCK/T0)PD4 2 1000 -900 150 L 40 40 1 1 B
+X AREF 20 -900 500 150 R 40 40 1 1 B
+X GND 21 -900 -1000 150 R 40 40 1 1 W
+X ADC7 22 -900 -350 150 R 40 40 1 1 I
+X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
+X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
+X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
+X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
+X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
+X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
+X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
+X GND 3 -900 -1200 150 R 40 40 1 1 W
+X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
+X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
+X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
+X VCC 4 -900 1100 150 R 40 40 1 1 W
+X GND 5 -900 -1100 150 R 40 40 1 1 W
+X VCC 6 -900 1000 150 R 40 40 1 1 W
+X (PCINT6/XTAL1/TOSC1)PB6 7 1000 500 150 L 40 40 1 1 B
+X (PCINT7/XTAL2/TOSC2)PB7 8 1000 400 150 L 40 40 1 1 B
+X (PCINT21/OC0B/T1)PD5 9 1000 -1000 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x02
+#
+DEF Conn_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x04
+#
+DEF Conn_01x04 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Conn_01x04" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 50 -250 1 1 10 f
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x05
+#
+DEF Conn_01x05 J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Conn_01x05" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 50 -250 1 1 10 f
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_2 2 -200 100 150 R 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 -200 -100 150 R 50 50 1 1 P
+X Pin_5 5 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_02x03_Odd_Even
+#
+DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 200 50 H V C CNN
+F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*2x??x*mm*
+ Connector*:*2x???Pitch*
+ Pin_Header_Straight_2X*
+ Pin_Header_Angled_2X*
+ Socket_Strip_Straight_2X*
+ Socket_Strip_Angled_2X*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 150 -150 1 1 10 f
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 300 100 150 L 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 300 0 150 L 50 50 1 1 P
+X Pin_5 5 -200 -100 150 R 50 50 1 1 P
+X Pin_6 6 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal
+#
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FT232RL
+#
+DEF FT232RL U 0 40 Y Y 1 F N
+F0 "U" -650 900 50 H V L CNN
+F1 "FT232RL" 400 900 50 H V L CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SSOP*5.3x10.2mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -650 850 650 -850 0 1 10 f
+X TXD 1 800 700 150 L 50 50 1 1 O
+X DCD 10 800 100 150 L 50 50 1 1 I L
+X CTS 11 800 400 150 L 50 50 1 1 I L
+X CBUS4 12 800 -700 150 L 50 50 1 1 B
+X CBUS2 13 800 -500 150 L 50 50 1 1 B
+X CBUS3 14 800 -600 150 L 50 50 1 1 B
+X USBD+ 15 -800 400 150 R 50 50 1 1 B
+X USBD- 16 -800 300 150 R 50 50 1 1 B
+X 3V3OUT 17 -800 700 150 R 50 50 1 1 I
+X GND 18 100 -1000 150 U 50 50 1 1 W
+X ~RESET~ 19 -800 0 150 R 50 50 1 1 I
+X DTR 2 800 300 150 L 50 50 1 1 O V
+X VCC 20 100 1000 150 D 50 50 1 1 W
+X GND 21 200 -1000 150 U 50 50 1 1 W
+X CBUS1 22 800 -400 150 L 50 50 1 1 O
+X CBUS0 23 800 -300 150 L 50 50 1 1 B
+X AGND 25 -200 -1000 150 U 50 50 1 1 W
+X TEST 26 -800 -700 150 R 50 50 1 1 W
+X OSCI 27 -800 -200 150 R 50 50 1 1 I
+X OSCO 28 -800 -400 150 R 50 50 1 1 O
+X RTS 3 800 500 150 L 50 50 1 1 O V
+X VCCIO 4 -100 1000 150 D 50 50 1 1 I
+X RXD 5 800 600 150 L 50 50 1 1 I
+X RI 6 800 0 150 L 50 50 1 1 I L
+X GND 7 0 -1000 150 U 50 50 1 1 W
+X DCR 9 800 200 150 L 50 50 1 1 I L
+ENDDRAW
+ENDDEF
+#
+# L
+#
+DEF L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SW_Push
+#
+DEF SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/NMM1_Kicad/rev_B/rescue-backup/sym-lib-table-2018-11-20-11-04-32 b/NMM1_Kicad/rev_B/rescue-backup/sym-lib-table-2018-11-20-11-04-32
new file mode 100644
index 0000000..f3903de
--- /dev/null
+++ b/NMM1_Kicad/rev_B/rescue-backup/sym-lib-table-2018-11-20-11-04-32
@@ -0,0 +1,4 @@
+(sym_lib_table
+  (lib (name nmm1_B-rescue)(type Legacy)(uri ${KIPRJMOD}/nmm1_B-rescue.lib)(options "")(descr ""))
+  (lib (name electropepper_kicad)(type Legacy)(uri /home/ricardo/Projects/Kicad/Kicad_libs/electropepper_kicad.lib)(options "")(descr ""))
+)
diff --git a/NMM1_Kicad/rev_B/sym-lib-table b/NMM1_Kicad/rev_B/sym-lib-table
new file mode 100644
index 0000000..9f3e678
--- /dev/null
+++ b/NMM1_Kicad/rev_B/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name nmm1_B-rescue)(type Legacy)(uri ${KIPRJMOD}/nmm1_B-rescue.lib)(options "")(descr ""))
+)
diff --git a/firmware/v01/v01.ino b/firmware/v01/v01.ino
index 6d04eb8..e6c743c 100644
--- a/firmware/v01/v01.ino
+++ b/firmware/v01/v01.ino
@@ -1,5 +1,4 @@
 /*********************************************************************
-
 				NMM-1
 NMEA0183 serial Monitor.
 
@@ -15,7 +14,7 @@ Wed 24 Jan 23:11:25 GMT 2018
 #include <Adafruit_SSD1306.h>
 
 #define OLED_RESET 8
-Adafruit_SSD1306 display(OLED_RESET);
+Adafruit_SSD1306 display(OLED_RESET);	// Create display object for OLED display
 
 #define ON 0  // ON means pin is on GND
 #define OFF 1 // OFF means pin is on VCC
@@ -38,7 +37,7 @@ Adafruit_SSD1306 display(OLED_RESET);
 
 // Function declarations
 void one();				// Menu one
-void two();				// Menu two	
+void two();				// Menu two
 void three();			// Menu three
 void four();			// Menu four
 void read_serial();		// Menu that reads the serial
@@ -46,7 +45,6 @@ void write_gps();		// Menu that writes gps out to serial
 void write_hdg();		// Menu that writes hdg out to serial
 void write_dep();		// Menu that writes dep out to serial
 void batt_icon();		// Draws the battery icon acording to value
-
 void write_serial();	// Menu that writes to serial
 
 
@@ -59,14 +57,13 @@ int OK_state = OFF;  // Holds state for OK, either ON or OFF
 int DOWN_state = OFF;  // Holds state for DOWN, either ON or OFF
 int CANCEL_state = OFF;  // Holds state for CANCEL, either ON or OFF
 int batt_val = 0;	// Holds the value of battery voltage
-int incomingByte;	// Serial incoming byte buffer
-int read_s = 0;
+int read_s = 0;		// Serial flag, if 0 not reading, if 1 is reading
 
 
 // Create SoftwareSerial object and designate pins
   SoftwareSerial mySerial(6, 7); // RX, TX
 
-void setup() {    // BEGIN SETUP ------------------------------------      
+void setup() {    // BEGIN SETUP ------------------------------------
 
 
   pinMode(led1, OUTPUT);    // Led 1 is an output
@@ -79,18 +76,16 @@ void setup() {    // BEGIN SETUP ------------------------------------
   // Define the starting state of the led's
   digitalWrite(led1,HIGH);  // Turn off led 1
   digitalWrite(led2,HIGH);  // Turn off led 2
-  
-  // set the data rate for the SoftwareSerial port
-  
+
 	// set the data rate for the Serial port
 	Serial.begin(4800);
 
   // by default, we'll generate the high voltage from the 3.3v line internally! (neat!)
   display.begin(SSD1306_SWITCHCAPVCC, 0x3C);  // initialize with the I2C addr 0x3C (for the 128x32)
   // init done
-  
 
-  // initialize timer1 --------------------------------------- 
+
+  // initialize timer1 ---------------------------------------
   noInterrupts();           // disable all interrupts
   TCCR1A = 0;
   TCCR1B = 0;
@@ -98,7 +93,7 @@ void setup() {    // BEGIN SETUP ------------------------------------
 
   OCR1A = 9000;             // Load value to compare
   TCCR1B |= (1 << WGM12);   // CTC mode
-  TCCR1B |= (1 << CS10);    // 64 prescaler 
+  TCCR1B |= (1 << CS10);    // 64 prescaler
   TCCR1B |= (1 << CS11);    //
   TIMSK1 |= (1 << OCIE1A);  // enable timer compare interrupt
   interrupts();             // enable all interrupts
@@ -106,338 +101,383 @@ void setup() {    // BEGIN SETUP ------------------------------------
 
 
   // Clear the buffer.
-  display.clearDisplay();
-  display.display();
-  
-  display.setTextSize(2);
-  display.setTextColor(WHITE);
-  display.setCursor(36,22);
-  display.println("NMM-1");
-  display.display();
+  display.clearDisplay();			// Clean display
+  display.display();				// Refresh display
+
+  display.setTextSize(2);			// Set text size on the display
+  display.setTextColor(WHITE);		// Set text color on the display
+  display.setCursor(36,22);			// Set the display cursor to position
+  display.println("NMM-1");			// Print on display
+  display.display();				// Refresh display
   delay(3000);
-  display.clearDisplay();
-  display.display();
+  display.clearDisplay();			// Clean display
+  display.display();				// Refresh display
 
 }   // END SETUP --------------------------------------------------------------------
 
 
 
 // Timer compare interrupt service routine --------------------------
-ISR(TIMER1_COMPA_vect) //
-{                      //
-	if (!rUP) {
-		if (menuState == 1) {
-			menuState = 1;
+ISR(TIMER1_COMPA_vect)
+{
+	if (!rUP)							// If button UP pressed
+	{
+		if (menuState == 1)				// and the menuState is 1
+		{
+			menuState = 1;				// then reset menuState to 1
 		}
-		else if (menuState == 2) {
-			menuState = 1;
+		else if (menuState == 2)		// If menuState is 2
+		{
+			menuState = 1;				// then reset menuState to 1
 		}
-		else if (menuState == 3) {
-			menuState = 2;
+		else if (menuState == 3)		// If menuState is 3
+		{
+			menuState = 2;				// then reset menuState to 2
 		}
-		else if (menuState == 4) {
-			menuState = 3;
+		else if (menuState == 4)		// If menuState is 4
+		{
+			menuState = 3;				// then reset menuState to 3
 		}
 		while (!rUP); // Check if button is still pressed do nothing
 	}
-  
 
-	if (!rDOWN) {
-		if (menuState == 1) {
-			menuState = 2;
+
+	if (!rDOWN)							// If button DOWN pressed
+	{
+		if (menuState == 1)				// and the menuState is 1
+		{
+			menuState = 2;				// then reset menuState to 2
 		}
-		else if (menuState == 2) {
-			menuState = 3;
+		else if (menuState == 2)		// If menuState is 2
+		{
+			menuState = 3;				// then reset menuState to 3
 		}
-		else if (menuState == 3) {
-			menuState = 4;
+		else if (menuState == 3)		// If menuState is 3
+		{
+			menuState = 4;				// then reset menuState to 4
 		}
-		else if (menuState == 4) {
-			menuState = 4;
+		else if (menuState == 4)		// If menuState is 4
+		{
+			menuState = 4;				// then reset menuState to 4
 		}
 		while (!rDOWN); // Check if button is still pressed do nothing
 	}
-  
 
-	if (!rOK) {
-		if (menuState == 1) {
-			menuState = 10;
-			prevMenu = 1;
-		}	
-		else if (menuState == 2) {
-			menuState = 11;
-			prevMenu = 2;
+
+	if (!rOK)							// If button OK pressed
+	{
+		if (menuState == 1)				// and the menuState is 1
+		{
+			menuState = 10;				// then reset menuState to 10
+			prevMenu = 1;				// and set prevMenu to 1
 		}
-		else if (menuState == 3) {
-			menuState = 12;
-			prevMenu = 3;
+		else if (menuState == 2)		// If menuState is 2
+		{
+			menuState = 11;				// then reset menuState to 11
+			prevMenu = 2;				// and set prevMenu to 2
 		}
-		else if (menuState == 4) {
-			menuState = 13;
-			prevMenu = 4;
+		else if (menuState == 3)		// If menuState is 3
+		{
+			menuState = 12;				// then reset menuState to 12
+			prevMenu = 3;				// and set prevMenu to 3
+		}
+		else if (menuState == 4)		// If menuState is 4
+		{
+			menuState = 13;				// then reset menuState to 13
+			prevMenu = 4;				// and set prevMenu to 4
 		}
 		while (!rOK); // Check if button is still pressed do nothing
-	} 
+	}
 
 
-   if (!rCANCEL) {
-		if (prevMenu == 1) {
-			menuState = 1;
+	if (!rCANCEL) {						// If button OK pressed
+	{
+		if (prevMenu == 1)				// and the prevMenu is 1
+		{
+			menuState = 1;				// then reset menuState to 1
 		}
-		else if (prevMenu == 2) {
-			menuState = 2;
+		else if (prevMenu == 2)			// If prevMenu is 2
+		{
+			menuState = 2;				// then reset menuState to 2
 		}
-		else if (prevMenu == 3) {
-			menuState = 3;
+		else if (prevMenu == 3)			// If prevMenu is 3
+		{
+			menuState = 3;				// then reset menuState to 3
 		}
-		else if (prevMenu == 4) {
-			menuState = 4;
+		else if (prevMenu == 4)			// If prevMenu is 4
+		{
+			menuState = 4;				// then reset menuState to 4
 		}
 		while (!rCANCEL); // Check if button is still pressed do nothing
-  }
+	}
 }
-// -------------------------------------------------------------------
+// End of Timer compare interrupt ---------------------------------------
 
 
+// Main loop routine -----------------------------------------
+void loop()
+{
 
-void loop() {
+	batt_val = analogRead(batt);		// Read analog value from battery into batt_val
 
-	batt_val = analogRead(batt);
-	
-  if (menuState == 1) {
-    one();
-	mySerial.end();
-	read_s = 0;
-  }
-  else if (menuState == 2) {
-    two();
-	mySerial.end();
-	read_s = 0;
-  }
-  else if (menuState == 3) {
-    three();
-	mySerial.end();
-	read_s = 0;
-  }
-  else if (menuState == 4) {
-    four();
-	mySerial.end();
-	read_s = 0;
-  }
-  else if (menuState == 10) {
-	if (read_s == 0) {
-		mySerial.begin(4800);
-		read_s = 1;
-		display.clearDisplay();
-		display.setTextSize(1);
-		display.setTextColor(WHITE);
-		display.setCursor(1,17);
-		display.println("Sending GPS.....");
-		batt_icon();
-		display.display();
+	if (menuState == 1)					// If menuState is 1
+	{
+		one();							// call function one()
+		mySerial.end();					// close serial connection
+		read_s = 0;						// and set read_s to 0
 	}
-	write_gps();
-  }
-  else if (menuState == 11) {
-	if (read_s == 0) {
-		mySerial.begin(4800);
-		read_s = 1;
-		display.clearDisplay();
-		display.setTextSize(1);
-		display.setTextColor(WHITE);
-		display.setCursor(1,17);
-		display.println("Sending Heading.....");
-		batt_icon();
-		display.display();
+	else if (menuState == 2)			// If menuState is 2
+	{
+		two();							// call function two()
+		mySerial.end();					// close serial connection
+		read_s = 0;						// and set read_s to 0
 	}
-	write_hdg();
-  }
-  else if (menuState == 12) {
-    if (read_s == 0) {
-		mySerial.begin(4800);
-		read_s = 1;
-		display.clearDisplay();
-		display.setTextSize(1);
-		display.setTextColor(WHITE);
-		display.setCursor(1,17);
-		display.println("Sending Depth.....");
-		batt_icon();
-		display.display();
+	else if (menuState == 3)			// If menuState is 3
+	{
+		three();						// call function three()
+		mySerial.end();					// close serial connection
+		read_s = 0;						// and set read_s to 0
 	}
-	write_dep();
-  } 
-  else if (menuState == 13) {
-    if (read_s == 0) {
-		mySerial.begin(4800);
-		read_s = 1;
-		display.clearDisplay();
-		display.setTextSize(1);
-		display.setTextColor(WHITE);
-		display.setCursor(1,17);
-		display.println("RS-422 to USB");
-		display.println("Sending...");
-		batt_icon();
-		display.display();
+	else if (menuState == 4)			// If menuState is 4
+	{
+		four();							// call function four()
+		mySerial.end();					// close serial connection
+		read_s = 0;						// and set read_s to 0
+	}
+	else if (menuState == 10)			// If menuState is 10
+	{
+		if (read_s == 0)				// and read_s is 0
+		{
+			mySerial.begin(4800);					// Start serial with 4800bps
+			read_s = 1;								// set read_s to 1
+			display.clearDisplay();					// Clean display
+			display.setTextSize(1);					// Set text size on the display
+			display.setTextColor(WHITE);			// Set text color on the display
+			display.setCursor(1,17);				// Set the display cursor to position
+			display.println("Sending GPS.....");	// Print on display
+			batt_icon();							// call function batt_icon()
+			display.display();						// Refresh display
+		}
+		write_gps();								// call function write_gps()
+	}
+	else if (menuState == 11)						// If menuState is 11
+	{
+		if (read_s == 0)							// and read_s is 0
+		{
+			mySerial.begin(4800);					// Start serial with 4800bps
+			read_s = 1;								// set read_s to 1
+			display.clearDisplay();					// Clean display
+			display.setTextSize(1);					// Set text size on the display
+			display.setTextColor(WHITE);			// Set text color on the display
+			display.setCursor(1,17);				// Set the display cursor to position
+			display.println("Sending Heading.....");	// Print on display
+			batt_icon();							// call function batt_icon()
+			display.display();						// Refresh display
+		}
+		write_hdg();								// call function write_hdg()
+	}
+	else if (menuState == 12)						// If menuState is 12
+	{
+		if (read_s == 0)							// and read_s is 0
+		{
+			mySerial.begin(4800);					// Start serial with 4800bps
+			read_s = 1;								// set read_s to 1
+			display.clearDisplay();					// Clean display
+			display.setTextSize(1);					// Set text size on the display
+			display.setTextColor(WHITE);			// Set text color on the display
+			display.setCursor(1,17);				// Set the display cursor to position
+			display.println("Sending Depth.....");	// Print on display
+			batt_icon();							// call function batt_icon()
+			display.display();						// Refresh display
+		}
+		write_dep();								// call function write_dep()
+	}
+	else if (menuState == 13)						// If menuState is 13
+	{
+		if (read_s == 0)							// and read_s is 0
+		{
+			mySerial.begin(4800);					// Start serial with 4800bps
+			read_s = 1;								// set read_s to 1
+			display.clearDisplay();					// Clean display
+			display.setTextSize(1);					// Set text size on the display
+			display.setTextColor(WHITE);			// Set text color on the display
+			display.setCursor(1,17);				// Set the display cursor to position
+			display.println("RS-422 to USB");		// Print on display
+			display.println("Sending...");			// Print on display
+			batt_icon();							// call function batt_icon()
+			display.display();						// Refresh display
+		}
+		read_serial();								// call function read_serial()
+	}
+	else											// otherwise
+	{
+		one();										// call function one()
+		mySerial.end();								// close serial connection
+		read_s = 0;									// set read_s to 0
 	}
-    read_serial();
-  }
-  else {
-    one();
-	mySerial.end();
-	read_s = 0;
-  }
 }
+// END of Main loop routine -----------------------------------------
 
 
-void batt_icon (void) {
+
+void batt_icon (void)
+{
 
 
-	if (batt_val > 962) {
-	// Draw the battery icon - Full battery
-	display.drawRect(111, 1, 16, 6, WHITE);
-	display.drawRect(112, 2, 14, 4, WHITE);
-	display.drawRect(113, 3, 12, 2, WHITE);
-	display.drawPixel(110, 3, WHITE);
-	display.drawPixel(110, 4, WHITE);
-	display.drawPixel(109, 3, WHITE);
-	display.drawPixel(109, 4, WHITE);
-	display.drawPixel(108, 3, WHITE);
-	display.drawPixel(108, 4, WHITE);
+	if (batt_val > 962)								// If analog value is bigger then 962
+	{
+		// Draw the battery icon - Full battery
+		display.drawRect(111, 1, 16, 6, WHITE);		// Draw white reactangle with coordinates
+		display.drawRect(112, 2, 14, 4, WHITE);
+		display.drawRect(113, 3, 12, 2, WHITE);
+		display.drawPixel(110, 3, WHITE);			// Draw white dot with coordinates
+		display.drawPixel(110, 4, WHITE);
+		display.drawPixel(109, 3, WHITE);
+		display.drawPixel(109, 4, WHITE);
+		display.drawPixel(108, 3, WHITE);
+		display.drawPixel(108, 4, WHITE);
 	}
 
-	else if ((batt_val > 901) & (batt_val < 962)) {
-	// Draw the battery icon - 2/3 battery
-	display.drawRect(111, 1, 16, 6, WHITE);
-	display.drawRect(116, 2, 10, 4, WHITE);
-	display.drawRect(117, 3, 8, 2, WHITE);
-	display.drawPixel(110, 3, WHITE);
-	display.drawPixel(110, 4, WHITE);
-	display.drawPixel(109, 3, WHITE);
-	display.drawPixel(109, 4, WHITE);
-	display.drawPixel(108, 3, WHITE);
-	display.drawPixel(108, 4, WHITE);
+	else if ((batt_val > 901) & (batt_val < 962))	// If analog value is between 901 and 962
+	{
+		// Draw the battery icon - 2/3 battery
+		display.drawRect(111, 1, 16, 6, WHITE);		// Draw white reactangle with coordinates
+		display.drawRect(116, 2, 10, 4, WHITE);
+		display.drawRect(117, 3, 8, 2, WHITE);
+		display.drawPixel(110, 3, WHITE);			// Draw white dot with coordinates
+		display.drawPixel(110, 4, WHITE);
+		display.drawPixel(109, 3, WHITE);
+		display.drawPixel(109, 4, WHITE);
+		display.drawPixel(108, 3, WHITE);
+		display.drawPixel(108, 4, WHITE);
 	}
 
-	else if ((batt_val > 840) & (batt_val < 901)) {
+	else if ((batt_val > 840) & (batt_val < 901))	// If analog value is between 840 and 901
+	{
 	// Draw the battery icon - 1/3 battery
-	display.drawRect(111, 1, 16, 6, WHITE);
-	display.drawRect(121, 2, 5, 4, WHITE);
-	display.drawRect(122, 3, 3, 2, WHITE);
-	display.drawPixel(110, 3, WHITE);
-	display.drawPixel(110, 4, WHITE);
-	display.drawPixel(109, 3, WHITE);
-	display.drawPixel(109, 4, WHITE);
-	display.drawPixel(108, 3, WHITE);
-	display.drawPixel(108, 4, WHITE);
+		display.drawRect(111, 1, 16, 6, WHITE);		// Draw white reactangle with coordinates
+		display.drawRect(121, 2, 5, 4, WHITE);
+		display.drawRect(122, 3, 3, 2, WHITE);
+		display.drawPixel(110, 3, WHITE);			// Draw white dot with coordinates
+		display.drawPixel(110, 4, WHITE);
+		display.drawPixel(109, 3, WHITE);
+		display.drawPixel(109, 4, WHITE);
+		display.drawPixel(108, 3, WHITE);
+		display.drawPixel(108, 4, WHITE);
 	}
 
-	else {
-	// Draw the battery icon - Empty battery
-	display.setCursor(35,1);
-	display.println("BATT LOW");
-	display.drawRect(111, 1, 16, 6, WHITE);
-	display.drawPixel(110, 3, WHITE);
-	display.drawPixel(110, 4, WHITE);
-	display.drawPixel(109, 3, WHITE);
-	display.drawPixel(109, 4, WHITE);
-	display.drawPixel(108, 3, WHITE);
-	display.drawPixel(108, 4, WHITE);
+	else											// otherwise
+	{
+		// Draw the battery icon - Empty battery
+		display.setCursor(35,1);					// Set the display cursor to position
+		display.println("BATT LOW");				// Print on display
+		display.drawRect(111, 1, 16, 6, WHITE);		// Draw white reactangle with coordinates
+		display.drawPixel(110, 3, WHITE);			// Draw white dot with coordinates
+		display.drawPixel(110, 4, WHITE);
+		display.drawPixel(109, 3, WHITE);
+		display.drawPixel(109, 4, WHITE);
+		display.drawPixel(108, 3, WHITE);
+		display.drawPixel(108, 4, WHITE);
 	}
 }
 
-void one (void) {
-
-	display.clearDisplay();
-	display.setTextSize(1);
-	display.setTextColor(WHITE);
-	display.setCursor(1,22);
-	display.println("Send GPS          <--");
-	display.setCursor(1,32);
-	display.println("Send Heading");
-	display.setCursor(1,42);
-	display.println("Send Depth");
-	display.setCursor(1,52);
-	display.println("RS422 ==> USB");
-	batt_icon();
-	display.display();
+void one (void)
+{
+	display.clearDisplay();							// Clean display
+	display.setTextSize(1);							// Set text size on the display
+	display.setTextColor(WHITE);					// Set text color on the display
+	display.setCursor(1,22);						// Set the display cursor to position
+	display.println("Send GPS          <--");		// Print on display
+	display.setCursor(1,32);						// Set the display cursor to position
+	display.println("Send Heading");				// Print on display
+	display.setCursor(1,42);						// Set the display cursor to position
+	display.println("Send Depth");					// Print on display
+	display.setCursor(1,52);						// Set the display cursor to position
+	display.println("RS422 ==> USB");				// Print on display
+	batt_icon();									// call function batt_icon()
+	display.display();								// Refresh display
 }
 
-void two (void) {
-
-	display.clearDisplay();
-	display.setTextSize(1);
-	display.setTextColor(WHITE);
-	display.setCursor(1,22);
-	display.println("Send GPS");
-	display.setCursor(1,32);
-	display.println("Send Heading      <--");
-	display.setCursor(1,42);
-	display.println("Send Depth");
-	display.setCursor(1,52);
-	display.println("RS422 ==> USB");
-	batt_icon();
-	display.display();
+void two (void)
+{
+	display.clearDisplay();							// Clean display
+	display.setTextSize(1);							// Set text size on the display
+	display.setTextColor(WHITE);					// Set text color on the display
+	display.setCursor(1,22);						// Set the display cursor to position
+	display.println("Send GPS");					// Print on display
+	display.setCursor(1,32);						// Set the display cursor to position
+	display.println("Send Heading      <--");		// Print on display
+	display.setCursor(1,42);						// Set the display cursor to position
+	display.println("Send Depth");					// Print on display
+	display.setCursor(1,52);						// Set the display cursor to position
+	display.println("RS422 ==> USB");				// Print on display
+	batt_icon();									// call function batt_icon()
+	display.display();								// Refresh display
 }
 
-void three (void) {
-
-	display.clearDisplay();
-	display.setTextSize(1);
-	display.setTextColor(WHITE);
-	display.setCursor(1,22);
-	display.println("Send GPS");
-	display.setCursor(1,32);
-	display.println("Send Heading");
-	display.setCursor(1,42);
-	display.println("Send Depth        <--");
-	display.setCursor(1,52);
-	display.println("RS422 ==> USB");
-	batt_icon();
-	display.display();
+void three (void)
+{
+	display.clearDisplay();							// Clean display
+	display.setTextSize(1);							// Set text size on the display
+	display.setTextColor(WHITE);					// Set text color on the display
+	display.setCursor(1,22);						// Set the display cursor to position
+	display.println("Send GPS");					// Print on display
+	display.setCursor(1,32);						// Set the display cursor to position
+	display.println("Send Heading");				// Print on display
+	display.setCursor(1,42);						// Set the display cursor to position
+	display.println("Send Depth        <--");		// Print on display
+	display.setCursor(1,52);						// Set the display cursor to position
+	display.println("RS422 ==> USB");				// Print on display
+	batt_icon();									// call function batt_icon()
+	display.display();								// Refresh display
 }
 
-void four (void) {
-
-	display.clearDisplay();
-	display.setTextSize(1);
-	display.setTextColor(WHITE);
-	display.setCursor(1,22);
-	display.println("Send GPS");
-	display.setCursor(1,32);
-	display.println("Send Heading");
-	display.setCursor(1,42);
-	display.println("Send Depth");
-	display.setCursor(1,52);
-	display.println("RS422 ==> USB     <--");
-	batt_icon();
-	display.display();
+void four (void)
+{
+	display.clearDisplay();							// Clean display
+	display.setTextSize(1);							// Set text size on the display
+	display.setTextColor(WHITE);					// Set text color on the display
+	display.setCursor(1,22);						// Set the display cursor to position
+	display.println("Send GPS");					// Print on display
+	display.setCursor(1,32);						// Set the display cursor to position
+	display.println("Send Heading");				// Print on display
+	display.setCursor(1,42);						// Set the display cursor to position
+	display.println("Send Depth");					// Print on display
+	display.setCursor(1,52);						// Set the display cursor to position
+	display.println("RS422 ==> USB     <--");		// Print on display
+	batt_icon();									// call function batt_icon()
+	display.display();								// Refresh display
 }
 
-void read_serial (void) {
-
-	if (mySerial.available()) {
-		Serial.write(mySerial.read());
+void read_serial (void)
+{
+	if (mySerial.available())						// If incoming NMEA0183 serial
+	{
+		Serial.write(mySerial.read());				// redirect it to USB
 	}
 }
 
-void write_gps (void) {
-
+void write_gps (void)
+{
+	// Write NMEA0183 GPS sentence to USB
 	mySerial.print("$GPGGA,090000.10,6350.37829338,N,02225.18272240,W,1,05,2.87,160.00,M,-21.3213,M,,*64");
-	mySerial.println();
+	mySerial.println();								// Print on display
 	delay(100);
 }
 
-void write_hdg (void) {
-
+void write_hdg (void)
+{
+	// Write NMEA0183 Heading sentence to USB
 	mySerial.print("$HEHDT,268.4,T*27");
-	mySerial.println();
+	mySerial.println();								// Print on display
 	delay(100);
 }
 
-void write_dep (void) {
-
+void write_dep (void)
+{
+	// Write NMEA0183 Depth sentence to USB
 	mySerial.print("$SDDBT,0038.0,f,0011.6,M,0006.3,F");
-	mySerial.println();
+	mySerial.println();								// Print on display
 	delay(100);
 }