diff --git a/schemi/bassofono-cache.lib b/schemi/bassofono-cache.lib
index d247804..d547913 100644
--- a/schemi/bassofono-cache.lib
+++ b/schemi/bassofono-cache.lib
@@ -297,26 +297,24 @@ X CLK1 9 500 0 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# Regulator_Linear_AZ1117-3.3
+# Regulator_Linear_LP2985-3.3
 #
-DEF Regulator_Linear_AZ1117-3.3 U 0 10 Y Y 1 F N
-F0 "U" -150 125 50 H V C CNN
-F1 "Regulator_Linear_AZ1117-3.3" 0 125 50 H V L CNN
-F2 "" 0 250 50 H I C CIN
+DEF Regulator_Linear_LP2985-3.3 U 0 10 Y Y 1 F N
+F0 "U" -250 225 50 H V C CNN
+F1 "Regulator_Linear_LP2985-3.3" 0 225 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23-5" 0 325 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS AZ1117-1.5 AZ1117-1.8 AZ1117-2.5 AZ1117-2.85 AZ1117-3.3 AZ1117-5.0
+ALIAS LP2985-2.5 LP2985-2.8 LP2985-2.9 LP2985-3.0 LP2985-3.1 LP2985-3.3 LP2985-5.0 LP2985-10.0 TC2014-1.8VxCTTR TC2014-2.5VxCTTR TC2014-2.6VxCTTR TC2014-2.7VxCTTR TC2014-2.8VxCTTR TC2014-2.85VxCTTR TC2014-3.0VxCTTR TC2014-3.3VxCTTR TC2014-5.0VxCTTR TC2015-1.8VxCTTR TC2015-2.5VxCTTR TC2015-2.6VxCTTR TC2015-2.7VxCTTR TC2015-2.8VxCTTR TC2015-2.85VxCTTR TC2015-3.0VxCTTR TC2015-3.3VxCTTR TC2015-5.0VxCTTR TC2185-1.8VxCTTR TC2185-2.5VxCTTR TC2185-2.6VxCTTR TC2185-2.7VxCTTR TC2185-2.8VxCTTR TC2185-2.85VxCTTR TC2185-3.0VxCTTR TC2185-3.3VxCTTR TC2185-5.0VxCTTR
 $FPLIST
- SOT?223*
- SOT?89*
- TO?220*
- TO?252*
- TO?263*
+ SOT?23*
 $ENDFPLIST
 DRAW
-S -200 75 200 -200 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
+S -300 -200 300 175 0 1 10 f
+X VIN 1 -400 100 100 R 50 50 1 1 W
+X GND 2 0 -300 100 U 50 50 1 1 W
+X ON/~OFF~ 3 -400 0 100 R 50 50 1 1 I
+X BP 4 400 0 100 L 50 50 1 1 I
+X VOUT 5 400 100 100 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
diff --git a/schemi/bassofono.kicad_pcb b/schemi/bassofono.kicad_pcb
index f036785..40ba261 100644
--- a/schemi/bassofono.kicad_pcb
+++ b/schemi/bassofono.kicad_pcb
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 4)
-    (tracks 231)
+    (tracks 337)
     (zones 0)
-    (modules 51)
-    (nets 39)
+    (modules 52)
+    (nets 38)
   )
 
   (page A4)
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.5)
+    (last_trace_width 0.25)
     (user_trace_width 0.2)
     (user_trace_width 0.5)
     (user_trace_width 1)
@@ -127,10 +127,9 @@
   (net 32 "Net-(J2-Pad5)")
   (net 33 "Net-(J2-Pad9)")
   (net 34 "Net-(J2-Pad4)")
-  (net 35 "Net-(J1-Pad4)")
-  (net 36 "Net-(C15-Pad1)")
-  (net 37 "Net-(C17-Pad2)")
-  (net 38 "Net-(C17-Pad1)")
+  (net 35 "Net-(C15-Pad1)")
+  (net 36 "Net-(C17-Pad2)")
+  (net 37 "Net-(C17-Pad1)")
 
   (net_class Default "Questo è il gruppo di collegamenti predefinito"
     (clearance 0.2)
@@ -161,7 +160,6 @@
     (add_net "Net-(C7-Pad1)")
     (add_net "Net-(C8-Pad1)")
     (add_net "Net-(C8-Pad2)")
-    (add_net "Net-(J1-Pad4)")
     (add_net "Net-(J11-Pad1)")
     (add_net "Net-(J2-Pad1)")
     (add_net "Net-(J2-Pad4)")
@@ -177,6 +175,7 @@
     (add_net "Net-(R10-Pad2)")
     (add_net "Net-(R11-Pad1)")
     (add_net "Net-(R9-Pad2)")
+    (add_net "Net-(U1-Pad4)")
     (add_net "Net-(U2-Pad10)")
     (add_net "Net-(U2-Pad12)")
     (add_net "Net-(U2-Pad13)")
@@ -195,21 +194,126 @@
     (add_net "Net-(U5-Pad7)")
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A00A50)
-    (at 126.2 91.9625 270)
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B45)
+    (at 100.6 90 90)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /60E41D4B)
+    (attr smd)
+    (fp_text reference R3 (at 0 -1.65 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 15K (at 0 1.65 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 2 smd roundrect (at 1 0 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 10 "Net-(C1-Pad1)"))
+    (pad 1 smd roundrect (at -1 0 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 11 "Net-(C2-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A02545)
+    (at 102.6 90.0375 270)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /60E41D57)
+    (attr smd)
+    (fp_text reference C2 (at 0 -1.68 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 68p (at 0 1.68 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 2 smd roundrect (at 1.0375 0 270) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
+      (net 11 "Net-(C2-Pad2)"))
+    (pad 1 smd roundrect (at -1.0375 0 270) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
+      (net 2 "Net-(C2-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CF724E)
+    (at 117.9625 95 180)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
-    (path /61984C0D)
+    (path /61E8255F)
     (attr smd)
-    (fp_text reference C10 (at 0 -1.85 90) (layer F.SilkS)
+    (fp_text reference C17 (at 0 -1.85) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100n (at 0 1.85 90) (layer F.Fab)
+    (fp_text value 1µ (at 0 1.85) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
+    (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 36 "Net-(C17-Pad2)"))
+    (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 37 "Net-(C17-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C57C5C)
+    (at 123.0375 94.996 180)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /6197A0B3)
+    (attr smd)
+    (fp_text reference C9 (at 0 -1.85) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value C_Small (at 0 1.85) (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))
     (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
@@ -220,6 +324,45 @@
     (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 25 GNDA))
+    (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 26 +3.3VA))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A00A50)
+    (at 126.8 91.9625 270)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /61984C0D)
+    (attr smd)
+    (fp_text reference C10 (at 0 -1.85 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 0 1.85 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
     (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 6 +3V3))
     (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
@@ -231,6 +374,111 @@
     )
   )
 
+  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61CF81A1)
+    (at 127 103.6)
+    (descr "SMD rectangular pad as test Point, square 2.5mm side length")
+    (tags "test point SMD pad rectangle square")
+    (path /61DD78FE)
+    (attr virtual)
+    (fp_text reference J4 (at 0 -2.148) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value T1 (at 0 2.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -2.15) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
+      (net 3 GND))
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C65A00)
+    (at 124.15 82.275 270)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags capacitor)
+    (path /61CA4AF4)
+    (attr smd)
+    (fp_text reference C12 (at 0 -1.85 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 0 1.85 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.3 1.15) (end -2.3 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.3 -1.15) (end 2.3 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.3 -1.15) (end 2.3 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.3 1.15) (end -2.3 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (pad 2 smd roundrect (at 1.475 0 270) (size 1.15 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 18 "Net-(C12-Pad2)"))
+    (pad 1 smd roundrect (at -1.475 0 270) (size 1.15 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 19 "Net-(C12-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_TO_SOT_SMD:SOT-23-5 (layer F.Cu) (tedit 5A02FF57) (tstamp 61CF4945)
+    (at 127.15 99.7 90)
+    (descr "5-pin SOT23 package")
+    (tags SOT-23-5)
+    (path /61CF6A59)
+    (attr smd)
+    (fp_text reference U1 (at 0 -2.9 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value LP2985-3.3 (at 0 2.9 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.9 -1.61) (end -1.55 -1.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -1.8) (end 1.9 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 -1.8) (end 1.9 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 1.8) (end -1.9 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 1.8) (end -1.9 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.9) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -1.55) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
+    (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 5 smd rect (at 1.1 -0.95 90) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+      (net 6 +3V3))
+    (pad 4 smd rect (at 1.1 0.95 90) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask))
+    (pad 3 smd rect (at -1.1 0.95 90) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+      (net 35 "Net-(C15-Pad1)"))
+    (pad 2 smd rect (at -1.1 0 90) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+      (net 3 GND))
+    (pad 1 smd rect (at -1.1 -0.95 90) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
+      (net 35 "Net-(C15-Pad1)"))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23-5.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B89)
     (at 108.6 96.6 270)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
@@ -243,16 +491,16 @@
     (fp_text value 22k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -279,19 +527,19 @@
     (fp_text value TL082 (at 0 3.4) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.7 -2.7) (end -3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.98 0.98) (thickness 0.15)))
     )
@@ -318,44 +566,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CF724E)
-    (at 117.9625 94.8)
-    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "capacitor handsolder")
-    (path /61E8255F)
-    (attr smd)
-    (fp_text reference C17 (at 0 -1.85) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1µ (at 0 1.85) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)))
-    )
-    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (pad 2 smd roundrect (at 1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 37 "Net-(C17-Pad2)"))
-    (pad 1 smd roundrect (at -1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 38 "Net-(C17-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CF768D)
-    (at 105 99.8)
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CFA4C9)
+    (at 114.4 93 180)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /61E7FA69)
@@ -366,23 +578,23 @@
     (fp_text value 10k (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+    (pad 2 smd roundrect (at 1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 22 "Net-(C14-Pad1)"))
-    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 38 "Net-(C17-Pad1)"))
+    (pad 1 smd roundrect (at -1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 37 "Net-(C17-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -402,25 +614,25 @@
     (fp_text value D (at 0 2.28) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 1.4875 0) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
       (net 17 +12V))
     (pad 1 smd roundrect (at -1.4875 0) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 36 "Net-(C15-Pad1)"))
+      (net 35 "Net-(C15-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1210_3225Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -440,17 +652,17 @@
     (fp_text value T1 (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
     (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
       (net 17 +12V))
   )
@@ -467,19 +679,19 @@
     (fp_text value AO3400A (at 0 2.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (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))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (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 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
@@ -508,19 +720,19 @@
     (fp_text value AO3400A (at 0 2.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (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))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (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 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
@@ -549,19 +761,19 @@
     (fp_text value 100n (at 0 1.85) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 3 GND))
     (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
@@ -585,19 +797,19 @@
     (fp_text value 1k (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 3 GND))
     (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
@@ -621,19 +833,19 @@
     (fp_text value 1k (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 14 "Net-(Q1-Pad1)"))
     (pad 1 smd roundrect (at -1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
@@ -657,16 +869,16 @@
     (fp_text value 10k (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -693,16 +905,16 @@
     (fp_text value 22k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -718,33 +930,33 @@
   )
 
   (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37FBB)
-    (at 96.1625 103)
+    (at 109.8 101.0375 270)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61D7B29D)
     (attr smd)
-    (fp_text reference C14 (at 0 -1.85) (layer F.SilkS)
+    (fp_text reference C14 (at 0 -1.85 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1uF (at 0 1.85) (layer F.Fab)
+    (fp_text value 1uF (at 0 1.85 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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (pad 2 smd roundrect (at 1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+    (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 25 GNDA))
-    (pad 1 smd roundrect (at -1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+    (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 22 "Net-(C14-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
@@ -765,44 +977,44 @@
     (fp_text value Conn_01x06 (at 0 4.87 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.05 3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -3.81) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 3.81) (end 1.05 -3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -3.375) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -2.105) (end -2.5 -2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -2.105) (end -2.5 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -1.705) (end -1.05 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 0.435) (end -2.5 0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 0.435) (end -2.5 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 0.835) (end -1.05 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 2.975) (end -2.5 2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 2.975) (end -2.5 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 3.375) (end -1.05 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -3.375) (end 2.5 -3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -3.375) (end 2.5 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -2.975) (end 1.05 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -0.835) (end 2.5 -0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -0.835) (end 2.5 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -0.435) (end 1.05 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 1.705) (end 2.5 1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 1.705) (end 2.5 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 2.105) (end 1.05 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.11 -3.87) (end 1.11 -3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 3.87) (end 1.11 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -2.59) (end 1.11 -1.22) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -0.05) (end 1.11 1.32) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 2.49) (end 1.11 3.86) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -3.86) (end -1.11 -2.49) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -3.76) (end 2.94 -3.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -3.87) (end 1.11 -3.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 3.76) (end -1.11 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -1.32) (end -1.11 0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 1.22) (end -1.11 2.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.5 -4.35) (end -3.5 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 4.35) (end 3.5 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.5 4.35) (end 3.5 -4.35) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.5 -4.35) (end -3.5 -4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.5 4.35) (end 3.5 -4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 4.35) (end 3.5 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 -4.35) (end -3.5 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.11 1.22) (end -1.11 2.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -1.32) (end -1.11 0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 3.76) (end -1.11 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -3.87) (end 1.11 -3.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -3.76) (end 2.94 -3.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -3.86) (end -1.11 -2.49) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 2.49) (end 1.11 3.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -0.05) (end 1.11 1.32) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -2.59) (end 1.11 -1.22) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 3.87) (end 1.11 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -3.87) (end 1.11 -3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.5 2.105) (end 1.05 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 1.705) (end 2.5 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 1.705) (end 2.5 1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -0.435) (end 1.05 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -0.835) (end 2.5 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -0.835) (end 2.5 -0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -2.975) (end 1.05 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -3.375) (end 2.5 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -3.375) (end 2.5 -3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 3.375) (end -1.05 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 2.975) (end -2.5 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 2.975) (end -2.5 2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 0.835) (end -1.05 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 0.435) (end -2.5 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 0.435) (end -2.5 0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -1.705) (end -1.05 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -2.105) (end -2.5 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -2.105) (end -2.5 -2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -3.375) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 3.81) (end 1.05 -3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -3.81) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -815,7 +1027,7 @@
     (pad 6 smd rect (at -1.5 3.175 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 12 "Net-(C7-Pad1)"))
     (pad 4 smd rect (at -1.5 0.635 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 37 "Net-(C17-Pad2)"))
+      (net 36 "Net-(C17-Pad2)"))
     (pad 2 smd rect (at -1.5 -1.905 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 25 GNDA))
     (model ${KISYS3DMOD}/Connector_PinHeader_1.27mm.3dshapes/PinHeader_1x06_P1.27mm_Vertical_SMD_Pin1Right.wrl
@@ -837,16 +1049,16 @@
     (fp_text value 10µF (at 0 2.3 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -1.36) (end 0.711252 -1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 1.36) (end 0.711252 1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.6) (end -2.48 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.6) (end 2.48 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.6) (end 2.48 1.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.6) (end -2.48 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.6) (end 2.48 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.6) (end 2.48 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.6) (end -2.48 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 1.36) (end 0.711252 1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -1.36) (end 0.711252 -1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -873,76 +1085,76 @@
     (fp_text value Conn_01x14 (at 0 9.95) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.05 8.89) (end -1.05 8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.615 -8.89) (end 1.05 -8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 8.89) (end -1.05 -8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -8.455) (end -0.615 -8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -8.89) (end 1.05 8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -8.455) (end -2.5 -8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -8.455) (end -2.5 -8.055) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -8.055) (end -1.05 -8.055) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -5.915) (end -2.5 -5.915) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -5.915) (end -2.5 -5.515) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -5.515) (end -1.05 -5.515) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -3.375) (end -2.5 -3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -3.375) (end -2.5 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -2.975) (end -1.05 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -0.835) (end -2.5 -0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -0.835) (end -2.5 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -0.435) (end -1.05 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 1.705) (end -2.5 1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 1.705) (end -2.5 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 2.105) (end -1.05 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 4.245) (end -2.5 4.245) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 4.245) (end -2.5 4.645) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 4.645) (end -1.05 4.645) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 6.785) (end -2.5 6.785) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 6.785) (end -2.5 7.185) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 7.185) (end -1.05 7.185) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -7.185) (end 2.5 -7.185) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -7.185) (end 2.5 -6.785) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -6.785) (end 1.05 -6.785) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -4.645) (end 2.5 -4.645) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -4.645) (end 2.5 -4.245) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -4.245) (end 1.05 -4.245) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -2.105) (end 2.5 -2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -2.105) (end 2.5 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -1.705) (end 1.05 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 0.435) (end 2.5 0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 0.435) (end 2.5 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 0.835) (end 1.05 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 2.975) (end 2.5 2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 2.975) (end 2.5 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 3.375) (end 1.05 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 5.515) (end 2.5 5.515) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 5.515) (end 2.5 5.915) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 5.915) (end 1.05 5.915) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 8.055) (end 2.5 8.055) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 8.055) (end 2.5 8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 8.455) (end 1.05 8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.11 -8.95) (end 1.11 -8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 8.95) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -8.94) (end 1.11 -7.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -8.84) (end -2.94 -8.84) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -8.95) (end -1.11 -8.84) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 8.84) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -6.4) (end 1.11 -5.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -3.86) (end 1.11 -2.49) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -1.32) (end 1.11 0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 1.22) (end 1.11 2.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 3.76) (end 1.11 5.13) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 6.3) (end 1.11 7.67) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -7.67) (end -1.11 -6.3) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -5.13) (end -1.11 -3.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -2.59) (end -1.11 -1.22) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -0.05) (end -1.11 1.32) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 2.49) (end -1.11 3.86) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 5.03) (end -1.11 6.4) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 7.57) (end -1.11 8.94) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.5 -9.4) (end -3.5 9.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 9.4) (end 3.5 9.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.5 9.4) (end 3.5 -9.4) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.5 -9.4) (end -3.5 -9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.5 9.4) (end 3.5 -9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 9.4) (end 3.5 9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 -9.4) (end -3.5 9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.11 7.57) (end -1.11 8.94) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 5.03) (end -1.11 6.4) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 2.49) (end -1.11 3.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -0.05) (end -1.11 1.32) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -2.59) (end -1.11 -1.22) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -5.13) (end -1.11 -3.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -7.67) (end -1.11 -6.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 6.3) (end 1.11 7.67) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 3.76) (end 1.11 5.13) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 1.22) (end 1.11 2.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -1.32) (end 1.11 0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -3.86) (end 1.11 -2.49) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -6.4) (end 1.11 -5.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 8.84) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -8.95) (end -1.11 -8.84) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -8.84) (end -2.94 -8.84) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -8.94) (end 1.11 -7.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 8.95) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -8.95) (end 1.11 -8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.5 8.455) (end 1.05 8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 8.055) (end 2.5 8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 8.055) (end 2.5 8.055) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 5.915) (end 1.05 5.915) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 5.515) (end 2.5 5.915) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 5.515) (end 2.5 5.515) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 3.375) (end 1.05 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 2.975) (end 2.5 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 2.975) (end 2.5 2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 0.835) (end 1.05 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 0.435) (end 2.5 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 0.435) (end 2.5 0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -1.705) (end 1.05 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -2.105) (end 2.5 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -2.105) (end 2.5 -2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -4.245) (end 1.05 -4.245) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -4.645) (end 2.5 -4.245) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -4.645) (end 2.5 -4.645) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -6.785) (end 1.05 -6.785) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -7.185) (end 2.5 -6.785) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -7.185) (end 2.5 -7.185) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 7.185) (end -1.05 7.185) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 6.785) (end -2.5 7.185) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 6.785) (end -2.5 6.785) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.645) (end -1.05 4.645) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.245) (end -2.5 4.645) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 4.245) (end -2.5 4.245) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 2.105) (end -1.05 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 1.705) (end -2.5 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 1.705) (end -2.5 1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -0.435) (end -1.05 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -0.835) (end -2.5 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -0.835) (end -2.5 -0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -2.975) (end -1.05 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -3.375) (end -2.5 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -3.375) (end -2.5 -3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -5.515) (end -1.05 -5.515) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -5.915) (end -2.5 -5.515) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -5.915) (end -2.5 -5.915) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -8.055) (end -1.05 -8.055) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -8.455) (end -2.5 -8.055) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -8.455) (end -2.5 -8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -8.89) (end 1.05 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -8.455) (end -0.615 -8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 8.89) (end -1.05 -8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.615 -8.89) (end 1.05 -8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 8.89) (end -1.05 8.89) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -981,42 +1193,6 @@
     )
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C65A00)
-    (at 124.15 82.475 270)
-    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags capacitor)
-    (path /61CA4AF4)
-    (attr smd)
-    (fp_text reference C12 (at 0 -1.85 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100n (at 0 1.85 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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.3 1.15) (end -2.3 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1.15) (end 2.3 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.3 -1.15) (end 2.3 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.3 1.15) (end -2.3 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)))
-    )
-    (pad 2 smd roundrect (at 1.475 0 270) (size 1.15 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 18 "Net-(C12-Pad2)"))
-    (pad 1 smd roundrect (at -1.475 0 270) (size 1.15 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 19 "Net-(C12-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Package_SO:MSOP-10_3x3mm_P0.5mm (layer F.Cu) (tedit 5A02F25C) (tstamp 61C63E2B)
     (at 128.37 81.69)
     (descr "10-Lead Plastic Micro Small Outline Package (MS) [MSOP] (see Microchip Packaging Specification 00000049BS.pdf)")
@@ -1029,22 +1205,22 @@
     (fp_text value Si5351A-B-GT (at 0 2.6) (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))
-    (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
-    (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer F.Fab) (width 0.15))
-    (fp_line (start -1.5 1.5) (end -1.5 -0.5) (layer F.Fab) (width 0.15))
-    (fp_line (start -1.5 -0.5) (end -0.5 -1.5) (layer F.Fab) (width 0.15))
-    (fp_line (start -3.15 -1.85) (end -3.15 1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.15 -1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.15 -1.85) (end 3.15 -1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.15 1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.675 -1.675) (end -1.675 -1.45) (layer F.SilkS) (width 0.15))
-    (fp_line (start 1.675 -1.675) (end 1.675 -1.375) (layer F.SilkS) (width 0.15))
-    (fp_line (start 1.675 1.675) (end 1.675 1.375) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 1.675) (end -1.675 1.375) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 -1.675) (end 1.675 -1.675) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 1.675) (end 1.675 1.675) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.675 -1.45) (end -2.9 -1.45) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 1.675) (end 1.675 1.675) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 -1.675) (end 1.675 -1.675) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 1.675) (end -1.675 1.375) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.675 1.675) (end 1.675 1.375) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.675 -1.675) (end 1.675 -1.375) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 -1.675) (end -1.675 -1.45) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.15 1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.15 -1.85) (end 3.15 -1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.15 -1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.15 -1.85) (end -3.15 1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.5 -0.5) (end -0.5 -1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start -1.5 1.5) (end -1.5 -0.5) (layer F.Fab) (width 0.15))
+    (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.15)))
     )
