r5231 - in trunk/gta02-core: . components

daveb at docs.openmoko.org daveb at docs.openmoko.org
Sat Jun 27 12:15:31 CEST 2009


Author: daveb
Date: 2009-06-27 12:15:31 +0200 (Sat, 27 Jun 2009)
New Revision: 5231

Modified:
   trunk/gta02-core/components/gta02-core.lib
   trunk/gta02-core/components/gta02_power.lib
   trunk/gta02-core/pmu.sch
Log:
new power symbol - FLASH_1v8


Modified: trunk/gta02-core/components/gta02-core.lib
===================================================================
--- trunk/gta02-core/components/gta02-core.lib	2009-06-27 10:04:39 UTC (rev 5230)
+++ trunk/gta02-core/components/gta02-core.lib	2009-06-27 10:15:31 UTC (rev 5231)
@@ -1803,30 +1803,42 @@
 ENDDEF
 #
 #
-# VB_SYS
+# AVCC_CODEC
 #
-DEF VB_SYS #PWR 0 40 Y Y 1 F P
+DEF AVCC_CODEC #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VB_SYS" 0 150 50 H V C CNN
+F1 "AVCC_CODEC" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VB_SYS 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# IO_3V3
+# BT_3V2
 #
-DEF IO_3V3 #PWR 0 40 Y Y 1 F P
+DEF BT_3V2 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "IO_3V3" 0 150 50 H V C CNN
+F1 "BT_3V2" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X BT_3V2 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
+# CODEC_3V3
+#
+DEF CODEC_3V3 #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 -100 50 H I C CNN
+F1 "CODEC_3V3" 0 150 50 H V C CNN
+DRAW
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+X CODEC_3V3 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
 # CORE_1V3
 #
 DEF CORE_1V3 #PWR 0 40 Y Y 1 F P
@@ -1839,27 +1851,27 @@
 ENDDRAW
 ENDDEF
 #
-# IO_1V8
+# DVCC_CODEC
 #
-DEF IO_1V8 #PWR 0 40 Y Y 1 F P
+DEF DVCC_CODEC #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "IO_1V8" 0 150 50 H V C CNN
+F1 "DVCC_CODEC" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_1V8 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# SD_3V3
+# FLASH_1V8
 #
-DEF SD_3V3 #PWR 0 40 Y Y 1 F P
+DEF FLASH_1V8 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "SD_3V3" 0 150 50 H V C CNN
+F1 "FLASH_1V8" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X SD_3V3 1 0 0 0 U 20 30 0 0 W N
+X FLASH_1V8 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
@@ -1875,42 +1887,54 @@
 ENDDRAW
 ENDDEF
 #
-# VB
+# IO_1V8
 #
-DEF VB #PWR 0 40 Y Y 1 F P
+DEF IO_1V8 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VB" 0 150 50 H V C CNN
+F1 "IO_1V8" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VB 1 0 0 0 U 20 30 0 0 W N
+X IO_1V8 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# CODEC_3V3
+# IO_3V3
 #
-DEF CODEC_3V3 #PWR 0 40 Y Y 1 F P
+DEF IO_3V3 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "CODEC_3V3" 0 150 50 H V C CNN
+F1 "IO_3V3" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X CODEC_3V3 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# BT_3V2
+# LCM_3V
 #
-DEF BT_3V2 #PWR 0 40 Y Y 1 F P
+DEF LCM_3V #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "BT_3V2" 0 150 50 H V C CNN
+F1 "LCM_3V" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X BT_3V2 1 0 0 0 U 20 30 0 0 W N
+X LCM_3V 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
+# LNA_AVDD
+#
+DEF LNA_AVDD #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 -100 50 H I C CNN
+F1 "LNA_AVDD" 0 150 50 H V C CNN
+DRAW
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+X LNA_AVDD 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
 # RF_3V
 #
 DEF RF_3V #PWR 0 40 Y Y 1 F P
@@ -1923,27 +1947,26 @@
 ENDDRAW
 ENDDEF
 #
-# LCM_3V
+# RF_GND
 #
-DEF LCM_3V #PWR 0 40 Y Y 1 F P
-F0 "#PWR" 0 -100 50 H I C CNN
-F1 "LCM_3V" 0 150 50 H V C CNN
+DEF RF_GND #PWR 0 10 Y Y 1 F P
+F0 "#PWR" 0 0 40 H I C CNN
+F1 "RF_GND" 0 -100 50 H V C CNN
 DRAW
-C 0 60 20 0 1 0 N
-P 3 0 1 0  0 0  0 40  0 40 N
-X LCM_3V 1 0 0 0 U 20 30 0 0 W N
+P 4 0 1 0  -40 0  40 0  0 -40  -40 0 N
+X RF_GND 1 0 0 0 U 40 40 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# VBUS
+# SD_3V3
 #
-DEF VBUS #PWR 0 40 Y Y 1 F P
+DEF SD_3V3 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VBUS" 0 150 50 H V C CNN
+F1 "SD_3V3" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VBUS 1 0 0 0 U 20 30 0 0 W N
+X SD_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
@@ -1959,122 +1982,111 @@
 ENDDRAW
 ENDDEF
 #
-# VB_GSM
+# STBY_1V2
 #
-DEF VB_GSM #PWR 0 40 Y Y 1 F P
+DEF STBY_1V2 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VB_GSM" 0 150 50 H V C CNN
+F1 "STBY_1V2" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VB_GSM 1 0 0 0 U 20 30 0 0 W N
+X STBY_1V2 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# VBAT
+# USB_VBUS
 #
-DEF VBAT #PWR 0 40 Y Y 1 F P
+DEF USB_VBUS #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VBAT" 0 150 50 H V C CNN
+F1 "USB_VBUS" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VBAT 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# STBY_1V2
+# VB
 #
-DEF STBY_1V2 #PWR 0 40 Y Y 1 F P
+DEF VB #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "STBY_1V2" 0 150 50 H V C CNN
+F1 "VB" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X STBY_1V2 1 0 0 0 U 20 30 0 0 W N
+X VB 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# IO_3V3
+# VB_GSM
 #
-DEF USB_VBUS #PWR 0 40 Y Y 1 F P
+DEF VB_GSM #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "USB_VBUS" 0 150 50 H V C CNN
+F1 "VB_GSM" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X VB_GSM 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# LNA_AVDD
+# VB_SYS
 #
-DEF LNA_AVDD #PWR 0 40 Y Y 1 F P
+DEF VB_SYS #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "LNA_AVDD" 0 150 50 H V C CNN
+F1 "VB_SYS" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X LNA_AVDD 1 0 0 0 U 20 30 0 0 W N
+X VB_SYS 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# VCCRF
+# VBAT
 #
-DEF VCCRF #PWR 0 40 Y Y 1 F P
+DEF VBAT #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VCCRF" 0 150 50 H V C CNN
+F1 "VBAT" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VCCRF 1 0 0 0 U 20 30 0 0 W N
+X VBAT 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# RF_GND
+# VBUS
 #
-DEF RF_GND #PWR 0 10 Y Y 1 F P
-F0 "#PWR" 0 0 40 H I C CNN
-F1 "RF_GND" 0 -100 50 H V C CNN
-DRAW
-P 4 0 1 0  -40 0  40 0  0 -40  -40 0 N
-X RF_GND 1 0 0 0 U 40 40 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VCCTCXO
-#
-DEF VCCTCXO #PWR 0 40 Y Y 1 F P
+DEF VBUS #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VCCTCXO" 0 150 50 H V C CNN
+F1 "VBUS" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VCCTCXO 1 0 0 0 U 20 30 0 0 W N
+X VBUS 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# DVCC_CODEC
+# VCCRF
 #
-DEF DVCC_CODEC #PWR 0 40 Y Y 1 F P
+DEF VCCRF #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "DVCC_CODEC" 0 150 50 H V C CNN
+F1 "VCCRF" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X VCCRF 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# AVCC_CODEC
+# VCCTCXO
 #
-DEF AVCC_CODEC #PWR 0 40 Y Y 1 F P
+DEF VCCTCXO #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "AVCC_CODEC" 0 150 50 H V C CNN
+F1 "VCCTCXO" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X VCCTCXO 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #

Modified: trunk/gta02-core/components/gta02_power.lib
===================================================================
--- trunk/gta02-core/components/gta02_power.lib	2009-06-27 10:04:39 UTC (rev 5230)
+++ trunk/gta02-core/components/gta02_power.lib	2009-06-27 10:15:31 UTC (rev 5231)
@@ -1,29 +1,41 @@
-EESchema-LIBRARY Version 2.3  Date: Sun 21 Jun 2009 17:21:32 CDT
+EESchema-LIBRARY Version 2.3  Date: Sat 27 Jun 2009 11:12:02 BST
 #
-# VB_SYS
+# AVCC_CODEC
 #
-DEF VB_SYS #PWR 0 40 Y Y 1 F P
+DEF AVCC_CODEC #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VB_SYS" 0 150 50 H V C CNN
+F1 "AVCC_CODEC" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VB_SYS 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# IO_3V3
+# BT_3V2
 #
-DEF IO_3V3 #PWR 0 40 Y Y 1 F P
+DEF BT_3V2 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "IO_3V3" 0 150 50 H V C CNN
+F1 "BT_3V2" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X BT_3V2 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
+# CODEC_3V3
+#
+DEF CODEC_3V3 #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 -100 50 H I C CNN
+F1 "CODEC_3V3" 0 150 50 H V C CNN
+DRAW
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+X CODEC_3V3 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
 # CORE_1V3
 #
 DEF CORE_1V3 #PWR 0 40 Y Y 1 F P
@@ -36,27 +48,27 @@
 ENDDRAW
 ENDDEF
 #
-# IO_1V8
+# DVCC_CODEC
 #
-DEF IO_1V8 #PWR 0 40 Y Y 1 F P
+DEF DVCC_CODEC #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "IO_1V8" 0 150 50 H V C CNN
+F1 "DVCC_CODEC" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_1V8 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# SD_3V3
+# FLASH_1V8
 #
-DEF SD_3V3 #PWR 0 40 Y Y 1 F P
+DEF FLASH_1V8 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "SD_3V3" 0 150 50 H V C CNN
+F1 "FLASH_1V8" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X SD_3V3 1 0 0 0 U 20 30 0 0 W N
+X FLASH_1V8 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
@@ -72,42 +84,54 @@
 ENDDRAW
 ENDDEF
 #
-# VB
+# IO_1V8
 #
-DEF VB #PWR 0 40 Y Y 1 F P
+DEF IO_1V8 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VB" 0 150 50 H V C CNN
+F1 "IO_1V8" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VB 1 0 0 0 U 20 30 0 0 W N
+X IO_1V8 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# CODEC_3V3
+# IO_3V3
 #
-DEF CODEC_3V3 #PWR 0 40 Y Y 1 F P
+DEF IO_3V3 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "CODEC_3V3" 0 150 50 H V C CNN
+F1 "IO_3V3" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X CODEC_3V3 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# BT_3V2
+# LCM_3V
 #
-DEF BT_3V2 #PWR 0 40 Y Y 1 F P
+DEF LCM_3V #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "BT_3V2" 0 150 50 H V C CNN
+F1 "LCM_3V" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X BT_3V2 1 0 0 0 U 20 30 0 0 W N
+X LCM_3V 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
+# LNA_AVDD
+#
+DEF LNA_AVDD #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 -100 50 H I C CNN
+F1 "LNA_AVDD" 0 150 50 H V C CNN
+DRAW
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+X LNA_AVDD 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
 # RF_3V
 #
 DEF RF_3V #PWR 0 40 Y Y 1 F P
@@ -120,27 +144,26 @@
 ENDDRAW
 ENDDEF
 #
-# LCM_3V
+# RF_GND
 #
-DEF LCM_3V #PWR 0 40 Y Y 1 F P
-F0 "#PWR" 0 -100 50 H I C CNN
-F1 "LCM_3V" 0 150 50 H V C CNN
+DEF RF_GND #PWR 0 10 Y Y 1 F P
+F0 "#PWR" 0 0 40 H I C CNN
+F1 "RF_GND" 0 -100 50 H V C CNN
 DRAW
-C 0 60 20 0 1 0 N
-P 3 0 1 0  0 0  0 40  0 40 N
-X LCM_3V 1 0 0 0 U 20 30 0 0 W N
+P 4 0 1 0  -40 0  40 0  0 -40  -40 0 N
+X RF_GND 1 0 0 0 U 40 40 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# VBUS
+# SD_3V3
 #
-DEF VBUS #PWR 0 40 Y Y 1 F P
+DEF SD_3V3 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VBUS" 0 150 50 H V C CNN
+F1 "SD_3V3" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VBUS 1 0 0 0 U 20 30 0 0 W N
+X SD_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
@@ -156,122 +179,111 @@
 ENDDRAW
 ENDDEF
 #
-# VB_GSM
+# STBY_1V2
 #
-DEF VB_GSM #PWR 0 40 Y Y 1 F P
+DEF STBY_1V2 #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VB_GSM" 0 150 50 H V C CNN
+F1 "STBY_1V2" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VB_GSM 1 0 0 0 U 20 30 0 0 W N
+X STBY_1V2 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# VBAT
+# USB_VBUS
 #
-DEF VBAT #PWR 0 40 Y Y 1 F P
+DEF USB_VBUS #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VBAT" 0 150 50 H V C CNN
+F1 "USB_VBUS" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VBAT 1 0 0 0 U 20 30 0 0 W N
+X IO_3V3 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# STBY_1V2
+# VB
 #
-DEF STBY_1V2 #PWR 0 40 Y Y 1 F P
+DEF VB #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "STBY_1V2" 0 150 50 H V C CNN
+F1 "VB" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X STBY_1V2 1 0 0 0 U 20 30 0 0 W N
+X VB 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# IO_3V3
+# VB_GSM
 #
-DEF USB_VBUS #PWR 0 40 Y Y 1 F P
+DEF VB_GSM #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "USB_VBUS" 0 150 50 H V C CNN
+F1 "VB_GSM" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X VB_GSM 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# LNA_AVDD
+# VB_SYS
 #
-DEF LNA_AVDD #PWR 0 40 Y Y 1 F P
+DEF VB_SYS #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "LNA_AVDD" 0 150 50 H V C CNN
+F1 "VB_SYS" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X LNA_AVDD 1 0 0 0 U 20 30 0 0 W N
+X VB_SYS 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# VCCRF
+# VBAT
 #
-DEF VCCRF #PWR 0 40 Y Y 1 F P
+DEF VBAT #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VCCRF" 0 150 50 H V C CNN
+F1 "VBAT" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VCCRF 1 0 0 0 U 20 30 0 0 W N
+X VBAT 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# RF_GND
+# VBUS
 #
