added battery/display markings

3 files changed, 144 insertions, 100 deletions

diff --git a/hw/display/display.kicad_pcb b/hw/display/display.kicad_pcb
index c977ab0..72b616b 100644
--- a/hw/display/display.kicad_pcb
+++ b/hw/display/display.kicad_pcb
@@ -2,7 +2,7 @@
 
   (general
     (thickness 1.6)
-    (drawings 8)
+    (drawings 10)
     (tracks 542)
     (zones 0)
     (modules 30)
@@ -19,8 +19,8 @@
     (33 F.Adhes user)
     (34 B.Paste user)
     (35 F.Paste user)
-    (36 B.SilkS user hide)
-    (37 F.SilkS user hide)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
     (38 B.Mask user)
     (39 F.Mask user)
     (40 Dwgs.User user)
@@ -31,8 +31,8 @@
     (45 Margin user)
     (46 B.CrtYd user)
     (47 F.CrtYd user)
-    (48 B.Fab user hide)
-    (49 F.Fab user hide)
+    (48 B.Fab user)
+    (49 F.Fab user)
   )
 
   (setup
@@ -1397,7 +1397,7 @@
     (tags "connector Hirose FH12 horizontal")
     (path /6141DE10)
     (attr smd)
-    (fp_text reference J3 (at -5.8 1.65 180) (layer B.SilkS)
+    (fp_text reference J3 (at 0 3.7 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value Touch (at 2.15 -5.6 270) (layer B.Fab)
@@ -1673,6 +1673,12 @@
     )
   )
 
+  (gr_text 1 (at 132.4 79.8 90) (layer B.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)) (justify mirror))
+  )
+  (gr_text 1 (at 141.75 106.95 90) (layer B.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)) (justify mirror))
+  )
   (gr_arc (start 146.7 72.8) (end 148.2 72.8) (angle -90) (layer Edge.Cuts) (width 0.5))
   (gr_arc (start 146.7 109.8) (end 146.7 111.3) (angle -90) (layer Edge.Cuts) (width 0.5))
   (gr_arc (start 113.35 109.8) (end 111.85 109.8) (angle -90) (layer Edge.Cuts) (width 0.5))
@@ -2225,7 +2231,7 @@
   (segment (start 116.475 74.5) (end 115.75 74.5) (width 0.2) (layer F.Cu) (net 63))
   (segment (start 127.05 97.05) (end 127.05 97.55) (width 0.2) (layer F.Cu) (net 65))
 
-  (zone (net 1) (net_name GND) (layer GND) (tstamp 63369AB7) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer GND) (tstamp 63370E7C) (hatch edge 0.508)
     (connect_pads (clearance 0.2032))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.381) (thermal_bridge_width 0.508))
@@ -2759,7 +2765,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer PWR) (tstamp 63369AB4) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer PWR) (tstamp 63370E79) (hatch edge 0.508)
     (connect_pads (clearance 0.2032))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.381) (thermal_bridge_width 0.508))
@@ -3293,7 +3299,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 63369AB1) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 63370E76) (hatch edge 0.508)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -3308,7 +3314,7 @@
       )
     )
   )
-  (zone (net 35) (net_name LED_K) (layer F.Cu) (tstamp 63369AAE) (hatch edge 0.508)
+  (zone (net 35) (net_name LED_K) (layer F.Cu) (tstamp 63370E73) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -3325,7 +3331,7 @@
       )
     )
   )