@@ -1086,16 +1262,16 @@
     (fp_text value R (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1122,19 +1298,19 @@
     (fp_text value M24C02-RMN (at 0 3.4 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.7 -2.7) (end -3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.98 0.98) (thickness 0.15)))
     )
@@ -1169,14 +1345,14 @@
     (fp_text value T1 (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1196,14 +1372,14 @@
     (fp_text value T1 (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1223,23 +1399,23 @@
     (fp_text value 10µF (at 0 1.85 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.5625 0 90) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 3 GND))
     (pad 1 smd roundrect (at -1.5625 0 90) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 36 "Net-(C15-Pad1)"))
+      (net 35 "Net-(C15-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1259,21 +1435,21 @@
     (fp_text value Crystal_GND24 (at 0 2.95) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.8 -2.2) (end -2.8 -2.2) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.8 2.2) (end 2.8 -2.2) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 2.2) (end 2.8 2.2) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 -2.2) (end -2.8 2.2) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.7 2.15) (end 2.7 2.15) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.7 -2.15) (end -2.7 2.15) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.6 0.25) (end -0.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.15) (end -1.5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.15) (end -1.6 -1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.5 1.25) (end -1.6 1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.5 1.25) (end -1.5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.15) (end 1.5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.15) (end 1.6 1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.5 -1.25) (end 1.6 -1.15) (layer F.Fab) (width 0.1))
     (fp_line (start -1.5 -1.25) (end 1.5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -1.25) (end 1.6 -1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.15) (end 1.6 1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.15) (end 1.5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 1.25) (end -1.5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.25) (end -1.6 1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.15) (end -1.6 -1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.15) (end -1.5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.25) (end -0.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.7 -2.15) (end -2.7 2.15) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.7 2.15) (end 2.7 2.15) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.8 -2.2) (end -2.8 2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.8 2.2) (end 2.8 2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 2.2) (end 2.8 -2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 -2.2) (end -2.8 -2.2) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.7 0.7) (thickness 0.105)))
     )
@@ -1293,7 +1469,7 @@
   )
 
   (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A02534)
-    (at 86.3146 80.6688)
+    (at 101.6 82.6)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /60E41D5D)
@@ -1304,16 +1480,16 @@
     (fp_text value 330p (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1328,42 +1504,6 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A02545)
-    (at 86.3146 83.6788)
-    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-    (tags "capacitor handsolder")
-    (path /60E41D57)
-    (attr smd)
-    (fp_text reference C2 (at 0 -1.68) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 68p (at 0 1.68) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 2 smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 11 "Net-(C2-Pad2)"))
-    (pad 1 smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 2 "Net-(C2-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A009FB)
     (at 110.5375 81 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
@@ -1376,16 +1516,16 @@
     (fp_text value 18p (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1412,16 +1552,16 @@
     (fp_text value 100n (at 0 1.85 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -1448,16 +1588,16 @@
     (fp_text value L (at 0 2.28) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -1473,7 +1613,7 @@
   )
 
   (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C3A1EF)
-    (at 89.136 99.158)
+    (at 99.8 104)
     (descr "SMD rectangular pad as test Point, square 2.5mm side length")
     (tags "test point SMD pad rectangle square")
     (path /61DF1A37)
@@ -1484,14 +1624,14 @@
     (fp_text value RF_GND (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1499,8 +1639,8 @@
       (net 25 GNDA))
   )
 
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C3823E)
-    (at 93.962 94.856 270)
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CFC450)
+    (at 104.6 91.8 270)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /61CDE9AE)
@@ -1511,16 +1651,16 @@
     (fp_text value 220 (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1535,8 +1675,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C381AD)
-    (at 93.962 91.046 270)
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CFC4C4)
+    (at 104.6 88 270)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /61CD99F8)
@@ -1547,16 +1687,16 @@
     (fp_text value 4k7 (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1572,7 +1712,7 @@
   )
 
   (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C380BB)
-    (at 85.326 99.158 270)
+    (at 99.8 100.2 270)
     (descr "SMD rectangular pad as test Point, square 2.5mm side length")
     (tags "test point SMD pad rectangle square")
     (path /61D31443)
@@ -1583,14 +1723,14 @@
     (fp_text value RF_IN (at 0 2.25 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -2.15 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1599,7 +1739,7 @@
   )
 
   (module Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0) (tstamp 61C37FE1)
-    (at 88.882 94.1145 270)
+    (at 106.4 101.0875 270)
     (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags "diode handsolder")
     (path /61D403D1)
@@ -1610,18 +1750,18 @@
     (fp_text value D (at 0 2.28 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -1637,7 +1777,7 @@
   )
 
   (module Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0) (tstamp 61C37FCE)
-    (at 88.882 88.7805 270)
+    (at 103.2 101.0875 90)
     (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags "diode handsolder")
     (path /61D3F32C)
@@ -1648,24 +1788,24 @@
     (fp_text value D (at 0 2.28 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (pad 2 smd roundrect (at 1.4875 0 270) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
+    (pad 2 smd roundrect (at 1.4875 0 90) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
       (net 20 "Net-(C3-Pad1)"))
-    (pad 1 smd roundrect (at -1.4875 0 270) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
+    (pad 1 smd roundrect (at -1.4875 0 90) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
       (net 26 +3.3VA))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1210_3225Metric.wrl
       (at (xyz 0 0 0))
@@ -1675,17 +1815,20 @@
   )
 
   (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37FAA)
-    (at 93.1785 98.65 180)
+    (at 104.4 95.7625 270)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61D6FFE6)
     (attr smd)
-    (fp_text reference C13 (at 0 -1.68) (layer F.SilkS)
+    (fp_text reference C13 (at 0 -1.68 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100n (at 0 1.68) (layer F.Fab)
+    (fp_text value 100n (at 0 1.68 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
@@ -1696,13 +1839,10 @@
     (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 2 smd roundrect (at 1.0375 0 180) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 25 GNDA))
-    (pad 1 smd roundrect (at -1.0375 0 180) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
+    (pad 1 smd roundrect (at -1.0375 0 270) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
       (net 21 "Net-(C13-Pad1)"))
+    (pad 2 smd roundrect (at 1.0375 0 270) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
+      (net 25 GNDA))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1711,33 +1851,33 @@
   )
 
   (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37E4B)
-    (at 85.326 91.792 270)
+    (at 100.7625 97 180)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61D9EA3F)
     (attr smd)
-    (fp_text reference C3 (at 0 -1.85 90) (layer F.SilkS)
+    (fp_text reference C3 (at 0 -1.85) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 220n (at 0 1.85 90) (layer F.Fab)
+    (fp_text value 220n (at 0 1.85) (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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
-    (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+    (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 1 "Net-(C3-Pad2)"))
-    (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+    (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 20 "Net-(C3-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
@@ -1758,16 +1898,16 @@
     (fp_text value R (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1794,16 +1934,16 @@
     (fp_text value L (at 0 2.28) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -1818,49 +1958,8 @@
     )
   )
 
-  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 61A037EB)
-    (at 127 98.536 270)
-    (descr "SOT-23, Standard")
-    (tags SOT-23)
-    (path /61A3E66B)
-    (attr smd)
-    (fp_text reference U3 (at 0 -2.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value AZ1117-3.3 (at 0 2.5 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (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 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.075)))
-    )
-    (pad 3 smd rect (at 1 0 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 36 "Net-(C15-Pad1)"))
-    (pad 2 smd rect (at -1 0.95 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 6 +3V3))
-    (pad 1 smd rect (at -1 -0.95 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 3 GND))
-    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A01F7F)
-    (at 114.062 97.028 180)
+    (at 114.062 97.428 180)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /60E49D2D)
@@ -1871,16 +1970,16 @@
     (fp_text value 470 (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1896,7 +1995,7 @@
   )
 
   (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A01CB0)
-    (at 117.8775 97.028)
+    (at 117.8775 97.428)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /60E4B819)
@@ -1907,16 +2006,16 @@
     (fp_text value C (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1943,44 +2042,44 @@
     (fp_text value STM32G431KBTx (at 0 5.88) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5.18 3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 3.3) (end 5.18 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 3.75) (end 3.75 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 5.18) (end 3.3 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 5.18) (end 3.3 5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.18 3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 3.3) (end -5.18 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 3.75) (end -3.75 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 5.18) (end -3.3 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 5.18) (end -3.3 5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.18 -3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 -3.3) (end 5.18 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 -3.75) (end 3.75 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 -5.18) (end 3.3 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 -5.18) (end 3.3 -5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.18 -3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -3.3) (end -5.18 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -3.75) (end -3.75 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 -5.18) (end -3.3 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 -5.18) (end -3.3 -5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.61 -3.31) (end -4.925 -3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.61 -3.61) (end -3.61 -3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.31 -3.61) (end -3.61 -3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.61 -3.61) (end 3.61 -3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.31 -3.61) (end 3.61 -3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.61 3.61) (end -3.61 3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.31 3.61) (end -3.61 3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.61 3.61) (end 3.61 3.31) (layer F.SilkS) (width 0.12))
     (fp_line (start 3.31 3.61) (end 3.61 3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.61 3.61) (end 3.61 3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.31 3.61) (end -3.61 3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.61 3.61) (end -3.61 3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 -3.61) (end 3.61 -3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.61 -3.61) (end 3.61 -3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.31 -3.61) (end -3.61 -3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.61 -3.61) (end -3.61 -3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.61 -3.31) (end -4.925 -3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -5.18) (end -3.3 -5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 -5.18) (end -3.3 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.75) (end -3.75 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.3) (end -5.18 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.18 -3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 -5.18) (end 3.3 -5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 -5.18) (end 3.3 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.75) (end 3.75 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.3) (end 5.18 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.18 -3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 5.18) (end -3.3 5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 5.18) (end -3.3 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.75) (end -3.75 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.3) (end -5.18 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.18 3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 5.18) (end 3.3 5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 5.18) (end 3.3 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.75) (end 3.75 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.3) (end 5.18 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.18 3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -2020,7 +2119,7 @@
     (pad 13 smd roundrect (at 0.4 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 12 smd roundrect (at -0.4 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 11 smd roundrect (at -1.2 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 38 "Net-(C17-Pad1)"))
+      (net 37 "Net-(C17-Pad1)"))
     (pad 10 smd roundrect (at -2 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 9 smd roundrect (at -2.8 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 8 "Net-(C8-Pad1)"))
@@ -2044,44 +2143,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B45)
-    (at 107.742 75.14)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /60E41D4B)
-    (attr smd)
-    (fp_text reference R3 (at 0 -1.65) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 15K (at 0 1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 10 "Net-(C1-Pad1)"))
-    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 11 "Net-(C2-Pad2)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B34)
-    (at 106.132 72.19)
+    (at 101.6 87 180)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /60E41D51)
@@ -2092,22 +2155,22 @@
     (fp_text value 3.9K (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+    (pad 2 smd roundrect (at 1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 10 "Net-(C1-Pad1)"))
-    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+    (pad 1 smd roundrect (at -1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 2 "Net-(C2-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
       (at (xyz 0 0 0))
@@ -2117,7 +2180,7 @@
   )
 
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B23)
-    (at 99.332 78.89)
+    (at 101.6 85)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /60E41D45)
@@ -2128,16 +2191,16 @@
     (fp_text value 3k9 (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -2152,44 +2215,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C57C5C)
-    (at 122.326 94.996 180)
-    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "capacitor handsolder")
-    (path /6197A0B3)
-    (attr smd)
-    (fp_text reference C9 (at 0 -1.85) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value C_Small (at 0 1.85) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)))
-    )
-    (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 25 GNDA))
-    (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 26 +3.3VA))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CE9E1C)
-    (at 114.4 94 270)
+    (at 111 95.3625 270)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61B07F9F)
@@ -2200,16 +2227,16 @@
     (fp_text value 1µ (at 0 1.85 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -2236,16 +2263,16 @@
     (fp_text value 22p (at 0 1.68 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -2265,20 +2292,22 @@
   (gr_line (start 139.4 106) (end 98 106) (layer Edge.Cuts) (width 0.05))
   (gr_line (start 139.4 74) (end 139.4 106) (layer Edge.Cuts) (width 0.05) (tstamp 61CF0BB1))
 
+  (segment (start 99.2 99.6) (end 99.8 100.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 99.2 97) (end 99.2 99.6) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 115.391 89.27) (end 115.459 89.338) (width 0.5) (layer F.Cu) (net 2))
   (segment (start 112 89.27) (end 115.391 89.27) (width 0.5) (layer F.Cu) (net 2))
+  (segment (start 102.6 89) (end 102.6 87) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 111.37499 88.64499) (end 112 89.27) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 105.85818 88.64499) (end 111.37499 88.64499) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 105.28818 88.07499) (end 105.85818 88.64499) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 103.52501 88.07499) (end 105.28818 88.07499) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 102.6 89) (end 103.52501 88.07499) (width 0.25) (layer F.Cu) (net 2))
   (segment (start 109.4155 83.82) (end 109.4315 83.804) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 106.807 83.82) (end 109.4155 83.82) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 109.4315 81.513) (end 109.474 81.4705) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 116.834 82.854534) (end 116.834 83.963) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 115.062 81.082534) (end 116.834 82.854534) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 115.062 80.01) (end 115.062 81.082534) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 127.049999 98.436001) (end 127.95 97.536) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 126.607999 98.436001) (end 127.049999 98.436001) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 123.879 101.165) (end 126.607999 98.436001) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 123.879 101.346) (end 123.879 101.165) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 130.125 97.536) (end 130.302 97.713) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 127.95 97.536) (end 130.125 97.536) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 130.302 96.012) (end 130.048 95.758) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 130.302 97.713) (end 130.302 96.012) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 109.5 81) (end 109.5 83.5) (width 1) (layer F.Cu) (net 3))
@@ -2288,8 +2317,6 @@
   (segment (start 109.5 81) (end 109.5 80.275) (width 1) (layer F.Cu) (net 3))
   (segment (start 115.062 78.938) (end 118 76) (width 1) (layer F.Cu) (net 3))
   (segment (start 115.062 80.01) (end 115.062 78.938) (width 1) (layer F.Cu) (net 3))
-  (segment (start 133.144 95.758) (end 133.652 95.25) (width 1) (layer F.Cu) (net 3))
-  (segment (start 130.048 95.758) (end 133.144 95.758) (width 1) (layer F.Cu) (net 3))
   (segment (start 130.379 97.79) (end 130.302 97.713) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 133.652 97.79) (end 130.379 97.79) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 131.4 78.4) (end 131.4 76.4) (width 0.5) (layer F.Cu) (net 3))
@@ -2321,11 +2348,30 @@
   (segment (start 134.099999 80.442999) (end 134.957001 81.300001) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 134.099999 77.995999) (end 134.099999 80.442999) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 133 76.896) (end 134.099999 77.995999) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 134.922 96.52) (end 133.652 97.79) (width 1) (layer F.Cu) (net 3))
-  (segment (start 134.922 96.52) (end 133.652 95.25) (width 1) (layer F.Cu) (net 3))
-  (segment (start 136.652 96.52) (end 134.922 96.52) (width 1) (layer F.Cu) (net 3))
-  (segment (start 124.988 92.313) (end 126.2 93.525) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 122.434 92.313) (end 124.988 92.313) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 130.302 98.3755) (end 130.302 97.713) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 129.097499 99.580001) (end 130.302 98.3755) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 127.654997 99.580001) (end 129.097499 99.580001) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 127.15 100.084998) (end 127.654997 99.580001) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 125.405001 99.819999) (end 123.879 101.346) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 126.885001 99.819999) (end 125.405001 99.819999) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 127.15 100.084998) (end 126.885001 99.819999) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 127.15 100.8) (end 127.15 100.084998) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 134.922 96.52) (end 133.652 95.25) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 134.922 96.52) (end 133.652 97.79) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 136.652 96.52) (end 134.922 96.52) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 112.077498 85.675) (end 112.4 85.675) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 109.902498 83.5) (end 112.077498 85.675) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 109.5 83.5) (end 109.902498 83.5) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 126.133 103.6) (end 123.879 101.346) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 127 103.6) (end 126.133 103.6) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 125.588 92.313) (end 126.8 93.525) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 122.434 92.313) (end 125.588 92.313) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 122.84149 100.30849) (end 123.879 101.346) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 122.84149 96.73082) (end 122.84149 100.30849) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 123.17832 96.39399) (end 122.84149 96.73082) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 125.17029 96.39399) (end 123.17832 96.39399) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 126.8 94.76428) (end 125.17029 96.39399) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 126.8 93.525) (end 126.8 94.76428) (width 0.25) (layer F.Cu) (net 3))
   (segment (start 114.25899 85.701178) (end 114.695812 86.138) (width 0.5) (layer F.Cu) (net 4))
   (segment (start 114.695812 86.138) (end 115.459 86.138) (width 0.5) (layer F.Cu) (net 4))
   (segment (start 114.25899 84.974822) (end 114.25899 85.701178) (width 0.5) (layer F.Cu) (net 4))
@@ -2346,8 +2392,6 @@
   (segment (start 121.81 80.95) (end 121.95 80.95) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 123.809 90.938) (end 124.538 90.938) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 125.60499 80.12499) (end 126.17 80.69) (width 0.2) (layer F.Cu) (net 6))
-  (segment (start 122.63501 80.12499) (end 125.60499 80.12499) (width 0.2) (layer F.Cu) (net 6))
-  (segment (start 121.81 80.95) (end 122.63501 80.12499) (width 0.2) (layer F.Cu) (net 6))
   (segment (start 127.12 80.69) (end 128.595001 82.165001) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 126.17 80.69) (end 127.12 80.69) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 130.545001 82.165001) (end 130.57 82.19) (width 0.25) (layer F.Cu) (net 6))