-DEF RF_GND #PWR 0 10 Y Y 1 F P
-F0 "#PWR" 0 0 40 H I C CNN
-F1 "RF_GND" 0 -100 50 H V C CNN
-DRAW
-P 4 0 1 0  -40 0  40 0  0 -40  -40 0 N
-X RF_GND 1 0 0 0 U 40 40 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VCCTCXO
-#
-DEF VCCTCXO #PWR 0 40 Y Y 1 F P
+DEF VBUS #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "VCCTCXO" 0 150 50 H V C CNN
+F1 "VBUS" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X VCCTCXO 1 0 0 0 U 20 30 0 0 W N
+X VBUS 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# DVCC_CODEC
+# VCCRF
 #
-DEF DVCC_CODEC #PWR 0 40 Y Y 1 F P
+DEF VCCRF #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "DVCC_CODEC" 0 150 50 H V C CNN
+F1 "VCCRF" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X VCCRF 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# AVCC_CODEC
+# VCCTCXO
 #
-DEF AVCC_CODEC #PWR 0 40 Y Y 1 F P
+DEF VCCTCXO #PWR 0 40 Y Y 1 F P
 F0 "#PWR" 0 -100 50 H I C CNN
-F1 "AVCC_CODEC" 0 150 50 H V C CNN
+F1 "VCCTCXO" 0 150 50 H V C CNN
 DRAW
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
-X IO_3V3 1 0 0 0 U 20 30 0 0 W N
+X VCCTCXO 1 0 0 0 U 20 30 0 0 W N
 ENDDRAW
 ENDDEF
 #

Modified: trunk/gta02-core/pmu.sch
===================================================================
--- trunk/gta02-core/pmu.sch	2009-06-27 10:04:39 UTC (rev 5230)
+++ trunk/gta02-core/pmu.sch	2009-06-27 10:15:31 UTC (rev 5231)
@@ -1,9 +1,9 @@
-EESchema Schematic File Version 2  date Thu Jun 25 06:58:40 2009
+EESchema Schematic File Version 2  date Sat 27 Jun 2009 11:14:37 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
-Sheet 6 9
+Sheet 8 11
 Title ""
 Date "20 jun 2009"
 Rev ""
@@ -13,123 +13,107 @@
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 1450 1450 0    200  ~ 40
-PMU
-NoConn ~ 9200 7350
-NoConn ~ 9200 5200
-NoConn ~ 9200 4100
+$Comp
+L FLASH_1V8 #PWR?
+U 1 1 4A45F0E6
+P 15700 5900
+F 0 "#PWR?" H 15700 5800 50  0001 C CNN
+F 1 "FLASH_1V8" H 15700 6050 50  0000 C CNN
+	1    15700 5900
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	8900 4200 8900 3850
+	15700 5900 15700 6000
 Wire Wire Line
-	8900 4200 9200 4200
+	15700 6000 15500 6000
 Wire Wire Line
-	13600 9600 13600 9400
+	8250 4400 8250 4050
 Wire Wire Line
-	13600 9400 13600 9300
-Connection ~ 14600 9400
+	8250 4400 8550 4400
 Wire Wire Line
-	14600 9300 14600 9400
+	12950 9500 12950 9800
+Connection ~ 13950 9600
 Wire Wire Line
-	14600 9400 14600 9600
-Connection ~ 14600 10200
+	13950 9800 13950 9500
+Connection ~ 13950 10400
 Wire Wire Line
-	14600 10000 14600 10200
+	13950 10500 13950 10200
+Connection ~ 7650 6000
 Wire Wire Line
-	14600 10200 14600 10300
-Connection ~ 8300 5800
-Wire Wire Line
-	9200 4400 9000 4400
+	8550 4600 8350 4600
 Connection ~ 9700 2050
 Wire Wire Line
-	2950 4350 3350 4350
+	2300 4550 2700 4550
 Wire Wire Line
-	2250 4150 2250 4350
+	1600 4350 1600 4550
 Wire Wire Line
-	4850 9350 6250 9350
+	4200 9550 5600 9550
 Wire Wire Line
-	6250 9350 6250 8200
+	5600 9550 5600 8400
 Wire Wire Line
-	6250 8200 9000 8200
+	5950 7850 6350 7850
 Wire Wire Line
-	6600 7650 7000 7650
+	8100 7650 6350 7650
 Wire Wire Line
-	8750 7450 7000 7450
+	8100 7650 8100 7750
 Wire Wire Line
-	8750 7450 8750 7550
+	8100 7750 8550 7750
 Wire Wire Line
-	8750 7550 9200 7550
+	8550 7450 5950 7450
+Connection ~ 1400 6750
 Wire Wire Line
-	9200 7250 6600 7250
-Connection ~ 2050 6550
+	8550 6750 1200 6750
 Wire Wire Line
-	1850 6550 2050 6550
+	1400 6750 1400 6950
 Wire Wire Line
-	2050 6550 2250 6550
+	1400 7650 1400 7450
 Wire Wire Line
-	2250 6550 9200 6550
+	2600 5400 2150 5400
 Wire Wire Line
-	2050 6750 2050 6550
+	2600 5400 2600 6650
 Wire Wire Line
-	2050 7450 2050 7250
+	3600 5650 3600 5850
 Wire Wire Line
-	3250 5200 2800 5200
+	3600 6350 3600 6550
 Wire Wire Line
-	3250 5200 3250 6450
+	4450 5550 4450 5750
 Wire Wire Line
-	4250 5450 4250 5650
+	4450 6250 4450 6450
 Wire Wire Line
-	4250 6150 4250 6350
+	5400 5450 5400 5650
 Wire Wire Line
-	5100 5350 5100 5550
+	5400 6150 5400 6350
 Wire Wire Line
-	5100 6050 5100 6250
+	6350 5350 6350 5550
 Wire Wire Line
-	6050 5250 6050 5450
+	6350 6050 6350 6250
 Wire Wire Line
-	6050 5950 6050 6150
+	5600 8400 8550 8400
 Wire Wire Line
-	7000 5150 7000 5350
+	3500 9550 3050 9550
 Wire Wire Line
-	7000 5850 7000 6050
+	6300 8850 6300 9050
 Wire Wire Line
-	9000 8200 9000 8200
+	6650 8650 6650 9750
 Wire Wire Line
-	9000 8200 9200 8200
+	12400 6000 12850 6000
 Wire Wire Line
-	4150 9350 3700 9350
-Wire Wire Line
-	6950 8650 6950 8850
-Wire Wire Line
-	7300 8450 7300 9550
-Wire Wire Line
-	13500 5800 13250 5800
-Wire Wire Line
-	13250 5800 13050 5800
-Wire Wire Line
-	14000 5300 14250 5300
+	13350 5500 13600 5500
 Connection ~ 3300 2100
 Wire Wire Line
-	3300 1900 3300 2100
-Wire Wire Line
-	3300 2100 3300 2300
+	3300 2300 3300 1900
 Connection ~ 5450 2100
 Wire Wire Line
-	5450 1900 5450 2100
+	5450 2300 5450 1900
 Wire Wire Line
-	5450 2100 5450 2300
-Wire Wire Line
 	5250 2100 5450 2100
 Wire Wire Line
 	8050 1300 7850 1300
 Wire Wire Line
-	13950 1750 13750 1750
+	13550 1750 13950 1750
 Wire Wire Line
-	13750 1750 13550 1750
+	13350 2550 13350 2150
 Wire Wire Line
-	13350 2150 13350 2350
-Wire Wire Line
-	13350 2350 13350 2550
-Wire Wire Line
 	13750 2550 13750 2350
 Wire Wire Line
 	13750 1950 13750 1750
@@ -138,10 +122,8 @@
 	12800 850  12800 1050
 Connection ~ 13350 2350
 Wire Wire Line
-	12600 2350 13000 2350
+	12600 2350 13350 2350
 Wire Wire Line
-	13000 2350 13350 2350
-Wire Wire Line
 	13000 3150 13350 3150
 Wire Wire Line
 	13350 3150 13350 2950
@@ -158,12 +140,8 @@
 	12250 1250 12050 1250
 Connection ~ 11100 1250
 Wire Wire Line
-	11550 1250 11300 1250
+	10900 1250 11550 1250
 Wire Wire Line
-	11300 1250 11100 1250
-Wire Wire Line
-	11100 1250 10900 1250
-Wire Wire Line
 	11100 1250 11100 2000
 Wire Wire Line
 	11100 2000 11300 2000
@@ -176,559 +154,449 @@
 Wire Wire Line
 	10100 2050 9700 2050
 Wire Wire Line
-	9700 1850 9700 2050
+	9700 2150 9700 1850
 Wire Wire Line
-	9700 2050 9700 2150
-Wire Wire Line
 	8850 1650 8850 1450
 Wire Wire Line
 	8850 1450 8650 1450
-Connection ~ 13250 6600
+Connection ~ 12600 6800
 Wire Wire Line
-	13250 6600 13250 6700
+	12600 6800 12600 6900
 Wire Wire Line
-	13250 6700 13050 6700
+	12600 6900 12400 6900
 Wire Wire Line
-	2900 7400 2900 6750
+	2250 7600 2250 6950
 Wire Wire Line
-	2900 6750 9200 6750
+	2250 6950 8550 6950
 Wire Wire Line
-	3600 7400 3600 6950
+	2950 7600 2950 7150
 Wire Wire Line
-	3600 6950 9200 6950
+	2950 7150 8550 7150
 Wire Wire Line
-	8500 8000 8200 8000
+	7850 8200 7550 8200
 Wire Wire Line
-	12150 8600 12350 8600
+	11500 8800 11700 8800
 Wire Wire Line
-	13050 8200 13500 8200
-Connection ~ 15450 8600
+	12400 8400 12850 8400
+Connection ~ 14800 8800
 Wire Wire Line
-	15450 8500 15450 8600
+	14800 9000 14800 8700
+Connection ~ 14450 8800
 Wire Wire Line
-	15450 8600 15450 8800
-Connection ~ 15100 8600
+	14450 9000 14450 8800
 Wire Wire Line
-	15100 8800 15100 8600
+	14450 9400 14450 9600
 Wire Wire Line
-	15100 9200 15100 9400
+	14450 9600 14800 9600
 Wire Wire Line
-	15100 9400 15450 9400
+	14800 9700 14800 9400
+Connection ~ 14800 9600
 Wire Wire Line
-	15450 9200 15450 9400
+	12700 7700 13350 7700
 Wire Wire Line
-	15450 9400 15450 9500
-Connection ~ 15450 9400
+	13350 7700 13350 8100
 Wire Wire Line
-	13350 7500 14000 7500
+	13350 8100 13700 8100
 Wire Wire Line
-	14000 7500 14000 7900
+	14800 7300 13550 7300
 Wire Wire Line
-	14000 7900 14350 7900
+	13700 6800 13700 6700
 Wire Wire Line
-	14200 7100 15100 7100
+	13700 6700 13500 6700
 Wire Wire Line
-	15100 7100 15450 7100
+	14800 3600 13150 3600
 Wire Wire Line
-	14350 6600 14350 6500
+	13150 3600 13150 5100
 Wire Wire Line
-	14350 6500 14150 6500
+	12850 8100 13100 8100
 Wire Wire Line
-	15450 3400 15100 3400
+	14100 8300 14100 8500
+Connection ~ 14800 7300
 Wire Wire Line
-	15100 3400 14750 3400
+	14800 7500 14800 7200
+Connection ~ 14450 7300
 Wire Wire Line
-	14750 3400 13800 3400
+	6650 8650 8550 8650
 Wire Wire Line
-	13800 3400 13800 4900
+	10100 9800 10100 9400
+Connection ~ 7700 9950
 Wire Wire Line
-	13500 7900 13750 7900
+	7050 9950 8350 9950
+Connection ~ 7050 9150
 Wire Wire Line
-	14750 8100 14750 8300
-Connection ~ 15450 7100
+	7050 9350 7050 8750
 Wire Wire Line
-	15450 7000 15450 7100
+	7250 9150 7050 9150
 Wire Wire Line
-	15450 7100 15450 7300
-Connection ~ 15100 7100
+	7050 8750 8550 8750
+Connection ~ 12600 5500
 Wire Wire Line
-	7300 8450 9200 8450
+	14100 4400 14800 4400
 Wire Wire Line
-	10750 9200 10750 9400
+	14800 4400 14800 4200
+Connection ~ 14800 3600
 Wire Wire Line
-	10750 9400 10750 9600
-Connection ~ 8350 9750
+	14800 3800 14800 3500
+Connection ~ 14100 3600
 Wire Wire Line
-	7700 9750 8350 9750
+	14100 3800 14100 3600
 Wire Wire Line
-	8350 9750 9000 9750
-Connection ~ 7700 8950
+	11500 6600 12700 6600
 Wire Wire Line
-	7700 9150 7700 8950
+	12700 6600 12700 6500
 Wire Wire Line
-	7700 8950 7700 8550
+	12700 6500 12500 6500
 Wire Wire Line
-	7900 8950 7700 8950
+	11500 6800 12900 6800
 Wire Wire Line
-	7700 8550 9200 8550
-Connection ~ 13250 5300
+	12900 6800 12900 6900
 Wire Wire Line
-	14750 4200 15450 4200
+	12200 7500 12000 7500
 Wire Wire Line
-	15450 4200 15450 4000
-Connection ~ 15450 3400
+	12000 7500 12000 7600
 Wire Wire Line
-	15450 3300 15450 3400
+	12000 7600 11500 7600
 Wire Wire Line
-	15450 3400 15450 3600
-Connection ~ 14750 3400
+	12200 7700 11500 7700
 Wire Wire Line
-	14750 3600 14750 3400
+	11900 8400 11500 8400
 Wire Wire Line
-	12150 6400 13350 6400
+	12150 7900 11900 7900
 Wire Wire Line
-	13350 6400 13350 6300
+	11900 7900 11900 8000
 Wire Wire Line
-	13350 6300 13150 6300
+	11900 8000 11500 8000
 Wire Wire Line
-	12150 6600 13250 6600
+	11500 6900 11900 6900
 Wire Wire Line
-	13250 6600 13550 6600
+	11500 6500 11900 6500
 Wire Wire Line
-	13550 6600 13550 6700
+	12600 6000 12600 6100
 Wire Wire Line
-	12850 7300 12650 7300
+	12600 6100 11500 6100
 Wire Wire Line
-	12650 7300 12650 7400
+	11800 6000 11500 6000
 Wire Wire Line
-	12650 7400 12150 7400
+	11500 5900 11700 5900
+Connection ~ 11700 4800
 Wire Wire Line
-	12850 7500 12150 7500
+	12600 4800 12600 4600
 Wire Wire Line
-	12550 8200 12150 8200
+	12600 4800 11500 4800
+Connection ~ 11700 4600
 Wire Wire Line
-	12800 7700 12550 7700
+	11500 4600 11800 4600
 Wire Wire Line
-	12550 7700 12550 7800
+	12600 5500 12600 5600
 Wire Wire Line
-	12550 7800 12150 7800
+	12600 5600 11500 5600
 Wire Wire Line
-	12550 6700 12350 6700
+	11500 5400 11700 5400
+Connection ~ 11700 5100
 Wire Wire Line
-	12350 6700 12150 6700
+	7850 8100 7550 8100
 Wire Wire Line
