From 148f8a811e169ae72e5235d230dee5a348068abc Mon Sep 17 00:00:00 2001
From: Ricardo Work <electropepper@yahoo.com>
Date: Mon, 27 Feb 2017 16:30:39 +0000
Subject: [PATCH] Fixing RS232 port.

---
 NMM1_Kicad/nmm1-cache.lib     |  66 +++--
 NMM1_Kicad/nmm1.bak           | 224 ++++++++++++-----
 NMM1_Kicad/nmm1.kicad_pcb     | 436 ++++++++++++++++----------------
 NMM1_Kicad/nmm1.kicad_pcb-bak | 450 +++++++++++++++++-----------------
 NMM1_Kicad/nmm1.sch           | 226 ++++++++++++-----
 5 files changed, 827 insertions(+), 575 deletions(-)

diff --git a/NMM1_Kicad/nmm1-cache.lib b/NMM1_Kicad/nmm1-cache.lib
index 4b7188b..350d251 100755
--- a/NMM1_Kicad/nmm1-cache.lib
+++ b/NMM1_Kicad/nmm1-cache.lib
@@ -106,27 +106,29 @@ X P2 2 -200 -50 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_01X03
+# CONN_01X04
 #
-DEF CONN_01X03 P 0 40 Y N 1 F N
-F0 "P" 0 200 50 H V C CNN
-F1 "CONN_01X03" 100 0 50 V V C CNN
+DEF CONN_01X04 P 0 40 Y N 1 F N
+F0 "P" 0 250 50 H V C CNN
+F1 "CONN_01X04" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
- Pin_Header_Straight_1X03
- Pin_Header_Angled_1X03
- Socket_Strip_Straight_1X03
- Socket_Strip_Angled_1X03
+ Pin_Header_Straight_1X04
+ Pin_Header_Angled_1X04
+ Socket_Strip_Straight_1X04
+ Socket_Strip_Angled_1X04
 $ENDFPLIST
 DRAW
-S -50 -95 10 -105 0 1 0 N
-S -50 5 10 -5 0 1 0 N
-S -50 105 10 95 0 1 0 N
-S -50 150 50 -150 0 1 0 N
-X P1 1 -200 100 150 R 50 50 1 1 P
-X P2 2 -200 0 150 R 50 50 1 1 P
-X P3 3 -200 -100 150 R 50 50 1 1 P
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 200 50 -200 0 1 0 N
+X P1 1 -200 150 150 R 50 50 1 1 P
+X P2 2 -200 50 150 R 50 50 1 1 P
+X P3 3 -200 -50 150 R 50 50 1 1 P
+X P4 4 -200 -150 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -375,6 +377,24 @@ 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
@@ -476,4 +496,20 @@ 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/nmm1.bak b/NMM1_Kicad/nmm1.bak
index 8f34bbe..d23e64c 100755
--- a/NMM1_Kicad/nmm1.bak
+++ b/NMM1_Kicad/nmm1.bak
@@ -622,8 +622,8 @@ $Comp
 L LED D1
 U 1 1 589137FD
 P 3500 3275
-F 0 "D1" V 3450 3125 50  0000 C CNN
-F 1 "LED" V 3600 3375 50  0000 C CNN
+F 0 "D1" H 3500 3200 50  0000 C CNN
+F 1 "LED" H 3450 3375 50  0000 C CNN
 F 2 "LEDs:LED_PLCC-2" H 3500 3275 50  0001 C CNN
 F 3 "" H 3500 3275 50  0000 C CNN
 	1    3500 3275
@@ -1236,69 +1236,24 @@ Wire Wire Line
 Wire Wire Line
 	8000 8250 8000 8175
 $Comp
-L CONN_01X03 P2
+L CONN_01X04 P2
 U 1 1 58AC3DF0
-P 10650 7625
-F 0 "P2" H 10650 7825 50  0000 C CNN
-F 1 "Serial 1" H 10850 7650 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 10650 7625 50  0001 C CNN
-F 3 "" H 10650 7625 50  0000 C CNN
-	1    10650 7625
+P 11350 8200
+F 0 "P2" H 11350 8450 50  0000 C CNN
+F 1 "RS422" H 11375 7950 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x04_Pitch2.54mm" H 11350 8200 50  0001 C CNN
+F 3 "" H 11350 8200 50  0000 C CNN
+	1    11350 8200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9625 6700 9700 6700
+	9775 6600 9775 8050
 Wire Wire Line
-	9700 6700 9700 8250
+	9775 8050 10075 8050
 Wire Wire Line
-	9700 8250 10450 8250
+	9700 6700 9700 9100
 Wire Wire Line
-	9625 6600 9775 6600
-Wire Wire Line
-	9775 6600 9775 8150
-Wire Wire Line
-	9775 8150 10450 8150
-Wire Wire Line
-	9625 6400 10050 6400
-Wire Wire Line
-	10050 6400 10050 7525
-Wire Wire Line
-	10050 7525 10450 7525
-Wire Wire Line
-	9625 6500 9975 6500
-Wire Wire Line
-	9975 6500 9975 7625
-Wire Wire Line
-	9975 7625 10450 7625
-Wire Wire Line
-	10450 7725 10375 7725
-Wire Wire Line
-	10375 7725 10375 8425
-Wire Wire Line
-	10450 8350 10375 8350
-Connection ~ 10375 8350
-$Comp
-L GND #PWR031
-U 1 1 58AC7D39
-P 10375 8425
-F 0 "#PWR031" H 10375 8175 50  0001 C CNN
-F 1 "GND" H 10375 8275 50  0000 C CNN
-F 2 "" H 10375 8425 50  0000 C CNN
-F 3 "" H 10375 8425 50  0000 C CNN
-	1    10375 8425
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_01X03 P5
-U 1 1 58AC9EA0
-P 10650 8250
-F 0 "P5" H 10650 8450 50  0000 C CNN
-F 1 "Serial 2" H 10850 8275 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 10650 8250 50  0001 C CNN
-F 3 "" H 10650 8250 50  0000 C CNN
-	1    10650 8250
-	1    0    0    -1  
-$EndComp
+	9700 9100 10025 9100
 $Comp
 L R R6
 U 1 1 58AD148C
@@ -1395,4 +1350,157 @@ Wire Wire Line
 	7575 6050 7575 5850
 Wire Wire Line
 	7575 5850 7725 5850