@@ -2360,28 +2404,55 @@
   (segment (start 128.27 84.582) (end 133.144 84.582) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 129.032 92.633) (end 129.032 93.98) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 129.032 93.98) (end 136.652 93.98) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 127.58 93.98) (end 129.032 93.98) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 127.58 96.397466) (end 127.58 93.98) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 125.933466 98.044) (end 127.58 96.397466) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 123.879 98.044) (end 125.933466 98.044) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 126.05 97.602) (end 126.074241 97.626241) (width 1) (layer F.Cu) (net 6))
-  (segment (start 126.05 97.536) (end 126.05 97.602) (width 1) (layer F.Cu) (net 6))
   (segment (start 137.792002 85.09) (end 133.652 85.09) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 138.477001 85.774999) (end 137.792002 85.09) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 138.477001 92.154999) (end 138.477001 85.774999) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 136.652 93.98) (end 138.477001 92.154999) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 125.69 77.4725) (end 126.7625 76.4) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 125.69 78.68) (end 125.69 77.4725) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 123.809 90.938) (end 125.662 90.938) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 127.58 91.78) (end 127.58 93.98) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 126.2 90.4) (end 127.58 91.78) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 113.207 96.883) (end 113.062 97.028) (width 0.5) (layer F.Cu) (net 7))
+  (segment (start 125.644 98.044) (end 126.2 98.6) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 123.879 98.044) (end 125.644 98.044) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 124.47001 79.89999) (end 125.69 78.68) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 122.86001 79.89999) (end 124.47001 79.89999) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 121.81 80.95) (end 122.86001 79.89999) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 126.262 90.938) (end 126.8 90.4) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 123.809 90.938) (end 126.262 90.938) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 127.815 90.4) (end 130.048 92.633) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 126.8 90.4) (end 127.815 90.4) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 129.744466 92.633) (end 130.048 92.633) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 125.644 96.733466) (end 129.744466 92.633) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 125.644 98.044) (end 125.644 96.733466) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 113.207 97.283) (end 113.062 97.428) (width 0.5) (layer F.Cu) (net 7))
+  (segment (start 111.503 97.428) (end 111 96.925) (width 0.25) (layer F.Cu) (net 7))
+  (segment (start 113.062 97.428) (end 111.503 97.428) (width 0.25) (layer F.Cu) (net 7))
   (segment (start 116.8 92.347) (end 116.834 92.313) (width 0.5) (layer F.Cu) (net 8))
+  (segment (start 111.22501 94.02501) (end 111 93.8) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 113.98818 94.02501) (end 111.22501 94.02501) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 114.32501 93.68818) (end 113.98818 94.02501) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 114.32501 92.4618) (end 114.32501 93.68818) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 114.81182 91.97499) (end 114.32501 92.4618) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 116.49599 91.97499) (end 114.81182 91.97499) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 116.834 92.313) (end 116.49599 91.97499) (width 0.25) (layer F.Cu) (net 8))
   (segment (start 133.512 82.69) (end 133.652 82.55) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 130.57 82.69) (end 133.512 82.69) (width 0.25) (layer F.Cu) (net 9))
-  (segment (start 115.062 97.028) (end 116.84 97.028) (width 0.5) (layer F.Cu) (net 12))
-  (segment (start 112.268 99.822) (end 115.062 97.028) (width 0.5) (layer F.Cu) (net 12))
-  (segment (start 112.268 100.584) (end 112.268 99.822) (width 0.5) (layer F.Cu) (net 12))
+  (segment (start 100.6 89) (end 100.6 87) (width 0.25) (layer F.Cu) (net 10))
+  (segment (start 100.6 85) (end 100.6 87) (width 0.25) (layer F.Cu) (net 10))
+  (segment (start 102.525 91) (end 102.6 91.075) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 100.6 91) (end 102.525 91) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 111.723232 91.81) (end 112 91.81) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 109.828222 89.91499) (end 111.723232 91.81) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 105.928242 89.91499) (end 109.828222 89.91499) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 105.64999 90.193242) (end 105.928242 89.91499) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 105.64999 91.3632) (end 105.64999 90.193242) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 105.28818 91.72501) (end 105.64999 91.3632) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 103.91182 91.72501) (end 105.28818 91.72501) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 103.26181 91.075) (end 103.91182 91.72501) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 102.6 91.075) (end 103.26181 91.075) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 115.062 97.428) (end 116.84 97.428) (width 0.5) (layer F.Cu) (net 12))
+  (segment (start 114.157999 98.332001) (end 115.062 97.428) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 114.157999 99.269001) (end 114.157999 98.332001) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 112.843 100.584) (end 114.157999 99.269001) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 112.268 100.584) (end 112.843 100.584) (width 0.25) (layer F.Cu) (net 12))
   (segment (start 129.210034 78.4) (end 129 78.4) (width 0.5) (layer F.Cu) (net 13))
   (segment (start 129.4 80.955002) (end 129.4 78.4) (width 0.25) (layer F.Cu) (net 13))
   (segment (start 129.634998 81.19) (end 129.4 80.955002) (width 0.25) (layer F.Cu) (net 13))
@@ -2420,48 +2491,97 @@
   (segment (start 119.27 80.95) (end 119.27 79.975) (width 0.25) (layer F.Cu) (net 16))
   (segment (start 136.6 103.6) (end 136.8 103.4) (width 1) (layer F.Cu) (net 17))
   (segment (start 133.175 103.6) (end 136.6 103.6) (width 1) (layer F.Cu) (net 17))
-  (segment (start 136.8 99.208) (end 136.652 99.06) (width 1) (layer F.Cu) (net 17))
-  (segment (start 136.8 103.4) (end 136.8 99.208) (width 1) (layer F.Cu) (net 17))
-  (segment (start 128.302 100.838) (end 127 99.536) (width 0.5) (layer F.Cu) (net 36))
-  (segment (start 130.302 100.838) (end 128.302 100.838) (width 0.5) (layer F.Cu) (net 36))
-  (segment (start 123.845944 83.95) (end 124.15 83.95) (width 0.2) (layer F.Cu) (net 18))
-  (segment (start 122.75899 85.036954) (end 123.845944 83.95) (width 0.2) (layer F.Cu) (net 18))
-  (segment (start 122.75899 89.83799) (end 122.75899 85.036954) (width 0.2) (layer F.Cu) (net 18))
-  (segment (start 123.059 90.138) (end 122.75899 89.83799) (width 0.2) (layer F.Cu) (net 18))
-  (segment (start 123.809 90.138) (end 123.059 90.138) (width 0.2) (layer F.Cu) (net 18))
+  (segment (start 136.8 99.208) (end 136.652 99.06) (width 0.5) (layer F.Cu) (net 17))
+  (segment (start 136.8 103.4) (end 136.8 99.208) (width 0.5) (layer F.Cu) (net 17))
+  (segment (start 123.257944 90.138) (end 123.809 90.138) (width 0.2) (layer F.Cu) (net 18))
+  (segment (start 122.75899 89.639046) (end 123.257944 90.138) (width 0.2) (layer F.Cu) (net 18))
+  (segment (start 122.75899 85.036954) (end 122.75899 89.639046) (width 0.2) (layer F.Cu) (net 18))
+  (segment (start 124.045944 83.75) (end 122.75899 85.036954) (width 0.2) (layer F.Cu) (net 18))
+  (segment (start 124.15 83.75) (end 124.045944 83.75) (width 0.2) (layer F.Cu) (net 18))
   (segment (start 124.34 81.19) (end 126.17 81.19) (width 0.2) (layer F.Cu) (net 19))
   (segment (start 124.15 81) (end 124.34 81.19) (width 0.2) (layer F.Cu) (net 19))
-  (segment (start 108.44 90.54) (end 108 90.54) (width 0.25) (layer F.Cu) (net 7))
-  (segment (start 110.8 92.9) (end 108.44 90.54) (width 0.25) (layer F.Cu) (net 7))
-  (segment (start 110.8 93.6) (end 110.8 92.9) (width 0.25) (layer F.Cu) (net 7))
+  (segment (start 108.6 91.415) (end 108.6 93.6) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 107.725 90.54) (end 108.6 91.415) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 106.85 90.54) (end 107.725 90.54) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 106.575 99.6) (end 106.6 99.625) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 103.2 99.6) (end 106.575 99.6) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 102.325 98.725) (end 103.2 99.6) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 102.325 97) (end 102.325 98.725) (width 0.25) (layer F.Cu) (net 20))
+  (segment (start 104.4 93) (end 104.6 92.8) (width 0.25) (layer F.Cu) (net 21))
+  (segment (start 104.4 94.725) (end 104.4 93) (width 0.25) (layer F.Cu) (net 21))
   (segment (start 115.453 90.932) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 22))
-  (segment (start 112.398 90.938) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 22))
   (segment (start 112 90.54) (end 112.398 90.938) (width 0.5) (layer F.Cu) (net 22))
-  (segment (start 120.7635 92.3835) (end 120.834 92.313) (width 0.5) (layer F.Cu) (net 25))
-  (segment (start 120.7635 94.996) (end 120.7635 92.3835) (width 0.5) (layer F.Cu) (net 25))
-  (segment (start 119.49149 99.93349) (end 119.49149 96.26801) (width 1) (layer F.Cu) (net 25))
-  (segment (start 119.49149 96.26801) (end 120.7635 94.996) (width 1) (layer F.Cu) (net 25))
+  (segment (start 113.4 91.076) (end 113.538 90.938) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 113.4 93) (end 113.4 91.076) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 113.538 90.938) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 22))
+  (segment (start 112.398 90.938) (end 113.538 90.938) (width 0.5) (layer F.Cu) (net 22))
+  (segment (start 106.6 95.6) (end 108.6 95.6) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 106.6 95.6) (end 106.6 93.6) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 113.21249 92.81249) (end 113.4 93) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 110.11182 92.81249) (end 113.21249 92.81249) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 109.52501 93.3993) (end 110.11182 92.81249) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 109.52501 94.67499) (end 109.52501 93.3993) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 108.6 95.6) (end 109.52501 94.67499) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 109.77499 96.77499) (end 108.6 95.6) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 109.77499 99.44999) (end 109.77499 96.77499) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 109.8 99.475) (end 109.77499 99.44999) (width 0.25) (layer F.Cu) (net 22))
+  (segment (start 102.6 85) (end 104.6 87) (width 0.25) (layer F.Cu) (net 23))
+  (segment (start 105.85 87) (end 104.6 87) (width 0.25) (layer F.Cu) (net 23))
+  (segment (start 106.85 88) (end 105.85 87) (width 0.25) (layer F.Cu) (net 23))
+  (segment (start 104.93 89.27) (end 106.85 89.27) (width 0.25) (layer F.Cu) (net 24))
+  (segment (start 104.6 90.8) (end 104.6 89) (width 0.25) (layer F.Cu) (net 24))
   (segment (start 120.904 101.346) (end 119.49149 99.93349) (width 1) (layer F.Cu) (net 25))
   (segment (start 116.078 101.854) (end 117.348 100.584) (width 1) (layer F.Cu) (net 25))
   (segment (start 116.078 103.584) (end 116.078 101.854) (width 1) (layer F.Cu) (net 25))
   (segment (start 113.538 103.584) (end 116.078 103.584) (width 1) (layer F.Cu) (net 25))
-  (segment (start 118.915 96.8445) (end 119.49149 96.26801) (width 0.25) (layer F.Cu) (net 25))
-  (segment (start 118.915 97.028) (end 118.915 96.8445) (width 0.25) (layer F.Cu) (net 25))
   (segment (start 118.84098 100.584) (end 119.49149 99.93349) (width 0.5) (layer F.Cu) (net 25))
   (segment (start 117.348 100.584) (end 118.84098 100.584) (width 0.5) (layer F.Cu) (net 25))
-  (segment (start 111 97.6) (end 111 101.951002) (width 0.5) (layer F.Cu) (net 25))
-  (segment (start 111 101.951002) (end 112.632998 103.584) (width 0.5) (layer F.Cu) (net 25))
-  (segment (start 112.632998 103.584) (end 113.538 103.584) (width 0.5) (layer F.Cu) (net 25))
-  (segment (start 121.634 93.404) (end 121.634 92.313) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 123.226 94.996) (end 121.634 93.404) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 123.675 95.2095) (end 123.8885 94.996) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 120.904 97.318) (end 123.226 94.996) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 123.226 94.996) (end 123.8885 94.996) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 120.904 98.044) (end 120.904 97.318) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 121.193466 103.584) (end 118.618 103.584) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 122.06651 102.710956) (end 121.193466 103.584) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 122.06651 99.20651) (end 122.06651 102.710956) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 120.904 98.044) (end 122.06651 99.20651) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 120.834 94.355) (end 120.834 92.313) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 121.475 94.996) (end 120.834 94.355) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 120.07701 96.39399) (end 121.475 94.996) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 119.94901 96.39399) (end 120.07701 96.39399) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 118.915 97.428) (end 119.94901 96.39399) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 118.915 99.357) (end 119.49149 99.93349) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 118.915 97.428) (end 118.915 99.357) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 105.57499 92.21001) (end 105.975 91.81) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 105.57499 96.18818) (end 105.57499 92.21001) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 105.91182 96.52501) (end 105.57499 96.18818) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 105.975 91.81) (end 106.85 91.81) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.12501 96.52501) (end 105.91182 96.52501) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.6 97) (end 108.12501 96.52501) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.6 97.6) (end 108.6 97) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 104.96317 96.8) (end 105.57499 96.18818) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 104.4 96.8) (end 104.96317 96.8) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 112.554 102.6) (end 113.538 103.584) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 109.8 102.6) (end 112.554 102.6) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.57499 100.12568) (end 109.44931 101) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.57499 98.82432) (end 108.57499 100.12568) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.6 98.79931) (end 108.57499 98.82432) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 108.6 97.6) (end 108.6 98.79931) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 109.44931 102.24931) (end 109.8 102.6) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 109.44931 101) (end 109.44931 102.24931) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 109.775 102.575) (end 109.8 102.6) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 106.4 102.575) (end 109.775 102.575) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 121.01669 103.584) (end 118.618 103.584) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 121.94151 102.65918) (end 121.01669 103.584) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 121.94151 99.08151) (end 121.94151 102.65918) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 120.904 98.044) (end 121.94151 99.08151) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 123.763124 94.996) (end 124.6 94.996) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 120.904 97.855124) (end 123.763124 94.996) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 120.904 98.044) (end 120.904 97.855124) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 123.553812 94.996) (end 121.634 93.076188) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 121.634 93.076188) (end 121.634 92.313) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 124.6 94.996) (end 123.553812 94.996) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 111.723232 88) (end 112 88) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 106.75069 97.6) (end 106.6 97.6) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 108.05001 98.89932) (end 106.75069 97.6) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 108.05001 100.30068) (end 108.05001 98.89932) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 104.23751 101.53749) (end 106.8132 101.53749) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 103.2 102.575) (end 104.23751 101.53749) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 106.8132 101.53749) (end 108.05001 100.30068) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 116.792999 105.409001) (end 118.618 103.584) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 106.034001 105.409001) (end 116.792999 105.409001) (width 0.25) (layer F.Cu) (net 26))
+  (segment (start 103.2 102.575) (end 106.034001 105.409001) (width 0.25) (layer F.Cu) (net 26))
   (segment (start 135 75.946) (end 137.4 75.946) (width 0.5) (layer F.Cu) (net 27))
   (segment (start 137.368 79.568) (end 137.4 79.6) (width 0.5) (layer F.Cu) (net 28))
   (segment (start 135 79.568) (end 137.368 79.568) (width 0.5) (layer F.Cu) (net 28))
@@ -2489,12 +2609,25 @@
   (segment (start 123.809 85.338) (end 125.41281 85.338) (width 0.25) (layer F.Cu) (net 34))
   (segment (start 136.621998 86.36) (end 136.652 86.36) (width 0.25) (layer F.Cu) (net 34))
   (segment (start 136.001999 85.740001) (end 136.621998 86.36) (width 0.25) (layer F.Cu) (net 34))
-  (segment (start 118.434 95.30869) (end 118.434 92.313) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 118.00249 97.4912) (end 118.00249 95.7402) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 118.00249 95.7402) (end 118.434 95.30869) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 114.90969 100.584) (end 118.00249 97.4912) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 114.808 100.584) (end 114.90969 100.584) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 130.2 100.94) (end 130.302 100.838) (width 1) (layer F.Cu) (net 36))
-  (segment (start 130.2 103.6) (end 130.2 100.94) (width 1) (layer F.Cu) (net 36))
+  (segment (start 130.2 100.94) (end 130.302 100.838) (width 1) (layer F.Cu) (net 35))
+  (segment (start 126.2 101.515002) (end 126.484998 101.8) (width 0.5) (layer F.Cu) (net 35))
+  (segment (start 126.2 100.8) (end 126.2 101.515002) (width 0.5) (layer F.Cu) (net 35))
+  (segment (start 130.2 101.8) (end 130.2 100.94) (width 1) (layer F.Cu) (net 35))
+  (segment (start 130.2 103.6) (end 130.2 101.8) (width 1) (layer F.Cu) (net 35))
+  (segment (start 128.1 101.7) (end 128 101.8) (width 0.5) (layer F.Cu) (net 35))
+  (segment (start 128.1 100.8) (end 128.1 101.7) (width 0.5) (layer F.Cu) (net 35))
+  (segment (start 128 101.8) (end 130.2 101.8) (width 0.5) (layer F.Cu) (net 35))
+  (segment (start 126.484998 101.8) (end 128 101.8) (width 0.5) (layer F.Cu) (net 35))
+  (segment (start 116.633001 98.758999) (end 114.808 100.584) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 117.134691 98.758999) (end 116.633001 98.758999) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 118.00249 97.8912) (end 117.134691 98.758999) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 118.00249 96.60249) (end 118.00249 97.8912) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 116.4 95) (end 118.00249 96.60249) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 118.434 93.509) (end 119.525 94.6) (width 0.5) (layer F.Cu) (net 37))
+  (segment (start 118.41199 93.38801) (end 118.434 93.366) (width 0.25) (layer F.Cu) (net 37))
+  (segment (start 115.78801 93.38801) (end 118.41199 93.38801) (width 0.25) (layer F.Cu) (net 37))
+  (segment (start 115.4 93) (end 115.78801 93.38801) (width 0.25) (layer F.Cu) (net 37))
+  (segment (start 118.434 93.366) (end 118.434 93.509) (width 0.5) (layer F.Cu) (net 37))
+  (segment (start 118.434 92.313) (end 118.434 93.366) (width 0.5) (layer F.Cu) (net 37))
 
 )
diff --git a/schemi/bassofono.kicad_pcb-bak b/schemi/bassofono.kicad_pcb-bak
index 6963352..f036785 100644
--- a/schemi/bassofono.kicad_pcb-bak
+++ b/schemi/bassofono.kicad_pcb-bak
@@ -2,11 +2,11 @@
 
   (general
     (thickness 1.6)
-    (drawings 0)
-    (tracks 148)
+    (drawings 4)
+    (tracks 231)
     (zones 0)
-    (modules 46)
-    (nets 37)
+    (modules 51)
+    (nets 39)
   )
 
   (page A4)
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.25)
+    (last_trace_width 0.5)
     (user_trace_width 0.2)
     (user_trace_width 0.5)
     (user_trace_width 1)
@@ -112,23 +112,25 @@
   (net 17 +12V)
   (net 18 "Net-(C12-Pad2)")
   (net 19 "Net-(C12-Pad1)")