-	12550 6300 12350 6300
+	11500 4500 11700 4500
+Connection ~ 7550 8000
 Wire Wire Line
-	12350 6300 12150 6300
+	7550 8200 7550 7900
+Connection ~ 7550 8100
 Wire Wire Line
-	13250 5800 13250 5900
+	7850 8000 7550 8000
 Wire Wire Line
-	13250 5900 12150 5900
+	8550 8100 8350 8100
 Wire Wire Line
-	12450 5800 12150 5800
+	11500 5200 11700 5200
 Wire Wire Line
-	12150 5700 12350 5700
-Connection ~ 12350 4600
+	11700 5200 11700 5100
 Wire Wire Line
-	13250 4600 13250 4400
+	7150 4850 7150 4950
+Connection ~ 8350 6000
 Wire Wire Line
-	13250 4600 12350 4600
+	7650 6000 7650 5900
 Wire Wire Line
-	12350 4600 12150 4600
-Connection ~ 12350 4400
+	7450 6000 8550 6000
+Connection ~ 8350 5750
 Wire Wire Line
-	12450 4400 12350 4400
+	8550 5750 8150 5750
 Wire Wire Line
-	12350 4400 12150 4400
+	7050 5600 7050 5300
 Wire Wire Line
-	13250 5300 13250 5400
+	7050 5300 7250 5300
 Wire Wire Line
-	13250 5400 12150 5400
+	7450 5600 7450 5500
 Wire Wire Line
-	12150 5200 12350 5200
-Connection ~ 12350 4900
+	7450 5500 7650 5500
 Wire Wire Line
-	8500 7900 8200 7900
+	7750 5300 8550 5300
 Wire Wire Line
-	12150 4300 12350 4300
-Connection ~ 8200 7800
+	6450 3700 8350 3700
 Wire Wire Line
-	8200 8000 8200 7900
+	7350 4050 7350 3700
+Connection ~ 7350 4050
 Wire Wire Line
-	8200 7900 8200 7800
+	8150 5500 8550 5500
 Wire Wire Line
-	8200 7800 8200 7700
-Connection ~ 8200 7900
+	8550 5050 8350 5050
 Wire Wire Line
-	8500 7800 8200 7800
+	8350 5050 8350 4950
 Wire Wire Line
-	9200 7900 9000 7900
+	7150 4500 7550 4500
 Wire Wire Line
-	12150 5000 12350 5000
+	8550 4200 8350 4200
 Wire Wire Line
-	12350 5000 12350 4900
+	8350 4200 8350 3700
+Connection ~ 7350 3700
 Wire Wire Line
-	7800 4650 7800 4750
-Connection ~ 9000 5800
+	8550 4500 8050 4500
 Wire Wire Line
-	8300 5800 8300 5700
+	8550 4700 7350 4700
 Wire Wire Line
-	9200 5800 9000 5800
+	7350 4700 7350 4500
+Connection ~ 7350 4500
 Wire Wire Line
-	9000 5800 8300 5800
+	7150 4050 7550 4050
 Wire Wire Line
-	8300 5800 8100 5800
-Connection ~ 9000 5550
+	8250 4050 8050 4050
 Wire Wire Line
-	8800 5550 9000 5550
+	6650 4050 6450 4050
 Wire Wire Line
-	9000 5550 9200 5550
+	6650 4500 6450 4500
+Connection ~ 8350 4950
 Wire Wire Line
-	7700 5400 7700 5100
+	8550 5650 8350 5650
 Wire Wire Line
-	7700 5100 7900 5100
+	8350 5650 8350 5750
 Wire Wire Line
-	8100 5400 8100 5300
+	8550 5900 8350 5900
 Wire Wire Line
-	8100 5300 8300 5300
+	8350 5900 8350 6000
 Wire Wire Line
-	8400 5100 9200 5100
+	7150 4950 8550 4950
 Wire Wire Line
-	7100 3500 8000 3500
+	11500 4200 11700 4200
 Wire Wire Line
-	8000 3500 9000 3500
+	11500 4300 11700 4300
 Wire Wire Line
-	8000 3500 8000 3850
-Connection ~ 8000 3850
+	8550 8000 8350 8000
 Wire Wire Line
-	8800 5300 9200 5300
+	8550 8200 8350 8200
 Wire Wire Line
-	9200 4850 9000 4850
+	11500 4900 11700 4900
 Wire Wire Line
-	9000 4850 9000 4750
+	11700 4300 11700 4100
+Connection ~ 11700 4200
 Wire Wire Line
-	8200 4300 8000 4300
+	11500 5100 12250 5100
 Wire Wire Line
-	8000 4300 7800 4300
+	11800 5500 11500 5500
 Wire Wire Line
-	9200 4000 9000 4000
+	11700 4500 11700 4600
 Wire Wire Line
-	9000 4000 9000 3500
-Connection ~ 8000 3500
+	11700 4900 11700 4800
 Wire Wire Line
-	9200 4300 8700 4300
+	11700 6400 11700 6500
+Connection ~ 11700 6500
 Wire Wire Line
-	9200 4500 8000 4500
+	11700 7000 11700 6900
+Connection ~ 11700 6900
 Wire Wire Line
-	8000 4500 8000 4300
-Connection ~ 8000 4300
+	11500 7500 11700 7500
 Wire Wire Line
-	8200 3850 8000 3850
+	11500 7900 11700 7900
 Wire Wire Line
-	8000 3850 7800 3850
+	11500 8300 11700 8300
 Wire Wire Line
-	8900 3850 8700 3850
+	12350 8100 11500 8100
 Wire Wire Line
-	7300 3850 7100 3850
+	13050 7300 11500 7300
 Wire Wire Line
-	7300 4300 7100 4300
-Connection ~ 9000 4750
+	11900 8600 11700 8600
 Wire Wire Line
-	9200 5450 9000 5450
+	11700 8600 11700 8500
 Wire Wire Line
-	9000 5450 9000 5550
+	11700 8500 11500 8500
 Wire Wire Line
-	9200 5700 9000 5700
+	12900 6600 12900 6700
 Wire Wire Line
-	9000 5700 9000 5800
+	11500 7200 11900 7200
 Wire Wire Line
-	7800 4750 9000 4750
+	14450 3600 14450 3800
+Connection ~ 14450 3600
 Wire Wire Line
-	9000 4750 9200 4750
+	13150 5100 12750 5100
 Wire Wire Line
-	12150 4000 12350 4000
+	14450 4200 14450 4400
 Wire Wire Line
-	12150 4100 12350 4100
+	14100 4500 14100 4200
+Connection ~ 14100 4400
 Wire Wire Line
-	9200 7800 9000 7800
+	14100 5600 14800 5600
 Wire Wire Line
-	9200 8000 9000 8000
+	14800 5600 14800 5400
+Connection ~ 14800 4800
 Wire Wire Line
-	12150 4700 12350 4700
+	14800 5000 14800 4700
+Connection ~ 14100 4800
 Wire Wire Line
-	12350 4100 12350 4000
+	14100 5000 14100 4800
 Wire Wire Line
-	12350 4000 12350 3900
-Connection ~ 12350 4000
+	14450 4800 14450 5000
+Connection ~ 14450 4800
 Wire Wire Line
-	12900 4900 12350 4900
+	14450 5400 14450 5600
 Wire Wire Line
-	12350 4900 12150 4900
+	14100 5400 14100 5700
+Connection ~ 14100 5600
+Connection ~ 14450 5600
 Wire Wire Line
-	12450 5300 12150 5300
+	14100 6800 14800 6800
 Wire Wire Line
-	12350 4300 12350 4400
+	14800 6800 14800 6600
+Connection ~ 14800 6000
 Wire Wire Line
-	12350 4700 12350 4600
+	14800 6200 14800 5900
+Connection ~ 14100 6000
 Wire Wire Line
-	12350 6200 12350 6300
-Connection ~ 12350 6300
+	14100 6200 14100 6000
 Wire Wire Line
-	12350 6800 12350 6700
-Connection ~ 12350 6700
+	14450 6000 14450 6200
+Connection ~ 14450 6000
 Wire Wire Line
-	12150 7300 12350 7300
+	14450 6600 14450 6800
 Wire Wire Line
-	12150 7700 12350 7700
+	14100 6600 14100 6900
+Connection ~ 14100 6800
+Connection ~ 14450 6800
 Wire Wire Line
-	12150 8100 12350 8100
+	8550 8850 8350 8850
 Wire Wire Line
-	13000 7900 12150 7900
+	8150 9150 8350 9150
 Wire Wire Line
-	13700 7100 12150 7100
+	8350 8850 8350 9350
+Connection ~ 8350 9150
 Wire Wire Line
-	12550 8400 12350 8400
+	7700 9550 7700 9950
 Wire Wire Line
-	12350 8400 12350 8300
+	8350 9950 8350 9750
 Wire Wire Line
-	12350 8300 12150 8300
+	7050 9750 7050 10200
+Connection ~ 7050 9950
 Wire Wire Line
-	13550 6400 13550 6500
+	9900 9400 9900 9600
 Wire Wire Line
-	12150 7000 12550 7000
+	9900 9600 10100 9600
+Connection ~ 10100 9600
 Wire Wire Line
-	15100 3400 15100 3600
-Connection ~ 15100 3400
+	14450 7500 14450 7300
 Wire Wire Line
-	13800 4900 13400 4900
+	14450 7900 14450 8100
 Wire Wire Line
-	15100 4000 15100 4200
+	14450 8100 14800 8100
 Wire Wire Line
-	14750 4000 14750 4200
+	14100 7600 14100 7900
+Connection ~ 14100 7700
 Wire Wire Line
-	14750 4200 14750 4300
-Connection ~ 14750 4200
+	14800 8200 14800 7900
+Connection ~ 14800 8100
 Wire Wire Line
-	14750 5400 15100 5400
+	13700 8700 13700 8900
 Wire Wire Line
-	15100 5400 15450 5400
+	13700 8000 13700 8300
+Connection ~ 13700 8100
 Wire Wire Line
-	15450 5400 15450 5200
-Connection ~ 15450 4600
+	13600 5500 13600 4800
 Wire Wire Line
-	15450 4500 15450 4600
+	13600 4800 14800 4800
 Wire Wire Line
-	15450 4600 15450 4800
-Connection ~ 14750 4600
+	11500 6700 13100 6700
+Connection ~ 12900 6700
+Connection ~ 12600 6000
 Wire Wire Line
-	14750 4800 14750 4600
+	14100 7700 13700 7700
 Wire Wire Line
-	15100 4600 15100 4800
-Connection ~ 15100 4600
+	13700 7700 13700 7500
 Wire Wire Line
-	15100 5200 15100 5400
+	13700 7500 12700 7500
 Wire Wire Line
-	14750 5500 14750 5400
+	14250 8800 14250 9050
 Wire Wire Line
-	14750 5400 14750 5200
-Connection ~ 14750 5400
-Connection ~ 15100 5400
+	14250 8800 14800 8800
+Connection ~ 12950 9600
+Connection ~ 12600 9600
 Wire Wire Line
-	14750 6600 15100 6600
+	12600 10200 12600 10400
 Wire Wire Line
-	15100 6600 15450 6600
+	12600 10400 12950 10400
 Wire Wire Line
-	15450 6600 15450 6400
-Connection ~ 15450 5800
+	12950 10500 12950 10200
+Connection ~ 12950 10400
 Wire Wire Line
-	15450 5700 15450 5800
+	13100 8100 13100 8400
 Wire Wire Line
-	15450 5800 15450 6000
-Connection ~ 14750 5800
+	13100 8400 13400 8400
 Wire Wire Line
-	14750 6000 14750 5800
+	13400 8400 13400 9050
 Wire Wire Line
-	15100 5800 15100 6000
-Connection ~ 15100 5800
+	13400 9050 14250 9050
 Wire Wire Line
-	15100 6400 15100 6600
+	12600 9600 12950 9600
 Wire Wire Line
-	14750 6700 14750 6600
+	7050 6000 6850 6000
 Wire Wire Line
-	14750 6600 14750 6400
-Connection ~ 14750 6600
-Connection ~ 15100 6600
+	6850 6000 6850 6100
 Wire Wire Line
-	9200 8650 9000 8650
+	2950 8000 2950 8400
 Wire Wire Line
-	8800 8950 9000 8950
+	2600 8000 2600 8200
 Wire Wire Line
-	9000 8650 9000 8950
+	2250 8000 2250 8200
 Wire Wire Line
-	9000 8950 9000 9150
-Connection ~ 9000 8950
+	2600 7600 2600 7050
 Wire Wire Line
-	8350 9350 8350 9750
+	2600 7050 8550 7050
 Wire Wire Line
-	9000 9750 9000 9550
+	2250 8200 2950 8200
+Connection ~ 2600 8200
+Connection ~ 2950 8200
 Wire Wire Line
-	7700 10000 7700 9750
-Wire Wire Line
-	7700 9750 7700 9550
-Connection ~ 7700 9750
-Wire Wire Line
-	10550 9200 10550 9400
-Wire Wire Line
-	10550 9400 10750 9400
-Connection ~ 10750 9400
-Wire Wire Line
-	15100 7300 15100 7100
-Wire Wire Line
-	15100 7700 15100 7900
-Wire Wire Line
-	15100 7900 15450 7900
-Wire Wire Line
-	14750 7700 14750 7500
-Wire Wire Line
-	14750 7500 14750 7400
-Connection ~ 14750 7500
-Wire Wire Line
-	15450 7700 15450 7900
-Wire Wire Line
-	15450 7900 15450 8000
-Connection ~ 15450 7900
-Wire Wire Line
-	14350 8500 14350 8700
-Wire Wire Line
-	14350 8100 14350 7900
-Wire Wire Line
-	14350 7900 14350 7800
-Connection ~ 14350 7900
-Wire Wire Line
-	14250 5300 14250 4600
-Wire Wire Line
-	14250 4600 14750 4600
-Wire Wire Line
-	14750 4600 15100 4600
-Wire Wire Line
-	15100 4600 15450 4600
-Wire Wire Line
-	13750 6500 13550 6500
-Wire Wire Line
-	13550 6500 12150 6500
-Connection ~ 13550 6500
-Connection ~ 13250 5800
-Wire Wire Line
-	14750 7500 14350 7500
-Wire Wire Line
-	14350 7500 14350 7300
-Wire Wire Line
-	14350 7300 13350 7300
-Wire Wire Line
-	14900 8600 14900 8850
-Wire Wire Line
-	14900 8600 15100 8600
-Wire Wire Line
-	15100 8600 15450 8600
-Connection ~ 13600 9400
-Connection ~ 13250 9400
-Wire Wire Line
-	13250 10000 13250 10200
-Wire Wire Line
-	13250 10200 13600 10200
-Wire Wire Line
-	13600 10000 13600 10200
-Wire Wire Line
-	13600 10200 13600 10300
-Connection ~ 13600 10200
-Wire Wire Line
-	13750 7900 13750 8200
-Wire Wire Line
-	13750 8200 14050 8200
-Wire Wire Line
-	14050 8200 14050 8850
-Wire Wire Line
-	14050 8850 14900 8850
-Wire Wire Line
-	13600 9400 13250 9400
-Wire Wire Line
-	7700 5800 7500 5800
-Wire Wire Line
-	7500 5800 7500 5900
-Wire Wire Line
-	3600 8200 3600 8000
-Wire Wire Line
-	3600 8000 3600 7800
-Wire Wire Line
-	3250 7800 3250 8000
-Wire Wire Line
-	2900 7800 2900 8000
-Wire Wire Line
-	3250 7400 3250 6850
-Wire Wire Line
-	3250 6850 9200 6850
-Wire Wire Line
-	2900 8000 3250 8000
-Wire Wire Line
-	3250 8000 3600 8000
-Connection ~ 3250 8000
-Connection ~ 3600 8000
-Wire Wire Line
 	8650 1350 9050 1350
 Wire Wire Line
 	9700 1250 9700 1450
 Wire Wire Line