-  (zone (net 36) (net_name LED_A) (layer F.Cu) (tstamp 63369AAB) (hatch edge 0.508)
+  (zone (net 36) (net_name LED_A) (layer F.Cu) (tstamp 63370E70) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
diff --git a/hw/rvPhone/rvPhone.kicad_pcb b/hw/rvPhone/rvPhone.kicad_pcb
index 12a00f1..8852e11 100644
--- a/hw/rvPhone/rvPhone.kicad_pcb
+++ b/hw/rvPhone/rvPhone.kicad_pcb
@@ -2,7 +2,7 @@
 
   (general
     (thickness 1.6)
-    (drawings 16)
+    (drawings 22)
     (tracks 7356)
     (zones 0)
     (modules 314)
@@ -19,8 +19,8 @@
     (33 F.Adhes user)
     (34 B.Paste user)
     (35 F.Paste user)
-    (36 B.SilkS user hide)
-    (37 F.SilkS user hide)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
     (38 B.Mask user)
     (39 F.Mask user)
     (40 Dwgs.User user)
@@ -31,8 +31,8 @@
     (45 Margin user)
     (46 B.CrtYd user)
     (47 F.CrtYd user)
-    (48 B.Fab user hide)
-    (49 F.Fab user hide)
+    (48 B.Fab user)
+    (49 F.Fab user)
   )
 
   (setup
@@ -610,10 +610,6 @@
     (via_drill 0.3)
     (uvia_dia 0.3)
     (uvia_drill 0.1)
-    (add_net +1V8)
-    (add_net +3V3)
-    (add_net +5V)
-    (add_net +VSYS)
     (add_net /BQ_SW)
     (add_net /disp/BT81X_1V2)
     (add_net /periph/ESP32_EN)
@@ -649,7 +645,6 @@
     (add_net ESP32.HSPI.SS0)
     (add_net ESP32.IO26)
     (add_net ESP32.IO27)
-    (add_net GND)
     (add_net "Net-(C2-Pad2)")
     (add_net "Net-(C214-Pad1)")
     (add_net "Net-(C215-Pad1)")
@@ -934,9 +929,7 @@
     (add_net PCA.IO1)
     (add_net PCA.IO2)
     (add_net PCA.IO3)
-    (add_net VBUS)
     (add_net VBUS_SENSE)
-    (add_net VDDA)
   )
 
   (net_class AUDIO ""
@@ -1102,6 +1095,22 @@
     (add_net JTAG_TMS)
   )
 
+  (net_class POWER ""
+    (clearance 0.2)
+    (trace_width 0.25)
+    (via_dia 0.6)
+    (via_drill 0.3)
+    (uvia_dia 0.3)
+    (uvia_drill 0.1)
+    (add_net +1V8)
+    (add_net +3V3)
+    (add_net +5V)
+    (add_net +VSYS)
+    (add_net GND)
+    (add_net VBUS)
+    (add_net VDDA)
+  )
+
   (net_class PRIMARY ""
     (clearance 0.2)
     (trace_width 0.2)
@@ -2038,7 +2047,7 @@
   (module footprints:Panasonic_EVPAE (layer F.Cu) (tedit 60DA617B) (tstamp 6010DDAE)
     (at 150.15 138.25)
     (path /5CC4AF43)
-    (fp_text reference SW2 (at 0 -2.25 180) (layer F.SilkS)
+    (fp_text reference SW2 (at 4.7 0 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value WAKE (at 0 2.75) (layer F.Fab)
@@ -8146,7 +8155,7 @@
     (tags "connector Hirose FH12 horizontal")
     (path /619DBCF0/60922A25)
     (attr smd)
-    (fp_text reference J205 (at -5.1 -3.7 180) (layer F.SilkS)
+    (fp_text reference J205 (at -1.65 -3.65 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value Prog (at 0 5.6 180) (layer F.Fab)
@@ -9971,7 +9980,7 @@
     (tags "connector Molex SlimStack side entry")
     (path /619DBCF0/60922A83)
     (attr smd)
-    (fp_text reference J207 (at -2 4.65 90) (layer B.SilkS)
+    (fp_text reference J207 (at -5.45 2.7 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value Camera (at -0.05 -5.55 90) (layer B.Fab)
@@ -11243,7 +11252,7 @@
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5CE1BD9A)
-    (fp_text reference J2 (at -2.4 -1.25 180) (layer B.SilkS)
+    (fp_text reference J2 (at 0 -5.45 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value BATT (at -2.4 1.15) (layer B.Fab)
@@ -15159,6 +15168,24 @@
     )
   )
 
+  (gr_text WAKE (at 150.35 135.8) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)))
+  )
+  (gr_text BAT (at 110 113.95) (layer B.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)) (justify mirror))
+  )
+  (gr_text + (at 108.6 115.85) (layer B.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)) (justify mirror))
+  )
+  (gr_text CAMERA (at 114.6 100.9 90) (layer B.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)) (justify mirror))
+  )
+  (gr_text DISPLAY (at 192.2 92.75) (layer B.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)) (justify mirror))
+  )
+  (gr_text 1 (at 182.05 132.9) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.2)))
+  )
   (gr_line (start 148.55 138.65) (end 151.75 138.65) (layer Edge.Cuts) (width 0.5) (tstamp 61AC2B63))
   (gr_arc (start 148.55 138.95) (end 148.55 138.65) (angle -90) (layer Edge.Cuts) (width 0.5))
   (gr_arc (start 151.75 138.95) (end 152.05 138.95) (angle -90) (layer Edge.Cuts) (width 0.5))