-  (net 20 "Net-(J4-Pad1)")
-  (net 21 "Net-(C3-Pad1)")
-  (net 22 "Net-(C13-Pad1)")
-  (net 23 "Net-(C14-Pad1)")
-  (net 24 "Net-(R1-Pad2)")
-  (net 25 "Net-(R11-Pad1)")
-  (net 26 GNDA)
-  (net 27 +3.3VA)
-  (net 28 "Net-(J9-Pad1)")
-  (net 29 "Net-(J11-Pad1)")
-  (net 30 "Net-(J2-Pad8)")
-  (net 31 "Net-(J2-Pad6)")
-  (net 32 "Net-(J2-Pad7)")
-  (net 33 "Net-(J2-Pad5)")
-  (net 34 "Net-(J2-Pad9)")
-  (net 35 "Net-(J2-Pad4)")
-  (net 36 "Net-(J1-Pad4)")
+  (net 20 "Net-(C3-Pad1)")
+  (net 21 "Net-(C13-Pad1)")
+  (net 22 "Net-(C14-Pad1)")
+  (net 23 "Net-(R1-Pad2)")
+  (net 24 "Net-(R11-Pad1)")
+  (net 25 GNDA)
+  (net 26 +3.3VA)
+  (net 27 "Net-(J9-Pad1)")
+  (net 28 "Net-(J11-Pad1)")
+  (net 29 "Net-(J2-Pad8)")
+  (net 30 "Net-(J2-Pad6)")
+  (net 31 "Net-(J2-Pad7)")
+  (net 32 "Net-(J2-Pad5)")
+  (net 33 "Net-(J2-Pad9)")
+  (net 34 "Net-(J2-Pad4)")
+  (net 35 "Net-(J1-Pad4)")
+  (net 36 "Net-(C15-Pad1)")
+  (net 37 "Net-(C17-Pad2)")
+  (net 38 "Net-(C17-Pad1)")
 
   (net_class Default "Questo è il gruppo di collegamenti predefinito"
     (clearance 0.2)
@@ -147,6 +149,9 @@
     (add_net "Net-(C12-Pad2)")
     (add_net "Net-(C13-Pad1)")
     (add_net "Net-(C14-Pad1)")
+    (add_net "Net-(C15-Pad1)")
+    (add_net "Net-(C17-Pad1)")
+    (add_net "Net-(C17-Pad2)")
     (add_net "Net-(C2-Pad1)")
     (add_net "Net-(C2-Pad2)")
     (add_net "Net-(C3-Pad1)")
@@ -159,15 +164,12 @@
     (add_net "Net-(J1-Pad4)")
     (add_net "Net-(J11-Pad1)")
     (add_net "Net-(J2-Pad1)")
-    (add_net "Net-(J2-Pad12)")
-    (add_net "Net-(J2-Pad13)")
     (add_net "Net-(J2-Pad4)")
     (add_net "Net-(J2-Pad5)")
     (add_net "Net-(J2-Pad6)")
     (add_net "Net-(J2-Pad7)")
     (add_net "Net-(J2-Pad8)")
     (add_net "Net-(J2-Pad9)")
-    (add_net "Net-(J4-Pad1)")
     (add_net "Net-(J9-Pad1)")
     (add_net "Net-(Q1-Pad1)")
     (add_net "Net-(Q2-Pad1)")
@@ -181,6 +183,7 @@
     (add_net "Net-(U2-Pad25)")
     (add_net "Net-(U2-Pad26)")
     (add_net "Net-(U2-Pad27)")
+    (add_net "Net-(U2-Pad28)")
     (add_net "Net-(U2-Pad29)")
     (add_net "Net-(U2-Pad4)")
     (add_net "Net-(U2-Pad5)")
@@ -192,8 +195,566 @@
     (add_net "Net-(U5-Pad7)")
   )
 
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A00A50)
+    (at 126.2 91.9625 270)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /61984C0D)
+    (attr smd)
+    (fp_text reference C10 (at 0 -1.85 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 0 1.85 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 6 +3V3))
+    (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 3 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B89)
+    (at 108.6 96.6 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /61AFC66D)
+    (attr smd)
+    (fp_text reference R7 (at 0 -1.65 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 22k (at 0 1.65 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 2 smd roundrect (at 1 0 270) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 25 GNDA))
+    (pad 1 smd roundrect (at -1 0 270) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 22 "Net-(C14-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_SO:SO-8_3.9x4.9mm_P1.27mm (layer F.Cu) (tedit 5D9F72B1) (tstamp 61C383AE)
+    (at 109.425 89.905)
+    (descr "SO, 8 Pin (https://www.nxp.com/docs/en/data-sheet/PCF8523.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
+    (tags "SO SO")
+    (path /61CD40EF)
+    (attr smd)
+    (fp_text reference U6 (at 0 -3.4) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value TL082 (at 0 3.4) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 -2.7) (end -3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.98 0.98) (thickness 0.15)))
+    )
+    (pad 8 smd roundrect (at 2.575 -1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 26 +3.3VA))
+    (pad 7 smd roundrect (at 2.575 -0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 2 "Net-(C2-Pad1)"))
+    (pad 6 smd roundrect (at 2.575 0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 22 "Net-(C14-Pad1)"))
+    (pad 5 smd roundrect (at 2.575 1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 11 "Net-(C2-Pad2)"))
+    (pad 4 smd roundrect (at -2.575 1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 25 GNDA))
+    (pad 3 smd roundrect (at -2.575 0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 20 "Net-(C3-Pad1)"))
+    (pad 2 smd roundrect (at -2.575 -0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 24 "Net-(R11-Pad1)"))
+    (pad 1 smd roundrect (at -2.575 -1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 23 "Net-(R1-Pad2)"))
+    (model ${KISYS3DMOD}/Package_SO.3dshapes/SO-8_3.9x4.9mm_P1.27mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CF724E)
+    (at 117.9625 94.8)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /61E8255F)
+    (attr smd)
+    (fp_text reference C17 (at 0 -1.85) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1µ (at 0 1.85) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 37 "Net-(C17-Pad2)"))
+    (pad 1 smd roundrect (at -1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 38 "Net-(C17-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CF768D)
+    (at 105 99.8)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /61E7FA69)
+    (attr smd)
+    (fp_text reference R14 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 10k (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 22 "Net-(C14-Pad1)"))
+    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 38 "Net-(C17-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0) (tstamp 61CF5953)
+    (at 131.6875 103.6)
+    (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "diode handsolder")
+    (path /61E592A1)
+    (attr smd)
+    (fp_text reference D3 (at 0 -2.28) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D (at 0 2.28) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 1.4875 0) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
+      (net 17 +12V))
+    (pad 1 smd roundrect (at -1.4875 0) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
+      (net 36 "Net-(C15-Pad1)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61CF41C7)
+    (at 136.8 103.4)
+    (descr "SMD rectangular pad as test Point, square 2.5mm side length")
+    (tags "test point SMD pad rectangle square")
+    (path /61E46F2E)
+    (attr virtual)
+    (fp_text reference J3 (at 0 -2.148) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value T1 (at 0 2.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -2.15) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
+      (net 17 +12V))
+  )
+
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 61CF0C87)
+    (at 134 75.946)
+    (descr "SOT-23, Standard")
+    (tags SOT-23)
+    (path /61BFB2BF)
+    (attr smd)
+    (fp_text reference Q1 (at 0 -2.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value AO3400A (at 0 2.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (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))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 27 "Net-(J9-Pad1)"))
+    (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 3 GND))
+    (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 14 "Net-(Q1-Pad1)"))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 61CF0C4B)
+    (at 134 79.568)
+    (descr "SOT-23, Standard")
+    (tags SOT-23)
+    (path /61BFCDBB)
+    (attr smd)
+    (fp_text reference Q2 (at 0 -2.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value AO3400A (at 0 2.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (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))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 28 "Net-(J11-Pad1)"))
+    (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 3 GND))
+    (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 13 "Net-(Q2-Pad1)"))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CEF4AF)
+    (at 125.2 76.4 180)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /61E0787F)
+    (attr smd)
+    (fp_text reference C16 (at 0 -1.85) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 0 1.85) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 3 GND))
+    (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 6 +3V3))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CF0BCF)
+    (at 130.4 78.4)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /61DD6B28)
+    (attr smd)
+    (fp_text reference R13 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1k (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 3 GND))
+    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 13 "Net-(Q2-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CF0B8D)
+    (at 130.4 76.4 180)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /61DB9882)
+    (attr smd)
+    (fp_text reference R12 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1k (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 14 "Net-(Q1-Pad1)"))
+    (pad 1 smd roundrect (at -1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 3 GND))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C3819C)
+    (at 107.6 93.6 180)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /61D8745A)
+    (attr smd)
+    (fp_text reference R4 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 10k (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 2 smd roundrect (at 1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 22 "Net-(C14-Pad1)"))
+    (pad 1 smd roundrect (at -1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 20 "Net-(C3-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61CF8DB0)
+    (at 106.6 96.6 90)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /61AFC673)
+    (attr smd)
+    (fp_text reference R6 (at 0 -1.65 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 22k (at 0 1.65 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 2 smd roundrect (at 1 0 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 22 "Net-(C14-Pad1)"))
+    (pad 1 smd roundrect (at -1 0 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+      (net 26 +3.3VA))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37FBB)
+    (at 96.1625 103)
+    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /61D7B29D)
+    (attr smd)
+    (fp_text reference C14 (at 0 -1.85) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1uF (at 0 1.85) (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))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (pad 2 smd roundrect (at 1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 25 GNDA))
+    (pad 1 smd roundrect (at -1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
+      (net 22 "Net-(C14-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module Connector_PinHeader_1.27mm:PinHeader_1x06_P1.27mm_Vertical_SMD_Pin1Right (layer F.Cu) (tedit 59FED6E3) (tstamp 61C7179D)
-    (at 120.015 108.18 270)
+    (at 115.443 102.084 270)
     (descr "surface-mounted straight pin header, 1x06, 1.27mm pitch, single row, style 2 (pin 1 right)")
     (tags "Surface mounted pin header SMD 1x06 1.27mm single row style2 pin1 right")
     (path /61D46357)
@@ -204,59 +765,59 @@
     (fp_text value Conn_01x06 (at 0 4.87 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 3.5 -4.35) (end -3.5 -4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.5 4.35) (end 3.5 -4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 4.35) (end 3.5 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 -4.35) (end -3.5 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.11 1.22) (end -1.11 2.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -1.32) (end -1.11 0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 3.76) (end -1.11 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -3.87) (end 1.11 -3.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -3.76) (end 2.94 -3.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -3.86) (end -1.11 -2.49) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 2.49) (end 1.11 3.86) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -0.05) (end 1.11 1.32) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -2.59) (end 1.11 -1.22) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 3.87) (end 1.11 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -3.87) (end 1.11 -3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.5 2.105) (end 1.05 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 1.705) (end 2.5 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 1.705) (end 2.5 1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -0.435) (end 1.05 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -0.835) (end 2.5 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -0.835) (end 2.5 -0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -2.975) (end 1.05 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -3.375) (end 2.5 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -3.375) (end 2.5 -3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 3.375) (end -1.05 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 2.975) (end -2.5 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 2.975) (end -2.5 2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 0.835) (end -1.05 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 0.435) (end -2.5 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 0.435) (end -2.5 0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -1.705) (end -1.05 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -2.105) (end -2.5 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -2.105) (end -2.5 -2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -3.375) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 3.81) (end 1.05 -3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -3.81) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
     (fp_line (start 1.05 3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -3.81) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 3.81) (end 1.05 -3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -3.375) (end 0.615 -3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -3.81) (end -1.05 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -2.105) (end -2.5 -2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -2.105) (end -2.5 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -1.705) (end -1.05 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 0.435) (end -2.5 0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 0.435) (end -2.5 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 0.835) (end -1.05 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 2.975) (end -2.5 2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 2.975) (end -2.5 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 3.375) (end -1.05 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -3.375) (end 2.5 -3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -3.375) (end 2.5 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -2.975) (end 1.05 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -0.835) (end 2.5 -0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -0.835) (end 2.5 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -0.435) (end 1.05 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 1.705) (end 2.5 1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 1.705) (end 2.5 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 2.105) (end 1.05 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.11 -3.87) (end 1.11 -3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 3.87) (end 1.11 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -2.59) (end 1.11 -1.22) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -0.05) (end 1.11 1.32) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 2.49) (end 1.11 3.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -3.86) (end -1.11 -2.49) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -3.76) (end 2.94 -3.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -3.87) (end 1.11 -3.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 3.76) (end -1.11 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -1.32) (end -1.11 0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 1.22) (end -1.11 2.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.5 -4.35) (end -3.5 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 4.35) (end 3.5 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.5 4.35) (end 3.5 -4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.5 -4.35) (end -3.5 -4.35) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 5 smd rect (at 1.5 1.905 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 3 smd rect (at 1.5 -0.635 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd rect (at 1.5 -3.175 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 27 +3.3VA))
+      (net 26 +3.3VA))
     (pad 6 smd rect (at -1.5 3.175 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 12 "Net-(C7-Pad1)"))
     (pad 4 smd rect (at -1.5 0.635 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 36 "Net-(J1-Pad4)"))
+      (net 37 "Net-(C17-Pad2)"))
     (pad 2 smd rect (at -1.5 -1.905 270) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (model ${KISYS3DMOD}/Connector_PinHeader_1.27mm.3dshapes/PinHeader_1x06_P1.27mm_Vertical_SMD_Pin1Right.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -276,16 +837,16 @@
     (fp_text value 10µF (at 0 2.3 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.48 1.6) (end -2.48 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.6) (end 2.48 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.6) (end 2.48 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.6) (end -2.48 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 1.36) (end 0.711252 1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -1.36) (end 0.711252 -1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -1.36) (end 0.711252 -1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 1.36) (end 0.711252 1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.6) (end -2.48 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.6) (end 2.48 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.6) (end 2.48 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.6) (end -2.48 1.6) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -300,7 +861,7 @@
     )
   )
 
-  (module Connector_PinHeader_1.27mm:PinHeader_1x14_P1.27mm_Vertical_SMD_Pin1Left (layer F.Cu) (tedit 59FED6E3) (tstamp 61C6CA39)
+  (module Connector_PinHeader_1.27mm:PinHeader_1x14_P1.27mm_Vertical_SMD_Pin1Left (layer F.Cu) (tedit 59FED6E3) (tstamp 61CE7609)
     (at 135.152 90.805)
     (descr "surface-mounted straight pin header, 1x14, 1.27mm pitch, single row, style 1 (pin 1 left)")
     (tags "Surface mounted pin header SMD 1x14 1.27mm single row style1 pin1 left")
@@ -312,101 +873,103 @@
     (fp_text value Conn_01x14 (at 0 9.95) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 3.5 -9.4) (end -3.5 -9.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.5 9.4) (end 3.5 -9.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 9.4) (end 3.5 9.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.5 -9.4) (end -3.5 9.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.11 7.57) (end -1.11 8.94) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 5.03) (end -1.11 6.4) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 2.49) (end -1.11 3.86) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -0.05) (end -1.11 1.32) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -2.59) (end -1.11 -1.22) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -5.13) (end -1.11 -3.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -7.67) (end -1.11 -6.3) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 6.3) (end 1.11 7.67) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 3.76) (end 1.11 5.13) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 1.22) (end 1.11 2.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -1.32) (end 1.11 0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -3.86) (end 1.11 -2.49) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -6.4) (end 1.11 -5.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 8.84) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -8.95) (end -1.11 -8.84) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -8.84) (end -2.94 -8.84) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.11 -8.94) (end 1.11 -7.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 8.95) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.11 -8.95) (end 1.11 -8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.5 8.455) (end 1.05 8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 8.055) (end 2.5 8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 8.055) (end 2.5 8.055) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 5.915) (end 1.05 5.915) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 5.515) (end 2.5 5.915) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 5.515) (end 2.5 5.515) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 3.375) (end 1.05 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 2.975) (end 2.5 3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 2.975) (end 2.5 2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 0.835) (end 1.05 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 0.435) (end 2.5 0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 0.435) (end 2.5 0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -1.705) (end 1.05 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -2.105) (end 2.5 -1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -2.105) (end 2.5 -2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -4.245) (end 1.05 -4.245) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -4.645) (end 2.5 -4.245) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -4.645) (end 2.5 -4.645) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -6.785) (end 1.05 -6.785) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -7.185) (end 2.5 -6.785) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -7.185) (end 2.5 -7.185) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 7.185) (end -1.05 7.185) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 6.785) (end -2.5 7.185) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 6.785) (end -2.5 6.785) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 4.645) (end -1.05 4.645) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 4.245) (end -2.5 4.645) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 4.245) (end -2.5 4.245) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 2.105) (end -1.05 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 1.705) (end -2.5 2.105) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 1.705) (end -2.5 1.705) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -0.435) (end -1.05 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -0.835) (end -2.5 -0.435) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -0.835) (end -2.5 -0.835) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -2.975) (end -1.05 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -3.375) (end -2.5 -2.975) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -3.375) (end -2.5 -3.375) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -5.515) (end -1.05 -5.515) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -5.915) (end -2.5 -5.515) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -5.915) (end -2.5 -5.915) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -8.055) (end -1.05 -8.055) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -8.455) (end -2.5 -8.055) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -8.455) (end -2.5 -8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.05 -8.89) (end 1.05 8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 -8.455) (end -0.615 -8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.05 8.89) (end -1.05 -8.455) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.615 -8.89) (end 1.05 -8.89) (layer F.Fab) (width 0.1))
     (fp_line (start 1.05 8.89) (end -1.05 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.615 -8.89) (end 1.05 -8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 8.89) (end -1.05 -8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -8.455) (end -0.615 -8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -8.89) (end 1.05 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -8.455) (end -2.5 -8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -8.455) (end -2.5 -8.055) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -8.055) (end -1.05 -8.055) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -5.915) (end -2.5 -5.915) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -5.915) (end -2.5 -5.515) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -5.515) (end -1.05 -5.515) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -3.375) (end -2.5 -3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -3.375) (end -2.5 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -2.975) (end -1.05 -2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 -0.835) (end -2.5 -0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -0.835) (end -2.5 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -0.435) (end -1.05 -0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 1.705) (end -2.5 1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 1.705) (end -2.5 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 2.105) (end -1.05 2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 4.245) (end -2.5 4.245) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.245) (end -2.5 4.645) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.645) (end -1.05 4.645) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.05 6.785) (end -2.5 6.785) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 6.785) (end -2.5 7.185) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 7.185) (end -1.05 7.185) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -7.185) (end 2.5 -7.185) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -7.185) (end 2.5 -6.785) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -6.785) (end 1.05 -6.785) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -4.645) (end 2.5 -4.645) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -4.645) (end 2.5 -4.245) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -4.245) (end 1.05 -4.245) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 -2.105) (end 2.5 -2.105) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -2.105) (end 2.5 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -1.705) (end 1.05 -1.705) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 0.435) (end 2.5 0.435) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 0.435) (end 2.5 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 0.835) (end 1.05 0.835) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 2.975) (end 2.5 2.975) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 2.975) (end 2.5 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 3.375) (end 1.05 3.375) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 5.515) (end 2.5 5.515) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 5.515) (end 2.5 5.915) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 5.915) (end 1.05 5.915) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.05 8.055) (end 2.5 8.055) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 8.055) (end 2.5 8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 8.455) (end 1.05 8.455) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.11 -8.95) (end 1.11 -8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 8.95) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -8.94) (end 1.11 -7.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -8.84) (end -2.94 -8.84) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -8.95) (end -1.11 -8.84) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 8.84) (end 1.11 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -6.4) (end 1.11 -5.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -3.86) (end 1.11 -2.49) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 -1.32) (end 1.11 0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 1.22) (end 1.11 2.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 3.76) (end 1.11 5.13) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.11 6.3) (end 1.11 7.67) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -7.67) (end -1.11 -6.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -5.13) (end -1.11 -3.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -2.59) (end -1.11 -1.22) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 -0.05) (end -1.11 1.32) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 2.49) (end -1.11 3.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 5.03) (end -1.11 6.4) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.11 7.57) (end -1.11 8.94) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.5 -9.4) (end -3.5 9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 9.4) (end 3.5 9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.5 9.4) (end 3.5 -9.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.5 -9.4) (end -3.5 -9.4) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 14 smd rect (at 1.5 8.255) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 17 +12V))
-    (pad 12 smd rect (at 1.5 5.715) (size 3 0.65) (layers F.Cu F.Paste F.Mask))
+    (pad 12 smd rect (at 1.5 5.715) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
+      (net 3 GND))
     (pad 10 smd rect (at 1.5 3.175) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 6 +3V3))
     (pad 8 smd rect (at 1.5 0.635) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 30 "Net-(J2-Pad8)"))
+      (net 29 "Net-(J2-Pad8)"))
     (pad 6 smd rect (at 1.5 -1.905) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 31 "Net-(J2-Pad6)"))