-	10100 1450 10100 1250
-Wire Wire Line
-	10100 1250 10100 1000
-Wire Wire Line
-	10100 1000 10100 850 
+	10100 850  10100 1450
 Connection ~ 10100 1250
 Wire Wire Line
-	10300 1250 10100 1250
-Wire Wire Line
-	10100 1250 9700 1250
-Wire Wire Line
-	9700 1250 8650 1250
+	8650 1250 10300 1250
 Connection ~ 11300 1250
 Wire Wire Line
-	10900 2350 11100 2350
+	11300 2350 10900 2350
 Wire Wire Line
-	11100 2350 11300 2350
+	11300 1250 11300 850 
 Wire Wire Line
-	11300 850  11300 1250
-Wire Wire Line
 	13000 2550 13000 2350
 Connection ~ 13000 2350
 Wire Wire Line
-	13000 2950 13000 3150
-Wire Wire Line
-	13000 3150 13000 3250
+	13000 3250 13000 2950
 Connection ~ 13000 3150
 Wire Wire Line
 	12600 2000 12800 2000
 Wire Wire Line
-	12800 2000 12800 1750
-Wire Wire Line
-	12800 1750 12800 1550
+	12800 2000 12800 1550
 Connection ~ 13750 1750
 Wire Wire Line
 	13050 1750 12800 1750
 Wire Wire Line
 	8050 1400 7850 1400
 Wire Wire Line
-	7850 1300 7850 1400
-Wire Wire Line
-	7850 1400 7850 1650
+	7850 1300 7850 1650
 Connection ~ 7850 1400
 Wire Wire Line
 	3650 2100 3650 2450
 Wire Wire Line
 	3650 2450 3850 2450
 Wire Wire Line
-	3850 2100 3650 2100
-Wire Wire Line
-	3650 2100 3300 2100
+	3850 2100 3300 2100
 Connection ~ 3650 2100
 Wire Wire Line
 	5450 2700 5450 2900
@@ -737,140 +605,125 @@
 Wire Wire Line
 	4550 2800 4550 2900
 Wire Wire Line
-	13500 5300 13250 5300
+	12400 5500 12850 5500
 Wire Wire Line
-	13250 5300 13050 5300
+	12600 4600 12400 4600
 Wire Wire Line
-	14000 5800 14750 5800
+	6300 9550 6300 9750
 Wire Wire Line
-	14750 5800 15100 5800
+	6650 9750 6100 9750
+Connection ~ 6300 9750
 Wire Wire Line
-	15100 5800 15450 5800
+	3050 9550 3050 10200
 Wire Wire Line
-	13250 4400 13050 4400
+	3900 9800 3900 10000
 Wire Wire Line
-	6950 9350 6950 9550
+	3900 10000 4400 10000
 Wire Wire Line
-	7300 9550 6950 9550
+	4400 10000 4400 9550
 Wire Wire Line
-	6950 9550 6750 9550
-Connection ~ 6950 9550
+	3800 9800 3800 10000
 Wire Wire Line
-	3700 9350 3700 9800
+	3800 10000 3050 10000
+Connection ~ 3050 10000
 Wire Wire Line
-	3700 9800 3700 10000
+	8550 6250 6150 6250
+Connection ~ 6350 6250
 Wire Wire Line
-	4550 9600 4550 9800
+	8550 6350 5200 6350
+Connection ~ 5400 6350
 Wire Wire Line
-	4550 9800 5050 9800
+	8550 6450 4250 6450
+Connection ~ 4450 6450
 Wire Wire Line
-	5050 9800 5050 9350
+	8550 6550 3400 6550
+Connection ~ 3600 6550
 Wire Wire Line
-	4450 9600 4450 9800
+	1600 5850 1600 6050
 Wire Wire Line
-	4450 9800 3700 9800
-Connection ~ 3700 9800
+	1600 6550 1600 6750
 Wire Wire Line
-	6800 6050 7000 6050
+	8550 6650 2400 6650
+Connection ~ 2600 6650
 Wire Wire Line
-	7000 6050 9200 6050
-Connection ~ 7000 6050
+	2150 5400 2150 5600
 Wire Wire Line
-	5850 6150 6050 6150
+	2150 6300 2150 6100
+Connection ~ 1600 6750
 Wire Wire Line
-	6050 6150 9200 6150
-Connection ~ 6050 6150
+	8550 7250 3500 7250
 Wire Wire Line
-	4900 6250 5100 6250
+	3500 7250 3500 7450
 Wire Wire Line
-	5100 6250 9200 6250
-Connection ~ 5100 6250
+	3500 8050 3500 8450
 Wire Wire Line
-	4050 6350 4250 6350
+	4400 7600 4400 7800
 Wire Wire Line
-	4250 6350 9200 6350
-Connection ~ 4250 6350
+	4400 8300 4400 8500
 Wire Wire Line
-	2250 5650 2250 5850
+	8550 7650 8300 7650
 Wire Wire Line
-	2250 6550 2250 6350
+	8300 7650 8300 7550
 Wire Wire Line
-	3050 6450 3250 6450
+	8300 7550 4850 7550
 Wire Wire Line
-	3250 6450 9200 6450
-Connection ~ 3250 6450
+	4850 7550 4850 8500
 Wire Wire Line
-	2800 5200 2800 5400
+	4850 8500 4150 8500
+Connection ~ 4400 8500
 Wire Wire Line
-	2800 6100 2800 5900
-Connection ~ 2250 6550
+	6350 7650 6350 8150
 Wire Wire Line
-	9200 7050 4150 7050
+	6350 8150 5900 8150
+Connection ~ 6350 7850
 Wire Wire Line
-	4150 7050 4150 7250
+	1600 3650 1600 3850
 Wire Wire Line
-	4150 7850 4150 8250
+	1800 4550 1200 4550
+Connection ~ 1600 4550
 Wire Wire Line
-	5050 7400 5050 7600
+	13600 10200 13600 10400
 Wire Wire Line
-	5050 8100 5050 8300
+	13600 10400 13950 10400
 Wire Wire Line
-	9200 7450 8950 7450
+	13600 9800 13600 9600
 Wire Wire Line
-	8950 7450 8950 7350
+	12850 8400 12850 8700
 Wire Wire Line
-	8950 7350 5500 7350
+	12850 8700 13200 8700
 Wire Wire Line
-	5500 7350 5500 8300
+	13200 8700 13200 9600
 Wire Wire Line
-	5500 8300 5050 8300
+	13200 9600 13950 9600
+Connection ~ 13600 9600
 Wire Wire Line
-	5050 8300 4800 8300
-Connection ~ 5050 8300
+	12400 8600 12600 8600
 Wire Wire Line
-	7000 7450 7000 7650
+	12600 8600 12600 9800
 Wire Wire Line
-	7000 7650 7000 7950
-Wire Wire Line
-	7000 7950 6550 7950
-Connection ~ 7000 7650
-Wire Wire Line
-	2250 3450 2250 3650
-Wire Wire Line
-	1850 4350 2250 4350
-Wire Wire Line
-	2250 4350 2450 4350
-Connection ~ 2250 4350
-Wire Wire Line
-	14250 10000 14250 10200
-Wire Wire Line
-	14250 10200 14600 10200
-Wire Wire Line
-	14250 9600 14250 9400
-Wire Wire Line
-	13500 8200 13500 8500
-Wire Wire Line
-	13500 8500 13850 8500
-Wire Wire Line
-	13850 8500 13850 9400
-Wire Wire Line
-	13850 9400 14250 9400
-Wire Wire Line
-	14250 9400 14600 9400
-Connection ~ 14250 9400
-Wire Wire Line
-	13050 8400 13250 8400
-Wire Wire Line
-	13250 8400 13250 9400
-Wire Wire Line
-	13250 9400 13250 9600
+	15000 6000 13350 6000
 $Comp
+L R_US R2504
+U 1 1 4A45F0BA
+P 15250 6000
+F 0 "R2504" H 15250 6100 50  0000 C CNN
+F 1 "0R" H 15450 6050 50  0000 C CNN
+F 2 "R0402-H" H 15250 6000 60  0001 C CNN
+	1    15250 6000
+	1    0    0    -1  
+$EndComp
+Text Notes 1450 1450 0    200  ~ 40
+PMU
+NoConn ~ 8550 7550
+NoConn ~ 8550 5400
+NoConn ~ 8550 4300
+$Comp
 L VB #PWR?
 U 1 1 4A3F38F6
-P 9000 4400
-F 0 "#PWR?" H 9000 4300 50  0001 C CNN
-F 1 "VB" V 9000 4550 50  0000 C CNN
-	1    9000 4400
+P 8350 4600
+F 0 "#PWR?" H 8350 4500 50  0001 C CNN
+F 1 "VB" V 8350 4750 50  0000 C CNN
+	1    8350 4600
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -882,304 +735,304 @@
 	1    9700 2150
 	1    0    0    -1  
 $EndComp
-Text GLabel 3350 4350 2    60   Output ~ 0
+Text GLabel 2700 4550 2    60   Output ~ 0
 HDQ
 $Comp
 L R_US R1762
 U 1 1 4A3CEDC9
-P 2700 4350
-F 0 "R1762" H 2700 4450 50  0000 C CNN
-F 1 "470R" H 2700 4250 50  0000 C CNN
-F 2 "R0402-H" H 2700 4350 60  0001 C CNN
-	1    2700 4350
+P 2050 4550
+F 0 "R1762" H 2050 4650 50  0000 C CNN
+F 1 "470R" H 2050 4450 50  0000 C CNN
+F 2 "R0402-H" H 2050 4550 60  0001 C CNN
+	1    2050 4550
 	1    0    0    -1  
 $EndComp
 $Comp
 L IO_3V3 #PWR2
 U 1 1 4A3CEDAF
-P 2250 3450
-F 0 "#PWR2" H 2250 3350 50  0001 C CNN
-F 1 "IO_3V3" H 2250 3600 50  0000 C CNN
-	1    2250 3450
+P 1600 3650
+F 0 "#PWR2" H 1600 3550 50  0001 C CNN
+F 1 "IO_3V3" H 1600 3800 50  0000 C CNN
+	1    1600 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1761
 U 1 1 4A3CEDAE
-P 2250 3900
-F 0 "R1761" V 2200 4100 50  0000 C CNN
-F 1 "10K" V 2300 4050 50  0000 C CNN
-F 2 "R0402-H" H 2250 3900 60  0001 C CNN
-	1    2250 3900
+P 1600 4100
+F 0 "R1761" V 1550 4300 50  0000 C CNN
+F 1 "10K" V 1650 4250 50  0000 C CNN
+F 2 "R0402-H" H 1600 4100 60  0001 C CNN
+	1    1600 4100
 	0    1    1    0   
 $EndComp
-Text GLabel 1850 4350 0    60   Input ~ 0
+Text GLabel 1200 4550 0    60   Input ~ 0
 BAT_ID
 $Comp
 L TST TP1704
 U 1 1 4A3CEC74
-P 6550 7950
-F 0 "TP1704" V 6650 8100 50  0000 C CNN
-F 1 "TST" V 6500 8000 50  0001 C CNN
-	1    6550 7950
+P 5900 8150
+F 0 "TP1704" V 6000 8300 50  0000 C CNN
+F 1 "TST" V 5850 8200 50  0001 C CNN
+	1    5900 8150
 	0    -1   -1   0   
 $EndComp
-Text GLabel 4800 8300 0    60   Output ~ 0
+Text GLabel 4150 8500 0    60   Output ~ 0
 GSM_ON
-Text GLabel 6600 7650 0    60   Input ~ 0
+Text GLabel 5950 7850 0    60   Input ~ 0
 PWREN
 $Comp
 L IO_3V3 #PWR12
 U 1 1 4A3CEBB9
-P 5050 7400
-F 0 "#PWR12" H 5050 7300 50  0001 C CNN
-F 1 "IO_3V3" H 5050 7550 50  0000 C CNN
-	1    5050 7400
+P 4400 7600
+F 0 "#PWR12" H 4400 7500 50  0001 C CNN
+F 1 "IO_3V3" H 4400 7750 50  0000 C CNN
+	1    4400 7600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1729
 U 1 1 4A3CEBB8
-P 5050 7850
-F 0 "R1729" V 5000 8050 50  0000 C CNN
-F 1 "100K" V 5100 8000 50  0000 C CNN
-F 2 "R0402-H" H 5050 7850 60  0001 C CNN
-	1    5050 7850
+P 4400 8050
+F 0 "R1729" V 4350 8250 50  0000 C CNN
+F 1 "100K" V 4450 8200 50  0000 C CNN
+F 2 "R0402-H" H 4400 8050 60  0001 C CNN
+	1    4400 8050
 	0    1    1    0   
 $EndComp
-Text GLabel 6600 7250 0    60   Output ~ 0
+Text GLabel 5950 7450 0    60   Output ~ 0
 EN_USBHOST
 $Comp
 L GND #PWR9
 U 1 1 4A3CEB20
-P 4150 8250
-F 0 "#PWR9" H 4150 8250 30  0001 C CNN
-F 1 "GND" H 4150 8180 30  0001 C CNN
-	1    4150 8250
+P 3500 8450
+F 0 "#PWR9" H 3500 8450 30  0001 C CNN
+F 1 "GND" H 3500 8380 30  0001 C CNN
+	1    3500 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L BATTERY BAT1701
 U 1 1 4A3CEB03
-P 4150 7550
-F 0 "BAT1701" V 3950 7850 50  0000 C CNN
-F 1 "HB414 IVO1E" V 4350 7950 50  0000 C CNN
-	1    4150 7550
+P 3500 7750
+F 0 "BAT1701" V 3300 8050 50  0000 C CNN
+F 1 "HB414 IVO1E" V 3700 8150 50  0000 C CNN
+	1    3500 7750
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR1
 U 1 1 4A3CEA74