+Wire Wire Line
+	9700 6700 9625 6700
+Wire Wire Line
+	9625 6600 9775 6600
+$Comp
+L VOS627A U?
+U 1 1 58B4533F
+P 10375 8100
+F 0 "U?" H 10250 8250 60  0000 C CNN
+F 1 "VOS627A" H 10375 7950 60  0000 C CNN
+F 2 "Housings_SSOP:SOP-4_4.4x2.8mm_Pitch1.27mm" H 10375 8050 60  0001 C CNN
+F 3 "" H 10375 8050 60  0001 C CNN
+	1    10375 8100
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	10675 8150 11150 8150
+$Comp
+L R R?
+U 1 1 58B47C35
+P 10925 8050
+F 0 "R?" V 11000 8125 50  0000 C CNN
+F 1 "1K" V 10875 7900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10825 8100 50  0001 C CNN
+F 3 "" H 10925 8050 50  0000 C CNN
+	1    10925 8050
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	10675 8050 10775 8050
+Wire Wire Line
+	11075 8050 11150 8050
+Wire Wire Line
+	10075 8150 10025 8150
+Wire Wire Line
+	10025 8150 10025 8200
+$Comp
+L GND #PWR?
+U 1 1 58B4A6CC
+P 10025 8200
+F 0 "#PWR?" H 10025 7950 50  0001 C CNN
+F 1 "GND" H 10025 8050 50  0000 C CNN
+F 2 "" H 10025 8200 50  0000 C CNN
+F 3 "" H 10025 8200 50  0000 C CNN
+	1    10025 8200
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 58B4BD0A
+P 9900 7850
+F 0 "R?" H 9975 8000 50  0000 C CNN
+F 1 "1K" H 10000 7775 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9800 7900 50  0001 C CNN
+F 3 "" H 9900 7850 50  0000 C CNN
+	1    9900 7850
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 58B4CA78
+P 9900 7650
+F 0 "#PWR?" H 9900 7500 50  0001 C CNN
+F 1 "+3V3" H 9900 7790 50  0000 C CNN
+F 2 "" H 9900 7650 50  0000 C CNN
+F 3 "" H 9900 7650 50  0000 C CNN
+	1    9900 7650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9900 8000 9900 8050
+Connection ~ 9900 8050
+Wire Wire Line
+	9900 7650 9900 7700
+$Comp
+L MAX3295 U?
+U 1 1 58B4FEA4
+P 10350 9225
+F 0 "U?" H 10200 9525 60  0000 C CNN
+F 1 "MAX3295" H 10575 8950 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 10350 9225 60  0001 C CNN
+F 3 "" H 10350 9225 60  0001 C CNN
+	1    10350 9225
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11150 8250 10800 8250
+Wire Wire Line
+	10800 8250 10800 9100
+Wire Wire Line
+	10800 9100 10675 9100
+Wire Wire Line
+	10675 9225 10875 9225
+Wire Wire Line
+	10875 9225 10875 8350
+Wire Wire Line
+	10875 8350 11150 8350
+Wire Wire Line
+	10350 8850 10350 8600
+$Comp
+L GND #PWR?
+U 1 1 58B553F1
+P 10350 9700
+F 0 "#PWR?" H 10350 9450 50  0001 C CNN
+F 1 "GND" H 10350 9550 50  0000 C CNN
+F 2 "" H 10350 9700 50  0000 C CNN
+F 3 "" H 10350 9700 50  0000 C CNN
+	1    10350 9700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10350 9575 10350 9700
+$Comp
+L +3V3 #PWR?
+U 1 1 58B55F48
+P 10350 8600
+F 0 "#PWR?" H 10350 8450 50  0001 C CNN
+F 1 "+3V3" H 10350 8740 50  0000 C CNN
+F 2 "" H 10350 8600 50  0000 C CNN
+F 3 "" H 10350 8600 50  0000 C CNN
+	1    10350 8600
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 58B57DAA
+P 9875 8875
+F 0 "R?" H 9800 9025 50  0000 C CNN
+F 1 "1K" H 9975 8800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9775 8925 50  0001 C CNN
+F 3 "" H 9875 8875 50  0000 C CNN
+	1    9875 8875
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9875 8725 9875 8650
+Wire Wire Line
+	9875 8650 10350 8650
+Connection ~ 10350 8650
+Wire Wire Line
+	9875 9025 9875 9300
+Wire Wire Line
+	9875 9300 10025 9300
+NoConn ~ 9625 6400
+NoConn ~ 9625 6500
+Text Notes 11450 8050 0    60   ~ 0
+RX+
+Text Notes 11450 8150 0    60   ~ 0
+RX-
+Text Notes 11450 8350 0    60   ~ 0
+TX-
+Text Notes 11450 8250 0    60   ~ 0
+TX+
 $EndSCHEMATC
diff --git a/NMM1_Kicad/nmm1.kicad_pcb b/NMM1_Kicad/nmm1.kicad_pcb
index ff7a061..a3c1740 100755
--- a/NMM1_Kicad/nmm1.kicad_pcb
+++ b/NMM1_Kicad/nmm1.kicad_pcb
@@ -300,7 +300,7 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC512F)
-    (at 91.25 90.75 270)
+    (at 90.25 90.75 270)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /5888837D)
@@ -372,18 +372,18 @@
   )
 
   (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 58AC5151)
-    (at 58.75 175)
+    (at 98.25 91.25 270)
     (descr "Capacitor SMD 1206, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 1206")
     (path /588996E9)
     (attr smd)