+      (net 30 "Net-(J2-Pad6)"))
     (pad 4 smd rect (at 1.5 -4.445) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 35 "Net-(J2-Pad4)"))
+      (net 34 "Net-(J2-Pad4)"))
     (pad 2 smd rect (at 1.5 -6.985) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 3 GND))
-    (pad 13 smd rect (at -1.5 6.985) (size 3 0.65) (layers F.Cu F.Paste F.Mask))
+    (pad 13 smd rect (at -1.5 6.985) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
+      (net 3 GND))
     (pad 11 smd rect (at -1.5 4.445) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 3 GND))
     (pad 9 smd rect (at -1.5 1.905) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 34 "Net-(J2-Pad9)"))
+      (net 33 "Net-(J2-Pad9)"))
     (pad 7 smd rect (at -1.5 -0.635) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 32 "Net-(J2-Pad7)"))
+      (net 31 "Net-(J2-Pad7)"))
     (pad 5 smd rect (at -1.5 -3.175) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 33 "Net-(J2-Pad5)"))
+      (net 32 "Net-(J2-Pad5)"))
     (pad 3 smd rect (at -1.5 -5.715) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
       (net 6 +3V3))
     (pad 1 smd rect (at -1.5 -8.255) (size 3 0.65) (layers F.Cu F.Paste F.Mask)
@@ -430,16 +993,16 @@
     (fp_text value 100n (at 0 1.85 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.3 1.15) (end -2.3 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.3 -1.15) (end 2.3 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1.15) (end 2.3 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1.15) (end -2.3 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.3 1.15) (end -2.3 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.3 -1.15) (end 2.3 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.3 -1.15) (end 2.3 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.3 1.15) (end -2.3 1.15) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -466,22 +1029,22 @@
     (fp_text value Si5351A-B-GT (at 0 2.6) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.675 -1.45) (end -2.9 -1.45) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 1.675) (end 1.675 1.675) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 -1.675) (end 1.675 -1.675) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 1.675) (end -1.675 1.375) (layer F.SilkS) (width 0.15))
-    (fp_line (start 1.675 1.675) (end 1.675 1.375) (layer F.SilkS) (width 0.15))
-    (fp_line (start 1.675 -1.675) (end 1.675 -1.375) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.675 -1.675) (end -1.675 -1.45) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.15 1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.15 -1.85) (end 3.15 -1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.15 -1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.15 -1.85) (end -3.15 1.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.5 -0.5) (end -0.5 -1.5) (layer F.Fab) (width 0.15))
-    (fp_line (start -1.5 1.5) (end -1.5 -0.5) (layer F.Fab) (width 0.15))
-    (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer F.Fab) (width 0.15))
-    (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
     (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start -1.5 1.5) (end -1.5 -0.5) (layer F.Fab) (width 0.15))
+    (fp_line (start -1.5 -0.5) (end -0.5 -1.5) (layer F.Fab) (width 0.15))
+    (fp_line (start -3.15 -1.85) (end -3.15 1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.15 -1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.15 -1.85) (end 3.15 -1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.15 1.85) (end 3.15 1.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.675 -1.675) (end -1.675 -1.45) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.675 -1.675) (end 1.675 -1.375) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.675 1.675) (end 1.675 1.375) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 1.675) (end -1.675 1.375) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 -1.675) (end 1.675 -1.675) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 1.675) (end 1.675 1.675) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.675 -1.45) (end -2.9 -1.45) (layer F.SilkS) (width 0.15))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.15)))
     )
@@ -523,16 +1086,16 @@
     (fp_text value R (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -547,42 +1110,6 @@
     )
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A00A50)
-    (at 126.2 94.1625 270)
-    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "capacitor handsolder")
-    (path /61984C0D)
-    (attr smd)
-    (fp_text reference C10 (at 0 -1.85 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100n (at 0 1.85 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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)))
-    )
-    (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 3 GND))
-    (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 6 +3V3))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Package_SO:SOIC-8_3.9x4.9mm_P1.27mm (layer F.Cu) (tedit 5D9F72B1) (tstamp 61C650EA)
     (at 119.905 78.475 270)
     (descr "SOIC, 8 Pin (JEDEC MS-012AA, https://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/soic_narrow-r/r_8.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
@@ -595,19 +1122,19 @@
     (fp_text value M24C02-RMN (at 0 3.4 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 3.7 -2.7) (end -3.7 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
     (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 -2.7) (end -3.7 -2.7) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.98 0.98) (thickness 0.15)))
     )
@@ -630,8 +1157,8 @@
     )
   )
 
-  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C6D43D)
-    (at 171.6 63.5)
+  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61CF0C1D)
+    (at 137.4 79.6)
     (descr "SMD rectangular pad as test Point, square 2.5mm side length")
     (tags "test point SMD pad rectangle square")
     (path /61D77A37)
@@ -642,50 +1169,23 @@
     (fp_text value T1 (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
-      (net 29 "Net-(J11-Pad1)"))
+      (net 28 "Net-(J11-Pad1)"))
   )
 
-  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C6D42F)
-    (at 167.05 63.5)
-    (descr "SMD rectangular pad as test Point, square 2.5mm side length")
-    (tags "test point SMD pad rectangle square")
-    (path /61D79F6C)
-    (attr virtual)
-    (fp_text reference J10 (at 0 -2.148) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value T1 (at 0 2.25) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 -2.15) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
-      (net 17 +12V))
-  )
-
-  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C6D421)
-    (at 162.5 63.5)
+  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61CF0CBC)
+    (at 137.4 75.946)
     (descr "SMD rectangular pad as test Point, square 2.5mm side length")
     (tags "test point SMD pad rectangle square")
     (path /61D7A7DD)
@@ -696,22 +1196,22 @@
     (fp_text value T1 (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
-      (net 28 "Net-(J9-Pad1)"))
+      (net 27 "Net-(J9-Pad1)"))
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C3C102)
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CF8934)
     (at 130.302 99.2755 90)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -723,23 +1223,23 @@
     (fp_text value 10µF (at 0 1.85 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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.5625 0 90) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 3 GND))
     (pad 1 smd roundrect (at -1.5625 0 90) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 17 +12V))
+      (net 36 "Net-(C15-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -759,21 +1259,21 @@
     (fp_text value Crystal_GND24 (at 0 2.95) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.5 -1.25) (end 1.5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.5 -1.25) (end 1.6 -1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.15) (end 1.6 1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.15) (end 1.5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.5 1.25) (end -1.5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.5 1.25) (end -1.6 1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.15) (end -1.6 -1.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.15) (end -1.5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 0.25) (end -0.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.7 -2.15) (end -2.7 2.15) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.7 2.15) (end 2.7 2.15) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.8 -2.2) (end -2.8 2.2) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 2.2) (end 2.8 2.2) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.8 2.2) (end 2.8 -2.2) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.8 -2.2) (end -2.8 -2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 2.2) (end 2.8 -2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.8 2.2) (end 2.8 2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.8 -2.2) (end -2.8 2.2) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.7 2.15) (end 2.7 2.15) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.7 -2.15) (end -2.7 2.15) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.6 0.25) (end -0.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.15) (end -1.5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.15) (end -1.6 -1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.25) (end -1.6 1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 1.25) (end -1.5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.15) (end 1.5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.15) (end 1.6 1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -1.25) (end 1.6 -1.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.25) (end 1.5 -1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.7 0.7) (thickness 0.105)))
     )
@@ -804,21 +1304,21 @@
     (fp_text value 330p (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 2 smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
       (net 10 "Net-(C1-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
@@ -840,16 +1340,16 @@
     (fp_text value 68p (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -876,16 +1376,16 @@
     (fp_text value 18p (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -912,16 +1412,16 @@
     (fp_text value 100n (at 0 1.85 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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -948,21 +1448,21 @@
     (fp_text value L (at 0 2.28) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.4875 0 180) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd roundrect (at -1.4875 0 180) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
       (net 3 GND))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
@@ -973,7 +1473,7 @@
   )
 
   (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C3A1EF)
-    (at 97.536 95.758)
+    (at 89.136 99.158)
     (descr "SMD rectangular pad as test Point, square 2.5mm side length")
     (tags "test point SMD pad rectangle square")
     (path /61DF1A37)
@@ -984,74 +1484,23 @@
     (fp_text value RF_GND (at 0 2.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 -2.15) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
-      (net 26 GNDA))
-  )
-
-  (module Package_SO:SO-8_3.9x4.9mm_P1.27mm (layer F.Cu) (tedit 5D9F72B1) (tstamp 61C383AE)
-    (at 110.59 90.65)
-    (descr "SO, 8 Pin (https://www.nxp.com/docs/en/data-sheet/PCF8523.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
-    (tags "SO SO")
-    (path /61CD40EF)
-    (attr smd)
-    (fp_text reference U6 (at 0 -3.4) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value TL082 (at 0 3.4) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.7 -2.7) (end -3.7 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.7 2.7) (end 3.7 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.7 2.7) (end 3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.7 -2.7) (end -3.7 2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.95 -1.475) (end -0.975 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.95 2.45) (end -1.95 -1.475) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 2.45) (end -1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -2.56) (end -3.45 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 -2.56) (end 1.95 -2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.98 0.98) (thickness 0.15)))
-    )
-    (pad 8 smd roundrect (at 2.575 -1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 27 +3.3VA))
-    (pad 7 smd roundrect (at 2.575 -0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 2 "Net-(C2-Pad1)"))
-    (pad 6 smd roundrect (at 2.575 0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 23 "Net-(C14-Pad1)"))
-    (pad 5 smd roundrect (at 2.575 1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 11 "Net-(C2-Pad2)"))
-    (pad 4 smd roundrect (at -2.575 1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 26 GNDA))
-    (pad 3 smd roundrect (at -2.575 0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 21 "Net-(C3-Pad1)"))
-    (pad 2 smd roundrect (at -2.575 -0.635) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 25 "Net-(R11-Pad1)"))
-    (pad 1 smd roundrect (at -2.575 -1.905) (size 1.75 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 24 "Net-(R1-Pad2)"))
-    (model ${KISYS3DMOD}/Package_SO.3dshapes/SO-8_3.9x4.9mm_P1.27mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
+      (net 25 GNDA))
   )
 
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C3823E)
-    (at 102.362 91.456 270)
+    (at 93.962 94.856 270)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /61CDE9AE)
@@ -1062,23 +1511,23 @@
     (fp_text value 220 (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 2 smd roundrect (at 1 0 270) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 22 "Net-(C13-Pad1)"))
+      (net 21 "Net-(C13-Pad1)"))
     (pad 1 smd roundrect (at -1 0 270) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 25 "Net-(R11-Pad1)"))
+      (net 24 "Net-(R11-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1087,7 +1536,7 @@
   )
 
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C381AD)
-    (at 102.362 87.646 270)
+    (at 93.962 91.046 270)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /61CD99F8)
@@ -1098,59 +1547,23 @@
     (fp_text value 4k7 (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 2 smd roundrect (at 1 0 270) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 25 "Net-(R11-Pad1)"))
+      (net 24 "Net-(R11-Pad1)"))
     (pad 1 smd roundrect (at -1 0 270) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 24 "Net-(R1-Pad2)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61C3819C)
-    (at 107.458 94.742)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /61D8745A)
-    (attr smd)
-    (fp_text reference R4 (at 0 -1.65) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10k (at 0 1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 23 "Net-(C14-Pad1)"))
-    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 21 "Net-(C3-Pad1)"))
+      (net 23 "Net-(R1-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1159,7 +1572,7 @@
   )
 
   (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C380BB)
-    (at 93.726 95.758 270)
+    (at 85.326 99.158 270)
     (descr "SMD rectangular pad as test Point, square 2.5mm side length")
     (tags "test point SMD pad rectangle square")
     (path /61D31443)
@@ -1170,14 +1583,14 @@
     (fp_text value RF_IN (at 0 2.25 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 -2.15 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1186,7 +1599,7 @@
   )
 
   (module Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0) (tstamp 61C37FE1)
-    (at 97.282 90.7145 270)
+    (at 88.882 94.1145 270)
     (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags "diode handsolder")
     (path /61D403D1)
@@ -1197,25 +1610,25 @@
     (fp_text value D (at 0 2.28 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.4875 0 270) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd roundrect (at -1.4875 0 270) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 21 "Net-(C3-Pad1)"))
+      (net 20 "Net-(C3-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1210_3225Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1224,7 +1637,7 @@
   )
 
   (module Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0) (tstamp 61C37FCE)
-    (at 97.282 85.3805 270)
+    (at 88.882 88.7805 270)
     (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags "diode handsolder")
     (path /61D3F32C)
@@ -1235,25 +1648,25 @@
     (fp_text value D (at 0 2.28 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start 1.6 -1.25) (end -0.975 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.975 -1.25) (end -1.6 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.625) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.585) (end -2.46 -1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 -1.585) (end -2.46 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.46 1.585) (end 1.6 1.585) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.4875 0 270) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 21 "Net-(C3-Pad1)"))
+      (net 20 "Net-(C3-Pad1)"))
     (pad 1 smd roundrect (at -1.4875 0 270) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 27 +3.3VA))
+      (net 26 +3.3VA))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1210_3225Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1261,44 +1674,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37FBB)
-    (at 111.7215 102.616)
-    (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "capacitor handsolder")
-    (path /61D7B29D)
-    (attr smd)
-    (fp_text reference C14 (at 0 -1.85) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1uF (at 0 1.85) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)))
-    )
-    (pad 2 smd roundrect (at 1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 26 GNDA))
-    (pad 1 smd roundrect (at -1.5625 0) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 23 "Net-(C14-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37FAA)
-    (at 101.5785 95.25 180)
+    (at 93.1785 98.65 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61D6FFE6)
@@ -1309,23 +1686,23 @@
     (fp_text value 100n (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 2 smd roundrect (at 1.0375 0 180) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd roundrect (at -1.0375 0 180) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 22 "Net-(C13-Pad1)"))
+      (net 21 "Net-(C13-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1334,7 +1711,7 @@
   )
 
   (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61C37E4B)
-    (at 93.726 88.392 270)
+    (at 85.326 91.792 270)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61D9EA3F)
@@ -1345,23 +1722,23 @@
     (fp_text value 220n (at 0 1.85 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
       (net 1 "Net-(C3-Pad2)"))
     (pad 1 smd roundrect (at -1.5625 0 270) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 21 "Net-(C3-Pad1)"))
+      (net 20 "Net-(C3-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1369,33 +1746,6 @@
     )
   )
 
-  (module TestPoint:TestPoint_Pad_2.5x2.5mm (layer F.Cu) (tedit 5A0F774F) (tstamp 61C5718E)
-    (at 127.508 74.93)
-    (descr "SMD rectangular pad as test Point, square 2.5mm side length")
-    (tags "test point SMD pad rectangle square")
-    (path /61C97C6E)
-    (attr virtual)
-    (fp_text reference J4 (at 0 -2.148) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value PTT (at 0 2.25) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1.45 -1.45) (end 1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -1.45) (end 1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 1.45) (end -1.45 1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.45 1.45) (end -1.45 -1.45) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.75 1.75) (end -1.75 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 -2.15) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 smd rect (at 0 0) (size 2.5 2.5) (layers F.Cu F.Mask)
-      (net 20 "Net-(J4-Pad1)"))
-  )
-
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61BF9D23)
     (at 127.27 84.582 180)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
@@ -1408,16 +1758,16 @@
     (fp_text value R (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
     (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1432,88 +1782,6 @@
     )
   )
 
-  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 61BF9C12)
-    (at 155.718 65.278)
-    (descr "SOT-23, Standard")
-    (tags SOT-23)
-    (path /61BFCDBB)
-    (attr smd)
-    (fp_text reference Q2 (at 0 -2.5) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value AO3400A (at 0 2.5) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (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 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.075)))
-    )
-    (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 29 "Net-(J11-Pad1)"))
-    (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 3 GND))
-    (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 13 "Net-(Q2-Pad1)"))
-    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 61BF9BFD)
-    (at 155.652 60.858)
-    (descr "SOT-23, Standard")
-    (tags SOT-23)
-    (path /61BFB2BF)
-    (attr smd)
-    (fp_text reference Q1 (at 0 -2.5) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value AO3400A (at 0 2.5) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (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 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.075)))
-    )
-    (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 28 "Net-(J9-Pad1)"))
-    (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 3 GND))
-    (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 14 "Net-(Q1-Pad1)"))
-    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Inductor_SMD:L_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0) (tstamp 61BF9BE8)
     (at 122.3915 98.044 180)
     (descr "Inductor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
@@ -1526,21 +1794,21 @@
     (fp_text value L (at 0 2.28) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
     (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.4875 0 180) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
-      (net 27 +3.3VA))
+      (net 26 +3.3VA))
     (pad 1 smd roundrect (at -1.4875 0 180) (size 1.425 2.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.175439)
       (net 6 +3V3))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
@@ -1562,24 +1830,24 @@
     (fp_text value AZ1117-3.3 (at 0 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (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))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (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 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 17 +12V))
+      (net 36 "Net-(C15-Pad1)"))
     (pad 2 smd rect (at -1 0.95 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
       (net 6 +3V3))
     (pad 1 smd rect (at -1 -0.95 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
@@ -1592,33 +1860,33 @@
   )
 
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A01F7F)
-    (at 116.84 100.346 90)
+    (at 114.062 97.028 180)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
     (path /60E49D2D)
     (attr smd)
-    (fp_text reference R8 (at 0 -1.65 90) (layer F.SilkS)
+    (fp_text reference R8 (at 0 -1.65) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 470 (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 470 (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (pad 2 smd roundrect (at 1 0 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+    (pad 2 smd roundrect (at 1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 7 "Net-(C8-Pad2)"))
-    (pad 1 smd roundrect (at -1 0 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
+    (pad 1 smd roundrect (at -1 0 180) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 12 "Net-(C7-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
       (at (xyz 0 0 0))
@@ -1628,7 +1896,7 @@
   )
 
   (module Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A01CB0)
-    (at 117.8345 103.378)
+    (at 117.8775 97.028)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /60E4B819)
@@ -1639,21 +1907,21 @@
     (fp_text value C (at 0 1.68) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 2 smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.212766)
       (net 12 "Net-(C7-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
@@ -1675,44 +1943,44 @@
     (fp_text value STM32G431KBTx (at 0 5.88) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 3.31 3.61) (end 3.61 3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.61 3.61) (end 3.61 3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.31 3.61) (end -3.61 3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.61 3.61) (end -3.61 3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.31 -3.61) (end 3.61 -3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.61 -3.61) (end 3.61 -3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.31 -3.61) (end -3.61 -3.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.61 -3.61) (end -3.61 -3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.61 -3.31) (end -4.925 -3.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -5.18) (end -3.3 -5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 -5.18) (end -3.3 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -3.75) (end -3.75 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -3.3) (end -5.18 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.18 -3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 -5.18) (end 3.3 -5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 -5.18) (end 3.3 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 -3.75) (end 3.75 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 -3.3) (end 5.18 -3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.18 -3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 5.18) (end -3.3 5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 5.18) (end -3.3 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 3.75) (end -3.75 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 3.3) (end -5.18 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.18 3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 5.18) (end 3.3 5.18) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 5.18) (end 3.3 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.3 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 3.75) (end 3.75 3.3) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 3.3) (end 5.18 3.3) (layer F.CrtYd) (width 0.05))
     (fp_line (start 5.18 3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.3) (end 5.18 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.75) (end 3.75 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 5.18) (end 3.3 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 5.18) (end 3.3 5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.18 3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.3) (end -5.18 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.75) (end -3.75 3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 5.18) (end -3.3 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 5.18) (end -3.3 5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.18 -3.3) (end 5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.3) (end 5.18 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.75) (end 3.75 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.3 -5.18) (end 3.3 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 -5.18) (end 3.3 -5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.18 -3.3) (end -5.18 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.3) (end -5.18 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.75) (end -3.75 -3.3) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.3 -5.18) (end -3.3 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0 -5.18) (end -3.3 -5.18) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.61 -3.31) (end -4.925 -3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.61 -3.61) (end -3.61 -3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.31 -3.61) (end -3.61 -3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.61 -3.61) (end 3.61 -3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 -3.61) (end 3.61 -3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.61 3.61) (end -3.61 3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.31 3.61) (end -3.61 3.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.61 3.61) (end 3.61 3.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 3.61) (end 3.61 3.61) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1723,23 +1991,22 @@
     (pad 30 smd roundrect (at -1.2 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 15 "Net-(R9-Pad2)"))
     (pad 29 smd roundrect (at -0.4 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-    (pad 28 smd roundrect (at 0.4 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 20 "Net-(J4-Pad1)"))
+    (pad 28 smd roundrect (at 0.4 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 27 smd roundrect (at 1.2 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 26 smd roundrect (at 2 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 25 smd roundrect (at 2.8 -4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 24 smd roundrect (at 4.175 -2.8) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 35 "Net-(J2-Pad4)"))
+      (net 34 "Net-(J2-Pad4)"))
     (pad 23 smd roundrect (at 4.175 -2) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 33 "Net-(J2-Pad5)"))
+      (net 32 "Net-(J2-Pad5)"))
     (pad 22 smd roundrect (at 4.175 -1.2) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 31 "Net-(J2-Pad6)"))
+      (net 30 "Net-(J2-Pad6)"))
     (pad 21 smd roundrect (at 4.175 -0.4) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 32 "Net-(J2-Pad7)"))
+      (net 31 "Net-(J2-Pad7)"))
     (pad 20 smd roundrect (at 4.175 0.4) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 30 "Net-(J2-Pad8)"))
+      (net 29 "Net-(J2-Pad8)"))
     (pad 19 smd roundrect (at 4.175 1.2) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 34 "Net-(J2-Pad9)"))