-P 2050 7450
-F 0 "#PWR1" H 2050 7450 30  0001 C CNN
-F 1 "GND" H 2050 7380 30  0001 C CNN
-	1    2050 7450
+P 1400 7650
+F 0 "#PWR1" H 1400 7650 30  0001 C CNN
+F 1 "GND" H 1400 7580 30  0001 C CNN
+	1    1400 7650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR4
 U 1 1 4A3CEA71
-P 2800 6100
-F 0 "#PWR4" H 2800 6100 30  0001 C CNN
-F 1 "GND" H 2800 6030 30  0001 C CNN
-	1    2800 6100
+P 2150 6300
+F 0 "#PWR4" H 2150 6300 30  0001 C CNN
+F 1 "GND" H 2150 6230 30  0001 C CNN
+	1    2150 6300
 	1    0    0    -1  
 $EndComp
-Text GLabel 1850 6550 0    60   Input ~ 0
+Text GLabel 1200 6750 0    60   Input ~ 0
 KEEPACT
 $Comp
 L R_US R1741
 U 1 1 4A3CEA3E
-P 2050 7000
-F 0 "R1741" V 2000 7200 50  0000 C CNN
-F 1 "NC" V 2100 7150 50  0000 C CNN
-F 2 "R0402-H" H 2050 7000 60  0001 C CNN
-	1    2050 7000
+P 1400 7200
+F 0 "R1741" V 1350 7400 50  0000 C CNN
+F 1 "NC" V 1450 7350 50  0000 C CNN
+F 2 "R0402-H" H 1400 7200 60  0001 C CNN
+	1    1400 7200
 	0    1    1    0   
 $EndComp
 $Comp
 L R_US R1765
 U 1 1 4A3CEA0E
-P 2800 5650
-F 0 "R1765" V 2750 5850 50  0000 C CNN
-F 1 "10K" V 2850 5800 50  0000 C CNN
-F 2 "R0402-H" H 2800 5650 60  0001 C CNN
-	1    2800 5650
+P 2150 5850
+F 0 "R1765" V 2100 6050 50  0000 C CNN
+F 1 "10K" V 2200 6000 50  0000 C CNN
+F 2 "R0402-H" H 2150 5850 60  0001 C CNN
+	1    2150 5850
 	0    1    1    0   
 $EndComp
-Text GLabel 3050 6450 0    60   Input ~ 0
+Text GLabel 2400 6650 0    60   Input ~ 0
 SHUTDOWN
 $Comp
 L IO_3V3 #PWR3
 U 1 1 4A3CE972
-P 2250 5650
-F 0 "#PWR3" H 2250 5550 50  0001 C CNN
-F 1 "IO_3V3" H 2250 5800 50  0000 C CNN
-	1    2250 5650
+P 1600 5850
+F 0 "#PWR3" H 1600 5750 50  0001 C CNN
+F 1 "IO_3V3" H 1600 6000 50  0000 C CNN
+	1    1600 5850
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1710
 U 1 1 4A3CE971
-P 2250 6100
-F 0 "R1710" V 2200 6300 50  0000 C CNN
-F 1 "33K" V 2300 6250 50  0000 C CNN
-F 2 "R0402-H" H 2250 6100 60  0001 C CNN
-	1    2250 6100
+P 1600 6300
+F 0 "R1710" V 1550 6500 50  0000 C CNN
+F 1 "33K" V 1650 6450 50  0000 C CNN
+F 2 "R0402-H" H 1600 6300 60  0001 C CNN
+	1    1600 6300
 	0    1    1    0   
 $EndComp
-Text GLabel 4050 6350 0    60   Output ~ 0
+Text GLabel 3400 6550 0    60   Output ~ 0
 nPWR_IRQ
-Text GLabel 4900 6250 0    60   Output ~ 0
+Text GLabel 4250 6450 0    60   Output ~ 0
 nRESET
-Text GLabel 5850 6150 0    60   BiDi ~ 0
+Text GLabel 5200 6350 0    60   BiDi ~ 0
 X_I2C_SDA
-Text GLabel 6800 6050 0    60   Input ~ 0
+Text GLabel 6150 6250 0    60   Input ~ 0
 X_I2C_SCL
 $Comp
 L IO_3V3 #PWR10
 U 1 1 4A3CE7CD
-P 4250 5450
-F 0 "#PWR10" H 4250 5350 50  0001 C CNN
-F 1 "IO_3V3" H 4250 5600 50  0000 C CNN
-	1    4250 5450
+P 3600 5650
+F 0 "#PWR10" H 3600 5550 50  0001 C CNN
+F 1 "IO_3V3" H 3600 5800 50  0000 C CNN
+	1    3600 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1709
 U 1 1 4A3CE7CC
-P 4250 5900
-F 0 "R1709" V 4200 6100 50  0000 C CNN
-F 1 "100K" V 4300 6050 50  0000 C CNN
-F 2 "R0402-H" H 4250 5900 60  0001 C CNN
-	1    4250 5900
+P 3600 6100
+F 0 "R1709" V 3550 6300 50  0000 C CNN
+F 1 "100K" V 3650 6250 50  0000 C CNN
+F 2 "R0402-H" H 3600 6100 60  0001 C CNN
+	1    3600 6100
 	0    1    1    0   
 $EndComp
 $Comp
 L IO_3V3 #PWR13
 U 1 1 4A3CE7C2
-P 5100 5350
-F 0 "#PWR13" H 5100 5250 50  0001 C CNN
-F 1 "IO_3V3" H 5100 5500 50  0000 C CNN
-	1    5100 5350
+P 4450 5550
+F 0 "#PWR13" H 4450 5450 50  0001 C CNN
+F 1 "IO_3V3" H 4450 5700 50  0000 C CNN
+	1    4450 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1713
 U 1 1 4A3CE7C1
-P 5100 5800
-F 0 "R1713" V 5050 6000 50  0000 C CNN
-F 1 "100K" V 5150 5950 50  0000 C CNN
-F 2 "R0402-H" H 5100 5800 60  0001 C CNN
-	1    5100 5800
+P 4450 6000
+F 0 "R1713" V 4400 6200 50  0000 C CNN
+F 1 "100K" V 4500 6150 50  0000 C CNN
+F 2 "R0402-H" H 4450 6000 60  0001 C CNN
+	1    4450 6000
 	0    1    1    0   
 $EndComp
 $Comp
 L IO_3V3 #PWR16
 U 1 1 4A3CE7B2
-P 6050 5250
-F 0 "#PWR16" H 6050 5150 50  0001 C CNN
-F 1 "IO_3V3" H 6050 5400 50  0000 C CNN
-	1    6050 5250
+P 5400 5450
+F 0 "#PWR16" H 5400 5350 50  0001 C CNN
+F 1 "IO_3V3" H 5400 5600 50  0000 C CNN
+	1    5400 5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1708
 U 1 1 4A3CE7B1
-P 6050 5700
-F 0 "R1708" V 6000 5900 50  0000 C CNN
-F 1 "10K" V 6100 5850 50  0000 C CNN
-F 2 "R0402-H" H 6050 5700 60  0001 C CNN
-	1    6050 5700
+P 5400 5900
+F 0 "R1708" V 5350 6100 50  0000 C CNN
+F 1 "10K" V 5450 6050 50  0000 C CNN
+F 2 "R0402-H" H 5400 5900 60  0001 C CNN
+	1    5400 5900
 	0    1    1    0   
 $EndComp
 $Comp
 L IO_3V3 #PWR18
 U 1 1 4A3CE7AB
-P 7000 5150
-F 0 "#PWR18" H 7000 5050 50  0001 C CNN
-F 1 "IO_3V3" H 7000 5300 50  0000 C CNN
-	1    7000 5150
+P 6350 5350
+F 0 "#PWR18" H 6350 5250 50  0001 C CNN
+F 1 "IO_3V3" H 6350 5500 50  0000 C CNN
+	1    6350 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1707
 U 1 1 4A3CE7AA
-P 7000 5600
-F 0 "R1707" V 6950 5800 50  0000 C CNN
-F 1 "10K" V 7050 5750 50  0000 C CNN
-F 2 "R0402-H" H 7000 5600 60  0001 C CNN
-	1    7000 5600
+P 6350 5800
+F 0 "R1707" V 6300 6000 50  0000 C CNN
+F 1 "10K" V 6400 5950 50  0000 C CNN
+F 2 "R0402-H" H 6350 5800 60  0001 C CNN
+	1    6350 5800
 	0    1    1    0   
 $EndComp
-Text Notes 4100 9000 0    80   ~ 16
+Text Notes 3450 9200 0    80   ~ 16
 Power Button
 $Comp
 L GND #PWR8
 U 1 1 4A3CE5DF
-P 3700 10000
-F 0 "#PWR8" H 3700 10000 30  0001 C CNN
-F 1 "GND" H 3700 9930 30  0001 C CNN
-	1    3700 10000
+P 3050 10200
+F 0 "#PWR8" H 3050 10200 30  0001 C CNN
+F 1 "GND" H 3050 10130 30  0001 C CNN
+	1    3050 10200
 	1    0    0    -1  
 $EndComp
-Text GLabel 6750 9550 0    60   Output ~ 0
+Text GLabel 6100 9750 0    60   Output ~ 0
 CLK32
 $Comp
 L IO_3V3 #PWR17
 U 1 1 4A3CE5A8
-P 6950 8650
-F 0 "#PWR17" H 6950 8550 50  0001 C CNN
-F 1 "IO_3V3" H 6950 8800 50  0000 C CNN
-	1    6950 8650
+P 6300 8850
+F 0 "#PWR17" H 6300 8750 50  0001 C CNN
+F 1 "IO_3V3" H 6300 9000 50  0000 C CNN
+	1    6300 8850
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1714
 U 1 1 4A3CE550
-P 6950 9100
-F 0 "R1714" V 6900 9300 50  0000 C CNN
-F 1 "100K" V 7000 9250 50  0000 C CNN
-F 2 "R0402-H" H 6950 9100 60  0001 C CNN
-	1    6950 9100
+P 6300 9300
+F 0 "R1714" V 6250 9500 50  0000 C CNN
+F 1 "100K" V 6350 9450 50  0000 C CNN
+F 2 "R0402-H" H 6300 9300 60  0001 C CNN
+	1    6300 9300
 	0    1    1    0   
 $EndComp
 $Comp
 L SW_PUSH_4 SW1701
 U 1 1 4A3CE53B
-P 4500 9350
-F 0 "SW1701" H 4500 9550 60  0000 C CNN
-F 1 "EVPQUD02K" H 4050 9250 60  0000 C CNN
-	1    4500 9350
+P 3850 9550
+F 0 "SW1701" H 3850 9750 60  0000 C CNN
+F 1 "EVPQUD02K" H 3400 9450 60  0000 C CNN
+	1    3850 9550
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L1701
 U 1 1 4A3BCEC9
-P 12750 4400
-F 0 "L1701" V 12700 4400 50  0000 C CNN
-F 1 "2U2" V 12850 4400 50  0000 C CNN
-	1    12750 4400
+P 12100 4600
+F 0 "L1701" V 12050 4600 50  0000 C CNN
+F 1 "2U2" V 12200 4600 50  0000 C CNN
+	1    12100 4600
 	0    1    1    0   
 $EndComp
 $Comp
 L R_US R1722
 U 1 1 4A3B561A
-P 13750 5800
-F 0 "R1722" H 13750 5900 50  0000 C CNN
-F 1 "0R" H 13750 5700 50  0000 C CNN
-F 2 "R0402-H" H 13750 5800 60  0001 C CNN
-	1    13750 5800
+P 13100 6000
+F 0 "R1722" H 13100 6100 50  0000 C CNN
+F 1 "0R" H 13100 5900 50  0000 C CNN
+F 2 "R0402-H" H 13100 6000 60  0001 C CNN
+	1    13100 6000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1720
 U 1 1 4A3B5615
-P 13750 5300
-F 0 "R1720" H 13750 5400 50  0000 C CNN
-F 1 "0R" H 13750 5200 50  0000 C CNN
-F 2 "R0402-H" H 13750 5300 60  0001 C CNN
-	1    13750 5300
+P 13100 5500
+F 0 "R1720" H 13100 5600 50  0000 C CNN
+F 1 "0R" H 13100 5400 50  0000 C CNN
+F 2 "R0402-H" H 13100 5500 60  0001 C CNN
+	1    13100 5500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1473,736 +1326,736 @@
 $Comp
 L VB #PWR28
 U 1 1 4A3B4AE1
-P 8800 5550
-F 0 "#PWR28" H 8800 5450 50  0001 C CNN
-F 1 "VB" V 8800 5700 50  0000 C CNN
-	1    8800 5550
+P 8150 5750
+F 0 "#PWR28" H 8150 5650 50  0001 C CNN
+F 1 "VB" V 8150 5900 50  0000 C CNN
+	1    8150 5750
 	0    -1   -1   0   
 $EndComp
 $Comp
 L IO_3V3 #PWR42
 U 1 1 4A3B496B
-P 12350 8100
-F 0 "#PWR42" H 12350 8000 50  0001 C CNN
-F 1 "IO_3V3" V 12250 8150 50  0000 C CNN
-	1    12350 8100
+P 11700 8300
+F 0 "#PWR42" H 11700 8200 50  0001 C CNN
+F 1 "IO_3V3" V 11600 8350 50  0000 C CNN
+	1    11700 8300
 	0    1    1    0   
 $EndComp
 $Comp
 L VB_SYS #PWR41
 U 1 1 4A3B495E
-P 12350 7700
-F 0 "#PWR41" H 12350 7600 50  0001 C CNN
-F 1 "VB_SYS" V 12250 7750 50  0000 C CNN
-	1    12350 7700
+P 11700 7900
+F 0 "#PWR41" H 11700 7800 50  0001 C CNN
+F 1 "VB_SYS" V 11600 7950 50  0000 C CNN
+	1    11700 7900
 	0    1    1    0   
 $EndComp
 $Comp
 L VB_SYS #PWR40
 U 1 1 4A3B495A
-P 12350 7300
-F 0 "#PWR40" H 12350 7200 50  0001 C CNN
-F 1 "VB_SYS" V 12250 7350 50  0000 C CNN
-	1    12350 7300
+P 11700 7500
+F 0 "#PWR40" H 11700 7400 50  0001 C CNN
+F 1 "VB_SYS" V 11600 7550 50  0000 C CNN
+	1    11700 7500
 	0    1    1    0   
 $EndComp
 $Comp
 L LCM_3V #PWR43
 U 1 1 4A3B4937
-P 13600 9300
-F 0 "#PWR43" H 13600 9200 50  0001 C CNN
-F 1 "LCM_3V" H 13600 9450 50  0000 C CNN
-	1    13600 9300
+P 12950 9500
+F 0 "#PWR43" H 12950 9400 50  0001 C CNN
+F 1 "LCM_3V" H 12950 9650 50  0000 C CNN
+	1    12950 9500
 	1    0    0    -1  
 $EndComp
 $Comp
 L RF_3V #PWR52
 U 1 1 4A3B492B