-    (fp_text reference C6 (at 0 -1.75) (layer F.SilkS)
+    (fp_text reference C6 (at 0 -1.75 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 22uF (at 0 2) (layer F.Fab)
+    (fp_text value 22uF (at 0 2 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.75) (layer F.Fab)
+    (fp_text user %R (at 0 -1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
@@ -396,9 +396,9 @@
     (fp_line (start -2.25 -1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end 2.25 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.5 0 270) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at 1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.5 0 270) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_1206.wrl
       (at (xyz 0 0 0))
@@ -408,18 +408,18 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC5162)
-    (at 80.25 167.5)
+    (at 119.75 91.25 45)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /58825549)
     (attr smd)
-    (fp_text reference C7 (at 0 -1.5) (layer F.SilkS)
+    (fp_text reference C7 (at 0 -1.5 45) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.75) (layer F.Fab)
+    (fp_text value 100nF (at 0 1.75 45) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.5) (layer F.Fab)
+    (fp_text user %R (at 0 -1.5 45) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -432,9 +432,9 @@
     (fp_line (start -1.75 -0.88) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end 1.75 -0.88) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 0 45) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 2 smd rect (at 1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1 0 45) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Capacitors_SMD.3dshapes/C_0805.wrl
       (at (xyz 0 0 0))
@@ -444,18 +444,18 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC5173)
-    (at 84.75 167.75)
+    (at 129.5 81.25 135)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /5891C141)
     (attr smd)
-    (fp_text reference C8 (at 0 -1.5) (layer F.SilkS)
+    (fp_text reference C8 (at 0 -1.5 135) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.75) (layer F.Fab)
+    (fp_text value 100nF (at 0 1.75 135) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.5) (layer F.Fab)
+    (fp_text user %R (at 0 -1.5 135) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -468,9 +468,9 @@
     (fp_line (start -1.75 -0.88) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end 1.75 -0.88) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 0 135) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 9 "Net-(C8-Pad1)"))
-    (pad 2 smd rect (at 1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1 0 135) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_0805.wrl
       (at (xyz 0 0 0))
@@ -480,18 +480,18 @@
   )
 
   (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 58AC5184)
-    (at 73.5 162)
+    (at 92.25 91.25 90)
     (descr "Capacitor SMD 1206, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 1206")
     (path /5889990B)
     (attr smd)
-    (fp_text reference C9 (at 0 -1.75) (layer F.SilkS)
+    (fp_text reference C9 (at 0 -1.75 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 22uF (at 0 2) (layer F.Fab)
+    (fp_text value 22uF (at 0 2 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.75) (layer F.Fab)
+    (fp_text user %R (at 0 -1.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
@@ -504,9 +504,9 @@
     (fp_line (start -2.25 -1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end 2.25 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.5 0 90) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
-    (pad 2 smd rect (at 1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.5 0 90) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_1206.wrl
       (at (xyz 0 0 0))
@@ -588,7 +588,7 @@
   )
 
   (module LEDs:LED_PLCC-2 (layer F.Cu) (tedit 5860D51E) (tstamp 58AC51B9)
-    (at 88.25 96.25)
+    (at 87.25 96.25)
     (descr "LED PLCC-2 SMD package")
     (tags "LED PLCC-2 SMD")
     (path /589137FD)
@@ -619,15 +619,15 @@
   )
 
   (module LEDs:LED_PLCC-2 (layer F.Cu) (tedit 5860D51E) (tstamp 58AC51CC)
-    (at 61.25 167.5)
+    (at 107.25 94.25 180)
     (descr "LED PLCC-2 SMD package")
     (tags "LED PLCC-2 SMD")
     (path /5881DC19)
     (attr smd)
-    (fp_text reference D2 (at 0 -2.5) (layer F.SilkS)
+    (fp_text reference D2 (at 0 -2.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value LED (at 0 2.5) (layer F.Fab)
+    (fp_text value LED (at 0 2.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 0 -1.25) (layer F.Fab) (width 0.1))
@@ -643,22 +643,22 @@
     (fp_line (start 2.25 1.6) (end -2.4 1.6) (layer F.SilkS) (width 0.12))
     (fp_line (start 2.25 -1.6) (end -2.4 -1.6) (layer F.SilkS) (width 0.12))
     (fp_line (start -2.4 -1.6) (end -2.4 -0.8) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.5 0) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.5 0 180) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
       (net 13 "Net-(D2-Pad1)"))
-    (pad 2 smd rect (at 1.5 0) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.5 0 180) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
       (net 44 "Net-(D2-Pad2)"))
   )
 
   (module LEDs:LED_PLCC-2 (layer F.Cu) (tedit 5860D51E) (tstamp 58AC51DF)
-    (at 62 172)
+    (at 107.25 98.5 180)
     (descr "LED PLCC-2 SMD package")
     (tags "LED PLCC-2 SMD")
     (path /58912C50)
     (attr smd)
-    (fp_text reference D3 (at 0 -2.5) (layer F.SilkS)
+    (fp_text reference D3 (at 0 -2.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value LED (at 0 2.5) (layer F.Fab)
+    (fp_text value LED (at 0 2.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 0 -1.25) (layer F.Fab) (width 0.1))
@@ -674,9 +674,9 @@
     (fp_line (start 2.25 1.6) (end -2.4 1.6) (layer F.SilkS) (width 0.12))
     (fp_line (start 2.25 -1.6) (end -2.4 -1.6) (layer F.SilkS) (width 0.12))
     (fp_line (start -2.4 -1.6) (end -2.4 -0.8) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.5 0) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.5 0 180) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
       (net 14 "Net-(D3-Pad1)"))
-    (pad 2 smd rect (at 1.5 0) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.5 0 180) (size 1.5 2.6) (layers F.Cu F.Paste F.Mask)
       (net 45 "Net-(D3-Pad2)"))
   )
 
@@ -735,12 +735,12 @@
   )
 
   (module "Electropepper parts:SRN6028" (layer F.Cu) (tedit 58913167) (tstamp 58AC520A)
-    (at 114 100.5)
+    (at 95 98.25 270)
     (path /5889C7D1)
-    (fp_text reference L1 (at 0 -3.81) (layer F.SilkS)
+    (fp_text reference L1 (at 0 -3.81 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 6.2uH (at 0 4.445) (layer F.Fab)
+    (fp_text value 6.2uH (at 0 4.445 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -3.175 2.54) (end -3.175 -2.54) (layer F.SilkS) (width 0.15))
@@ -751,9 +751,9 @@
     (fp_line (start -3.175 2.54) (end -2.54 3.175) (layer F.SilkS) (width 0.15))
     (fp_line (start 3.175 -2.54) (end 2.54 -3.175) (layer F.SilkS) (width 0.15))
     (fp_line (start -3.175 -2.54) (end -2.54 -3.175) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -2.54 0) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -2.54 0 270) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(L1-Pad1)"))
-    (pad 2 smd rect (at 2.54 0) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 2.54 0 270) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
   )
 
@@ -800,14 +800,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC5246)
-    (at 48.25 177.5)
+    (at 94.75 87 180)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /58896012)
-    (fp_text reference P3 (at 0 -2.39) (layer F.SilkS)
+    (fp_text reference P3 (at 0 -2.39 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value Battery (at 0 4.93) (layer F.Fab)
+    (fp_text value Battery (at 0 4.93 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 3.81) (layer F.Fab) (width 0.1))
@@ -824,9 +824,9 @@
     (fp_line (start -1.6 4.1) (end 1.6 4.1) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 4.1) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 5 /VBatt))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wrl
       (at (xyz 0 -0.05 0))
@@ -836,7 +836,7 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC52CD)
-    (at 88.5 93.5 180)
+    (at 87.5 93.5 180)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58883862)
@@ -872,7 +872,7 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC52DE)
-    (at 85.75 90.75 270)
+    (at 84.75 90.75 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /5888A417)
@@ -908,7 +908,7 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC52EF)
-    (at 57.5 172.75)
+    (at 133.25 76.75)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /5894FF99)
@@ -944,18 +944,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5300)
-    (at 73 164.5)
+    (at 130 77.5 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /5895063D)
     (attr smd)
-    (fp_text reference R4 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R4 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -968,9 +968,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 31 /BTN_2))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -980,18 +980,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5311)
-    (at 76.5 166.75)
+    (at 128 77.5 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58950803)
     (attr smd)
-    (fp_text reference R5 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R5 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1004,9 +1004,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 30 /BTN_3))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1016,18 +1016,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5322)
-    (at 66.25 167)
+    (at 126 77.5 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58AD148C)
     (attr smd)
-    (fp_text reference R6 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R6 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1040,9 +1040,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 29 /BTN_4))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1124,18 +1124,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5355)
-    (at 93 166)
+    (at 112 75 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /588021DF)
     (attr smd)
-    (fp_text reference R9 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R9 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1148,9 +1148,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 /RESET))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1160,18 +1160,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5366)
-    (at 76.5 171.75)
+    (at 108.5 79.25 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58AE3757)
     (attr smd)
-    (fp_text reference R10 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R10 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 36K (at 0 1.75) (layer F.Fab)
+    (fp_text value 36K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1184,9 +1184,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 39 "Net-(R10-Pad2)"))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1196,87 +1196,15 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5377)
-    (at 89.25 170.75)
+    (at 110.25 79.25 90)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58AE393C)
     (attr smd)