+      (net 33 "Net-(J2-Pad9)"))
     (pad 18 smd roundrect (at 4.175 2) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 18 "Net-(C12-Pad2)"))
     (pad 17 smd roundrect (at 4.175 2.8) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
@@ -1747,18 +2014,18 @@
     (pad 16 smd roundrect (at 2.8 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 3 GND))
     (pad 15 smd roundrect (at 2 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 27 +3.3VA))
+      (net 26 +3.3VA))
     (pad 14 smd roundrect (at 1.2 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 13 smd roundrect (at 0.4 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 12 smd roundrect (at -0.4 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 11 smd roundrect (at -1.2 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 36 "Net-(J1-Pad4)"))
+      (net 38 "Net-(C17-Pad1)"))
     (pad 10 smd roundrect (at -2 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 9 smd roundrect (at -2.8 4.175) (size 0.5 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 8 "Net-(C8-Pad1)"))
     (pad 8 smd roundrect (at -4.175 2.8) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 23 "Net-(C14-Pad1)"))
+      (net 22 "Net-(C14-Pad1)"))
     (pad 7 smd roundrect (at -4.175 2) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
     (pad 6 smd roundrect (at -4.175 1.2) (size 1.5 0.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 2 "Net-(C2-Pad1)"))
@@ -1777,78 +2044,6 @@
     )
   )
 
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B89)
-    (at 112.506 100.076)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /61AFC66D)
-    (attr smd)
-    (fp_text reference R7 (at 0 -1.65) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 22k (at 0 1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 26 GNDA))
-    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 23 "Net-(C14-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B78)
-    (at 108.728 100.076)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /61AFC673)
-    (attr smd)
-    (fp_text reference R6 (at 0 -1.65) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 22k (at 0 1.65) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 23 "Net-(C14-Pad1)"))
-    (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 27 +3.3VA))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE) (tstamp 61A00B45)
     (at 107.742 75.14)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
@@ -1861,16 +2056,16 @@
     (fp_text value 15K (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1897,16 +2092,16 @@
     (fp_text value 3.9K (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -1933,21 +2128,21 @@
     (fp_text value 3k9 (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
-      (net 24 "Net-(R1-Pad2)"))
+      (net 23 "Net-(R1-Pad2)"))
     (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.208333)
       (net 10 "Net-(C1-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
@@ -1969,23 +2164,23 @@
     (fp_text value C_Small (at 0 1.85) (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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (pad 2 smd roundrect (at 1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 26 GNDA))
+      (net 25 GNDA))
     (pad 1 smd roundrect (at -1.5625 0 180) (size 1.325 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.188679)
-      (net 27 +3.3VA))
+      (net 26 +3.3VA))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1993,8 +2188,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61A00A2E)
-    (at 116.84 95.7965 270)
+  (module Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF) (tstamp 61CE9E1C)
+    (at 114.4 94 270)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /61B07F9F)
@@ -2005,16 +2200,16 @@
     (fp_text value 1µ (at 0 1.85 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))
-    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -2041,16 +2236,16 @@
     (fp_text value 22p (at 0 1.68 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
@@ -2065,24 +2260,19 @@
     )
   )
 
-  (segment (start 114.695812 89.338) (end 115.459 89.338) (width 0.5) (layer F.Cu) (net 2))
-  (segment (start 114.018812 90.015) (end 114.695812 89.338) (width 0.5) (layer F.Cu) (net 2))
-  (segment (start 113.165 90.015) (end 114.018812 90.015) (width 0.5) (layer F.Cu) (net 2))
+  (gr_line (start 98 74) (end 139.4 74) (layer Edge.Cuts) (width 0.05) (tstamp 61CF0BF3))
+  (gr_line (start 98 106) (end 98 74) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 139.4 106) (end 98 106) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 139.4 74) (end 139.4 106) (layer Edge.Cuts) (width 0.05) (tstamp 61CF0BB1))
+
+  (segment (start 115.391 89.27) (end 115.459 89.338) (width 0.5) (layer F.Cu) (net 2))
+  (segment (start 112 89.27) (end 115.391 89.27) (width 0.5) (layer F.Cu) (net 2))
   (segment (start 109.4155 83.82) (end 109.4315 83.804) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 106.807 83.82) (end 109.4155 83.82) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 109.4315 81.513) (end 109.474 81.4705) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 122.434 92.313) (end 122.434 91.549812) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 122.434 92.313) (end 123.805 92.313) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 116.834 82.854534) (end 116.834 83.963) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 115.062 81.082534) (end 116.834 82.854534) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 115.062 80.01) (end 115.062 81.082534) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 115.062 78.938) (end 118 76) (width 0.25) (layer F.Cu) (net 3))
-  (segment (start 115.062 80.01) (end 115.062 78.938) (width 0.25) (layer F.Cu) (net 3))
-  (segment (start 126.2 94.708) (end 126.2 95.725) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 123.805 92.313) (end 126.2 94.708) (width 0.5) (layer F.Cu) (net 3))
-  (segment (start 136.652 83.139998) (end 135.202002 81.69) (width 0.25) (layer F.Cu) (net 3))
-  (segment (start 135.202002 81.69) (end 130.57 81.69) (width 0.25) (layer F.Cu) (net 3))
-  (segment (start 136.652 83.82) (end 136.652 83.139998) (width 0.25) (layer F.Cu) (net 3))
   (segment (start 127.049999 98.436001) (end 127.95 97.536) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 126.607999 98.436001) (end 127.049999 98.436001) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 123.879 101.165) (end 126.607999 98.436001) (width 0.5) (layer F.Cu) (net 3))
@@ -2091,17 +2281,62 @@
   (segment (start 127.95 97.536) (end 130.125 97.536) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 130.302 96.012) (end 130.048 95.758) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 130.302 97.713) (end 130.302 96.012) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 109.5 81) (end 109.5 83.5) (width 1) (layer F.Cu) (net 3))
+  (segment (start 114.62699 79.57499) (end 115.062 80.01) (width 1) (layer F.Cu) (net 3))
+  (segment (start 110.20001 79.57499) (end 114.62699 79.57499) (width 1) (layer F.Cu) (net 3))
+  (segment (start 109.5 80.275) (end 110.20001 79.57499) (width 1) (layer F.Cu) (net 3))
+  (segment (start 109.5 81) (end 109.5 80.275) (width 1) (layer F.Cu) (net 3))
+  (segment (start 115.062 78.938) (end 118 76) (width 1) (layer F.Cu) (net 3))
+  (segment (start 115.062 80.01) (end 115.062 78.938) (width 1) (layer F.Cu) (net 3))
+  (segment (start 133.144 95.758) (end 133.652 95.25) (width 1) (layer F.Cu) (net 3))
+  (segment (start 130.048 95.758) (end 133.144 95.758) (width 1) (layer F.Cu) (net 3))
+  (segment (start 130.379 97.79) (end 130.302 97.713) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 133.652 97.79) (end 130.379 97.79) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 131.4 78.4) (end 131.4 76.4) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 132.6 80.731412) (end 132.6 80.518) (width 0.25) (layer F.Cu) (net 3) (tstamp 61CF0BB4))
+  (segment (start 131.641412 81.69) (end 132.6 80.731412) (width 0.25) (layer F.Cu) (net 3) (tstamp 61CF0B7B))
+  (segment (start 130.57 81.69) (end 131.641412 81.69) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 137.792002 95.25) (end 133.652 95.25) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 138.927011 94.114991) (end 137.792002 95.25) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 138.927011 84.345011) (end 138.927011 94.114991) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 138.402 83.82) (end 138.927011 84.345011) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 136.652 83.82) (end 138.402 83.82) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 123.6375 75.5) (end 123.6375 76.4) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 122.71249 74.57499) (end 123.6375 75.5) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 118.45001 74.57499) (end 122.71249 74.57499) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 118 75.025) (end 118.45001 74.57499) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 118 76) (end 118 75.025) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 132.504 76.4) (end 133 76.896) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 131.4 76.4) (end 132.504 76.4) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 136.652 82.995) (end 136.652 83.82) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 134.957001 81.300001) (end 136.652 82.995) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 133 80.518) (end 133.782001 81.300001) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 129.49 81.69) (end 130.57 81.69) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 128.42499 80.62499) (end 129.49 81.69) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 128.42499 76.1868) (end 128.42499 80.62499) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 127.41318 75.17499) (end 128.42499 76.1868) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 124.86251 75.17499) (end 127.41318 75.17499) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 123.6375 76.4) (end 124.86251 75.17499) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 133.782001 81.300001) (end 134.957001 81.300001) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 134.099999 80.442999) (end 134.957001 81.300001) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 134.099999 77.995999) (end 134.099999 80.442999) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 133 76.896) (end 134.099999 77.995999) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 134.922 96.52) (end 133.652 97.79) (width 1) (layer F.Cu) (net 3))
+  (segment (start 134.922 96.52) (end 133.652 95.25) (width 1) (layer F.Cu) (net 3))
+  (segment (start 136.652 96.52) (end 134.922 96.52) (width 1) (layer F.Cu) (net 3))
+  (segment (start 124.988 92.313) (end 126.2 93.525) (width 0.5) (layer F.Cu) (net 3))
+  (segment (start 122.434 92.313) (end 124.988 92.313) (width 0.5) (layer F.Cu) (net 3))
   (segment (start 114.25899 85.701178) (end 114.695812 86.138) (width 0.5) (layer F.Cu) (net 4))
   (segment (start 114.695812 86.138) (end 115.459 86.138) (width 0.5) (layer F.Cu) (net 4))
   (segment (start 114.25899 84.974822) (end 114.25899 85.701178) (width 0.5) (layer F.Cu) (net 4))
   (segment (start 113.088168 83.804) (end 114.25899 84.974822) (width 0.5) (layer F.Cu) (net 4))
   (segment (start 112.3315 83.804) (end 113.088168 83.804) (width 0.5) (layer F.Cu) (net 4))
-  (segment (start 114.003499 87.291501) (end 114.357 86.938) (width 0.5) (layer F.Cu) (net 5))
-  (segment (start 114.357 86.938) (end 115.459 86.938) (width 0.5) (layer F.Cu) (net 5))
-  (segment (start 110.744001 87.291501) (end 114.003499 87.291501) (width 0.5) (layer F.Cu) (net 5))
-  (segment (start 109.4315 85.979) (end 110.744001 87.291501) (width 0.5) (layer F.Cu) (net 5))
-  (segment (start 109.3475 85.895) (end 109.4315 85.979) (width 0.5) (layer F.Cu) (net 5))
+  (segment (start 111.575 82.675) (end 112.4 83.5) (width 1) (layer F.Cu) (net 4))
+  (segment (start 111.575 81) (end 111.575 82.675) (width 1) (layer F.Cu) (net 4))
   (segment (start 106.807 85.895) (end 109.3475 85.895) (width 0.5) (layer F.Cu) (net 5))
+  (segment (start 115.409499 86.987501) (end 115.459 86.938) (width 0.5) (layer F.Cu) (net 5))
+  (segment (start 110.812501 86.987501) (end 115.409499 86.987501) (width 0.5) (layer F.Cu) (net 5))
+  (segment (start 109.5 85.675) (end 110.812501 86.987501) (width 0.5) (layer F.Cu) (net 5))
   (segment (start 115.062 84.941) (end 115.459 85.338) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 115.062 83.135) (end 115.062 84.941) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 117.445812 85.338) (end 115.459 85.338) (width 0.5) (layer F.Cu) (net 6))
@@ -2109,7 +2344,6 @@
   (segment (start 123.809 90.938) (end 123.045812 90.938) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 121.95 80.95) (end 121.985 80.915) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 121.81 80.95) (end 121.95 80.95) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 124.538 90.938) (end 126.2 92.6) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 123.809 90.938) (end 124.538 90.938) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 125.60499 80.12499) (end 126.17 80.69) (width 0.2) (layer F.Cu) (net 6))
   (segment (start 122.63501 80.12499) (end 125.60499 80.12499) (width 0.2) (layer F.Cu) (net 6))
@@ -2124,22 +2358,44 @@
   (segment (start 125.60499 80.12499) (end 125.60499 78.76501) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 133.144 84.582) (end 133.652 85.09) (width 0.25) (layer F.Cu) (net 6))
   (segment (start 128.27 84.582) (end 133.144 84.582) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 126.2 92.6) (end 127.58 93.98) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 129.032 92.633) (end 129.032 93.98) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 129.032 93.98) (end 136.652 93.98) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 127.58 93.98) (end 129.032 93.98) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 127.58 96.397466) (end 127.58 93.98) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 125.933466 98.044) (end 127.58 96.397466) (width 0.5) (layer F.Cu) (net 6))
   (segment (start 123.879 98.044) (end 125.933466 98.044) (width 0.5) (layer F.Cu) (net 6))
-  (segment (start 116.84 97.359) (end 116.84 99.346) (width 0.5) (layer F.Cu) (net 7))
+  (segment (start 126.05 97.602) (end 126.074241 97.626241) (width 1) (layer F.Cu) (net 6))
+  (segment (start 126.05 97.536) (end 126.05 97.602) (width 1) (layer F.Cu) (net 6))
+  (segment (start 137.792002 85.09) (end 133.652 85.09) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 138.477001 85.774999) (end 137.792002 85.09) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 138.477001 92.154999) (end 138.477001 85.774999) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 136.652 93.98) (end 138.477001 92.154999) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 125.69 77.4725) (end 126.7625 76.4) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 125.69 78.68) (end 125.69 77.4725) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 123.809 90.938) (end 125.662 90.938) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 127.58 91.78) (end 127.58 93.98) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 126.2 90.4) (end 127.58 91.78) (width 0.5) (layer F.Cu) (net 6))
+  (segment (start 113.207 96.883) (end 113.062 97.028) (width 0.5) (layer F.Cu) (net 7))
   (segment (start 116.8 92.347) (end 116.834 92.313) (width 0.5) (layer F.Cu) (net 8))
-  (segment (start 116.8 94.475) (end 116.8 92.347) (width 0.5) (layer F.Cu) (net 8))
   (segment (start 133.512 82.69) (end 133.652 82.55) (width 0.25) (layer F.Cu) (net 9))
   (segment (start 130.57 82.69) (end 133.512 82.69) (width 0.25) (layer F.Cu) (net 9))
-  (segment (start 116.84 103.335) (end 116.797 103.378) (width 0.5) (layer F.Cu) (net 12))
-  (segment (start 116.84 101.346) (end 116.84 103.335) (width 0.5) (layer F.Cu) (net 12))
-  (segment (start 116.797 106.637) (end 116.84 106.68) (width 0.5) (layer F.Cu) (net 12))
-  (segment (start 116.797 103.378) (end 116.797 106.637) (width 0.5) (layer F.Cu) (net 12))
+  (segment (start 115.062 97.028) (end 116.84 97.028) (width 0.5) (layer F.Cu) (net 12))
+  (segment (start 112.268 99.822) (end 115.062 97.028) (width 0.5) (layer F.Cu) (net 12))
+  (segment (start 112.268 100.584) (end 112.268 99.822) (width 0.5) (layer F.Cu) (net 12))
+  (segment (start 129.210034 78.4) (end 129 78.4) (width 0.5) (layer F.Cu) (net 13))
+  (segment (start 129.4 80.955002) (end 129.4 78.4) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 129.634998 81.19) (end 129.4 80.955002) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 130.57 81.19) (end 129.634998 81.19) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 132.14999 79.46801) (end 133 78.618) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 132.14999 80.545012) (end 132.14999 79.46801) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 131.505002 81.19) (end 132.14999 80.545012) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 130.57 81.19) (end 131.505002 81.19) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 132.62101 75.37499) (end 133 74.996) (width 0.25) (layer F.Cu) (net 14))
+  (segment (start 130.42501 75.37499) (end 132.62101 75.37499) (width 0.25) (layer F.Cu) (net 14))
+  (segment (start 129.4 76.4) (end 130.42501 75.37499) (width 0.25) (layer F.Cu) (net 14))
+  (segment (start 130.47499 80.59499) (end 130.57 80.69) (width 0.25) (layer F.Cu) (net 14))
+  (segment (start 130.47499 77.47499) (end 130.47499 80.59499) (width 0.25) (layer F.Cu) (net 14))
+  (segment (start 129.4 76.4) (end 130.47499 77.47499) (width 0.25) (layer F.Cu) (net 14))
   (segment (start 118 80.95) (end 118.434 81.384) (width 0.25) (layer F.Cu) (net 15))
   (segment (start 118.434 81.384) (end 118.434 82.434) (width 0.25) (layer F.Cu) (net 15))
   (segment (start 118.434 82.434) (end 118.434 83.066) (width 0.25) (layer F.Cu) (net 15))
@@ -2162,10 +2418,12 @@
   (segment (start 120.565 78.68) (end 123.69 78.68) (width 0.25) (layer F.Cu) (net 16))
   (segment (start 119.27 79.975) (end 120.565 78.68) (width 0.25) (layer F.Cu) (net 16))
   (segment (start 119.27 80.95) (end 119.27 79.975) (width 0.25) (layer F.Cu) (net 16))
-  (segment (start 134.874 100.838) (end 136.652 99.06) (width 0.5) (layer F.Cu) (net 17))
-  (segment (start 130.302 100.838) (end 134.874 100.838) (width 0.5) (layer F.Cu) (net 17))
-  (segment (start 128.302 100.838) (end 127 99.536) (width 0.5) (layer F.Cu) (net 17))
-  (segment (start 130.302 100.838) (end 128.302 100.838) (width 0.5) (layer F.Cu) (net 17))
+  (segment (start 136.6 103.6) (end 136.8 103.4) (width 1) (layer F.Cu) (net 17))
+  (segment (start 133.175 103.6) (end 136.6 103.6) (width 1) (layer F.Cu) (net 17))
+  (segment (start 136.8 99.208) (end 136.652 99.06) (width 1) (layer F.Cu) (net 17))
+  (segment (start 136.8 103.4) (end 136.8 99.208) (width 1) (layer F.Cu) (net 17))
+  (segment (start 128.302 100.838) (end 127 99.536) (width 0.5) (layer F.Cu) (net 36))
+  (segment (start 130.302 100.838) (end 128.302 100.838) (width 0.5) (layer F.Cu) (net 36))
   (segment (start 123.845944 83.95) (end 124.15 83.95) (width 0.2) (layer F.Cu) (net 18))
   (segment (start 122.75899 85.036954) (end 123.845944 83.95) (width 0.2) (layer F.Cu) (net 18))
   (segment (start 122.75899 89.83799) (end 122.75899 85.036954) (width 0.2) (layer F.Cu) (net 18))
@@ -2173,70 +2431,70 @@
   (segment (start 123.809 90.138) (end 123.059 90.138) (width 0.2) (layer F.Cu) (net 18))
   (segment (start 124.34 81.19) (end 126.17 81.19) (width 0.2) (layer F.Cu) (net 19))
   (segment (start 124.15 81) (end 124.34 81.19) (width 0.2) (layer F.Cu) (net 19))