-P 14600 9300
-F 0 "#PWR52" H 14600 9200 50  0001 C CNN
-F 1 "RF_3V" H 14600 9450 50  0000 C CNN
-	1    14600 9300
+P 13950 9500
+F 0 "#PWR52" H 13950 9400 50  0001 C CNN
+F 1 "RF_3V" H 13950 9650 50  0000 C CNN
+	1    13950 9500
 	1    0    0    -1  
 $EndComp
 $Comp
 L BT_3V2 #PWR67
 U 1 1 4A3B491D
-P 15450 8500
-F 0 "#PWR67" H 15450 8400 50  0001 C CNN
-F 1 "BT_3V2" H 15450 8650 50  0000 C CNN
-	1    15450 8500
+P 14800 8700
+F 0 "#PWR67" H 14800 8600 50  0001 C CNN
+F 1 "BT_3V2" H 14800 8850 50  0000 C CNN
+	1    14800 8700
 	1    0    0    -1  
 $EndComp
 $Comp
 L CODEC_3V3 #PWR54
 U 1 1 4A3B4900
-P 14350 7800
-F 0 "#PWR54" H 14350 7700 50  0001 C CNN
-F 1 "CODEC_3V3" H 14350 7950 50  0000 C CNN
-	1    14350 7800
+P 13700 8000
+F 0 "#PWR54" H 13700 7900 50  0001 C CNN
+F 1 "CODEC_3V3" H 13700 8150 50  0000 C CNN
+	1    13700 8000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GSENSOR_3V3 #PWR60
 U 1 1 4A3B48F1
-P 14750 7400
-F 0 "#PWR60" H 14750 7300 50  0001 C CNN
-F 1 "GSENSOR_3V3" H 14750 7550 50  0000 C CNN
-	1    14750 7400
+P 14100 7600
+F 0 "#PWR60" H 14100 7500 50  0001 C CNN
+F 1 "GSENSOR_3V3" H 14100 7750 50  0000 C CNN
+	1    14100 7600
 	1    0    0    -1  
 $EndComp
 $Comp
 L SD_3V3 #PWR65
 U 1 1 4A3B48E2
-P 15450 7000
-F 0 "#PWR65" H 15450 6900 50  0001 C CNN
-F 1 "SD_3V3" H 15450 7150 50  0000 C CNN
-	1    15450 7000
+P 14800 7200
+F 0 "#PWR65" H 14800 7100 50  0001 C CNN
+F 1 "SD_3V3" H 14800 7350 50  0000 C CNN
+	1    14800 7200
 	1    0    0    -1  
 $EndComp
 $Comp
 L IO_1V8 #PWR64
 U 1 1 4A3B48D4
-P 15450 5700
-F 0 "#PWR64" H 15450 5600 50  0001 C CNN
-F 1 "IO_1V8" H 15450 5850 50  0000 C CNN
-	1    15450 5700
+P 14800 5900
+F 0 "#PWR64" H 14800 5800 50  0001 C CNN
+F 1 "IO_1V8" H 14800 6050 50  0000 C CNN
+	1    14800 5900
 	1    0    0    -1  
 $EndComp
 $Comp
 L CORE_1V3 #PWR63
 U 1 1 4A3B48C2
-P 15450 4500
-F 0 "#PWR63" H 15450 4400 50  0001 C CNN
-F 1 "CORE_1V3" H 15450 4650 50  0000 C CNN
-	1    15450 4500
+P 14800 4700
+F 0 "#PWR63" H 14800 4600 50  0001 C CNN
+F 1 "CORE_1V3" H 14800 4850 50  0000 C CNN
+	1    14800 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L IO_3V3 #PWR62
 U 1 1 4A3B48B3
-P 15450 3300
-F 0 "#PWR62" H 15450 3200 50  0001 C CNN
-F 1 "IO_3V3" H 15450 3450 50  0000 C CNN
-	1    15450 3300
+P 14800 3500
+F 0 "#PWR62" H 14800 3400 50  0001 C CNN
+F 1 "IO_3V3" H 14800 3650 50  0000 C CNN
+	1    14800 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L VBUS #PWR23
 U 1 1 4A3B489B
-P 7800 4650
-F 0 "#PWR23" H 7800 4550 50  0001 C CNN
-F 1 "VBUS" H 7800 4800 50  0000 C CNN
-	1    7800 4650
+P 7150 4850
+F 0 "#PWR23" H 7150 4750 50  0001 C CNN
+F 1 "VBUS" H 7150 5000 50  0000 C CNN
+	1    7150 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L VB_SYS #PWR26
 U 1 1 4A3B47B9
-P 8200 7700
-F 0 "#PWR26" H 8200 7600 50  0001 C CNN
-F 1 "VB_SYS" H 8200 7850 50  0000 C CNN
-	1    8200 7700
+P 7550 7900
+F 0 "#PWR26" H 7550 7800 50  0001 C CNN
+F 1 "VB_SYS" H 7550 8050 50  0000 C CNN
+	1    7550 7900
 	1    0    0    -1  
 $EndComp
 $Comp
 L VB_SYS #PWR44
 U 1 1 4A3B4799
-P 12550 7000
-F 0 "#PWR44" H 12550 6900 50  0001 C CNN
-F 1 "VB_SYS" V 12550 7250 50  0000 C CNN
-	1    12550 7000
+P 11900 7200
+F 0 "#PWR44" H 11900 7100 50  0001 C CNN
+F 1 "VB_SYS" V 11900 7450 50  0000 C CNN
+	1    11900 7200
 	0    1    1    0   
 $EndComp
 $Comp
 L VB_SYS #PWR38
 U 1 1 4A3B4782
-P 12350 6200
-F 0 "#PWR38" H 12350 6100 50  0001 C CNN
-F 1 "VB_SYS" H 12350 6350 50  0000 C CNN
-	1    12350 6200
+P 11700 6400
+F 0 "#PWR38" H 11700 6300 50  0001 C CNN
+F 1 "VB_SYS" H 11700 6550 50  0000 C CNN
+	1    11700 6400
 	1    0    0    -1  
 $EndComp
 $Comp
 L VB_SYS #PWR37
 U 1 1 4A3B4778
-P 12350 5700
-F 0 "#PWR37" H 12350 5600 50  0001 C CNN
-F 1 "VB_SYS" V 12250 5750 50  0000 C CNN
-	1    12350 5700
+P 11700 5900
+F 0 "#PWR37" H 11700 5800 50  0001 C CNN
+F 1 "VB_SYS" V 11600 5950 50  0000 C CNN
+	1    11700 5900
 	0    1    1    0   
 $EndComp
 $Comp
 L VB_SYS #PWR36
 U 1 1 4A3B4757
-P 12350 5200
-F 0 "#PWR36" H 12350 5100 50  0001 C CNN
-F 1 "VB_SYS" V 12250 5250 50  0000 C CNN
-	1    12350 5200
+P 11700 5400
+F 0 "#PWR36" H 11700 5300 50  0001 C CNN
+F 1 "VB_SYS" V 11600 5450 50  0000 C CNN
+	1    11700 5400
 	0    1    1    0   
 $EndComp
 $Comp
 L VB_SYS #PWR27
 U 1 1 4A3B473F
-P 8300 5700
-F 0 "#PWR27" H 8300 5600 50  0001 C CNN
-F 1 "VB_SYS" H 8300 5850 50  0000 C CNN
-	1    8300 5700
+P 7650 5900
+F 0 "#PWR27" H 7650 5800 50  0001 C CNN
+F 1 "VB_SYS" H 7650 6050 50  0000 C CNN
+	1    7650 5900
 	1    0    0    -1  
 $EndComp
 $Comp
 L VB_SYS #PWR35
 U 1 1 4A3B46E9
-P 12350 3900
-F 0 "#PWR35" H 12350 3800 50  0001 C CNN
-F 1 "VB_SYS" H 12350 4050 50  0000 C CNN
-	1    12350 3900
+P 11700 4100
+F 0 "#PWR35" H 11700 4000 50  0001 C CNN
+F 1 "VB_SYS" H 11700 4250 50  0000 C CNN
+	1    11700 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR7
 U 1 1 4A3A888E
-P 3600 8200
-F 0 "#PWR7" H 3600 8200 30  0001 C CNN
-F 1 "GND" H 3600 8130 30  0001 C CNN
-	1    3600 8200
+P 2950 8400
+F 0 "#PWR7" H 2950 8400 30  0001 C CNN
+F 1 "GND" H 2950 8330 30  0001 C CNN
+	1    2950 8400
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1704
 U 1 1 4A3A8851
-P 2900 7600
-F 0 "C1704" H 2950 7700 50  0000 L CNN
-F 1 "100N" H 2950 7500 50  0000 L CNN
-F 2 "C0402-H" H 2900 7600 60  0001 C CNN
-	1    2900 7600
+P 2250 7800
+F 0 "C1704" H 2300 7900 50  0000 L CNN
+F 1 "100N" H 2300 7700 50  0000 L CNN
+F 2 "C0402-H" H 2250 7800 60  0001 C CNN
+	1    2250 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1761
 U 1 1 4A3A884F
-P 3250 7600
-F 0 "C1761" H 3300 7700 50  0000 L CNN
-F 1 "100N" H 3300 7500 50  0000 L CNN
-F 2 "C0402-H" H 3250 7600 60  0001 C CNN
-	1    3250 7600
+P 2600 7800
+F 0 "C1761" H 2650 7900 50  0000 L CNN
+F 1 "100N" H 2650 7700 50  0000 L CNN
+F 2 "C0402-H" H 2600 7800 60  0001 C CNN
+	1    2600 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1762
 U 1 1 4A3A8844
-P 3600 7600
-F 0 "C1762" H 3650 7700 50  0000 L CNN
-F 1 "10N" H 3650 7500 50  0000 L CNN
-F 2 "C0402-H" H 3600 7600 60  0001 C CNN
-	1    3600 7600
+P 2950 7800
+F 0 "C1762" H 3000 7900 50  0000 L CNN
+F 1 "10N" H 3000 7700 50  0000 L CNN
+F 2 "C0402-H" H 2950 7800 60  0001 C CNN
+	1    2950 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR20
 U 1 1 4A3A875F
-P 7500 5900
-F 0 "#PWR20" H 7500 5900 30  0001 C CNN
-F 1 "GND" H 7500 5830 30  0001 C CNN
-	1    7500 5900
+P 6850 6100
+F 0 "#PWR20" H 6850 6100 30  0001 C CNN
+F 1 "GND" H 6850 6030 30  0001 C CNN
+	1    6850 6100
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1767
 U 1 1 4A3A8730
-P 7900 5800
-F 0 "C1767" V 7700 5800 50  0000 L CNN
-F 1 "100U" V 7950 5950 50  0000 L CNN
-	1    7900 5800
+P 7250 6000
+F 0 "C1767" V 7050 6000 50  0000 L CNN
+F 1 "100U" V 7300 6150 50  0000 L CNN
+	1    7250 6000
 	0    1    1    0   
 $EndComp
 $Comp
 L TST TP1705
 U 1 1 4A3A851A
-P 12350 8600
-F 0 "TP1705" V 12450 8750 50  0000 C CNN
-F 1 "TST" V 12300 8650 50  0001 C CNN
-	1    12350 8600
+P 11700 8800
+F 0 "TP1705" V 11800 8950 50  0000 C CNN
+F 1 "TST" V 11650 8850 50  0001 C CNN
+	1    11700 8800
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR56
 U 1 1 4A3A847E
-P 14600 10300
-F 0 "#PWR56" H 14600 10300 30  0001 C CNN
-F 1 "GND" H 14600 10230 30  0001 C CNN
-	1    14600 10300
+P 13950 10500
+F 0 "#PWR56" H 13950 10500 30  0001 C CNN
+F 1 "GND" H 13950 10430 30  0001 C CNN
+	1    13950 10500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1765
 U 1 1 4A3A847D
-P 14250 9800
-F 0 "C1765" H 14300 9900 50  0000 L CNN
-F 1 "4U7" H 14300 9700 50  0000 L CNN
-F 2 "C0603-H" H 14250 9800 60  0001 C CNN
-	1    14250 9800
+P 13600 10000
+F 0 "C1765" H 13650 10100 50  0000 L CNN
+F 1 "4U7" H 13650 9900 50  0000 L CNN
+F 2 "C0603-H" H 13600 10000 60  0001 C CNN
+	1    13600 10000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1766
 U 1 1 4A3A847C
-P 14600 9800
-F 0 "C1766" H 14300 9700 50  0000 L CNN
-F 1 "100N" H 14350 9900 50  0000 L CNN
-F 2 "C0402-H" H 14600 9800 60  0001 C CNN
-	1    14600 9800
+P 13950 10000
+F 0 "C1766" H 13650 9900 50  0000 L CNN
+F 1 "100N" H 13700 10100 50  0000 L CNN
+F 2 "C0402-H" H 13950 10000 60  0001 C CNN
+	1    13950 10000
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR47
 U 1 1 4A3A8418
-P 13600 10300
-F 0 "#PWR47" H 13600 10300 30  0001 C CNN
-F 1 "GND" H 13600 10230 30  0001 C CNN
-	1    13600 10300
+P 12950 10500
+F 0 "#PWR47" H 12950 10500 30  0001 C CNN
+F 1 "GND" H 12950 10430 30  0001 C CNN
+	1    12950 10500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1713
 U 1 1 4A3A8416
-P 13250 9800
-F 0 "C1713" H 13300 9900 50  0000 L CNN
-F 1 "4U7" H 13300 9700 50  0000 L CNN
-F 2 "C0603-H" H 13250 9800 60  0001 C CNN
-	1    13250 9800
+P 12600 10000
+F 0 "C1713" H 12650 10100 50  0000 L CNN
+F 1 "4U7" H 12650 9900 50  0000 L CNN
+F 2 "C0603-H" H 12600 10000 60  0001 C CNN
+	1    12600 10000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1717
 U 1 1 4A3A8415
-P 13600 9800
-F 0 "C1717" H 13650 9900 50  0000 L CNN
-F 1 "470N" H 13650 9700 50  0000 L CNN
-F 2 "C0402-H" H 13600 9800 60  0001 C CNN
-	1    13600 9800
+P 12950 10000
+F 0 "C1717" H 13000 10100 50  0000 L CNN
+F 1 "470N" H 13000 9900 50  0000 L CNN
+F 2 "C0402-H" H 12950 10000 60  0001 C CNN
+	1    12950 10000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR68
 U 1 1 4A3A83A1
-P 15450 9500
-F 0 "#PWR68" H 15450 9500 30  0001 C CNN
-F 1 "GND" H 15450 9430 30  0001 C CNN
-	1    15450 9500
+P 14800 9700
+F 0 "#PWR68" H 14800 9700 30  0001 C CNN
+F 1 "GND" H 14800 9630 30  0001 C CNN
+	1    14800 9700
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1714
 U 1 1 4A3A839F
-P 15100 9000
-F 0 "C1714" H 15150 9100 50  0000 L CNN
-F 1 "4U7" H 15150 8900 50  0000 L CNN
-F 2 "C0603-H" H 15100 9000 60  0001 C CNN
-	1    15100 9000
+P 14450 9200
+F 0 "C1714" H 14500 9300 50  0000 L CNN
+F 1 "4U7" H 14500 9100 50  0000 L CNN
+F 2 "C0603-H" H 14450 9200 60  0001 C CNN
+	1    14450 9200
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1716
 U 1 1 4A3A839E
-P 15450 9000
-F 0 "C1716" H 15500 9100 50  0000 L CNN
-F 1 "470N" H 15500 8900 50  0000 L CNN
-F 2 "C0402-H" H 15450 9000 60  0001 C CNN
-	1    15450 9000
+P 14800 9200
+F 0 "C1716" H 14850 9300 50  0000 L CNN
+F 1 "470N" H 14850 9100 50  0000 L CNN
+F 2 "C0402-H" H 14800 9200 60  0001 C CNN
+	1    14800 9200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR55
 U 1 1 4A3A81ED
-P 14350 8700
-F 0 "#PWR55" H 14350 8700 30  0001 C CNN
-F 1 "GND" H 14350 8630 30  0001 C CNN
-	1    14350 8700
+P 13700 8900
+F 0 "#PWR55" H 13700 8900 30  0001 C CNN
+F 1 "GND" H 13700 8830 30  0001 C CNN
+	1    13700 8900
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1728
 U 1 1 4A3A81EB
-P 14350 8300
-F 0 "C1728" H 14400 8400 50  0000 L CNN
-F 1 "470N" H 14400 8200 50  0000 L CNN
-F 2 "C0402-H" H 14350 8300 60  0001 C CNN
-	1    14350 8300
+P 13700 8500
+F 0 "C1728" H 13750 8600 50  0000 L CNN
+F 1 "470N" H 13750 8400 50  0000 L CNN
+F 2 "C0402-H" H 13700 8500 60  0001 C CNN
+	1    13700 8500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR61
 U 1 1 4A3A80F3
-P 14750 8300
-F 0 "#PWR61" H 14750 8300 30  0001 C CNN
-F 1 "GND" H 14750 8230 30  0001 C CNN
-	1    14750 8300
+P 14100 8500
+F 0 "#PWR61" H 14100 8500 30  0001 C CNN
+F 1 "GND" H 14100 8430 30  0001 C CNN
+	1    14100 8500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR66
 U 1 1 4A3A80D6
-P 15450 8000
-F 0 "#PWR66" H 15450 8000 30  0001 C CNN
-F 1 "GND" H 15450 7930 30  0001 C CNN
-	1    15450 8000
+P 14800 8200
+F 0 "#PWR66" H 14800 8200 30  0001 C CNN
+F 1 "GND" H 14800 8130 30  0001 C CNN
+	1    14800 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1718
 U 1 1 4A3A8076
-P 14750 7900
-F 0 "C1718" H 14800 8000 50  0000 L CNN
-F 1 "470N" H 14800 7800 50  0000 L CNN
-F 2 "C0402-H" H 14750 7900 60  0001 C CNN
-	1    14750 7900
+P 14100 8100
+F 0 "C1718" H 14150 8200 50  0000 L CNN
+F 1 "470N" H 14150 8000 50  0000 L CNN
+F 2 "C0402-H" H 14100 8100 60  0001 C CNN
+	1    14100 8100
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1710
 U 1 1 4A3A7FDE
-P 15100 7500
-F 0 "C1710" H 15150 7600 50  0000 L CNN
-F 1 "4U7" H 15150 7400 50  0000 L CNN
-F 2 "C0603-H" H 15100 7500 60  0001 C CNN
-	1    15100 7500
+P 14450 7700
+F 0 "C1710" H 14500 7800 50  0000 L CNN
+F 1 "4U7" H 14500 7600 50  0000 L CNN
+F 2 "C0603-H" H 14450 7700 60  0001 C CNN
+	1    14450 7700
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1719
 U 1 1 4A3A7FD8
-P 15450 7500
-F 0 "C1719" H 15500 7600 50  0000 L CNN
-F 1 "470N" H 15500 7400 50  0000 L CNN
-F 2 "C0402-H" H 15450 7500 60  0001 C CNN
-	1    15450 7500
+P 14800 7700
+F 0 "C1719" H 14850 7800 50  0000 L CNN
+F 1 "470N" H 14850 7600 50  0000 L CNN
+F 2 "C0402-H" H 14800 7700 60  0001 C CNN
+	1    14800 7700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR31
 U 1 1 4A3A7E54
-P 10750 9600
-F 0 "#PWR31" H 10750 9600 30  0001 C CNN
-F 1 "GND" H 10750 9530 30  0001 C CNN
-	1    10750 9600
+P 10100 9800
+F 0 "#PWR31" H 10100 9800 30  0001 C CNN
+F 1 "GND" H 10100 9730 30  0001 C CNN
+	1    10100 9800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR22
 U 1 1 4A3A7E21
-P 7700 10000
-F 0 "#PWR22" H 7700 10000 30  0001 C CNN
-F 1 "GND" H 7700 9930 30  0001 C CNN
-	1    7700 10000
+P 7050 10200
+F 0 "#PWR22" H 7050 10200 30  0001 C CNN
+F 1 "GND" H 7050 10130 30  0001 C CNN
+	1    7050 10200
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1702
 U 1 1 4A3A7DE6
-P 7700 9350
-F 0 "C1702" H 7750 9450 50  0000 L CNN
-F 1 "10P" H 7750 9250 50  0000 L CNN
-F 2 "C0402-H" H 7700 9350 60  0001 C CNN
-	1    7700 9350
+P 7050 9550
+F 0 "C1702" H 7100 9650 50  0000 L CNN
+F 1 "10P" H 7100 9450 50  0000 L CNN
+F 2 "C0402-H" H 7050 9550 60  0001 C CNN
+	1    7050 9550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1703
 U 1 1 4A3A7DA5
-P 9000 9350
-F 0 "C1703" H 9050 9450 50  0000 L CNN
-F 1 "10P" H 9050 9250 50  0000 L CNN
-F 2 "C0402-H" H 9000 9350 60  0001 C CNN
-	1    9000 9350
+P 8350 9550
+F 0 "C1703" H 8400 9650 50  0000 L CNN
+F 1 "10P" H 8400 9450 50  0000 L CNN
+F 2 "C0402-H" H 8350 9550 60  0001 C CNN
+	1    8350 9550
 	1    0    0    -1  
 $EndComp
 $Comp
 L MS2V-T1S X1701
 U 1 1 4A3A7D91
-P 8350 8950
-F 0 "X1701" H 8350 9300 60  0000 C CNN
-F 1 "MS2V-T1S" H 8350 9200 60  0000 C CNN
-	1    8350 8950
+P 7700 9150
+F 0 "X1701" H 7700 9500 60  0000 C CNN
+F 1 "MS2V-T1S" H 7700 9400 60  0000 C CNN
+	1    7700 9150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR59
 U 1 1 4A39FFAD
-P 14750 6700
-F 0 "#PWR59" H 14750 6700 30  0001 C CNN
-F 1 "GND" H 14750 6630 30  0001 C CNN
-	1    14750 6700
+P 14100 6900
+F 0 "#PWR59" H 14100 6900 30  0001 C CNN
+F 1 "GND" H 14100 6830 30  0001 C CNN
+	1    14100 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1734
 U 1 1 4A39FFAB
-P 15450 6200
-F 0 "C1734" H 15500 6300 50  0000 L CNN
-F 1 "100P" H 15500 6100 50  0000 L CNN
-F 2 "C0402-H" H 15450 6200 60  0001 C CNN
-	1    15450 6200
+P 14800 6400
+F 0 "C1734" H 14850 6500 50  0000 L CNN
+F 1 "100P" H 14850 6300 50  0000 L CNN
+F 2 "C0402-H" H 14800 6400 60  0001 C CNN
+	1    14800 6400
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1720
 U 1 1 4A39FFAA
-P 15100 6200
-F 0 "C1720" H 15150 6300 50  0000 L CNN
-F 1 "100N" H 15150 6100 50  0000 L CNN
-F 2 "C0402-H" H 15100 6200 60  0001 C CNN
-	1    15100 6200
+P 14450 6400
+F 0 "C1720" H 14500 6500 50  0000 L CNN
+F 1 "100N" H 14500 6300 50  0000 L CNN
+F 2 "C0402-H" H 14450 6400 60  0001 C CNN
+	1    14450 6400
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1709
 U 1 1 4A39FFA9
-P 14750 6200
-F 0 "C1709" H 14800 6300 50  0000 L CNN
-F 1 "22U" H 14800 6100 50  0000 L CNN
-F 2 "C0805-H" H 14750 6200 60  0001 C CNN
-	1    14750 6200
+P 14100 6400
+F 0 "C1709" H 14150 6500 50  0000 L CNN
+F 1 "22U" H 14150 6300 50  0000 L CNN
+F 2 "C0805-H" H 14100 6400 60  0001 C CNN
+	1    14100 6400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR58
 U 1 1 4A39FEF8
-P 14750 5500
-F 0 "#PWR58" H 14750 5500 30  0001 C CNN
-F 1 "GND" H 14750 5430 30  0001 C CNN
-	1    14750 5500
+P 14100 5700
+F 0 "#PWR58" H 14100 5700 30  0001 C CNN
+F 1 "GND" H 14100 5630 30  0001 C CNN
+	1    14100 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1733
 U 1 1 4A39FEF6
-P 15450 5000
-F 0 "C1733" H 15500 5100 50  0000 L CNN
-F 1 "100P" H 15500 4900 50  0000 L CNN
-F 2 "C0402-H" H 15450 5000 60  0001 C CNN
-	1    15450 5000
+P 14800 5200
+F 0 "C1733" H 14850 5300 50  0000 L CNN
+F 1 "100P" H 14850 5100 50  0000 L CNN
+F 2 "C0402-H" H 14800 5200 60  0001 C CNN
+	1    14800 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1721
 U 1 1 4A39FEF5
-P 15100 5000
-F 0 "C1721" H 15150 5100 50  0000 L CNN
-F 1 "100N" H 15150 4900 50  0000 L CNN
-F 2 "C0402-H" H 15100 5000 60  0001 C CNN
-	1    15100 5000
+P 14450 5200
+F 0 "C1721" H 14500 5300 50  0000 L CNN
+F 1 "100N" H 14500 5100 50  0000 L CNN
+F 2 "C0402-H" H 14450 5200 60  0001 C CNN
+	1    14450 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1708
 U 1 1 4A39FEF4
-P 14750 5000
-F 0 "C1708" H 14800 5100 50  0000 L CNN
-F 1 "22U" H 14800 4900 50  0000 L CNN
-F 2 "C0805-H" H 14750 5000 60  0001 C CNN
-	1    14750 5000
+P 14100 5200
+F 0 "C1708" H 14150 5300 50  0000 L CNN
+F 1 "22U" H 14150 5100 50  0000 L CNN
+F 2 "C0805-H" H 14100 5200 60  0001 C CNN
+	1    14100 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR57
 U 1 1 4A39FEB0
-P 14750 4300
-F 0 "#PWR57" H 14750 4300 30  0001 C CNN
-F 1 "GND" H 14750 4230 30  0001 C CNN
-	1    14750 4300
+P 14100 4500
+F 0 "#PWR57" H 14100 4500 30  0001 C CNN
+F 1 "GND" H 14100 4430 30  0001 C CNN
+	1    14100 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1732
 U 1 1 4A39FE40
-P 15450 3800
-F 0 "C1732" H 15500 3900 50  0000 L CNN
-F 1 "100P" H 15500 3700 50  0000 L CNN
-F 2 "C0402-H" H 15450 3800 60  0001 C CNN
-	1    15450 3800
+P 14800 4000
+F 0 "C1732" H 14850 4100 50  0000 L CNN
+F 1 "100P" H 14850 3900 50  0000 L CNN
+F 2 "C0402-H" H 14800 4000 60  0001 C CNN
+	1    14800 4000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1722
 U 1 1 4A39FE27
-P 15100 3800
-F 0 "C1722" H 15150 3900 50  0000 L CNN
-F 1 "100N" H 15150 3700 50  0000 L CNN
-F 2 "C0402-H" H 15100 3800 60  0001 C CNN
-	1    15100 3800
+P 14450 4000
+F 0 "C1722" H 14500 4100 50  0000 L CNN
+F 1 "100N" H 14500 3900 50  0000 L CNN
+F 2 "C0402-H" H 14450 4000 60  0001 C CNN
+	1    14450 4000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1707
 U 1 1 4A39FE25
-P 14750 3800
-F 0 "C1707" H 14800 3900 50  0000 L CNN
-F 1 "47U" H 14800 3700 50  0000 L CNN
-F 2 "C1206-H" H 14750 3800 60  0001 C CNN
-	1    14750 3800
+P 14100 4000
+F 0 "C1707" H 14150 4100 50  0000 L CNN
+F 1 "47U" H 14150 3900 50  0000 L CNN
+F 2 "C1206-H" H 14100 4000 60  0001 C CNN
+	1    14100 4000
 	1    0    0    -1  
 $EndComp
 $Comp
 L TST TP1702
 U 1 1 4A39FAD1
-P 12800 7700
-F 0 "TP1702" V 12750 8050 50  0000 C CNN
-F 1 "TST" V 12750 7750 50  0001 C CNN
-	1    12800 7700
+P 12150 7900
+F 0 "TP1702" V 12100 8250 50  0000 C CNN
+F 1 "TST" V 12100 7950 50  0001 C CNN
+	1    12150 7900
 	0    1    1    0   
 $EndComp
 $Comp
 L R_US R1716
 U 1 1 4A39FAAB
-P 12800 8400
-F 0 "R1716" H 12800 8500 50  0000 C CNN
-F 1 "0R" H 12600 8350 50  0000 C CNN
-F 2 "R0402-H" H 12800 8400 60  0001 C CNN
-	1    12800 8400
+P 12150 8600
+F 0 "R1716" H 12150 8700 50  0000 C CNN
+F 1 "0R" H 11950 8550 50  0000 C CNN
+F 2 "R0402-H" H 12150 8600 60  0001 C CNN
+	1    12150 8600
 	-1   0    0    1   
 $EndComp
 $Comp
 L R_US R1764
 U 1 1 4A39FAAA
-P 12800 8200
-F 0 "R1764" H 12800 8300 50  0000 C CNN
-F 1 "0R" H 13000 8250 50  0000 C CNN
-F 2 "R0402-H" H 12800 8200 60  0001 C CNN
-	1    12800 8200
+P 12150 8400
+F 0 "R1764" H 12150 8500 50  0000 C CNN
+F 1 "0R" H 12350 8450 50  0000 C CNN
+F 2 "R0402-H" H 12150 8400 60  0001 C CNN
+	1    12150 8400
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1715
 U 1 1 4A39FA0B
-P 13250 7900
-F 0 "R1715" H 13250 8000 50  0000 C CNN
-F 1 "0R" H 13450 7950 50  0000 C CNN
-F 2 "R0402-H" H 13250 7900 60  0001 C CNN
-	1    13250 7900
+P 12600 8100
+F 0 "R1715" H 12600 8200 50  0000 C CNN
+F 1 "0R" H 12800 8150 50  0000 C CNN
+F 2 "R0402-H" H 12600 8100 60  0001 C CNN
+	1    12600 8100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1717
 U 1 1 4A39FA05
-P 13100 7500
-F 0 "R1717" H 13100 7600 50  0000 C CNN
-F 1 "0R" H 13300 7550 50  0000 C CNN
-F 2 "R0402-H" H 13100 7500 60  0001 C CNN
-	1    13100 7500
+P 12450 7700
+F 0 "R1717" H 12450 7800 50  0000 C CNN
+F 1 "0R" H 12650 7750 50  0000 C CNN
+F 2 "R0402-H" H 12450 7700 60  0001 C CNN
+	1    12450 7700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1718
 U 1 1 4A39FA02
-P 13100 7300
-F 0 "R1718" H 13100 7400 50  0000 C CNN
-F 1 "0R" H 13300 7350 50  0000 C CNN
-F 2 "R0402-H" H 13100 7300 60  0001 C CNN
-	1    13100 7300
+P 12450 7500
+F 0 "R1718" H 12450 7600 50  0000 C CNN
+F 1 "0R" H 12650 7550 50  0000 C CNN
+F 2 "R0402-H" H 12450 7500 60  0001 C CNN
+	1    12450 7500
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1719
 U 1 1 4A39F9FB
-P 13950 7100
-F 0 "R1719" H 13950 7200 50  0000 C CNN
-F 1 "0R" H 14150 7150 50  0000 C CNN
-F 2 "R0402-H" H 13950 7100 60  0001 C CNN
-	1    13950 7100
+P 13300 7300
+F 0 "R1719" H 13300 7400 50  0000 C CNN
+F 1 "0R" H 13500 7350 50  0000 C CNN
+F 2 "R0402-H" H 13300 7300 60  0001 C CNN
+	1    13300 7300
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR39
 U 1 1 4A39F993
-P 12350 6800
-F 0 "#PWR39" H 12350 6800 30  0001 C CNN
-F 1 "GND" H 12350 6730 30  0001 C CNN
-	1    12350 6800
+P 11700 7000
+F 0 "#PWR39" H 11700 7000 30  0001 C CNN
+F 1 "GND" H 11700 6930 30  0001 C CNN
+	1    11700 7000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1763
 U 1 1 4A39F90E
-P 12800 6700
-F 0 "R1763" H 12650 6600 50  0000 C CNN
-F 1 "42R2" H 12900 6600 50  0000 C CNN
-F 2 "R0402-H" H 12800 6700 60  0001 C CNN
-	1    12800 6700
+P 12150 6900
+F 0 "R1763" H 12000 6800 50  0000 C CNN
+F 1 "42R2" H 12250 6800 50  0000 C CNN
+F 2 "R0402-H" H 12150 6900 60  0001 C CNN
+	1    12150 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L VAA #PWR50
 U 1 1 4A39F8D3
-P 13550 6700
-F 0 "#PWR50" H 13550 6760 30  0001 C CNN
-F 1 "LED-" H 13550 6850 50  0000 C CNN
-	1    13550 6700
+P 12900 6900
+F 0 "#PWR50" H 12900 6960 30  0001 C CNN
+F 1 "LED-" H 12900 7050 50  0000 C CNN
+	1    12900 6900
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR53
 U 1 1 4A39F7D7
-P 14350 6600
-F 0 "#PWR53" H 14350 6600 30  0001 C CNN
-F 1 "GND" H 14350 6530 30  0001 C CNN
-	1    14350 6600
+P 13700 6800
+F 0 "#PWR53" H 13700 6800 30  0001 C CNN
+F 1 "GND" H 13700 6730 30  0001 C CNN
+	1    13700 6800
 	1    0    0    -1  
 $EndComp
 $Comp
 L VAA #PWR49
 U 1 1 4A39F7C2
-P 13550 6400
-F 0 "#PWR49" H 13550 6460 30  0001 C CNN
-F 1 "LED+" H 13550 6550 50  0000 C CNN
-	1    13550 6400
+P 12900 6600
+F 0 "#PWR49" H 12900 6660 30  0001 C CNN
+F 1 "LED+" H 12900 6750 50  0000 C CNN
+	1    12900 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1764
 U 1 1 4A39F794
-P 13950 6500
-F 0 "C1764" V 13750 6500 50  0000 L CNN
-F 1 "10U" V 14100 6500 50  0000 L CNN
-F 2 "C1206-H" H 13950 6500 60  0001 C CNN
-	1    13950 6500
+P 13300 6700
+F 0 "C1764" V 13100 6700 50  0000 L CNN
+F 1 "10U" V 13450 6700 50  0000 L CNN
+F 2 "C1206-H" H 13300 6700 60  0001 C CNN
+	1    13300 6700
 	0    1    1    0   
 $EndComp
 $Comp
 L INDUCTOR L1704
 U 1 1 4A39F6EA
-P 12850 6300
-F 0 "L1704" V 12800 6150 50  0000 C CNN
-F 1 "2U2" V 12800 6400 50  0000 C CNN
-	1    12850 6300
+P 12200 6500
+F 0 "L1704" V 12150 6350 50  0000 C CNN
+F 1 "2U2" V 12150 6600 50  0000 C CNN
+	1    12200 6500
 	0    1    1    0   
 $EndComp
 $Comp
 L INDUCTOR L1702
 U 1 1 4A39F6BF
-P 12750 5800
-F 0 "L1702" V 12700 5650 50  0000 C CNN
-F 1 "4U7" V 12700 5900 50  0000 C CNN
-	1    12750 5800
+P 12100 6000
+F 0 "L1702" V 12050 5850 50  0000 C CNN
+F 1 "4U7" V 12050 6100 50  0000 C CNN
+	1    12100 6000
 	0    1    1    0   
 $EndComp
 $Comp
 L INDUCTOR L1703
 U 1 1 4A39F110
-P 12750 5300
-F 0 "L1703" V 12700 5150 50  0000 C CNN
-F 1 "4U7" V 12700 5400 50  0000 C CNN
-	1    12750 5300
+P 12100 5500
+F 0 "L1703" V 12050 5350 50  0000 C CNN
+F 1 "4U7" V 12050 5600 50  0000 C CNN
+	1    12100 5500
 	0    1    1    0   
 $EndComp
 $Comp
 L R_US R1721
 U 1 1 4A39F0B7
-P 13150 4900
-F 0 "R1721" H 13150 5000 50  0000 C CNN
-F 1 "0R" H 13150 4800 50  0000 C CNN
-F 2 "R0402-H" H 13150 4900 60  0001 C CNN
-	1    13150 4900
+P 12500 5100
+F 0 "R1721" H 12500 5200 50  0000 C CNN
+F 1 "0R" H 12500 5000 50  0000 C CNN
+F 2 "R0402-H" H 12500 5100 60  0001 C CNN
+	1    12500 5100
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2217,135 +2070,135 @@
 $Comp
 L R_US R1768
 U 1 1 4A3943B4
-P 8750 8000
-F 0 "R1768" H 8450 8050 50  0000 C CNN
-F 1 "10K" H 9000 8050 50  0000 C CNN
-F 2 "R0402-H" H 8750 8000 60  0001 C CNN
-	1    8750 8000
+P 8100 8200
+F 0 "R1768" H 7800 8250 50  0000 C CNN
+F 1 "10K" H 8350 8250 50  0000 C CNN
+F 2 "R0402-H" H 8100 8200 60  0001 C CNN
+	1    8100 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1767
 U 1 1 4A3943B2
-P 8750 7900
-F 0 "R1767" H 8450 7950 50  0000 C CNN
-F 1 "10K" H 9000 7950 50  0000 C CNN
-F 2 "R0402-H" H 8750 7900 60  0001 C CNN
-	1    8750 7900
+P 8100 8100
+F 0 "R1767" H 7800 8150 50  0000 C CNN
+F 1 "10K" H 8350 8150 50  0000 C CNN
+F 2 "R0402-H" H 8100 8100 60  0001 C CNN
+	1    8100 8100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1766
 U 1 1 4A3943AF
-P 8750 7800
-F 0 "R1766" H 8450 7850 50  0000 C CNN
-F 1 "10K" H 9000 7850 50  0000 C CNN
-F 2 "R0402-H" H 8750 7800 60  0001 C CNN
-	1    8750 7800
+P 8100 8000
+F 0 "R1766" H 7800 8050 50  0000 C CNN
+F 1 "10K" H 8350 8050 50  0000 C CNN
+F 2 "R0402-H" H 8100 8000 60  0001 C CNN
+	1    8100 8000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR21
 U 1 1 4A3940A8
-P 7700 5400
-F 0 "#PWR21" H 7700 5400 30  0001 C CNN
-F 1 "GND" H 7700 5330 30  0001 C CNN
-	1    7700 5400
+P 7050 5600
+F 0 "#PWR21" H 7050 5600 30  0001 C CNN
+F 1 "GND" H 7050 5530 30  0001 C CNN
+	1    7050 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR25
 U 1 1 4A394062
-P 8100 5400
-F 0 "#PWR25" H 8100 5400 30  0001 C CNN
-F 1 "GND" H 8100 5330 30  0001 C CNN
-	1    8100 5400
+P 7450 5600
+F 0 "#PWR25" H 7450 5600 30  0001 C CNN
+F 1 "GND" H 7450 5530 30  0001 C CNN
+	1    7450 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1704
 U 1 1 4A393F2C
-P 8550 5300
-F 0 "R1704" H 8550 5400 50  0000 C CNN
-F 1 "12K4" H 8450 5200 50  0000 C CNN
-F 2 "R0402-H" H 8550 5300 60  0001 C CNN
-F 4 "1%" H 8650 5200 50  0000 C CNN "Tolerance"
-	1    8550 5300
+P 7900 5500
+F 0 "R1704" H 7900 5600 50  0000 C CNN
+F 1 "12K4" H 7800 5400 50  0000 C CNN
+F 2 "R0402-H" H 7900 5500 60  0001 C CNN
+F 4 "1%" H 8000 5400 50  0000 C CNN "Tolerance"
+	1    7900 5500
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1701
 U 1 1 4A393F24
-P 8150 5100
-F 0 "R1701" H 8150 5200 50  0000 C CNN
-F 1 "NC" H 8150 5000 50  0000 C CNN
-F 2 "R0402-H" H 8150 5100 60  0001 C CNN
-	1    8150 5100
+P 7500 5300
+F 0 "R1701" H 7500 5400 50  0000 C CNN
+F 1 "NC" H 7500 5200 50  0000 C CNN
+F 2 "R0402-H" H 7500 5300 60  0001 C CNN
+	1    7500 5300
 	1    0    0    -1  
 $EndComp
-Text GLabel 7100 4300 0    60   Input ~ 0
+Text GLabel 6450 4500 0    60   Input ~ 0
 BAT_ID
 $Comp
 L R_US R1769
 U 1 1 4A393BD2
-P 7550 4300
-F 0 "R1769" H 7550 4200 50  0000 C CNN
-F 1 "NC" H 7550 4400 50  0000 C CNN
-F 2 "R0402-H" H 7550 4300 60  0001 C CNN
-	1    7550 4300
+P 6900 4500
+F 0 "R1769" H 6900 4400 50  0000 C CNN
+F 1 "NC" H 6900 4600 50  0000 C CNN
+F 2 "R0402-H" H 6900 4500 60  0001 C CNN
+	1    6900 4500
 	-1   0    0    1   
 $EndComp
 $Comp
 L R_US R1731
 U 1 1 4A393BCA
-P 7550 3850
-F 0 "R1731" H 7550 3950 50  0000 C CNN
-F 1 "100K" H 7450 3750 50  0000 C CNN
-F 2 "R0402-H" H 7550 3850 60  0001 C CNN
-F 4 "1%" H 7650 3750 50  0000 C CNN "Tolerance"
-	1    7550 3850
+P 6900 4050
+F 0 "R1731" H 6900 4150 50  0000 C CNN
+F 1 "100K" H 6800 3950 50  0000 C CNN
+F 2 "R0402-H" H 6900 4050 60  0001 C CNN
+F 4 "1%" H 7000 3950 50  0000 C CNN "Tolerance"
+	1    6900 4050
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1705
 U 1 1 4A393BC6
-P 8450 4300
-F 0 "R1705" H 8450 4400 50  0000 C CNN
-F 1 "5K36" H 8350 4200 50  0000 C CNN
-F 2 "R0402-H" H 8450 4300 60  0001 C CNN
-F 4 "1%" H 8550 4200 50  0000 C CNN "Tolerance"
-	1    8450 4300
+P 7800 4500
+F 0 "R1705" H 7800 4600 50  0000 C CNN
+F 1 "5K36" H 7700 4400 50  0000 C CNN
+F 2 "R0402-H" H 7800 4500 60  0001 C CNN
+F 4 "1%" H 7900 4400 50  0000 C CNN "Tolerance"
+	1    7800 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L R_US R1732
 U 1 1 4A3937A7
-P 8450 3850
-F 0 "R1732" H 8450 3950 50  0000 C CNN
-F 1 "39K" H 8400 3750 50  0000 C CNN
-F 2 "R0402-H" H 8450 3850 60  0001 C CNN
-F 4 "1%" H 8550 3750 50  0000 C CNN "Tolerance"
-	1    8450 3850
+P 7800 4050
+F 0 "R1732" H 7800 4150 50  0000 C CNN
+F 1 "39K" H 7750 3950 50  0000 C CNN
+F 2 "R0402-H" H 7800 4050 60  0001 C CNN
+F 4 "1%" H 7900 3950 50  0000 C CNN "Tolerance"
+	1    7800 4050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR19
 U 1 1 4A392F75
-P 7100 3850
-F 0 "#PWR19" H 7100 3850 30  0001 C CNN
-F 1 "GND" H 7100 3780 30  0001 C CNN
-	1    7100 3850
+P 6450 4050
+F 0 "#PWR19" H 6450 4050 30  0001 C CNN
+F 1 "GND" H 6450 3980 30  0001 C CNN
+	1    6450 4050
 	0    1    1    0   
 $EndComp
-Text GLabel 7100 3500 0    60   Input ~ 0
+Text GLabel 6450 3700 0    60   Input ~ 0
 USB_ID
 $Comp
 L PCF50633/04/N3 U1701
 U 1 1 4A0CA9CE
-P 10650 6350
-F 0 "U1701" H 10650 6350 60  0000 C CNN
-F 1 "PCF50633/04/N3" H 10650 5350 60  0000 C CNN
-	1    10650 6350
+P 10000 6550
+F 0 "U1701" H 10000 6550 60  0000 C CNN
+F 1 "PCF50633/04/N3" H 10000 5550 60  0000 C CNN
+	1    10000 6550
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC




More information about the commitlog mailing list