-    (fp_text reference R11 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R11 (at 0 -1.65 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 330R (at 0 1.75) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 39 "Net-(R10-Pad2)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 "Net-(R11-Pad2)"))
-    (model Resistors_SMD.3dshapes/R_0805.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5388)
-    (at 86 163.25)
-    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0805")
-    (path /58AE3E88)
-    (attr smd)
-    (fp_text reference R12 (at 0 -1.65) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330R (at 0 1.75) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 "Net-(R11-Pad2)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 2 GND))
-    (model Resistors_SMD.3dshapes/R_0805.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5399)
-    (at 69.25 174.5 90)
-    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0805")
-    (path /58AE025B)
-    (attr smd)
-    (fp_text reference R13 (at 0 -1.65 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330K (at 0 1.75 90) (layer F.Fab)
+    (fp_text value 330R (at 0 1.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 -1.65 90) (layer F.Fab)
@@ -1293,8 +1221,80 @@
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (pad 1 smd rect (at -0.95 0 90) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 5 /VBatt))
+      (net 39 "Net-(R10-Pad2)"))
     (pad 2 smd rect (at 0.95 0 90) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 "Net-(R11-Pad2)"))
+    (model Resistors_SMD.3dshapes/R_0805.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5388)
+    (at 112 79.25 270)
+    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
+    (tags "resistor 0805")
+    (path /58AE3E88)
+    (attr smd)
+    (fp_text reference R12 (at 0 -1.65 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 330R (at 0 1.75 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 "Net-(R11-Pad2)"))
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 2 GND))
+    (model Resistors_SMD.3dshapes/R_0805.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5399)
+    (at 109.25 76.75)
+    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
+    (tags "resistor 0805")
+    (path /58AE025B)
+    (attr smd)
+    (fp_text reference R13 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 330K (at 0 1.75) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 5 /VBatt))
+    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 41 "Net-(R13-Pad2)"))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1304,18 +1304,18 @@
   )
 
   (module Buttons_Switches_SMD:SW_SPST_B3S-1000 (layer F.Cu) (tedit 58724047) (tstamp 58AC53B3)
-    (at 41.25 171)
+    (at 118 76.25 180)
     (descr "Surface Mount Tactile Switch for High-Density Packaging")
     (tags "Tactile Switch")
     (path /58821233)
     (attr smd)
-    (fp_text reference SW4 (at 0 -4.5) (layer F.SilkS)
+    (fp_text reference SW4 (at 0 -4.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value SW_Push (at 0 4.5) (layer F.Fab)
+    (fp_text value SW_Push (at 0 4.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -4.5) (layer F.Fab)
+    (fp_text user %R (at 0 -4.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -5 3.7) (end 5 3.7) (layer F.CrtYd) (width 0.05))
@@ -1335,18 +1335,18 @@
     (fp_line (start 3 -3.3) (end 3 3.3) (layer F.Fab) (width 0.1))
     (fp_line (start 3 3.3) (end -3 3.3) (layer F.Fab) (width 0.1))
     (fp_line (start -3 3.3) (end -3 -3.3) (layer F.Fab) (width 0.1))
-    (pad 1 smd rect (at -3.975 -2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -3.975 -2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 1 smd rect (at 3.975 -2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at 3.975 -2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 2 smd rect (at -3.975 2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -3.975 2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 /RESET))
-    (pad 2 smd rect (at 3.975 2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 3.975 2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 /RESET))
   )
 
   (module TO_SOT_Packages_SMD:SOT-23-5 (layer F.Cu) (tedit 5883B1A6) (tstamp 58AC53C7)
-    (at 88.5 90.75 180)
+    (at 87.5 90.75 180)
     (descr "5-pin SOT23 package")
     (tags SOT-23-5)
     (path /5887F26B)
@@ -1465,15 +1465,15 @@
   )
 
   (module Housings_SSOP:MSOP-10-1EP_3x3mm_Pitch0.5mm (layer F.Cu) (tedit 57AFAE31) (tstamp 58AC5419)
-    (at 106.5 100.5)
+    (at 95.25 91.75 270)
     (descr "MSE Package; 10-Lead Plastic MSOP, Exposed Die Pad (see Linear Technology 05081664_I_MSE.pdf)")
     (tags "SSOP 0.5")
     (path /58897588)
     (attr smd)
-    (fp_text reference U3 (at 0 -2.55) (layer F.SilkS)
+    (fp_text reference U3 (at 0 -2.55 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TPS62046 (at 0 2.55) (layer F.Fab)
+    (fp_text value TPS62046 (at 0 2.55 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
@@ -1492,33 +1492,33 @@
     (fp_line (start -1.625 -1.625) (end 1.625 -1.625) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.625 1.625) (end 1.625 1.625) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.625 -1.475) (end -2.55 -1.475) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -2.105 -1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -2.105 -1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at -2.105 -0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -2.105 -0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 3 smd rect (at -2.105 0) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at -2.105 0 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 4 smd rect (at -2.105 0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at -2.105 0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 5 smd rect (at -2.105 1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at -2.105 1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
-    (pad 6 smd rect (at 2.105 1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at 2.105 1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 7 smd rect (at 2.105 0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at 2.105 0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(L1-Pad1)"))
-    (pad 8 smd rect (at 2.105 0) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 8 smd rect (at 2.105 0 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(L1-Pad1)"))
-    (pad 9 smd rect (at 2.105 -0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 9 smd rect (at 2.105 -0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 10 smd rect (at 2.105 -1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 10 smd rect (at 2.105 -1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 11 smd rect (at 0.42 0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at 0.42 0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
-    (pad 11 smd rect (at 0.42 -0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at 0.42 -0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
-    (pad 11 smd rect (at -0.42 0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at -0.42 0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
-    (pad 11 smd rect (at -0.42 -0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at -0.42 -0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
     (model Housings_SSOP.3dshapes/MSOP-10-1EP_3x3mm_Pitch0.5mm.wrl
       (at (xyz 0 0 0))
@@ -1704,14 +1704,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC56F9)
-    (at 104.25 151.75)
+    (at 124.75 74.25 90)
     (descr "Through hole straight pin header, 1x05, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x05 2.54mm single row")
     (path /589D3AE4)
-    (fp_text reference P8 (at 0 -2.39) (layer F.SilkS)
+    (fp_text reference P8 (at 0 -2.39 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value CONN_01X05 (at 0 12.55) (layer F.Fab)
+    (fp_text value CONN_01X05 (at 0 12.55 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 11.43) (layer F.Fab) (width 0.1))
@@ -1728,15 +1728,15 @@
     (fp_line (start -1.6 11.7) (end 1.6 11.7) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 11.7) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 29 /BTN_4))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 30 /BTN_3))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 31 /BTN_2))
-    (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 32 /BTN_1))
-    (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 10.16 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.54mm.wrl
       (at (xyz 0 -0.2 0))
@@ -1746,18 +1746,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC6462)
-    (at 93.5 153)
+    (at 103 98.5 180)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58ACCCE1)
     (attr smd)
-    (fp_text reference R14 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R14 (at 0 -1.65 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 330R (at 0 1.75) (layer F.Fab)
+    (fp_text value 330R (at 0 1.75 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1770,9 +1770,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 180) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 45 "Net-(D3-Pad2)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 180) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1782,18 +1782,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC6473)
-    (at 94 155.75)
+    (at 103 94.25 180)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58ACD105)
     (attr smd)
-    (fp_text reference R15 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R15 (at 0 -1.65 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 330R (at 0 1.75) (layer F.Fab)
+    (fp_text value 330R (at 0 1.75 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1806,9 +1806,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 180) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 44 "Net-(D2-Pad2)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 180) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1818,7 +1818,7 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC672D)
-    (at 36.25 160)
+    (at 113.5 89.5)
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /58AC3DF0)
@@ -1856,14 +1856,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_2x03_Pitch2.54mm (layer F.Cu) (tedit 5862ED53) (tstamp 58AC6741)
-    (at 85.25 125)
+    (at 129.75 92.25 315)
     (descr "Through hole straight pin header, 2x03, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x03 2.54mm double row")
     (path /58823534)
-    (fp_text reference P4 (at 1.27 -2.39) (layer F.SilkS)
+    (fp_text reference P4 (at 1.27 -2.39 315) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value CONN_02X03 (at 1.27 7.47) (layer F.Fab)
+    (fp_text value CONN_02X03 (at 1.27 7.47 315) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 6.35) (layer F.Fab) (width 0.1))
@@ -1882,17 +1882,17 @@
     (fp_line (start -1.6 6.6) (end 4.1 6.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 4.1 6.6) (end 4.1 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 4.1 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 8 +3V3))
-    (pad 2 thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 2.54 0 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 22 /CLK))
-    (pad 3 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 2.54 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 6 /RESET))
-    (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 2.54 2.54 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 23 /DO))
-    (pad 5 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 5.08 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 6 thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 6 thru_hole oval (at 2.54 5.08 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 24 /DI))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.54mm.wrl
       (at (xyz 0.05 -0.1 0))
@@ -1902,14 +1902,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC675A)
-    (at 81.5 156.25)
+    (at 121.75 97.75 270)
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /58AC9EA0)
-    (fp_text reference P5 (at 0 -2.39) (layer F.SilkS)
+    (fp_text reference P5 (at 0 -2.39 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value "Serial 2" (at 0 7.47) (layer F.Fab)
+    (fp_text value "Serial 2" (at 0 7.47 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 6.35) (layer F.Fab) (width 0.1))
@@ -1926,11 +1926,11 @@
     (fp_line (start -1.6 6.6) (end 1.6 6.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 6.6) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 25 "Net-(P5-Pad1)"))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 26 "Net-(P5-Pad2)"))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.54mm.wrl
       (at (xyz 0 -0.1 0))
@@ -1940,7 +1940,7 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_2x05_Pitch2.54mm (layer F.Cu) (tedit 5862ED53) (tstamp 58AC676E)
-    (at 59.5 123.25)
+    (at 133 79.25)
     (descr "Through hole straight pin header, 2x05, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x05 2.54mm double row")
     (path /58AC71D2)
diff --git a/NMM1_Kicad/nmm1.kicad_pcb-bak b/NMM1_Kicad/nmm1.kicad_pcb-bak
index ce822b4..d5b26ab 100755
--- a/NMM1_Kicad/nmm1.kicad_pcb-bak
+++ b/NMM1_Kicad/nmm1.kicad_pcb-bak
@@ -3,7 +3,7 @@
   (general
     (links 125)
     (no_connects 125)
-    (area 0 0 0 0)
+    (area 33.02619 73.175 133.654161 183.505)
     (thickness 1.6)
     (drawings 0)
     (tracks 0)
@@ -62,7 +62,7 @@
     (pad_drill 0.762)
     (pad_to_mask_clearance 0.2)
     (aux_axis_origin 0 0)
-    (visible_elements 7FFFFFFF)
+    (visible_elements 7FFEFFFF)
     (pcbplotparams
       (layerselection 0x00030_80000001)
       (usegerberextensions false)
@@ -192,7 +192,7 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC50FC)
-    (at 53.25 168.5)
+    (at 88.5 88)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /58885F04)
@@ -300,18 +300,18 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC512F)
-    (at 54.25 174.75)
+    (at 90.25 90.75 270)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /5888837D)
     (attr smd)
-    (fp_text reference C4 (at 0 -1.5) (layer F.SilkS)
+    (fp_text reference C4 (at 0 -1.5 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 4.7uF (at 0 1.75) (layer F.Fab)
+    (fp_text value 4.7uF (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.5) (layer F.Fab)
+    (fp_text user %R (at 0 -1.5 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -324,9 +324,9 @@
     (fp_line (start -1.75 -0.88) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end 1.75 -0.88) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 0 270) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at 1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1 0 270) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_0805.wrl
       (at (xyz 0 0 0))
@@ -372,18 +372,18 @@
   )
 
   (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 58AC5151)
-    (at 58.75 175)
+    (at 98.25 91.25 270)
     (descr "Capacitor SMD 1206, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 1206")
     (path /588996E9)
     (attr smd)
-    (fp_text reference C6 (at 0 -1.75) (layer F.SilkS)
+    (fp_text reference C6 (at 0 -1.75 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 22uF (at 0 2) (layer F.Fab)
+    (fp_text value 22uF (at 0 2 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.75) (layer F.Fab)
+    (fp_text user %R (at 0 -1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
@@ -396,9 +396,9 @@
     (fp_line (start -2.25 -1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end 2.25 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.5 0 270) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at 1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.5 0 270) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_1206.wrl
       (at (xyz 0 0 0))
@@ -408,18 +408,18 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC5162)
-    (at 80.25 167.5)
+    (at 119.75 91.25 45)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /58825549)
     (attr smd)
-    (fp_text reference C7 (at 0 -1.5) (layer F.SilkS)
+    (fp_text reference C7 (at 0 -1.5 45) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.75) (layer F.Fab)
+    (fp_text value 100nF (at 0 1.75 45) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.5) (layer F.Fab)
+    (fp_text user %R (at 0 -1.5 45) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -432,9 +432,9 @@
     (fp_line (start -1.75 -0.88) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end 1.75 -0.88) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 0 45) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 2 smd rect (at 1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1 0 45) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Capacitors_SMD.3dshapes/C_0805.wrl
       (at (xyz 0 0 0))
@@ -444,18 +444,18 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 58AC5173)
-    (at 84.75 167.75)
+    (at 129.5 81.25 135)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /5891C141)
     (attr smd)
-    (fp_text reference C8 (at 0 -1.5) (layer F.SilkS)
+    (fp_text reference C8 (at 0 -1.5 135) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.75) (layer F.Fab)
+    (fp_text value 100nF (at 0 1.75 135) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.5) (layer F.Fab)
+    (fp_text user %R (at 0 -1.5 135) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -468,9 +468,9 @@
     (fp_line (start -1.75 -0.88) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end 1.75 -0.88) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 0 135) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 9 "Net-(C8-Pad1)"))
-    (pad 2 smd rect (at 1 0) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1 0 135) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_0805.wrl
       (at (xyz 0 0 0))
@@ -480,18 +480,18 @@
   )
 
   (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 58AC5184)
-    (at 73.5 162)
+    (at 92.25 91.25 90)
     (descr "Capacitor SMD 1206, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 1206")
     (path /5889990B)
     (attr smd)
-    (fp_text reference C9 (at 0 -1.75) (layer F.SilkS)
+    (fp_text reference C9 (at 0 -1.75 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 22uF (at 0 2) (layer F.Fab)
+    (fp_text value 22uF (at 0 2 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.75) (layer F.Fab)
+    (fp_text user %R (at 0 -1.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
@@ -504,9 +504,9 @@
     (fp_line (start -2.25 -1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end 2.25 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.5 0 90) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
-    (pad 2 smd rect (at 1.5 0) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.5 0 90) (size 1 1.6) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model Capacitors_SMD.3dshapes/C_1206.wrl
       (at (xyz 0 0 0))
@@ -588,7 +588,7 @@
   )
 
   (module LEDs:LED_PLCC-2 (layer F.Cu) (tedit 5860D51E) (tstamp 58AC51B9)
-    (at 74.25 154.75)
+    (at 87.25 96.25)
     (descr "LED PLCC-2 SMD package")
     (tags "LED PLCC-2 SMD")
     (path /589137FD)
@@ -619,7 +619,7 @@
   )
 
   (module LEDs:LED_PLCC-2 (layer F.Cu) (tedit 5860D51E) (tstamp 58AC51CC)
-    (at 61.25 167.5)
+    (at 113.25 107)
     (descr "LED PLCC-2 SMD package")
     (tags "LED PLCC-2 SMD")
     (path /5881DC19)
@@ -650,7 +650,7 @@
   )
 
   (module LEDs:LED_PLCC-2 (layer F.Cu) (tedit 5860D51E) (tstamp 58AC51DF)
-    (at 62 172)
+    (at 114.5 111.75)
     (descr "LED PLCC-2 SMD package")
     (tags "LED PLCC-2 SMD")
     (path /58912C50)
@@ -735,12 +735,12 @@
   )
 
   (module "Electropepper parts:SRN6028" (layer F.Cu) (tedit 58913167) (tstamp 58AC520A)
-    (at 90.25 103)
+    (at 95 98.25 270)
     (path /5889C7D1)
-    (fp_text reference L1 (at 0 -3.81) (layer F.SilkS)
+    (fp_text reference L1 (at 0 -3.81 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 6.2uH (at 0 4.445) (layer F.Fab)
+    (fp_text value 6.2uH (at 0 4.445 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -3.175 2.54) (end -3.175 -2.54) (layer F.SilkS) (width 0.15))
@@ -751,9 +751,9 @@
     (fp_line (start -3.175 2.54) (end -2.54 3.175) (layer F.SilkS) (width 0.15))
     (fp_line (start 3.175 -2.54) (end 2.54 -3.175) (layer F.SilkS) (width 0.15))
     (fp_line (start -3.175 -2.54) (end -2.54 -3.175) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -2.54 0) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -2.54 0 270) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(L1-Pad1)"))
-    (pad 2 smd rect (at 2.54 0) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 2.54 0 270) (size 1.6 5.7) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
   )
 
@@ -800,14 +800,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC5246)
-    (at 48.25 177.5)
+    (at 94.75 87 180)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /58896012)
-    (fp_text reference P3 (at 0 -2.39) (layer F.SilkS)
+    (fp_text reference P3 (at 0 -2.39 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value Battery (at 0 4.93) (layer F.Fab)
+    (fp_text value Battery (at 0 4.93 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 3.81) (layer F.Fab) (width 0.1))
@@ -824,9 +824,9 @@
     (fp_line (start -1.6 4.1) (end 1.6 4.1) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 4.1) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 5 /VBatt))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wrl
       (at (xyz 0 -0.05 0))
@@ -836,18 +836,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC52CD)
-    (at 63.25 175)
+    (at 87.5 93.5 180)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58883862)
     (attr smd)
-    (fp_text reference R1 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R1 (at 0 -1.65 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 470R (at 0 1.75) (layer F.Fab)
+    (fp_text value 470R (at 0 1.75 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -860,9 +860,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 180) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 33 "Net-(R1-Pad1)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 180) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 12 "Net-(D1-Pad1)"))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -872,18 +872,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC52DE)
-    (at 73.75 158.5)
+    (at 84.75 90.75 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /5888A417)
     (attr smd)
-    (fp_text reference R2 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R2 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 2K (at 0 1.75) (layer F.Fab)
+    (fp_text value 2K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -896,9 +896,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 34 "Net-(R2-Pad2)"))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -908,7 +908,7 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC52EF)
-    (at 57.5 172.75)
+    (at 133.25 76.75)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /5894FF99)
@@ -944,18 +944,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5300)
-    (at 73 164.5)
+    (at 130 77.5 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /5895063D)
     (attr smd)
-    (fp_text reference R4 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R4 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -968,9 +968,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 31 /BTN_2))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -980,18 +980,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5311)
-    (at 76.5 166.75)
+    (at 128 77.5 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58950803)
     (attr smd)
-    (fp_text reference R5 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R5 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1004,9 +1004,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 30 /BTN_3))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1016,18 +1016,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5322)
-    (at 66.25 167)
+    (at 126 77.5 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58AD148C)
     (attr smd)
-    (fp_text reference R6 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R6 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1040,9 +1040,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 29 /BTN_4))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1124,18 +1124,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5355)
-    (at 82.25 163)
+    (at 112 75 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /588021DF)
     (attr smd)
-    (fp_text reference R9 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R9 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10K (at 0 1.75) (layer F.Fab)
+    (fp_text value 10K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1148,9 +1148,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 /RESET))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1160,18 +1160,18 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5366)
-    (at 76.25 169)
+    (at 108.5 79.25 270)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58AE3757)
     (attr smd)
-    (fp_text reference R10 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R10 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 36K (at 0 1.75) (layer F.Fab)
+    (fp_text value 36K (at 0 1.75 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1184,9 +1184,9 @@
     (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 39 "Net-(R10-Pad2)"))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1196,87 +1196,15 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5377)
-    (at 82.25 161)
+    (at 110.25 79.25 90)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58AE393C)
     (attr smd)
-    (fp_text reference R11 (at 0 -1.65) (layer F.SilkS)
+    (fp_text reference R11 (at 0 -1.65 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 330R (at 0 1.75) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 39 "Net-(R10-Pad2)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 "Net-(R11-Pad2)"))
-    (model Resistors_SMD.3dshapes/R_0805.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5388)
-    (at 86 163.25)
-    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0805")
-    (path /58AE3E88)
-    (attr smd)
-    (fp_text reference R12 (at 0 -1.65) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330R (at 0 1.75) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 "Net-(R11-Pad2)"))
-    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 2 GND))
-    (model Resistors_SMD.3dshapes/R_0805.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5399)
-    (at 66.25 173.5 90)
-    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0805")
-    (path /58AE025B)
-    (attr smd)
-    (fp_text reference R13 (at 0 -1.65 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330K (at 0 1.75 90) (layer F.Fab)
+    (fp_text value 330R (at 0 1.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 -1.65 90) (layer F.Fab)
@@ -1293,8 +1221,80 @@
     (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
     (pad 1 smd rect (at -0.95 0 90) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 5 /VBatt))
+      (net 39 "Net-(R10-Pad2)"))
     (pad 2 smd rect (at 0.95 0 90) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 "Net-(R11-Pad2)"))
+    (model Resistors_SMD.3dshapes/R_0805.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5388)
+    (at 112 79.25 270)
+    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
+    (tags "resistor 0805")
+    (path /58AE3E88)
+    (attr smd)
+    (fp_text reference R12 (at 0 -1.65 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 330R (at 0 1.75 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 "Net-(R11-Pad2)"))
+    (pad 2 smd rect (at 0.95 0 270) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 2 GND))
+    (model Resistors_SMD.3dshapes/R_0805.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC5399)
+    (at 109.25 76.75)
+    (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
+    (tags "resistor 0805")
+    (path /58AE025B)
+    (attr smd)
+    (fp_text reference R13 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 330K (at 0 1.75) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.62) (end -1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.62) (end 1 0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.62) (end 1 -0.62) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.6 0.88) (end -0.6 0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.6 -0.88) (end 0.6 -0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.55 -0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.55 -0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end 1.55 -0.9) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.55 0.9) (end -1.55 0.9) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+      (net 5 /VBatt))
+    (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
       (net 41 "Net-(R13-Pad2)"))
     (model Resistors_SMD.3dshapes/R_0805.wrl
       (at (xyz 0 0 0))
@@ -1304,18 +1304,18 @@
   )
 
   (module Buttons_Switches_SMD:SW_SPST_B3S-1000 (layer F.Cu) (tedit 58724047) (tstamp 58AC53B3)
-    (at 41.25 171)
+    (at 118 76.25 180)
     (descr "Surface Mount Tactile Switch for High-Density Packaging")
     (tags "Tactile Switch")
     (path /58821233)
     (attr smd)
-    (fp_text reference SW4 (at 0 -4.5) (layer F.SilkS)
+    (fp_text reference SW4 (at 0 -4.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value SW_Push (at 0 4.5) (layer F.Fab)
+    (fp_text value SW_Push (at 0 4.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -4.5) (layer F.Fab)
+    (fp_text user %R (at 0 -4.5 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -5 3.7) (end 5 3.7) (layer F.CrtYd) (width 0.05))
@@ -1335,26 +1335,26 @@
     (fp_line (start 3 -3.3) (end 3 3.3) (layer F.Fab) (width 0.1))
     (fp_line (start 3 3.3) (end -3 3.3) (layer F.Fab) (width 0.1))
     (fp_line (start -3 3.3) (end -3 -3.3) (layer F.Fab) (width 0.1))
-    (pad 1 smd rect (at -3.975 -2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -3.975 -2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 1 smd rect (at 3.975 -2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at 3.975 -2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 2 smd rect (at -3.975 2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -3.975 2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 /RESET))
-    (pad 2 smd rect (at 3.975 2.25) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 3.975 2.25 180) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 /RESET))
   )
 
   (module TO_SOT_Packages_SMD:SOT-23-5 (layer F.Cu) (tedit 5883B1A6) (tstamp 58AC53C7)
-    (at 63.75 101.5)
+    (at 87.5 90.75 180)
     (descr "5-pin SOT23 package")
     (tags SOT-23-5)
     (path /5887F26B)
     (attr smd)
-    (fp_text reference U1 (at 0 -2.9) (layer F.SilkS)
+    (fp_text reference U1 (at 0 -2.9 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MCP73831 (at 0 2.9) (layer F.Fab)
+    (fp_text value MCP73831 (at 0 2.9 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer F.SilkS) (width 0.12))
@@ -1368,15 +1368,15 @@
     (fp_line (start -0.9 -0.9) (end -0.9 1.55) (layer F.Fab) (width 0.1))
     (fp_line (start 0.9 1.55) (end -0.9 1.55) (layer F.Fab) (width 0.1))
     (fp_line (start 0.9 -1.55) (end 0.9 1.55) (layer F.Fab) (width 0.1))
-    (pad 1 smd rect (at -1.1 -0.95) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.1 -0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 33 "Net-(R1-Pad1)"))
-    (pad 2 smd rect (at -1.1 0) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -1.1 0 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 3 smd rect (at -1.1 0.95) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at -1.1 0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 4 smd rect (at 1.1 0.95) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at 1.1 0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 1 "Net-(C1-Pad1)"))
-    (pad 5 smd rect (at 1.1 -0.95) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at 1.1 -0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 34 "Net-(R2-Pad2)"))
     (model TO_SOT_Packages_SMD.3dshapes/SOT-23-5.wrl
       (at (xyz 0 0 0))
@@ -1465,15 +1465,15 @@
   )
 
   (module Housings_SSOP:MSOP-10-1EP_3x3mm_Pitch0.5mm (layer F.Cu) (tedit 57AFAE31) (tstamp 58AC5419)
-    (at 82.75 103)
+    (at 95.25 91.75 270)
     (descr "MSE Package; 10-Lead Plastic MSOP, Exposed Die Pad (see Linear Technology 05081664_I_MSE.pdf)")
     (tags "SSOP 0.5")
     (path /58897588)
     (attr smd)
-    (fp_text reference U3 (at 0 -2.55) (layer F.SilkS)
+    (fp_text reference U3 (at 0 -2.55 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TPS62046 (at 0 2.55) (layer F.Fab)
+    (fp_text value TPS62046 (at 0 2.55 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
@@ -1492,33 +1492,33 @@
     (fp_line (start -1.625 -1.625) (end 1.625 -1.625) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.625 1.625) (end 1.625 1.625) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.625 -1.475) (end -2.55 -1.475) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -2.105 -1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -2.105 -1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 2 smd rect (at -2.105 -0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -2.105 -0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 3 smd rect (at -2.105 0) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at -2.105 0 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 5 /VBatt))
-    (pad 4 smd rect (at -2.105 0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at -2.105 0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 5 smd rect (at -2.105 1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at -2.105 1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 8 +3V3))
-    (pad 6 smd rect (at 2.105 1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at 2.105 1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 7 smd rect (at 2.105 0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at 2.105 0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(L1-Pad1)"))
-    (pad 8 smd rect (at 2.105 0) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 8 smd rect (at 2.105 0 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(L1-Pad1)"))
-    (pad 9 smd rect (at 2.105 -0.5) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 9 smd rect (at 2.105 -0.5 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 10 smd rect (at 2.105 -1) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
+    (pad 10 smd rect (at 2.105 -1 270) (size 0.89 0.305) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
-    (pad 11 smd rect (at 0.42 0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at 0.42 0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
-    (pad 11 smd rect (at 0.42 -0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at 0.42 -0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
-    (pad 11 smd rect (at -0.42 0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at -0.42 0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
-    (pad 11 smd rect (at -0.42 -0.47) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at -0.42 -0.47 270) (size 0.84 0.94) (layers F.Cu F.Paste F.Mask)
       (net 2 GND) (solder_paste_margin_ratio -0.2))
     (model Housings_SSOP.3dshapes/MSOP-10-1EP_3x3mm_Pitch0.5mm.wrl
       (at (xyz 0 0 0))
@@ -1704,14 +1704,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC56F9)
-    (at 104.25 151.75)
+    (at 124.75 74.25 90)
     (descr "Through hole straight pin header, 1x05, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x05 2.54mm single row")
     (path /589D3AE4)
-    (fp_text reference P8 (at 0 -2.39) (layer F.SilkS)
+    (fp_text reference P8 (at 0 -2.39 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value CONN_01X05 (at 0 12.55) (layer F.Fab)
+    (fp_text value CONN_01X05 (at 0 12.55 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 11.43) (layer F.Fab) (width 0.1))
@@ -1728,15 +1728,15 @@
     (fp_line (start -1.6 11.7) (end 1.6 11.7) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 11.7) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 29 /BTN_4))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 30 /BTN_3))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 31 /BTN_2))
-    (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 32 /BTN_1))
-    (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 10.16 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.54mm.wrl
       (at (xyz 0 -0.2 0))
@@ -1746,7 +1746,7 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC6462)
-    (at 93.5 153)
+    (at 106.75 109.5)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58ACCCE1)
@@ -1782,7 +1782,7 @@
   )
 
   (module Resistors_SMD:R_0805 (layer F.Cu) (tedit 58AADA8F) (tstamp 58AC6473)
-    (at 94 155.75)
+    (at 107.75 112.5)
     (descr "Resistor SMD 0805, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0805")
     (path /58ACD105)
@@ -1818,7 +1818,7 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC672D)
-    (at 36.25 160)
+    (at 113.5 89.5)
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /58AC3DF0)
@@ -1856,14 +1856,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_2x03_Pitch2.54mm (layer F.Cu) (tedit 5862ED53) (tstamp 58AC6741)
-    (at 85.25 125)
+    (at 129.75 92.25 315)
     (descr "Through hole straight pin header, 2x03, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x03 2.54mm double row")
     (path /58823534)
-    (fp_text reference P4 (at 1.27 -2.39) (layer F.SilkS)
+    (fp_text reference P4 (at 1.27 -2.39 315) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value CONN_02X03 (at 1.27 7.47) (layer F.Fab)
+    (fp_text value CONN_02X03 (at 1.27 7.47 315) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 6.35) (layer F.Fab) (width 0.1))
@@ -1882,17 +1882,17 @@
     (fp_line (start -1.6 6.6) (end 4.1 6.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 4.1 6.6) (end 4.1 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 4.1 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 8 +3V3))
-    (pad 2 thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 2.54 0 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 22 /CLK))
-    (pad 3 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 2.54 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 6 /RESET))
-    (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 2.54 2.54 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 23 /DO))
-    (pad 5 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 5.08 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 6 thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 6 thru_hole oval (at 2.54 5.08 315) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 24 /DI))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.54mm.wrl
       (at (xyz 0.05 -0.1 0))
@@ -1902,14 +1902,14 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 58AC675A)
-    (at 81.5 156.25)
+    (at 121.75 97.75 270)
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /58AC9EA0)
-    (fp_text reference P5 (at 0 -2.39) (layer F.SilkS)
+    (fp_text reference P5 (at 0 -2.39 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value "Serial 2" (at 0 7.47) (layer F.Fab)
+    (fp_text value "Serial 2" (at 0 7.47 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.27 -1.27) (end -1.27 6.35) (layer F.Fab) (width 0.1))
@@ -1926,11 +1926,11 @@
     (fp_line (start -1.6 6.6) (end 1.6 6.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 6.6) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 25 "Net-(P5-Pad1)"))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 26 "Net-(P5-Pad2)"))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.54mm.wrl
       (at (xyz 0 -0.1 0))
@@ -1940,7 +1940,7 @@
   )
 
   (module Pin_Headers:Pin_Header_Straight_2x05_Pitch2.54mm (layer F.Cu) (tedit 5862ED53) (tstamp 58AC676E)
-    (at 59.5 123.25)
+    (at 133 79.25)
     (descr "Through hole straight pin header, 2x05, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x05 2.54mm double row")
     (path /58AC71D2)
diff --git a/NMM1_Kicad/nmm1.sch b/NMM1_Kicad/nmm1.sch
index 4d628c0..0bb858c 100755
--- a/NMM1_Kicad/nmm1.sch
+++ b/NMM1_Kicad/nmm1.sch
@@ -1186,7 +1186,7 @@ $Comp
 L R R10
 U 1 1 58AE3757
 P 8000 7650
-F 0 "R10" H 7900 7725 50  0000 C CNN
+F 0 "R10" H 7875 7725 50  0000 C CNN
 F 1 "36K" H 8125 7575 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805" V 7900 7700 50  0001 C CNN
 F 3 "" H 8000 7650 50  0000 C CNN
@@ -1197,7 +1197,7 @@ $Comp
 L R R11
 U 1 1 58AE393C
 P 8000 8025
-F 0 "R11" H 7900 8100 50  0000 C CNN
+F 0 "R11" H 7875 8100 50  0000 C CNN
 F 1 "330R" H 8150 7950 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805" V 7900 8075 50  0001 C CNN
 F 3 "" H 8000 8025 50  0000 C CNN
@@ -1208,7 +1208,7 @@ $Comp
 L R R12
 U 1 1 58AE3E88
 P 8000 8400
-F 0 "R12" H 7900 8475 50  0000 C CNN
+F 0 "R12" H 7875 8475 50  0000 C CNN
 F 1 "330R" H 8150 8325 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805" V 7900 8450 50  0001 C CNN
 F 3 "" H 8000 8400 50  0000 C CNN
@@ -1236,69 +1236,24 @@ Wire Wire Line
 Wire Wire Line
 	8000 8250 8000 8175
 $Comp
-L CONN_01X03 P2
+L CONN_01X04 P2
 U 1 1 58AC3DF0
-P 10650 7625
-F 0 "P2" H 10650 7825 50  0000 C CNN
-F 1 "Serial 1" H 10850 7650 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 10650 7625 50  0001 C CNN
-F 3 "" H 10650 7625 50  0000 C CNN
-	1    10650 7625
+P 11350 8200
+F 0 "P2" H 11350 8450 50  0000 C CNN
+F 1 "RS422" H 11375 7950 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x04_Pitch2.54mm" H 11350 8200 50  0001 C CNN
+F 3 "" H 11350 8200 50  0000 C CNN
+	1    11350 8200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9625 6700 9700 6700
+	9775 6600 9775 8050
 Wire Wire Line
-	9700 6700 9700 8250
+	9775 8050 10075 8050
 Wire Wire Line
-	9700 8250 10450 8250
+	9700 6700 9700 9100
 Wire Wire Line
-	9625 6600 9775 6600
-Wire Wire Line
-	9775 6600 9775 8150
-Wire Wire Line
-	9775 8150 10450 8150
-Wire Wire Line
-	9625 6400 10050 6400
-Wire Wire Line
-	10050 6400 10050 7525
-Wire Wire Line
-	10050 7525 10450 7525
-Wire Wire Line
-	9625 6500 9975 6500
-Wire Wire Line
-	9975 6500 9975 7625
-Wire Wire Line
-	9975 7625 10450 7625
-Wire Wire Line
-	10450 7725 10375 7725
-Wire Wire Line
-	10375 7725 10375 8425
-Wire Wire Line
-	10450 8350 10375 8350
-Connection ~ 10375 8350
-$Comp
-L GND #PWR031
-U 1 1 58AC7D39
-P 10375 8425
-F 0 "#PWR031" H 10375 8175 50  0001 C CNN
-F 1 "GND" H 10375 8275 50  0000 C CNN
-F 2 "" H 10375 8425 50  0000 C CNN
-F 3 "" H 10375 8425 50  0000 C CNN
-	1    10375 8425
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_01X03 P5
-U 1 1 58AC9EA0
-P 10650 8250
-F 0 "P5" H 10650 8450 50  0000 C CNN
-F 1 "Serial 2" H 10850 8275 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 10650 8250 50  0001 C CNN
-F 3 "" H 10650 8250 50  0000 C CNN
-	1    10650 8250
-	1    0    0    -1  
-$EndComp
+	9700 9100 10025 9100
 $Comp
 L R R6
 U 1 1 58AD148C
@@ -1395,4 +1350,157 @@ Wire Wire Line
 	7575 6050 7575 5850
 Wire Wire Line
 	7575 5850 7725 5850
+Wire Wire Line
+	9700 6700 9625 6700
+Wire Wire Line
+	9625 6600 9775 6600
+$Comp
+L VOS627A U?
+U 1 1 58B4533F
+P 10375 8100
+F 0 "U?" H 10250 8250 60  0000 C CNN
+F 1 "VOS627A" H 10375 7950 60  0000 C CNN
+F 2 "Housings_SSOP:SOP-4_4.4x2.8mm_Pitch1.27mm" H 10375 8050 60  0001 C CNN
+F 3 "" H 10375 8050 60  0001 C CNN
+	1    10375 8100
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	10675 8150 11150 8150
+$Comp
+L R R?
+U 1 1 58B47C35
+P 10925 8050
+F 0 "R?" V 11000 8125 50  0000 C CNN
+F 1 "1K" V 10875 7900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 10825 8100 50  0001 C CNN
+F 3 "" H 10925 8050 50  0000 C CNN
+	1    10925 8050
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	10675 8050 10775 8050
+Wire Wire Line
+	11075 8050 11150 8050
+Wire Wire Line
+	10075 8150 10025 8150
+Wire Wire Line
+	10025 8150 10025 8200
+$Comp
+L GND #PWR?
+U 1 1 58B4A6CC
+P 10025 8200
+F 0 "#PWR?" H 10025 7950 50  0001 C CNN
+F 1 "GND" H 10025 8050 50  0000 C CNN
+F 2 "" H 10025 8200 50  0000 C CNN
+F 3 "" H 10025 8200 50  0000 C CNN
+	1    10025 8200
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 58B4BD0A
+P 9900 7850
+F 0 "R?" H 9975 8000 50  0000 C CNN
+F 1 "1K" H 10000 7775 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9800 7900 50  0001 C CNN
+F 3 "" H 9900 7850 50  0000 C CNN
+	1    9900 7850
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 58B4CA78
+P 9900 7650
+F 0 "#PWR?" H 9900 7500 50  0001 C CNN
+F 1 "+3V3" H 9900 7790 50  0000 C CNN
+F 2 "" H 9900 7650 50  0000 C CNN
+F 3 "" H 9900 7650 50  0000 C CNN
+	1    9900 7650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9900 8000 9900 8050
+Connection ~ 9900 8050
+Wire Wire Line
+	9900 7650 9900 7700
+$Comp
+L MAX3295 U?
+U 1 1 58B4FEA4
+P 10350 9225
+F 0 "U?" H 10200 9525 60  0000 C CNN
+F 1 "MAX3295" H 10575 8950 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 10350 9225 60  0001 C CNN
+F 3 "" H 10350 9225 60  0001 C CNN
+	1    10350 9225
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11150 8250 10800 8250
+Wire Wire Line
+	10800 8250 10800 9100
+Wire Wire Line
+	10800 9100 10675 9100
+Wire Wire Line
+	10675 9225 10875 9225
+Wire Wire Line
+	10875 9225 10875 8350
+Wire Wire Line
+	10875 8350 11150 8350
+Wire Wire Line
+	10350 8850 10350 8600
+$Comp
+L GND #PWR?
+U 1 1 58B553F1
+P 10350 9700
+F 0 "#PWR?" H 10350 9450 50  0001 C CNN
+F 1 "GND" H 10350 9550 50  0000 C CNN
+F 2 "" H 10350 9700 50  0000 C CNN
+F 3 "" H 10350 9700 50  0000 C CNN
+	1    10350 9700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10350 9575 10350 9700
+$Comp
+L +3V3 #PWR?
+U 1 1 58B55F48
+P 10350 8600
+F 0 "#PWR?" H 10350 8450 50  0001 C CNN
+F 1 "+3V3" H 10350 8740 50  0000 C CNN
+F 2 "" H 10350 8600 50  0000 C CNN
+F 3 "" H 10350 8600 50  0000 C CNN
+	1    10350 8600
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 58B57DAA
+P 9875 8875
+F 0 "R?" H 9800 9025 50  0000 C CNN
+F 1 "1K" H 9975 8800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 9775 8925 50  0001 C CNN
+F 3 "" H 9875 8875 50  0000 C CNN
+	1    9875 8875
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9875 8725 9875 8650
+Wire Wire Line
+	9875 8650 10350 8650
+Connection ~ 10350 8650
+Wire Wire Line
+	9875 9025 9875 9300
+Wire Wire Line
+	9875 9300 10025 9300
+NoConn ~ 9625 6400
+NoConn ~ 9625 6500
+Text Notes 11450 8050 0    60   ~ 0
+RX+
+Text Notes 11450 8150 0    60   ~ 0
+RX-
+Text Notes 11450 8350 0    60   ~ 0
+TX-
+Text Notes 11450 8250 0    60   ~ 0
+TX+
 $EndSCHEMATC