-  (segment (start 115.453 90.932) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 23))
-  (segment (start 115.112 91.285) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 23))
-  (segment (start 113.165 91.285) (end 115.112 91.285) (width 0.5) (layer F.Cu) (net 23))
-  (segment (start 120.7635 92.3835) (end 120.834 92.313) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 120.7635 94.996) (end 120.7635 92.3835) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 118.872 103.378) (end 120.904 101.346) (width 0.5) (layer F.Cu) (net 26))
-  (segment (start 121.634 93.404) (end 121.634 92.313) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 123.226 94.996) (end 121.634 93.404) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 123.8885 94.996) (end 123.226 94.996) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 123.675 95.2095) (end 123.8885 94.996) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 120.904 97.9805) (end 123.8885 94.996) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 120.904 98.044) (end 120.904 97.9805) (width 0.5) (layer F.Cu) (net 27))
-  (segment (start 132.511998 91.44) (end 136.652 91.44) (width 0.25) (layer F.Cu) (net 30))
-  (segment (start 129.609998 88.538) (end 132.511998 91.44) (width 0.25) (layer F.Cu) (net 30))
-  (segment (start 123.809 88.538) (end 129.609998 88.538) (width 0.25) (layer F.Cu) (net 30))
-  (segment (start 132.511998 88.9) (end 136.652 88.9) (width 0.25) (layer F.Cu) (net 31))
-  (segment (start 130.549998 86.938) (end 132.511998 88.9) (width 0.25) (layer F.Cu) (net 31))
-  (segment (start 123.809 86.938) (end 130.549998 86.938) (width 0.25) (layer F.Cu) (net 31))
-  (segment (start 123.809 87.809) (end 123.83799 87.83799) (width 0.5) (layer F.Cu) (net 32))
-  (segment (start 123.809 87.738) (end 123.809 87.809) (width 0.5) (layer F.Cu) (net 32))
-  (segment (start 133.145588 90.17) (end 133.652 90.17) (width 0.25) (layer F.Cu) (net 32))
-  (segment (start 130.713588 87.738) (end 133.145588 90.17) (width 0.25) (layer F.Cu) (net 32))
-  (segment (start 123.809 87.738) (end 130.713588 87.738) (width 0.25) (layer F.Cu) (net 32))
-  (segment (start 123.809 86.138) (end 125.5764 86.138) (width 0.25) (layer F.Cu) (net 33))
-  (segment (start 125.92639 86.48799) (end 132.50999 86.48799) (width 0.25) (layer F.Cu) (net 33))
-  (segment (start 132.50999 86.48799) (end 133.652 87.63) (width 0.25) (layer F.Cu) (net 33))
-  (segment (start 125.5764 86.138) (end 125.92639 86.48799) (width 0.25) (layer F.Cu) (net 33))
-  (segment (start 133.145588 92.71) (end 133.652 92.71) (width 0.25) (layer F.Cu) (net 34))
-  (segment (start 129.773588 89.338) (end 133.145588 92.71) (width 0.25) (layer F.Cu) (net 34))
-  (segment (start 123.809 89.338) (end 129.773588 89.338) (width 0.25) (layer F.Cu) (net 34))
-  (segment (start 123.809 85.338) (end 124.559 85.338) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 125.814811 85.740001) (end 136.001999 85.740001) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 125.41281 85.338) (end 125.814811 85.740001) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 123.809 85.338) (end 125.41281 85.338) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 136.621998 86.36) (end 136.652 86.36) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 136.001999 85.740001) (end 136.621998 86.36) (width 0.25) (layer F.Cu) (net 35))
-  (segment (start 117.8345 105.1345) (end 119.38 106.68) (width 0.5) (layer F.Cu) (net 36))
-  (segment (start 117.8345 102.613034) (end 117.8345 105.1345) (width 0.5) (layer F.Cu) (net 36))
-  (segment (start 118.434 102.013534) (end 117.8345 102.613034) (width 0.5) (layer F.Cu) (net 36))
-  (segment (start 118.434 92.313) (end 118.434 102.013534) (width 0.5) (layer F.Cu) (net 36))
+  (segment (start 108.44 90.54) (end 108 90.54) (width 0.25) (layer F.Cu) (net 7))
+  (segment (start 110.8 92.9) (end 108.44 90.54) (width 0.25) (layer F.Cu) (net 7))
+  (segment (start 110.8 93.6) (end 110.8 92.9) (width 0.25) (layer F.Cu) (net 7))
+  (segment (start 115.453 90.932) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 22))
+  (segment (start 112.398 90.938) (end 115.459 90.938) (width 0.5) (layer F.Cu) (net 22))
+  (segment (start 112 90.54) (end 112.398 90.938) (width 0.5) (layer F.Cu) (net 22))
+  (segment (start 120.7635 92.3835) (end 120.834 92.313) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 120.7635 94.996) (end 120.7635 92.3835) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 119.49149 99.93349) (end 119.49149 96.26801) (width 1) (layer F.Cu) (net 25))
+  (segment (start 119.49149 96.26801) (end 120.7635 94.996) (width 1) (layer F.Cu) (net 25))
+  (segment (start 120.904 101.346) (end 119.49149 99.93349) (width 1) (layer F.Cu) (net 25))
+  (segment (start 116.078 101.854) (end 117.348 100.584) (width 1) (layer F.Cu) (net 25))
+  (segment (start 116.078 103.584) (end 116.078 101.854) (width 1) (layer F.Cu) (net 25))
+  (segment (start 113.538 103.584) (end 116.078 103.584) (width 1) (layer F.Cu) (net 25))
+  (segment (start 118.915 96.8445) (end 119.49149 96.26801) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 118.915 97.028) (end 118.915 96.8445) (width 0.25) (layer F.Cu) (net 25))
+  (segment (start 118.84098 100.584) (end 119.49149 99.93349) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 117.348 100.584) (end 118.84098 100.584) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 111 97.6) (end 111 101.951002) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 111 101.951002) (end 112.632998 103.584) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 112.632998 103.584) (end 113.538 103.584) (width 0.5) (layer F.Cu) (net 25))
+  (segment (start 121.634 93.404) (end 121.634 92.313) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 123.226 94.996) (end 121.634 93.404) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 123.675 95.2095) (end 123.8885 94.996) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 120.904 97.318) (end 123.226 94.996) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 123.226 94.996) (end 123.8885 94.996) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 120.904 98.044) (end 120.904 97.318) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 121.193466 103.584) (end 118.618 103.584) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 122.06651 102.710956) (end 121.193466 103.584) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 122.06651 99.20651) (end 122.06651 102.710956) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 120.904 98.044) (end 122.06651 99.20651) (width 0.5) (layer F.Cu) (net 26))
+  (segment (start 135 75.946) (end 137.4 75.946) (width 0.5) (layer F.Cu) (net 27))
+  (segment (start 137.368 79.568) (end 137.4 79.6) (width 0.5) (layer F.Cu) (net 28))
+  (segment (start 135 79.568) (end 137.368 79.568) (width 0.5) (layer F.Cu) (net 28))
+  (segment (start 132.511998 91.44) (end 136.652 91.44) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 129.609998 88.538) (end 132.511998 91.44) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 123.809 88.538) (end 129.609998 88.538) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 132.511998 88.9) (end 136.652 88.9) (width 0.25) (layer F.Cu) (net 30))
+  (segment (start 130.549998 86.938) (end 132.511998 88.9) (width 0.25) (layer F.Cu) (net 30))
+  (segment (start 123.809 86.938) (end 130.549998 86.938) (width 0.25) (layer F.Cu) (net 30))
+  (segment (start 123.809 87.809) (end 123.83799 87.83799) (width 0.5) (layer F.Cu) (net 31))
+  (segment (start 123.809 87.738) (end 123.809 87.809) (width 0.5) (layer F.Cu) (net 31))
+  (segment (start 133.145588 90.17) (end 133.652 90.17) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 130.713588 87.738) (end 133.145588 90.17) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 123.809 87.738) (end 130.713588 87.738) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 123.809 86.138) (end 125.5764 86.138) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 125.92639 86.48799) (end 132.50999 86.48799) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 132.50999 86.48799) (end 133.652 87.63) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 125.5764 86.138) (end 125.92639 86.48799) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 133.145588 92.71) (end 133.652 92.71) (width 0.25) (layer F.Cu) (net 33))
+  (segment (start 129.773588 89.338) (end 133.145588 92.71) (width 0.25) (layer F.Cu) (net 33))
+  (segment (start 123.809 89.338) (end 129.773588 89.338) (width 0.25) (layer F.Cu) (net 33))
+  (segment (start 123.809 85.338) (end 124.559 85.338) (width 0.25) (layer F.Cu) (net 34))
+  (segment (start 125.814811 85.740001) (end 136.001999 85.740001) (width 0.25) (layer F.Cu) (net 34))
+  (segment (start 125.41281 85.338) (end 125.814811 85.740001) (width 0.25) (layer F.Cu) (net 34))
+  (segment (start 123.809 85.338) (end 125.41281 85.338) (width 0.25) (layer F.Cu) (net 34))
+  (segment (start 136.621998 86.36) (end 136.652 86.36) (width 0.25) (layer F.Cu) (net 34))
+  (segment (start 136.001999 85.740001) (end 136.621998 86.36) (width 0.25) (layer F.Cu) (net 34))
+  (segment (start 118.434 95.30869) (end 118.434 92.313) (width 0.25) (layer F.Cu) (net 35))
+  (segment (start 118.00249 97.4912) (end 118.00249 95.7402) (width 0.25) (layer F.Cu) (net 35))
+  (segment (start 118.00249 95.7402) (end 118.434 95.30869) (width 0.25) (layer F.Cu) (net 35))
+  (segment (start 114.90969 100.584) (end 118.00249 97.4912) (width 0.25) (layer F.Cu) (net 35))
+  (segment (start 114.808 100.584) (end 114.90969 100.584) (width 0.25) (layer F.Cu) (net 35))
+  (segment (start 130.2 100.94) (end 130.302 100.838) (width 1) (layer F.Cu) (net 36))
+  (segment (start 130.2 103.6) (end 130.2 100.94) (width 1) (layer F.Cu) (net 36))
 