@@ -22533,7 +22560,7 @@
   (segment (start 143.15 129.05) (end 148.2 134.1) (width 0.2) (layer B.Cu) (net 509))
   (segment (start 143.15 118.15) (end 143.15 129.05) (width 0.2) (layer B.Cu) (net 509))
 
-  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 631766EE) (hatch edge 0.508)
+  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 633710CD) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22553,7 +22580,7 @@
       )
     )
   )
-  (zone (net 3) (net_name +1V8) (layer F.Cu) (tstamp 631766EB) (hatch edge 0.508)
+  (zone (net 3) (net_name +1V8) (layer F.Cu) (tstamp 633710CA) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22576,7 +22603,7 @@
       )
     )
   )
-  (zone (net 10) (net_name "Net-(L2-Pad1)") (layer F.Cu) (tstamp 631766E8) (hatch edge 0.508)
+  (zone (net 10) (net_name "Net-(L2-Pad1)") (layer F.Cu) (tstamp 633710C7) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22599,7 +22626,7 @@
       )
     )
   )
-  (zone (net 13) (net_name VBUS) (layer F.Cu) (tstamp 631766E5) (hatch edge 0.508)
+  (zone (net 13) (net_name VBUS) (layer F.Cu) (tstamp 633710C4) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22635,7 +22662,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 631766E2) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 633710C1) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22653,7 +22680,7 @@
       )
     )
   )
-  (zone (net 3) (net_name +1V8) (layer F.Cu) (tstamp 631766DF) (hatch edge 0.508)
+  (zone (net 3) (net_name +1V8) (layer F.Cu) (tstamp 633710BE) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22671,7 +22698,7 @@
       )
     )
   )
-  (zone (net 3) (net_name +1V8) (layer F.Cu) (tstamp 631766DC) (hatch edge 0.508)
+  (zone (net 3) (net_name +1V8) (layer F.Cu) (tstamp 633710BB) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22689,7 +22716,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 631766D9) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 633710B8) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -22707,7 +22734,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 631766D6) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 633710B5) (hatch edge 0.508)
     (connect_pads (clearance 0.2032))
     (min_thickness 0.254)
     (fill yes (arc_segments 16) (thermal_gap 0.254) (thermal_bridge_width 0.381))
@@ -27149,7 +27176,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 631766D3) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 633710B2) (hatch edge 0.508)
     (connect_pads (clearance 0.2032))
     (min_thickness 0.254)
     (fill yes (arc_segments 16) (thermal_gap 0.254) (thermal_bridge_width 0.381))
@@ -31008,7 +31035,7 @@
       )
     )
   )
-  (zone (net 42) (net_name DISP_LED_K) (layer F.Cu) (tstamp 631766D0) (hatch edge 0.508)
+  (zone (net 42) (net_name DISP_LED_K) (layer F.Cu) (tstamp 633710AF) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31028,7 +31055,7 @@
       )
     )
   )
-  (zone (net 264) (net_name "Net-(D401-Pad2)") (layer F.Cu) (tstamp 631766CD) (hatch edge 0.508)
+  (zone (net 264) (net_name "Net-(D401-Pad2)") (layer F.Cu) (tstamp 633710AC) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31044,7 +31071,7 @@
       )
     )
   )
-  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 631766CA) (hatch edge 0.508)
+  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 633710A9) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31065,7 +31092,7 @@
       )
     )
   )
-  (zone (net 18) (net_name "Net-(L3-Pad2)") (layer F.Cu) (tstamp 631766C7) (hatch edge 0.508)
+  (zone (net 18) (net_name "Net-(L3-Pad2)") (layer F.Cu) (tstamp 633710A6) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31081,7 +31108,7 @@
       )
     )
   )
-  (zone (net 17) (net_name "Net-(L3-Pad1)") (layer F.Cu) (tstamp 631766C4) (hatch edge 0.508)
+  (zone (net 17) (net_name "Net-(L3-Pad1)") (layer F.Cu) (tstamp 633710A3) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31097,7 +31124,7 @@
       )
     )
   )
-  (zone (net 17) (net_name "Net-(L3-Pad1)") (layer F.Cu) (tstamp 631766C1) (hatch edge 0.508)
+  (zone (net 17) (net_name "Net-(L3-Pad1)") (layer F.Cu) (tstamp 633710A0) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31116,7 +31143,7 @@
       )
     )
   )
-  (zone (net 18) (net_name "Net-(L3-Pad2)") (layer F.Cu) (tstamp 631766BE) (hatch edge 0.508)
+  (zone (net 18) (net_name "Net-(L3-Pad2)") (layer F.Cu) (tstamp 6337109D) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31135,7 +31162,7 @@
       )
     )
   )
-  (zone (net 18) (net_name "Net-(L3-Pad2)") (layer B.Cu) (tstamp 631766BB) (hatch edge 0.508)
+  (zone (net 18) (net_name "Net-(L3-Pad2)") (layer B.Cu) (tstamp 6337109A) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31153,7 +31180,7 @@
       )
     )
   )
-  (zone (net 17) (net_name "Net-(L3-Pad1)") (layer B.Cu) (tstamp 631766B8) (hatch edge 0.508)
+  (zone (net 17) (net_name "Net-(L3-Pad1)") (layer B.Cu) (tstamp 63371097) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31182,7 +31209,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 631766B5) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 63371094) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -31199,7 +31226,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer GND) (tstamp 631766B2) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer GND) (tstamp 63371091) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
     (fill yes (arc_segments 32) (thermal_gap 0.254) (thermal_bridge_width 0.4572))
@@ -35888,7 +35915,7 @@
       )
     )
   )
-  (zone (net 34) (net_name +VSYS) (layer PWR) (tstamp 631766AF) (hatch edge 0.508)
+  (zone (net 34) (net_name +VSYS) (layer PWR) (tstamp 6337108E) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -37311,7 +37338,7 @@
       )
     )
   )
-  (zone (net 14) (net_name "Net-(C6-Pad1)") (layer F.Cu) (tstamp 631766AC) (hatch edge 0.508)
+  (zone (net 14) (net_name "Net-(C6-Pad1)") (layer F.Cu) (tstamp 6337108B) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -37333,7 +37360,7 @@
       )
     )
   )
-  (zone (net 456) (net_name +5V) (layer F.Cu) (tstamp 631766A9) (hatch edge 0.508)
+  (zone (net 456) (net_name +5V) (layer F.Cu) (tstamp 63371088) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -37364,7 +37391,7 @@
       )
     )
   )
-  (zone (net 3) (net_name +1V8) (layer PWR) (tstamp 631766A6) (hatch edge 0.508)
+  (zone (net 3) (net_name +1V8) (layer PWR) (tstamp 63371085) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -37999,7 +38026,7 @@
       )
     )
   )
-  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 631766A3) (hatch edge 0.508)
+  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 63371082) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38020,7 +38047,7 @@
       )
     )
   )
-  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 631766A0) (hatch edge 0.508)
+  (zone (net 34) (net_name +VSYS) (layer F.Cu) (tstamp 6337107F) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38038,7 +38065,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 6317669D) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 6337107C) (hatch edge 0.508)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -38067,7 +38094,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 6317669A) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 63371079) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38085,7 +38112,7 @@
       )
     )
   )
-  (zone (net 41) (net_name DISP_LED_A) (layer B.Cu) (tstamp 63176697) (hatch edge 0.508)
+  (zone (net 41) (net_name DISP_LED_A) (layer B.Cu) (tstamp 63371076) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38106,7 +38133,7 @@
       )
     )
   )
-  (zone (net 396) (net_name VDDA) (layer F.Cu) (tstamp 63176694) (hatch edge 0.508)
+  (zone (net 396) (net_name VDDA) (layer F.Cu) (tstamp 63371073) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38125,7 +38152,7 @@
       )
     )
   )
-  (zone (net 396) (net_name VDDA) (layer F.Cu) (tstamp 63176691) (hatch edge 0.508)
+  (zone (net 396) (net_name VDDA) (layer F.Cu) (tstamp 63371070) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38144,7 +38171,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer PWR) (tstamp 6317668E) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer PWR) (tstamp 6337106D) (hatch edge 0.508)
     (priority 1)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
@@ -38278,7 +38305,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 6317668B) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer F.Cu) (tstamp 6337106A) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38348,7 +38375,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 63176688) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 63371067) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38367,7 +38394,7 @@
       )
     )
   )
-  (zone (net 419) (net_name /BQ_SW) (layer F.Cu) (tstamp 63176685) (hatch edge 0.508)
+  (zone (net 419) (net_name /BQ_SW) (layer F.Cu) (tstamp 63371064) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38389,7 +38416,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 63176682) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 63371061) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38434,7 +38461,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 6317667F) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 6337105E) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38479,7 +38506,7 @@
       )
     )
   )
-  (zone (net 41) (net_name DISP_LED_A) (layer F.Cu) (tstamp 6317667C) (hatch edge 0.508)
+  (zone (net 41) (net_name DISP_LED_A) (layer F.Cu) (tstamp 6337105B) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38498,7 +38525,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 63176679) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 63371058) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -38542,7 +38569,7 @@
       )
     )
   )
-  (zone (net 3) (net_name +1V8) (layer B.Cu) (tstamp 63176676) (hatch edge 0.508)
+  (zone (net 3) (net_name +1V8) (layer B.Cu) (tstamp 63371055) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38558,7 +38585,7 @@
       )
     )
   )
-  (zone (net 3) (net_name +1V8) (layer B.Cu) (tstamp 63176673) (hatch edge 0.508)
+  (zone (net 3) (net_name +1V8) (layer B.Cu) (tstamp 63371052) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -38574,7 +38601,7 @@
       )
     )
   )
-  (zone (net 396) (net_name VDDA) (layer PWR) (tstamp 63176670) (hatch edge 0.508)
+  (zone (net 396) (net_name VDDA) (layer PWR) (tstamp 6337104F) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -39509,7 +39536,7 @@
       )
     )
   )
-  (zone (net 456) (net_name +5V) (layer PWR) (tstamp 6317666D) (hatch edge 0.508)
+  (zone (net 456) (net_name +5V) (layer PWR) (tstamp 6337104C) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -39698,7 +39725,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer B.Cu) (tstamp 6317666A) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer B.Cu) (tstamp 63371049) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39717,7 +39744,7 @@
       )
     )
   )
-  (zone (net 215) (net_name /SPK_R+) (layer F.Cu) (tstamp 63176667) (hatch edge 0.508)
+  (zone (net 215) (net_name /SPK_R+) (layer F.Cu) (tstamp 63371046) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39733,7 +39760,7 @@
       )
     )
   )
-  (zone (net 216) (net_name /SPK_L+) (layer F.Cu) (tstamp 63176664) (hatch edge 0.508)
+  (zone (net 216) (net_name /SPK_L+) (layer F.Cu) (tstamp 63371043) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39749,7 +39776,7 @@
       )
     )
   )
-  (zone (net 390) (net_name /AUDIO_OUT_L-) (layer F.Cu) (tstamp 63176661) (hatch edge 0.508)
+  (zone (net 390) (net_name /AUDIO_OUT_L-) (layer F.Cu) (tstamp 63371040) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39765,7 +39792,7 @@
       )
     )
   )
-  (zone (net 392) (net_name /AUDIO_OUT_R-) (layer F.Cu) (tstamp 6317665E) (hatch edge 0.508)
+  (zone (net 392) (net_name /AUDIO_OUT_R-) (layer F.Cu) (tstamp 6337103D) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39781,7 +39808,7 @@
       )
     )
   )
-  (zone (net 388) (net_name /HP_L) (layer F.Cu) (tstamp 6317665B) (hatch edge 0.508)
+  (zone (net 388) (net_name /HP_L) (layer F.Cu) (tstamp 6337103A) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39797,7 +39824,7 @@
       )
     )
   )
-  (zone (net 391) (net_name /AUDIO_OUT_L+) (layer F.Cu) (tstamp 63176658) (hatch edge 0.508)
+  (zone (net 391) (net_name /AUDIO_OUT_L+) (layer F.Cu) (tstamp 63371037) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39816,7 +39843,7 @@
       )
     )
   )
-  (zone (net 390) (net_name /AUDIO_OUT_L-) (layer F.Cu) (tstamp 63176655) (hatch edge 0.508)
+  (zone (net 390) (net_name /AUDIO_OUT_L-) (layer F.Cu) (tstamp 63371034) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39836,7 +39863,7 @@
       )
     )
   )
-  (zone (net 392) (net_name /AUDIO_OUT_R-) (layer F.Cu) (tstamp 63176652) (hatch edge 0.508)
+  (zone (net 392) (net_name /AUDIO_OUT_R-) (layer F.Cu) (tstamp 63371031) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39856,7 +39883,7 @@
       )
     )
   )
-  (zone (net 393) (net_name /AUDIO_OUT_R+) (layer F.Cu) (tstamp 6317664F) (hatch edge 0.508)
+  (zone (net 393) (net_name /AUDIO_OUT_R+) (layer F.Cu) (tstamp 6337102E) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39875,7 +39902,7 @@
       )
     )
   )
-  (zone (net 216) (net_name /SPK_L+) (layer F.Cu) (tstamp 6317664C) (hatch edge 0.508)
+  (zone (net 216) (net_name /SPK_L+) (layer F.Cu) (tstamp 6337102B) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39891,7 +39918,7 @@
       )
     )
   )
-  (zone (net 217) (net_name /SPK_L-) (layer F.Cu) (tstamp 63176649) (hatch edge 0.508)
+  (zone (net 217) (net_name /SPK_L-) (layer F.Cu) (tstamp 63371028) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39907,7 +39934,7 @@
       )
     )
   )
-  (zone (net 391) (net_name /AUDIO_OUT_L+) (layer F.Cu) (tstamp 63176646) (hatch edge 0.508)
+  (zone (net 391) (net_name /AUDIO_OUT_L+) (layer F.Cu) (tstamp 63371025) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39927,7 +39954,7 @@
       )
     )
   )
-  (zone (net 393) (net_name /AUDIO_OUT_R+) (layer F.Cu) (tstamp 63176643) (hatch edge 0.508)
+  (zone (net 393) (net_name /AUDIO_OUT_R+) (layer F.Cu) (tstamp 63371022) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
@@ -39947,7 +39974,7 @@
       )
     )
   )
-  (zone (net 2) (net_name +3V3) (layer PWR) (tstamp 63176640) (hatch edge 0.508)
+  (zone (net 2) (net_name +3V3) (layer PWR) (tstamp 6337101F) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
     (min_thickness 0.2)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -43818,7 +43845,7 @@
       )
     )
   )
-  (zone (net 456) (net_name +5V) (layer F.Cu) (tstamp 6317663D) (hatch edge 0.508)
+  (zone (net 456) (net_name +5V) (layer F.Cu) (tstamp 6337101C) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.2032))
     (min_thickness 0.254)
diff --git a/hw/rvPhone/rvPhone.pro b/hw/rvPhone/rvPhone.pro
index 03d9e5f..8a15115 100644
--- a/hw/rvPhone/rvPhone.pro
+++ b/hw/rvPhone/rvPhone.pro
@@ -1,4 +1,4 @@
-update=Wednesday, September 28, 2022 at 05:51:00 PM
+update=Friday, September 30, 2022 at 02:55:15 PM
 version=1
 last_client=kicad
 [cvpcb]
@@ -9,6 +9,16 @@ version=1
 [eeschema]
 version=1
 LibDir=
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=schema/
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=Pcbnew
+SpiceAjustPassiveValues=0
+LabSize=60
+ERC_TestSimilarLabels=1
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -289,6 +299,17 @@ dPairWidth=0.2
 dPairGap=0.25
 dPairViaGap=0.25
 [pcbnew/Netclasses/6]
+Name=POWER
+Clearance=0.2
+TrackWidth=0.25
+ViaDiameter=0.6
+ViaDrill=0.3
+uViaDiameter=0.3
+uViaDrill=0.1
+dPairWidth=0.2
+dPairGap=0.25
+dPairViaGap=0.25
+[pcbnew/Netclasses/7]
 Name=PRIMARY
 Clearance=0.2
 TrackWidth=0.2
@@ -299,7 +320,7 @@ uViaDrill=0.1
 dPairWidth=0.2
 dPairGap=0.25
 dPairViaGap=0.25
-[pcbnew/Netclasses/7]
+[pcbnew/Netclasses/8]
 Name=USB2DIFF
 Clearance=0.1524
 TrackWidth=0.2288
@@ -310,7 +331,7 @@ uViaDrill=0.1
 dPairWidth=0.2288
 dPairGap=0.1524
 dPairViaGap=0.25
-[pcbnew/Netclasses/8]
+[pcbnew/Netclasses/9]
 Name=USB2UART
 Clearance=0.2
 TrackWidth=0.2
@@ -321,13 +342,3 @@ uViaDrill=0.1
 dPairWidth=0.2
 dPairGap=0.25
 dPairViaGap=0.25
-[schematic_editor]
-version=1
-PageLayoutDescrFile=
-PlotDirectoryName=schema/
-SubpartIdSeparator=0
-SubpartFirstId=65
-NetFmtName=Pcbnew
-SpiceAjustPassiveValues=0
-LabSize=60
-ERC_TestSimilarLabels=1