Fix LDO

5 files changed, 141 insertions, 148 deletions

diff --git a/pcb/kicad/right/right-cache.lib b/pcb/kicad/right/right-cache.lib
index d24cb02..e11d8c5 100644
--- a/pcb/kicad/right/right-cache.lib
+++ b/pcb/kicad/right/right-cache.lib
@@ -254,22 +254,22 @@ X VDDA 9 100 1500 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# Regulator_Linear_LM3480-3.3
+# Regulator_Linear_MCP1703A-3302_SOT23
 #
-DEF Regulator_Linear_LM3480-3.3 U 0 10 Y Y 1 F N
+DEF Regulator_Linear_MCP1703A-3302_SOT23 U 0 10 Y Y 1 F N
 F0 "U" -150 125 50 H V C CNN
-F1 "Regulator_Linear_LM3480-3.3" 0 125 50 H V L CNN
-F2 "Package_TO_SOT_SMD:SOT-23" 0 225 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS LM3480-5.0 LM3480-12 LM3480-15
+F1 "Regulator_Linear_MCP1703A-3302_SOT23" 0 125 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23" 0 200 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+ALIAS MCP1703A-1202_SOT23 MCP1703A-1502_SOT23 MCP1703A-1802_SOT23 MCP1703A-2502_SOT23 MCP1703A-2802_SOT23 MCP1703A-3002_SOT23 MCP1703A-4002_SOT23 MCP1703A-5002_SOT23
 $FPLIST
  SOT?23*
 $ENDFPLIST
 DRAW
-S -200 75 200 -200 0 1 10 f
-X VO 1 300 0 100 L 50 50 1 1 w
-X VI 2 -300 0 100 R 50 50 1 1 W
-X GND 3 0 -300 100 U 50 50 1 1 W
+S -200 -200 200 75 0 1 10 f
+X GND 1 0 -300 100 U 50 50 1 1 W
+X VO 2 300 0 100 L 50 50 1 1 w
+X VI 3 -300 0 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
diff --git a/pcb/kicad/right/right.bak b/pcb/kicad/right/right.bak
index ad52902..704d8e9 100644
--- a/pcb/kicad/right/right.bak
+++ b/pcb/kicad/right/right.bak
@@ -371,7 +371,7 @@ U 1 1 5DF621CF
 P 1350 3350
 F 0 "SW9" H 1350 3635 50  0000 C CNN
 F 1 "SW_Push" H 1350 3544 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3550 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 3550 50  0001 C CNN
 F 3 "" H 1350 3550 50  0001 C CNN
 	1    1350 3350
 	1    0    0    -1  
@@ -393,7 +393,7 @@ U 1 1 5DF621DD
 P 1350 3750
 F 0 "SW10" H 1350 4035 50  0000 C CNN
 F 1 "SW_Push" H 1350 3944 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3950 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 3950 50  0001 C CNN
 F 3 "" H 1350 3950 50  0001 C CNN
 	1    1350 3750
 	1    0    0    -1  
@@ -415,7 +415,7 @@ U 1 1 5DF621F9
 P 1350 2950
 F 0 "SW8" H 1350 3235 50  0000 C CNN
 F 1 "SW_Push" H 1350 3144 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3150 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 3150 50  0001 C CNN
 F 3 "" H 1350 3150 50  0001 C CNN
 	1    1350 2950
 	1    0    0    -1  
@@ -437,7 +437,7 @@ U 1 1 5DF62207
 P 1350 2550
 F 0 "SW7" H 1350 2835 50  0000 C CNN
 F 1 "SW_Push" H 1350 2744 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 2750 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 2750 50  0001 C CNN
 F 3 "" H 1350 2750 50  0001 C CNN
 	1    1350 2550
 	1    0    0    -1  
@@ -485,7 +485,7 @@ U 1 1 5DFE23D8
 P 2700 3350
 F 0 "SW23" H 2700 3635 50  0000 C CNN
 F 1 "SW_Push" H 2700 3544 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3550 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 3550 50  0001 C CNN
 F 3 "" H 2700 3550 50  0001 C CNN
 	1    2700 3350
 	1    0    0    -1  
@@ -507,7 +507,7 @@ U 1 1 5DFE23E6
 P 2700 3750
 F 0 "SW24" H 2700 4035 50  0000 C CNN
 F 1 "SW_Push" H 2700 3944 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3950 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 3950 50  0001 C CNN
 F 3 "" H 2700 3950 50  0001 C CNN
 	1    2700 3750
 	1    0    0    -1  
@@ -529,7 +529,7 @@ U 1 1 5DFE2402
 P 2700 2950
 F 0 "SW22" H 2700 3235 50  0000 C CNN
 F 1 "SW_Push" H 2700 3144 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3150 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 3150 50  0001 C CNN
 F 3 "" H 2700 3150 50  0001 C CNN
 	1    2700 2950
 	1    0    0    -1  
@@ -551,7 +551,7 @@ U 1 1 5DFE2410
 P 2700 2550
 F 0 "SW21" H 2700 2835 50  0000 C CNN
 F 1 "SW_Push" H 2700 2744 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 2750 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 2750 50  0001 C CNN
 F 3 "" H 2700 2750 50  0001 C CNN
 	1    2700 2550
 	1    0    0    -1  
@@ -591,7 +591,7 @@ U 1 1 5DFE3E91
 P 4050 3350
 F 0 "SW33" H 4050 3635 50  0000 C CNN
 F 1 "SW_Push" H 4050 3544 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3550 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 4050 3550 50  0001 C CNN
 F 3 "" H 4050 3550 50  0001 C CNN
 	1    4050 3350
 	1    0    0    -1  
@@ -613,7 +613,7 @@ U 1 1 5DFE3E9F
 P 4050 3750
 F 0 "SW34" H 4050 4035 50  0000 C CNN
 F 1 "SW_Push" H 4050 3944 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3950 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 4050 3950 50  0001 C CNN
 F 3 "" H 4050 3950 50  0001 C CNN
 	1    4050 3750
 	1    0    0    -1  
@@ -635,7 +635,7 @@ U 1 1 5DFE3EBB
 P 4050 2950
 F 0 "SW32" H 4050 3235 50  0000 C CNN
 F 1 "SW_Push" H 4050 3144 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3150 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 4050 3150 50  0001 C CNN
 F 3 "" H 4050 3150 50  0001 C CNN
 	1    4050 2950
 	1    0    0    -1  
@@ -657,7 +657,7 @@ U 1 1 5DFE3EC9
 P 4050 2550
 F 0 "SW31" H 4050 2835 50  0000 C CNN
 F 1 "SW_Push" H 4050 2744 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 2750 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 4050 2750 50  0001 C CNN
 F 3 "" H 4050 2750 50  0001 C CNN
 	1    4050 2550
 	1    0    0    -1  
@@ -697,7 +697,7 @@ U 1 1 5DFE637F
 P 1350 1650
 F 0 "SW5" H 1350 1935 50  0000 C CNN
 F 1 "SW_Push" H 1350 1844 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1850 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 1850 50  0001 C CNN
 F 3 "" H 1350 1850 50  0001 C CNN
 	1    1350 1650
 	1    0    0    -1  
@@ -719,7 +719,7 @@ U 1 1 5DFE63A9
 P 1350 1250
 F 0 "SW4" H 1350 1535 50  0000 C CNN
 F 1 "SW_Push" H 1350 1444 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1450 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 1450 50  0001 C CNN
 F 3 "" H 1350 1450 50  0001 C CNN
 	1    1350 1250
 	1    0    0    -1  
@@ -741,7 +741,7 @@ U 1 1 5DFE63B7
 P 1350 850
 F 0 "SW3" H 1350 1135 50  0000 C CNN
 F 1 "SW_Push" H 1350 1044 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1050 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1350 1050 50  0001 C CNN
 F 3 "" H 1350 1050 50  0001 C CNN
 	1    1350 850 
 	1    0    0    -1  
@@ -776,7 +776,7 @@ U 1 1 5DFE63D2
 P 2700 1650
 F 0 "SW19" H 2700 1935 50  0000 C CNN
 F 1 "SW_Push" H 2700 1844 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1850 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 1850 50  0001 C CNN
 F 3 "" H 2700 1850 50  0001 C CNN
 	1    2700 1650
 	1    0    0    -1  
@@ -798,7 +798,7 @@ U 1 1 5DFE63FC
 P 2700 1250
 F 0 "SW18" H 2700 1535 50  0000 C CNN
 F 1 "SW_Push" H 2700 1444 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1450 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 1450 50  0001 C CNN
 F 3 "" H 2700 1450 50  0001 C CNN
 	1    2700 1250
 	1    0    0    -1  
@@ -820,7 +820,7 @@ U 1 1 5DFE640A
 P 2700 850
 F 0 "SW17" H 2700 1135 50  0000 C CNN
 F 1 "SW_Push" H 2700 1044 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1050 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 2700 1050 50  0001 C CNN
 F 3 "" H 2700 1050 50  0001 C CNN
 	1    2700 850 
 	1    0    0    -1  
@@ -855,7 +855,7 @@ U 1 1 5DFEF7D9
 P 1300 5550
 F 0 "SW14" H 1300 5835 50  0000 C CNN
 F 1 "SW_Push" H 1300 5744 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1300 5750 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1300 5750 50  0001 C CNN
 F 3 "" H 1300 5750 50  0001 C CNN
 	1    1300 5550
 	1    0    0    -1  
@@ -877,7 +877,7 @@ U 1 1 5DFEF7E7
 P 1300 5950
 F 0 "SW15" H 1300 6235 50  0000 C CNN
 F 1 "SW_Push" H 1300 6144 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1300 6150 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1300 6150 50  0001 C CNN
 F 3 "" H 1300 6150 50  0001 C CNN
 	1    1300 5950
 	1    0    0    -1  
@@ -899,7 +899,7 @@ U 1 1 5DFEF803
 P 1300 5150
 F 0 "SW13" H 1300 5435 50  0000 C CNN
 F 1 "SW_Push" H 1300 5344 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1300 5350 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1300 5350 50  0001 C CNN
 F 3 "" H 1300 5350 50  0001 C CNN
 	1    1300 5150
 	1    0    0    -1  
@@ -921,7 +921,7 @@ U 1 1 5DFEF811
 P 1300 4750
 F 0 "SW12" H 1300 5035 50  0000 C CNN
 F 1 "SW_Push" H 1300 4944 50  0000 C CNN
-F 2 "foostan-kbd:CherryMX_Choc_1u" H 1300 4950 50  0001 C CNN
+F 2 "custom:CherryMX_Choc_1u" H 1300 4950 50  0001 C CNN
 F 3 "" H 1300 4950 50  0001 C CNN
 	1    1300 4750
 	1    0    0    -1  
diff --git a/pcb/kicad/right/right.kicad_pcb b/pcb/kicad/right/right.kicad_pcb
index c7bb14e..178008f 100644
--- a/pcb/kicad/right/right.kicad_pcb
+++ b/pcb/kicad/right/right.kicad_pcb
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.25)
+    (last_trace_width 0.381)
     (user_trace_width 0.381)
     (trace_clearance 0.2)
     (zone_clearance 0.508)
@@ -238,6 +238,38 @@
     (add_net VBAT)
   )
 
+  (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B09A)
+    (at 112.014 74.422)
+    (path /5DFEF811)
+    (fp_text reference SW12 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 62 "Net-(D14-Pad1)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL6))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL6))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 62 "Net-(D14-Pad1)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+  )
+
   (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B14E)
     (at 99.568 136.652 26.5)
     (path /5DFEF7E7)
@@ -526,38 +558,6 @@
       (net 63 "Net-(D12-Pad1)"))
   )
 
-  (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B09A)
-    (at 112.014 74.422)
-    (path /5DFEF811)
-    (fp_text reference SW12 (at 4.6 6) (layer Dwgs.User) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 62 "Net-(D14-Pad1)"))
-    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 23 COL6))
-    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 23 COL6))
-    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 62 "Net-(D14-Pad1)"))
-    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-  )
-
   (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B086)
     (at 112.014 112.522)
     (path /5DFEF7D9)
@@ -2385,18 +2385,18 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5F2332A0) (tstamp 5F026044)
-    (at 100.33 80.264 180)
+    (at 100.33 80.264 90)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5DED53E7)
     (attr smd)
-    (fp_text reference U2 (at 0 -2.5 180) (layer F.SilkS) hide
+    (fp_text reference U2 (at 0 -2.5 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value LDO (at 0 2.5 180) (layer F.Fab)
+    (fp_text value LDO (at 0 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
+    (fp_text user %R (at 0 0 180) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
@@ -2412,12 +2412,12 @@
     (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
     (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 -0.95 90) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 2 smd rect (at -1 0.95 90) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
       (net 9 3.3V))
-    (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at 1 0 90) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
       (net 8 5V))
-    (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2879,7 +2879,7 @@
   (gr_text 3.3V (at 85.217 80.772) (layer B.SilkS)
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify right mirror))
   )
-  (gr_text "KeySeeBee v0.1 by TeXitoi" (at 82.677 122.555 90) (layer F.SilkS)
+  (gr_text "KeySeeBee v0.2 by TeXitoi" (at 82.677 122.555 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.2)) (justify left))
   )
   (gr_line (start 80.899 64.897) (end 80.899 122.682) (layer Edge.Cuts) (width 0.15))
@@ -2969,8 +2969,6 @@
   (segment (start 93.286412 74.71749) (end 89.33151 74.71749) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 94.324 73.679902) (end 93.286412 74.71749) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 94.324 72.752) (end 94.324 73.679902) (width 0.381) (layer F.Cu) (net 8))
-  (segment (start 101.355 79.289) (end 101.33 79.314) (width 0.381) (layer F.Cu) (net 8))
-  (segment (start 101.355 77.216) (end 101.355 79.289) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 99.064501 72.592501) (end 99.224 72.752) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 99.064501 71.714599) (end 99.064501 72.592501) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 98.342902 70.993) (end 99.064501 71.714599) (width 0.381) (layer F.Cu) (net 8))
@@ -2982,8 +2980,8 @@
   (segment (start 81.608499 80.078501) (end 81.608499 107.821499) (width 0.381) (layer B.Cu) (net 8))
   (segment (start 85.32 76.367) (end 81.608499 80.078501) (width 0.381) (layer B.Cu) (net 8))
   (segment (start 86.501 76.367) (end 85.32 76.367) (width 0.381) (layer B.Cu) (net 8))
-  (segment (start 101.33 83.287) (end 101.355 83.312) (width 0.381) (layer F.Cu) (net 9))
-  (segment (start 101.33 81.214) (end 101.33 83.287) (width 0.381) (layer F.Cu) (net 9))
+  (segment (start 101.355 78.239) (end 100.33 79.264) (width 0.381) (layer F.Cu) (net 8))
+  (segment (start 101.355 77.216) (end 101.355 78.239) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 87.335 83.026) (end 86.614 82.305) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 88.944 83.026) (end 87.335 83.026) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 83.249 80.772) (end 85.09 80.772) (width 0.381) (layer B.Cu) (net 9))
@@ -3030,6 +3028,8 @@
   (segment (start 95.642628 81.132372) (end 96.266 80.509) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 96.044 84.251) (end 95.24099 83.44799) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 96.044 84.626) (end 96.044 84.251) (width 0.25) (layer F.Cu) (net 9))
+  (segment (start 101.28 83.237) (end 101.355 83.312) (width 0.381) (layer F.Cu) (net 9))
+  (segment (start 101.28 81.264) (end 101.28 83.237) (width 0.381) (layer F.Cu) (net 9))
   (segment (start 89.944 83.026) (end 89.944 81.562) (width 0.25) (layer F.Cu) (net 10))
   (segment (start 89.944 81.562) (end 89.408 81.026) (width 0.25) (layer F.Cu) (net 10))
   (segment (start 89.408 81.026) (end 89.408 81.026) (width 0.25) (layer F.Cu) (net 10) (tstamp 5F04F881))
@@ -5640,29 +5640,22 @@
         (xy 98.576185 78.532845) (xy 98.667458 78.551) (xy 99.01925 78.551) (xy 99.178 78.39225) (xy 99.178 77.343)
         (xy 99.158 77.343) (xy 99.158 77.089) (xy 99.178 77.089) (xy 99.178 77.069) (xy 99.432 77.069)
         (xy 99.432 77.089) (xy 99.452 77.089) (xy 99.452 77.343) (xy 99.432 77.343) (xy 99.432 78.39225)
-        (xy 99.59075 78.551) (xy 99.942542 78.551) (xy 100.065223 78.526597) (xy 100.180785 78.47873) (xy 100.284789 78.409237)
-        (xy 100.373237 78.320789) (xy 100.396043 78.286657) (xy 100.402038 78.293962) (xy 100.518301 78.389376) (xy 100.428815 78.462815)
-        (xy 100.349463 78.559506) (xy 100.290498 78.66982) (xy 100.254188 78.789518) (xy 100.241928 78.914) (xy 100.241928 79.427902)
-        (xy 100.184789 79.370763) (xy 100.080785 79.30127) (xy 99.965223 79.253403) (xy 99.842542 79.229) (xy 99.61575 79.229)
-        (xy 99.457 79.38775) (xy 99.457 80.137) (xy 100.25625 80.137) (xy 100.340857 80.052393) (xy 100.349463 80.068494)
-        (xy 100.428815 80.165185) (xy 100.525506 80.244537) (xy 100.561918 80.264) (xy 100.525506 80.283463) (xy 100.428815 80.362815)
-        (xy 100.349463 80.459506) (xy 100.340857 80.475607) (xy 100.25625 80.391) (xy 99.457 80.391) (xy 99.457 81.14025)
-        (xy 99.61575 81.299) (xy 99.842542 81.299) (xy 99.965223 81.274597) (xy 100.080785 81.22673) (xy 100.184789 81.157237)
-        (xy 100.241928 81.100098) (xy 100.241928 81.394218) (xy 100.22394 81.39599) (xy 99.120424 81.39599) (xy 99.023434 81.299)
-        (xy 99.04425 81.299) (xy 99.203 81.14025) (xy 99.203 80.391) (xy 98.40375 80.391) (xy 98.259591 80.535159)
-        (xy 97.678398 79.953966) (xy 97.652541 79.922459) (xy 97.526842 79.819301) (xy 97.52173 79.816568) (xy 97.513654 79.801458)
-        (xy 98.245 79.801458) (xy 98.245 79.97825) (xy 98.40375 80.137) (xy 99.203 80.137) (xy 99.203 79.38775)
-        (xy 99.04425 79.229) (xy 98.817458 79.229) (xy 98.694777 79.253403) (xy 98.579215 79.30127) (xy 98.475211 79.370763)
-        (xy 98.386763 79.459211) (xy 98.31727 79.563215) (xy 98.269403 79.678777) (xy 98.245 79.801458) (xy 97.513654 79.801458)
-        (xy 97.454405 79.690613) (xy 97.343962 79.556038) (xy 97.209387 79.445595) (xy 97.055851 79.363528) (xy 96.889255 79.312992)
-        (xy 96.716001 79.295928) (xy 95.815999 79.295928) (xy 95.642745 79.312992) (xy 95.476149 79.363528) (xy 95.322613 79.445595)
-        (xy 95.188038 79.556038) (xy 95.077595 79.690613) (xy 95.046149 79.749445) (xy 94.939014 79.759997) (xy 94.795753 79.803454)
-        (xy 94.707683 79.850529) (xy 95.322014 79.236199) (xy 95.351012 79.212401) (xy 95.445985 79.096676) (xy 95.516557 78.964647)
-        (xy 95.560014 78.821386) (xy 95.571011 78.709733) (xy 95.571011 78.709725) (xy 95.574687 78.6724) (xy 95.571011 78.635075)
-        (xy 95.571011 78.01875) (xy 95.947 78.01875) (xy 95.947 78.370542) (xy 95.971403 78.493223) (xy 96.01927 78.608785)
-        (xy 96.088763 78.712789) (xy 96.177211 78.801237) (xy 96.281215 78.87073) (xy 96.396777 78.918597) (xy 96.519458 78.943)
-        (xy 96.99625 78.943) (xy 97.155 78.78425) (xy 97.155 77.86) (xy 96.10575 77.86) (xy 95.947 78.01875)
-        (xy 95.571011 78.01875) (xy 95.571011 76.8282) (xy 96.025403 76.373809)
+        (xy 99.444445 78.404695) (xy 99.399463 78.459506) (xy 99.340498 78.56982) (xy 99.304188 78.689518) (xy 99.291928 78.814)
+        (xy 99.291928 79.714) (xy 99.304188 79.838482) (xy 99.340498 79.95818) (xy 99.399463 80.068494) (xy 99.478815 80.165185)
+        (xy 99.575506 80.244537) (xy 99.591607 80.253143) (xy 99.507 80.33775) (xy 99.507 81.137) (xy 99.527 81.137)
+        (xy 99.527 81.391) (xy 99.507 81.391) (xy 99.507 81.39599) (xy 99.253 81.39599) (xy 99.253 81.391)
+        (xy 99.233 81.391) (xy 99.233 81.137) (xy 99.253 81.137) (xy 99.253 80.33775) (xy 99.09425 80.179)
+        (xy 98.917458 80.179) (xy 98.794777 80.203403) (xy 98.679215 80.25127) (xy 98.575211 80.320763) (xy 98.486763 80.409211)
+        (xy 98.41727 80.513215) (xy 98.369403 80.628777) (xy 98.366716 80.642284) (xy 97.678398 79.953966) (xy 97.652541 79.922459)
+        (xy 97.526842 79.819301) (xy 97.52173 79.816568) (xy 97.454405 79.690613) (xy 97.343962 79.556038) (xy 97.209387 79.445595)
+        (xy 97.055851 79.363528) (xy 96.889255 79.312992) (xy 96.716001 79.295928) (xy 95.815999 79.295928) (xy 95.642745 79.312992)
+        (xy 95.476149 79.363528) (xy 95.322613 79.445595) (xy 95.188038 79.556038) (xy 95.077595 79.690613) (xy 95.046149 79.749445)
+        (xy 94.939014 79.759997) (xy 94.795753 79.803454) (xy 94.707683 79.850529) (xy 95.322014 79.236199) (xy 95.351012 79.212401)
+        (xy 95.445985 79.096676) (xy 95.516557 78.964647) (xy 95.560014 78.821386) (xy 95.571011 78.709733) (xy 95.571011 78.709725)
+        (xy 95.574687 78.6724) (xy 95.571011 78.635075) (xy 95.571011 78.01875) (xy 95.947 78.01875) (xy 95.947 78.370542)
+        (xy 95.971403 78.493223) (xy 96.01927 78.608785) (xy 96.088763 78.712789) (xy 96.177211 78.801237) (xy 96.281215 78.87073)
+        (xy 96.396777 78.918597) (xy 96.519458 78.943) (xy 96.99625 78.943) (xy 97.155 78.78425) (xy 97.155 77.86)
+        (xy 96.10575 77.86) (xy 95.947 78.01875) (xy 95.571011 78.01875) (xy 95.571011 76.8282) (xy 96.025403 76.373809)
       )
     )
   )
diff --git a/pcb/kicad/right/right.kicad_pcb-bak b/pcb/kicad/right/right.kicad_pcb-bak
index b84703b..a5f2f17 100644
--- a/pcb/kicad/right/right.kicad_pcb-bak
+++ b/pcb/kicad/right/right.kicad_pcb-bak
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.25)
+    (last_trace_width 0.381)
     (user_trace_width 0.381)
     (trace_clearance 0.2)
     (zone_clearance 0.508)
@@ -238,6 +238,38 @@
     (add_net VBAT)
   )
 
+  (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B09A)
+    (at 112.014 74.422)
+    (path /5DFEF811)
+    (fp_text reference SW12 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 62 "Net-(D14-Pad1)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL6))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL6))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 62 "Net-(D14-Pad1)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+  )
+
   (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B14E)
     (at 99.568 136.652 26.5)
     (path /5DFEF7E7)
@@ -526,38 +558,6 @@
       (net 63 "Net-(D12-Pad1)"))
   )
 
-  (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B09A)
-    (at 112.014 74.422)
-    (path /5DFEF811)
-    (fp_text reference SW12 (at 4.6 6) (layer Dwgs.User) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 62 "Net-(D14-Pad1)"))
-    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 23 COL6))
-    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 23 COL6))
-    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
-      (net 62 "Net-(D14-Pad1)"))
-    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-  )
-
   (module custom:CherryMX_Choc_1u (layer F.Cu) (tedit 5F2689FC) (tstamp 5F26B086)
     (at 112.014 112.522)
     (path /5DFEF7D9)
@@ -2385,18 +2385,18 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5F2332A0) (tstamp 5F026044)
-    (at 100.33 80.264 180)
+    (at 100.33 80.264 90)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5DED53E7)
     (attr smd)
-    (fp_text reference U2 (at 0 -2.5 180) (layer F.SilkS) hide
+    (fp_text reference U2 (at 0 -2.5 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value LDO (at 0 2.5 180) (layer F.Fab)
+    (fp_text value LDO (at 0 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
+    (fp_text user %R (at 0 0 180) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
@@ -2412,12 +2412,12 @@
     (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
     (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 -0.95 90) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 2 smd rect (at -1 0.95 90) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
       (net 9 3.3V))
-    (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at 1 0 90) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
       (net 8 5V))
-    (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2840,7 +2840,7 @@
     )
   )
 
-  (gr_text JLCJLCJLCJLC (at 150.114 72.898) (layer F.SilkS)
+  (gr_text JLCJLCJLCJLC (at 150.114 73.152) (layer F.SilkS)
     (effects (font (size 0.8 0.8) (thickness 0.2)))
   )
   (gr_text 5V (at 85.09 108.712) (layer B.SilkS)
@@ -2969,8 +2969,6 @@
   (segment (start 93.286412 74.71749) (end 89.33151 74.71749) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 94.324 73.679902) (end 93.286412 74.71749) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 94.324 72.752) (end 94.324 73.679902) (width 0.381) (layer F.Cu) (net 8))
-  (segment (start 101.355 79.289) (end 101.33 79.314) (width 0.381) (layer F.Cu) (net 8))
-  (segment (start 101.355 77.216) (end 101.355 79.289) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 99.064501 72.592501) (end 99.224 72.752) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 99.064501 71.714599) (end 99.064501 72.592501) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 98.342902 70.993) (end 99.064501 71.714599) (width 0.381) (layer F.Cu) (net 8))
@@ -2982,8 +2980,8 @@
   (segment (start 81.608499 80.078501) (end 81.608499 107.821499) (width 0.381) (layer B.Cu) (net 8))
   (segment (start 85.32 76.367) (end 81.608499 80.078501) (width 0.381) (layer B.Cu) (net 8))
   (segment (start 86.501 76.367) (end 85.32 76.367) (width 0.381) (layer B.Cu) (net 8))
-  (segment (start 101.33 83.287) (end 101.355 83.312) (width 0.381) (layer F.Cu) (net 9))
-  (segment (start 101.33 81.214) (end 101.33 83.287) (width 0.381) (layer F.Cu) (net 9))
+  (segment (start 101.355 78.239) (end 100.33 79.264) (width 0.381) (layer F.Cu) (net 8))
+  (segment (start 101.355 77.216) (end 101.355 78.239) (width 0.381) (layer F.Cu) (net 8))
   (segment (start 87.335 83.026) (end 86.614 82.305) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 88.944 83.026) (end 87.335 83.026) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 83.249 80.772) (end 85.09 80.772) (width 0.381) (layer B.Cu) (net 9))
@@ -3030,6 +3028,8 @@
   (segment (start 95.642628 81.132372) (end 96.266 80.509) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 96.044 84.251) (end 95.24099 83.44799) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 96.044 84.626) (end 96.044 84.251) (width 0.25) (layer F.Cu) (net 9))
+  (segment (start 101.28 83.237) (end 101.355 83.312) (width 0.381) (layer F.Cu) (net 9))
+  (segment (start 101.28 81.264) (end 101.28 83.237) (width 0.381) (layer F.Cu) (net 9))
   (segment (start 89.944 83.026) (end 89.944 81.562) (width 0.25) (layer F.Cu) (net 10))
   (segment (start 89.944 81.562) (end 89.408 81.026) (width 0.25) (layer F.Cu) (net 10))
   (segment (start 89.408 81.026) (end 89.408 81.026) (width 0.25) (layer F.Cu) (net 10) (tstamp 5F04F881))
diff --git a/pcb/kicad/right/right.sch b/pcb/kicad/right/right.sch
index 704d8e9..b4cf53d 100644
--- a/pcb/kicad/right/right.sch
+++ b/pcb/kicad/right/right.sch
@@ -243,7 +243,7 @@ Wire Wire Line
 	4450 1600 5400 1600
 Connection ~ 4450 1600
 $Comp
-L Regulator_Linear:LM3480-3.3 U2
+L Regulator_Linear:MCP1703A-3302_SOT23 U2
 U 1 1 5DED53E7
 P 8250 900
 F 0 "U2" H 8250 1050 50  0000 C CNN