-  (zone (net 3) (net_name GND) (layer B.Cu) (tstamp 0) (hatch edge 0.508)
-    (connect_pads (clearance 0.508))
-    (min_thickness 0.254)
-    (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
-    (polygon
-      (pts
-        (xy 132.5 88) (xy 103.5 88) (xy 103.5 70) (xy 132.5 70)
-      )
-    )
-    (filled_polygon
-      (pts
-        (xy 132.373 87.873) (xy 103.627 87.873) (xy 103.627 70.127) (xy 132.373 70.127)
-      )
-    )
-  )
-  (zone (net 26) (net_name GNDA) (layer B.Cu) (tstamp 0) (hatch edge 0.508)
-    (connect_pads (clearance 0.508))
-    (min_thickness 0.254)
-    (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
-    (polygon
-      (pts
-        (xy 121 102) (xy 103.5 102.5) (xy 103.5 89) (xy 121 89)
-      )
-    )
-  )
 )
diff --git a/schemi/bassofono.sch b/schemi/bassofono.sch
index e50ae73..88c085e 100644
--- a/schemi/bassofono.sch
+++ b/schemi/bassofono.sch
@@ -378,62 +378,62 @@ Connection ~ 6100 3600
 $Comp
 L power:+3.3V #PWR0102
 U 1 1 61A3FADC
-P 5300 2800
-F 0 "#PWR0102" H 5300 2650 50  0001 C CNN
-F 1 "+3.3V" V 5315 2928 50  0000 L CNN
-F 2 "" H 5300 2800 50  0001 C CNN
-F 3 "" H 5300 2800 50  0001 C CNN
-	1    5300 2800
-	0    1    1    0   
+P 8300 5850
+F 0 "#PWR0102" H 8300 5700 50  0001 C CNN
+F 1 "+3.3V" V 8315 5978 50  0000 L CNN
+F 2 "" H 8300 5850 50  0001 C CNN
+F 3 "" H 8300 5850 50  0001 C CNN
+	1    8300 5850
+	0    -1   1    0   
 $EndComp
 $Comp
 L Device:C C11
 U 1 1 61A40FCE
-P 4600 2950
-F 0 "C11" H 4715 2996 50  0000 L CNN
-F 1 "10µF" H 4715 2905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" H 4638 2800 50  0001 C CNN
-F 3 "~" H 4600 2950 50  0001 C CNN
-	1    4600 2950
-	1    0    0    -1  
+P 9000 6000
+F 0 "C11" H 9115 6046 50  0000 L CNN
+F 1 "10µF" H 9115 5955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.33x2.70mm_HandSolder" H 9038 5850 50  0001 C CNN
+F 3 "~" H 9000 6000 50  0001 C CNN
+	1    9000 6000
+	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	4450 2800 4600 2800
-Connection ~ 4600 2800
+	9150 5850 9000 5850
+Connection ~ 9000 5850
 Wire Wire Line
-	4600 2800 5050 2800
+	9000 5850 8550 5850
 $Comp
 L power:GND #PWR0103
 U 1 1 61A426E0
-P 4600 3100
-F 0 "#PWR0103" H 4600 2850 50  0001 C CNN
-F 1 "GND" H 4605 2927 50  0000 C CNN
-F 2 "" H 4600 3100 50  0001 C CNN
-F 3 "" H 4600 3100 50  0001 C CNN
-	1    4600 3100
-	1    0    0    -1  
+P 9000 6150
+F 0 "#PWR0103" H 9000 5900 50  0001 C CNN
+F 1 "GND" H 9005 5977 50  0000 C CNN
+F 2 "" H 9000 6150 50  0001 C CNN
+F 3 "" H 9000 6150 50  0001 C CNN
+	1    9000 6150
+	-1   0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0104
 U 1 1 61A42D16
-P 4150 3100
-F 0 "#PWR0104" H 4150 2850 50  0001 C CNN
-F 1 "GND" H 4155 2927 50  0000 C CNN
-F 2 "" H 4150 3100 50  0001 C CNN
-F 3 "" H 4150 3100 50  0001 C CNN
-	1    4150 3100
-	1    0    0    -1  
+P 9550 6250
+F 0 "#PWR0104" H 9550 6000 50  0001 C CNN
+F 1 "GND" H 9555 6077 50  0000 C CNN
+F 2 "" H 9550 6250 50  0001 C CNN
+F 3 "" H 9550 6250 50  0001 C CNN
+	1    9550 6250
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:L L1
 U 1 1 61A9517F
-P 5050 2950
-F 0 "L1" H 5103 2996 50  0000 L CNN
-F 1 "L" H 5103 2905 50  0000 L CNN
-F 2 "Inductor_SMD:L_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 5050 2950 50  0001 C CNN
-F 3 "~" H 5050 2950 50  0001 C CNN
-	1    5050 2950
-	1    0    0    -1  
+P 8550 6000
+F 0 "L1" H 8603 6046 50  0000 L CNN
+F 1 "L" H 8603 5955 50  0000 L CNN
+F 2 "Inductor_SMD:L_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 8550 6000 50  0001 C CNN
+F 3 "~" H 8550 6000 50  0001 C CNN
+	1    8550 6000
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Oscillator:Si5351A-B-GT U4
@@ -560,13 +560,13 @@ Wire Wire Line
 $Comp
 L power:+12V #PWR0105
 U 1 1 61C8D2AC
-P 3250 2800
-F 0 "#PWR0105" H 3250 2650 50  0001 C CNN
-F 1 "+12V" V 3265 2928 50  0000 L CNN
-F 2 "" H 3250 2800 50  0001 C CNN
-F 3 "" H 3250 2800 50  0001 C CNN
-	1    3250 2800
-	0    -1   -1   0   
+P 10900 5850
+F 0 "#PWR0105" H 10900 5700 50  0001 C CNN
+F 1 "+12V" V 10915 5978 50  0000 L CNN
+F 2 "" H 10900 5850 50  0001 C CNN
+F 3 "" H 10900 5850 50  0001 C CNN
+	1    10900 5850
+	0    1    -1   0   
 $EndComp
 Wire Wire Line
 	7700 5000 7950 5000
@@ -975,79 +975,79 @@ F 3 "" H 2750 5300 50  0001 C CNN
 	1    2750 5300
 	1    0    0    -1  
 $EndComp
-Connection ~ 5050 2800
+Connection ~ 8550 5850
 Wire Wire Line
-	5050 2800 5300 2800
+	8550 5850 8300 5850
 $Comp
 L power:+3.3VA #PWR0125
 U 1 1 61E9587E
-P 5050 3100
-F 0 "#PWR0125" H 5050 2950 50  0001 C CNN
-F 1 "+3.3VA" H 5065 3273 50  0000 C CNN
-F 2 "" H 5050 3100 50  0001 C CNN
-F 3 "" H 5050 3100 50  0001 C CNN
-	1    5050 3100
-	-1   0    0    1   
+P 8550 6150
+F 0 "#PWR0125" H 8550 6000 50  0001 C CNN
+F 1 "+3.3VA" H 8565 6323 50  0000 C CNN
+F 2 "" H 8550 6150 50  0001 C CNN
+F 3 "" H 8550 6150 50  0001 C CNN
+	1    8550 6150
+	1    0    0    1   
 $EndComp
 $Comp
 L Device:L L2
 U 1 1 61E962FD
-P 5550 3150
-F 0 "L2" H 5603 3196 50  0000 L CNN
-F 1 "L" H 5603 3105 50  0000 L CNN
-F 2 "Inductor_SMD:L_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 5550 3150 50  0001 C CNN
-F 3 "~" H 5550 3150 50  0001 C CNN
-	1    5550 3150
-	0    -1   -1   0   
+P 8050 6200
+F 0 "L2" H 8103 6246 50  0000 L CNN
+F 1 "L" H 8103 6155 50  0000 L CNN
+F 2 "Inductor_SMD:L_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 8050 6200 50  0001 C CNN
+F 3 "~" H 8050 6200 50  0001 C CNN
+	1    8050 6200
+	0    1    -1   0   
 $EndComp
 $Comp
 L power:GND #PWR0126
 U 1 1 61E96E2C
-P 5400 3150
-F 0 "#PWR0126" H 5400 2900 50  0001 C CNN
-F 1 "GND" H 5405 2977 50  0000 C CNN
-F 2 "" H 5400 3150 50  0001 C CNN
-F 3 "" H 5400 3150 50  0001 C CNN
-	1    5400 3150
-	1    0    0    -1  
+P 8200 6200
+F 0 "#PWR0126" H 8200 5950 50  0001 C CNN
+F 1 "GND" H 8205 6027 50  0000 C CNN
+F 2 "" H 8200 6200 50  0001 C CNN
+F 3 "" H 8200 6200 50  0001 C CNN
+	1    8200 6200
+	-1   0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0127
 U 1 1 61E97DC7
-P 5700 3150
-F 0 "#PWR0127" H 5700 2900 50  0001 C CNN
-F 1 "GNDA" H 5705 2977 50  0000 C CNN
-F 2 "" H 5700 3150 50  0001 C CNN
-F 3 "" H 5700 3150 50  0001 C CNN
-	1    5700 3150
-	1    0    0    -1  
+P 7900 6200
+F 0 "#PWR0127" H 7900 5950 50  0001 C CNN
+F 1 "GNDA" H 7905 6027 50  0000 C CNN
+F 2 "" H 7900 6200 50  0001 C CNN
+F 3 "" H 7900 6200 50  0001 C CNN
+	1    7900 6200
+	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	3550 2800 3700 2800
+	10600 5850 10400 5850
 $Comp
 L Device:C C15
 U 1 1 61E9EC64
-P 3700 2950
-F 0 "C15" H 3815 2996 50  0000 L CNN
-F 1 "10µF" H 3815 2905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" H 3738 2800 50  0001 C CNN
-F 3 "~" H 3700 2950 50  0001 C CNN
-	1    3700 2950
-	1    0    0    -1  
+P 10400 6000
+F 0 "C15" H 10515 6046 50  0000 L CNN
+F 1 "10µF" H 10515 5955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" H 10438 5850 50  0001 C CNN
+F 3 "~" H 10400 6000 50  0001 C CNN
+	1    10400 6000
+	-1   0    0    -1  
 $EndComp
-Connection ~ 3700 2800
+Connection ~ 10400 5850
 Wire Wire Line
-	3700 2800 3850 2800
+	10400 5850 9950 5850
 $Comp
 L power:GND #PWR0128
 U 1 1 61E9F25F
-P 3700 3100
-F 0 "#PWR0128" H 3700 2850 50  0001 C CNN
-F 1 "GND" H 3705 2927 50  0000 C CNN
-F 2 "" H 3700 3100 50  0001 C CNN
-F 3 "" H 3700 3100 50  0001 C CNN
-	1    3700 3100
-	1    0    0    -1  
+P 10400 6150
+F 0 "#PWR0128" H 10400 5900 50  0001 C CNN
+F 1 "GND" H 10405 5977 50  0000 C CNN
+F 2 "" H 10400 6150 50  0001 C CNN
+F 3 "" H 10400 6150 50  0001 C CNN
+	1    10400 6150
+	-1   0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0129
@@ -1363,13 +1363,13 @@ Connection ~ 8250 5300
 $Comp
 L Device:D D3
 U 1 1 61E592A1
-P 3400 2800
-F 0 "D3" V 3354 2880 50  0000 L CNN
-F 1 "D" V 3445 2880 50  0000 L CNN
-F 2 "Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 3400 2800 50  0001 C CNN
-F 3 "~" H 3400 2800 50  0001 C CNN
-	1    3400 2800
-	-1   0    0    1   
+P 10750 5850
+F 0 "D3" V 10704 5930 50  0000 L CNN
+F 1 "D" V 10795 5930 50  0000 L CNN
+F 2 "Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 10750 5850 50  0001 C CNN
+F 3 "~" H 10750 5850 50  0001 C CNN
+	1    10750 5850
+	1    0    0    1   
 $EndComp
 $Comp
 L Device:R R14
@@ -1406,14 +1406,39 @@ Connection ~ 6350 6600
 Wire Wire Line
 	6350 6600 6350 6650
 $Comp
-L Regulator_Linear:AZ1117-3.3 U3
-U 1 1 61A3E66B
-P 4150 2800
-F 0 "U3" H 4150 3042 50  0000 C CNN
-F 1 "AZ1117-3.3" H 4150 2951 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4150 3050 50  0001 C CIN
-F 3 "https://www.diodes.com/assets/Datasheets/AZ1117.pdf" H 4150 2800 50  0001 C CNN
-	1    4150 2800
+L Regulator_Linear:LP2985-3.3 U1
+U 1 1 61CF6A59
+P 9550 5950
+F 0 "U1" H 9550 6292 50  0000 C CNN
+F 1 "LP2985-3.3" H 9550 6201 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-5" H 9550 6275 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/lp2985.pdf" H 9550 5950 50  0001 C CNN
+	1    9550 5950
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	9950 5950 9950 5850
+Connection ~ 9950 5850
+$Comp
+L Connector:Conn_01x01_Female J4
+U 1 1 61DD78FE
+P 9300 5350
+F 0 "J4" V 9238 5262 50  0000 R CNN
+F 1 "T1" V 9147 5262 50  0000 R CNN
+F 2 "TestPoint:TestPoint_Pad_2.5x2.5mm" H 9300 5350 50  0001 C CNN
+F 3 "~" H 9300 5350 50  0001 C CNN
+	1    9300 5350
 	1    0    0    -1  
 $EndComp
+$Comp
+L power:GND #PWR0139
+U 1 1 61DD87C2
+P 9100 5350
+F 0 "#PWR0139" H 9100 5100 50  0001 C CNN
+F 1 "GND" H 9105 5177 50  0000 C CNN
+F 2 "" H 9100 5350 50  0001 C CNN
+F 3 "" H 9100 5350 50  0001 C CNN
+	1    9100 5350
+	0    1    -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/schemi/bassofono.sch-bak b/schemi/bassofono.sch-bak
index 95c283e..e50ae73 100644
--- a/schemi/bassofono.sch-bak
+++ b/schemi/bassofono.sch-bak
@@ -117,7 +117,7 @@ F 3 "~" H 6000 6350 50  0001 C CNN
 $EndComp
 Connection ~ 6150 6350
 Wire Wire Line
-	6150 6350 6150 6600
+	6150 6350 6150 7200
 $Comp
 L Device:C C4
 U 1 1 60E53518
@@ -376,17 +376,6 @@ Wire Wire Line
 	5550 3600 6100 3600
 Connection ~ 6100 3600
 $Comp
-L Regulator_Linear:AZ1117-3.3 U3
-U 1 1 61A3E66B
-P 4150 2800
-F 0 "U3" H 4150 3042 50  0000 C CNN
-F 1 "AZ1117-3.3" H 4150 2951 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4150 3050 50  0001 C CIN
-F 3 "https://www.diodes.com/assets/Datasheets/AZ1117.pdf" H 4150 2800 50  0001 C CNN
-	1    4150 2800
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+3.3V #PWR0102
 U 1 1 61A3FADC
 P 5300 2800
@@ -569,36 +558,14 @@ Wire Wire Line
 Wire Wire Line
 	10050 2950 10050 2700
 $Comp
-L power:+12V #PWR0108
-U 1 1 61C633B1
-P 10050 2500
-F 0 "#PWR0108" H 10050 2350 50  0001 C CNN
-F 1 "+12V" V 10065 2628 50  0000 L CNN
-F 2 "" H 10050 2500 50  0001 C CNN
-F 3 "" H 10050 2500 50  0001 C CNN
-	1    10050 2500
-	0    -1   -1   0   
-$EndComp
-$Comp
 L power:+12V #PWR0105
 U 1 1 61C8D2AC
-P 3550 2800
-F 0 "#PWR0105" H 3550 2650 50  0001 C CNN
-F 1 "+12V" V 3565 2928 50  0000 L CNN
-F 2 "" H 3550 2800 50  0001 C CNN
-F 3 "" H 3550 2800 50  0001 C CNN
-	1    3550 2800
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J4
-U 1 1 61C97C6E
-P 6700 3250
-F 0 "J4" V 6638 3162 50  0000 R CNN
-F 1 "PTT" V 6547 3162 50  0000 R CNN
-F 2 "TestPoint:TestPoint_Pad_2.5x2.5mm" H 6700 3250 50  0001 C CNN
-F 3 "~" H 6700 3250 50  0001 C CNN
-	1    6700 3250
+P 3250 2800
+F 0 "#PWR0105" H 3250 2650 50  0001 C CNN
+F 1 "+12V" V 3265 2928 50  0000 L CNN
+F 2 "" H 3250 2800 50  0001 C CNN
+F 3 "" H 3250 2800 50  0001 C CNN
+	1    3250 2800
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
@@ -618,23 +585,21 @@ Wire Wire Line
 	8100 2400 7950 2400
 Wire Wire Line
 	7950 2400 7950 2500
-Wire Wire Line
-	6700 3450 6700 3600
 $Comp
 L Memory_EEPROM:M24C02-RMN U5
 U 1 1 61C5D959
-P 9350 3750
-F 0 "U5" H 9350 4231 50  0000 C CNN
-F 1 "M24C02-RMN" H 9350 4140 50  0000 C CNN
-F 2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" H 9350 4100 50  0001 C CNN
-F 3 "http://www.st.com/content/ccc/resource/technical/document/datasheet/b0/d8/50/40/5a/85/49/6f/DM00071904.pdf/files/DM00071904.pdf/jcr:content/translations/en.DM00071904.pdf" H 9400 3250 50  0001 C CNN
-	1    9350 3750
+P 9850 3750
+F 0 "U5" H 9850 4231 50  0000 C CNN
+F 1 "M24C02-RMN" H 9850 4140 50  0000 C CNN
+F 2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" H 9850 4100 50  0001 C CNN
+F 3 "http://www.st.com/content/ccc/resource/technical/document/datasheet/b0/d8/50/40/5a/85/49/6f/DM00071904.pdf/files/DM00071904.pdf/jcr:content/translations/en.DM00071904.pdf" H 9900 3250 50  0001 C CNN
+	1    9850 3750
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
 	7750 2900 7750 3750
 Wire Wire Line
-	7750 3750 8950 3750
+	7750 3750 9450 3750
 Connection ~ 7750 2900
 Wire Wire Line
 	7750 2900 8100 2900
@@ -643,30 +608,30 @@ Wire Wire Line
 Wire Wire Line
 	7600 3000 7600 3650
 Wire Wire Line
-	7600 3650 8950 3650
+	7600 3650 9450 3650
 Connection ~ 7600 3000
 Wire Wire Line
 	7600 3000 8100 3000
 $Comp
 L power:+3.3V #PWR0109
 U 1 1 61C91AA9
-P 9350 3450
-F 0 "#PWR0109" H 9350 3300 50  0001 C CNN
-F 1 "+3.3V" V 9365 3578 50  0000 L CNN
-F 2 "" H 9350 3450 50  0001 C CNN
-F 3 "" H 9350 3450 50  0001 C CNN
-	1    9350 3450
+P 9850 3450
+F 0 "#PWR0109" H 9850 3300 50  0001 C CNN
+F 1 "+3.3V" V 9865 3578 50  0000 L CNN
+F 2 "" H 9850 3450 50  0001 C CNN
+F 3 "" H 9850 3450 50  0001 C CNN
+	1    9850 3450
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0110
 U 1 1 61C94598
-P 9350 4050
-F 0 "#PWR0110" H 9350 3800 50  0001 C CNN
-F 1 "GND" H 9355 3877 50  0000 C CNN
-F 2 "" H 9350 4050 50  0001 C CNN
-F 3 "" H 9350 4050 50  0001 C CNN
-	1    9350 4050
+P 9850 4050
+F 0 "#PWR0110" H 9850 3800 50  0001 C CNN
+F 1 "GND" H 9855 3877 50  0000 C CNN
+F 2 "" H 9850 4050 50  0001 C CNN
+F 3 "" H 9850 4050 50  0001 C CNN
+	1    9850 4050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -936,12 +901,12 @@ $EndComp
 $Comp
 L power:GNDA #PWR0118
 U 1 1 61E3C3B5
-P 6250 6600
-F 0 "#PWR0118" H 6250 6350 50  0001 C CNN
-F 1 "GNDA" H 6255 6427 50  0000 C CNN
-F 2 "" H 6250 6600 50  0001 C CNN
-F 3 "" H 6250 6600 50  0001 C CNN
-	1    6250 6600
+P 6250 7200
+F 0 "#PWR0118" H 6250 6950 50  0001 C CNN
+F 1 "GNDA" H 6255 7027 50  0000 C CNN
+F 2 "" H 6250 7200 50  0001 C CNN
+F 3 "" H 6250 7200 50  0001 C CNN
+	1    6250 7200
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -1098,12 +1063,12 @@ $EndComp
 $Comp
 L power:+3.3V #PWR0130
 U 1 1 61D54D68
-P 8500 2200
-F 0 "#PWR0130" H 8500 2050 50  0001 C CNN
-F 1 "+3.3V" V 8515 2328 50  0000 L CNN
-F 2 "" H 8500 2200 50  0001 C CNN
-F 3 "" H 8500 2200 50  0001 C CNN
-	1    8500 2200
+P 8500 1900
+F 0 "#PWR0130" H 8500 1750 50  0001 C CNN
+F 1 "+3.3V" V 8515 2028 50  0000 L CNN
+F 2 "" H 8500 1900 50  0001 C CNN
+F 3 "" H 8500 1900 50  0001 C CNN
+	1    8500 1900
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1159,17 +1124,6 @@ F 3 "~" H 10250 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Connector:Conn_01x01_Female J10
-U 1 1 61D79F6C
-P 10250 2500
-F 0 "J10" V 10188 2412 50  0000 R CNN
-F 1 "T1" V 10097 2412 50  0000 R CNN
-F 2 "TestPoint:TestPoint_Pad_2.5x2.5mm" H 10250 2500 50  0001 C CNN
-F 3 "~" H 10250 2500 50  0001 C CNN
-	1    10250 2500
-	1    0    0    -1  
-$EndComp
-$Comp
 L Connector:Conn_01x01_Female J9
 U 1 1 61D7A7DD
 P 10250 2300
@@ -1253,16 +1207,14 @@ $EndComp
 $Comp
 L Connector_Generic:Conn_01x06 J1
 U 1 1 61D46357
-P 6450 6800
-F 0 "J1" V 6322 7080 50  0000 L CNN
-F 1 "Conn_01x06" V 6413 7080 50  0000 L CNN
-F 2 "Connector_PinHeader_1.27mm:PinHeader_1x06_P1.27mm_Vertical_SMD_Pin1Right" H 6450 6800 50  0001 C CNN
-F 3 "~" H 6450 6800 50  0001 C CNN
-	1    6450 6800
+P 6450 7400
+F 0 "J1" V 6322 7680 50  0000 L CNN
+F 1 "Conn_01x06" V 6413 7680 50  0000 L CNN
+F 2 "Connector_PinHeader_1.27mm:PinHeader_1x06_P1.27mm_Vertical_SMD_Pin1Right" H 6450 7400 50  0001 C CNN
+F 3 "~" H 6450 7400 50  0001 C CNN
+	1    6450 7400
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	6350 6600 6350 5950
 Wire Wire Line
 	6350 5950 6450 5950
 Wire Wire Line
@@ -1270,23 +1222,23 @@ Wire Wire Line
 $Comp
 L power:GNDA #PWR0133
 U 1 1 61D5CD97
-P 6450 6600
-F 0 "#PWR0133" H 6450 6350 50  0001 C CNN
-F 1 "GNDA" H 6455 6427 50  0000 C CNN
-F 2 "" H 6450 6600 50  0001 C CNN
-F 3 "" H 6450 6600 50  0001 C CNN
-	1    6450 6600
+P 6450 7200
+F 0 "#PWR0133" H 6450 6950 50  0001 C CNN
+F 1 "GNDA" H 6455 7027 50  0000 C CNN
+F 2 "" H 6450 7200 50  0001 C CNN
+F 3 "" H 6450 7200 50  0001 C CNN
+	1    6450 7200
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GNDA #PWR0134
 U 1 1 61D5D92D
-P 6550 6600
-F 0 "#PWR0134" H 6550 6350 50  0001 C CNN
-F 1 "GNDA" H 6555 6427 50  0000 C CNN
-F 2 "" H 6550 6600 50  0001 C CNN
-F 3 "" H 6550 6600 50  0001 C CNN
-	1    6550 6600
+P 6550 7200
+F 0 "#PWR0134" H 6550 6950 50  0001 C CNN
+F 1 "GNDA" H 6555 7027 50  0000 C CNN
+F 2 "" H 6550 7200 50  0001 C CNN
+F 3 "" H 6550 7200 50  0001 C CNN
+	1    6550 7200
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
@@ -1296,5 +1248,172 @@ Wire Wire Line
 Wire Wire Line
 	7250 5900 7100 5900
 Wire Wire Line
-	6650 6250 6650 6600
+	6650 6250 6650 7200
+$Comp
+L power:GND #PWR0108
+U 1 1 61DB1448
+P 8250 5200
+F 0 "#PWR0108" H 8250 4950 50  0001 C CNN
+F 1 "GND" H 8255 5027 50  0000 C CNN
+F 2 "" H 8250 5200 50  0001 C CNN
+F 3 "" H 8250 5200 50  0001 C CNN
+	1    8250 5200
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R12
+U 1 1 61DB9882
+P 9300 2100
+F 0 "R12" H 9370 2146 50  0000 L CNN
+F 1 "1k" H 9370 2055 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9230 2100 50  0001 C CNN
+F 3 "~" H 9300 2100 50  0001 C CNN
+	1    9300 2100
+	1    0    0    -1  
+$EndComp
+Connection ~ 9300 2250
+$Comp
+L Device:R R13
+U 1 1 61DD6B28
+P 9300 2900
+F 0 "R13" H 9370 2946 50  0000 L CNN
+F 1 "1k" H 9370 2855 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9230 2900 50  0001 C CNN
+F 3 "~" H 9300 2900 50  0001 C CNN
+	1    9300 2900
+	1    0    0    -1  
+$EndComp
+Connection ~ 9300 2750
+$Comp
+L power:GND #PWR0135
+U 1 1 61DD8893
+P 9300 3050
+F 0 "#PWR0135" H 9300 2800 50  0001 C CNN
+F 1 "GND" H 9305 2877 50  0000 C CNN
+F 2 "" H 9300 3050 50  0001 C CNN
+F 3 "" H 9300 3050 50  0001 C CNN
+	1    9300 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0136
+U 1 1 61DDA012
+P 9300 1950
+F 0 "#PWR0136" H 9300 1700 50  0001 C CNN
+F 1 "GND" H 9305 1777 50  0000 C CNN
+F 2 "" H 9300 1950 50  0001 C CNN
+F 3 "" H 9300 1950 50  0001 C CNN
+	1    9300 1950
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:C_Small C16
+U 1 1 61E0787F
+P 8300 2050
+F 0 "C16" H 8392 2096 50  0000 L CNN
+F 1 "100n" H 8392 2005 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" H 8300 2050 50  0001 C CNN
+F 3 "~" H 8300 2050 50  0001 C CNN
+	1    8300 2050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8500 1900 8500 2050
+Wire Wire Line
+	8400 2050 8500 2050
+Connection ~ 8500 2050
+Wire Wire Line
+	8500 2050 8500 2200
+$Comp
+L power:GND #PWR0137
+U 1 1 61E2133B
+P 8200 2050
+F 0 "#PWR0137" H 8200 1800 50  0001 C CNN
+F 1 "GND" V 8205 1922 50  0000 R CNN
+F 2 "" H 8200 2050 50  0001 C CNN
+F 3 "" H 8200 2050 50  0001 C CNN
+	1    8200 2050
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0138
+U 1 1 61E455D8
+P 8250 5100
+F 0 "#PWR0138" H 8250 4850 50  0001 C CNN
+F 1 "GND" H 8255 4927 50  0000 C CNN
+F 2 "" H 8250 5100 50  0001 C CNN
+F 3 "" H 8250 5100 50  0001 C CNN
+	1    8250 5100
+	0    1    1    0   
+$EndComp
+$Comp
+L Connector:Conn_01x01_Female J3
+U 1 1 61E46F2E
+P 8450 5550
+F 0 "J3" V 8388 5462 50  0000 R CNN
+F 1 "T1" V 8297 5462 50  0000 R CNN
+F 2 "TestPoint:TestPoint_Pad_2.5x2.5mm" H 8450 5550 50  0001 C CNN
+F 3 "~" H 8450 5550 50  0001 C CNN
+	1    8450 5550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8250 5550 8250 5300
+Connection ~ 8250 5300
+$Comp
+L Device:D D3
+U 1 1 61E592A1
+P 3400 2800
+F 0 "D3" V 3354 2880 50  0000 L CNN
+F 1 "D" V 3445 2880 50  0000 L CNN
+F 2 "Diode_SMD:D_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 3400 2800 50  0001 C CNN
+F 3 "~" H 3400 2800 50  0001 C CNN
+	1    3400 2800
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:R R14
+U 1 1 61E7FA69
+P 4900 6600
+F 0 "R14" H 4970 6646 50  0000 L CNN
+F 1 "10k" H 4970 6555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4830 6600 50  0001 C CNN
+F 3 "~" H 4900 6600 50  0001 C CNN
+	1    4900 6600
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C17
+U 1 1 61E8255F
+P 6350 6800
+F 0 "C17" H 6465 6846 50  0000 L CNN
+F 1 "1µ" H 6465 6755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" H 6388 6650 50  0001 C CNN
+F 3 "~" H 6350 6800 50  0001 C CNN
+	1    6350 6800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6350 5950 6350 6600
+Wire Wire Line
+	6350 6950 6350 7200
+Wire Wire Line
+	4750 6300 4750 6600
+Connection ~ 4750 6300
+Wire Wire Line
+	5050 6600 6350 6600
+Connection ~ 6350 6600
+Wire Wire Line
+	6350 6600 6350 6650
+$Comp
+L Regulator_Linear:AZ1117-3.3 U3
+U 1 1 61A3E66B
+P 4150 2800
+F 0 "U3" H 4150 3042 50  0000 C CNN
+F 1 "AZ1117-3.3" H 4150 2951 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 4150 3050 50  0001 C CIN
+F 3 "https://www.diodes.com/assets/Datasheets/AZ1117.pdf" H 4150 2800 50  0001 C CNN
+	1    4150 2800
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC