New version using the MCP2025

6 files changed, 458 insertions, 778 deletions

diff --git a/hardware/kicad/MCP2025.lib b/hardware/kicad/MCP2025.lib
new file mode 100644
index 0000000..49a2415
--- /dev/null
+++ b/hardware/kicad/MCP2025.lib
@@ -0,0 +1,23 @@
+EESchema-LIBRARY Version 2.2  Date: 20/02/2014-03:51:29
+#
+# MCP2025
+#
+DEF MCP2025 U 0 40 Y Y 1 0 N
+F0 "U" 0 -100 50 H V C C
+F1 "MCP2025" 0 100 50 H V C C
+F2 "MODULE" 0 0 50 H I C C
+F3 "DOCUMENTATION" 0 0 50 H I C C
+DRAW
+S -550 -350 550 350 1 0 0 N
+X VBB 1 -850 150 300 R 50 50 1 1 W
+X CS/LWAKE 2 -850 50 300 R 50 50 1 1 I
+X VSS 3 -850 -50 300 R 50 50 1 1 W
+X LIN 4 -850 -150 300 R 50 50 1 1 B
+X RXD 5 850 -150 300 L 50 50 1 1 O
+X TXD 6 850 -50 300 L 50 50 1 1 I
+X N_RESET 7 850 50 300 L 50 50 1 1 I
+X VREG 8 850 150 300 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/hardware/kicad/TH8080.lib b/hardware/kicad/TH8080.lib
deleted file mode 100644
index 8367f78..0000000
--- a/hardware/kicad/TH8080.lib
+++ /dev/null
@@ -1,21 +0,0 @@
-EESchema-LIBRARY Version 2.2  Date: 16/02/2014-19:53:12
-#
-# TH8080
-#
-DEF TH8080 U 0 40 Y Y 1 0 N
-F0 "U" 0 -100 50 H V C C
-F1 "TH8080" 0 100 50 H V C C
-F2 "MODULE" 0 0 50 H I C C
-F3 "DOCUMENTATION" 0 0 50 H I C C
-DRAW
-S -450 -300 450 300 1 0 0 N
-X RXD 1 -750 100 300 R 50 50 1 1 I
-X VCC 3 -750 0 300 R 50 50 1 1 W
-X TXD 4 -750 -100 300 R 50 50 1 1 O
-X GND 5 750 -100 300 L 50 50 1 1 W
-X BUS 6 750 0 300 L 50 50 1 1 B
-X VS 7 750 100 300 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/hardware/kicad/TLV70033.lib b/hardware/kicad/TLV70033.lib
deleted file mode 100644
index 89e9ab9..0000000
--- a/hardware/kicad/TLV70033.lib
+++ /dev/null
@@ -1,19 +0,0 @@
-EESchema-LIBRARY Version 2.2  Date: 17/02/2014-05:55:59
-#
-# TLV70033
-#
-DEF TLV70033 U 0 40 Y Y 1 0 N
-F0 "U" 0 -100 50 H V C C
-F1 "TLV70033" 0 100 50 H V C C
-F2 "MODULE" 0 0 50 H I C C
-F3 "DOCUMENTATION" 0 0 50 H I C C
-DRAW
-S -550 -300 550 300 1 0 0 N
-X IN 1 -850 100 300 R 50 50 1 1 W
-X GND 2 -850 0 300 R 50 50 1 1 W
-X EN 3 -850 -100 300 R 50 50 1 1 I
-X OUT 5 850 -100 300 L 50 50 1 1 w
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/hardware/kicad/i-bus bluetooth soc-cache.lib b/hardware/kicad/i-bus bluetooth soc-cache.lib
index ea67252..da14edb 100644
--- a/hardware/kicad/i-bus bluetooth soc-cache.lib
+++ b/hardware/kicad/i-bus bluetooth soc-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon 17 Feb 2014 01:35:22 PM CST
+EESchema-LIBRARY Version 2.3  Date: Wed 19 Feb 2014 11:02:51 PM CST
 #encoding utf-8
 #
 # +3.3V
@@ -14,30 +14,6 @@ P 3 0 1 0  0 0  0 40  0 40 N
 ENDDRAW
 ENDDEF
 #
-# +5V
-#
-DEF +5V #PWR 0 40 Y Y 1 F P
-F0 "#PWR" 0 90 20 H I C CNN
-F1 "+5V" 0 90 30 H V C CNN
-DRAW
-X +5V 1 0 0 0 U 20 20 0 0 W N
-C 0 50 20 0 1 0 N
-P 4 0 1 0  0 0  0 30  0 30  0 30 N
-ENDDRAW
-ENDDEF
-#
-# +BATT
-#
-DEF +BATT #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -50 20 H I C CNN
-F1 "+BATT" 0 100 30 H V C CNN
-DRAW
-X +BATT 1 0 0 0 U 20 20 0 0 W N
-C 0 60 20 0 1 0 N
-P 3 0 1 0  0 0  0 40  0 40 N
-ENDDRAW
-ENDDEF
-#
 # ANTENNA-NC
 #
 DEF ANTENNA-NC U 0 40 Y Y 1 F N
@@ -167,24 +143,6 @@ X 6 6 -350 -250 250 R 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
-# CP1
-#
-DEF CP1 C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP1" 50 -100 50 H V L CNN
-$FPLIST
- CP*
- SM*
-$ENDFPLIST
-DRAW
-T 0 -50 100 80 0 0 0 +  Normal 0 C C
-A 0 -200 180 563 1236 0 1 15 N 100 -50 -100 -50
-P 4 0 1 15  -100 50  100 50  50 50  50 50 N
-X ~ 1 0 200 150 D 40 40 1 1 P
-X ~ 2 0 -200 180 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
 # CRYSTAL
 #
 DEF CRYSTAL X 0 40 N N 1 F N
@@ -199,23 +157,6 @@ X 2 2 300 0 200 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# DIODE
-#
-DEF DIODE D 0 40 N N 1 F N
-F0 "D" 0 100 40 H V C CNN
-F1 "DIODE" 0 -100 40 H V C CNN
-$FPLIST
- D?
- S*
-$ENDFPLIST
-DRAW
-P 2 0 1 6  50 50  50 -50 N
-P 3 0 1 0  -50 50  50 0  -50 -50 F
-X A 1 -200 0 150 R 40 40 1 1 P
-X K 2 200 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
 # GND
 #
 DEF ~GND #PWR 0 0 Y Y 1 F P
@@ -227,21 +168,6 @@ X GND 1 0 0 0 U 30 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# INDUCTOR
-#
-DEF INDUCTOR L 0 40 N N 1 F N
-F0 "L" -50 0 40 V V C CNN
-F1 "INDUCTOR" 100 0 40 V V C CNN
-DRAW
-A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
-A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
-A 0 51 51 -889 889 0 1 0 N 1 1 1 102
-A 0 148 48 -889 889 0 1 0 N 1 101 1 196
-X 1 1 0 300 100 D 70 70 1 1 P
-X 2 2 0 -300 100 U 70 70 1 1 P
-ENDDRAW
-ENDDEF
-#
 # LED
 #
 DEF LED D 0 40 Y N 1 F N
@@ -266,21 +192,23 @@ X K 2 200 0 150 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MC34063
+# MCP2025
 #
-DEF MC34063 U 0 40 Y Y 1 F N
-F0 "U" 150 350 60 H V L CNN
-F1 "MC34063" 100 -350 60 H V L CNN
+DEF MCP2025 U 0 40 Y Y 1 F N
+F0 "U" 0 -100 50 H V C CNN
+F1 "MCP2025" 0 100 50 H V C CNN
+F2 "MODULE" 0 0 50 H I C CNN
+F3 "DOCUMENTATION" 0 0 50 H I C CNN
 DRAW
-S 550 300 -550 -300 0 1 0 N
-X Sw_Coll 1 850 100 300 L 50 50 1 1 I
-X Sw_Emit 2 850 -50 300 L 50 50 1 1 I
-X Tim_Cap 3 -850 -150 300 R 50 50 1 1 I
-X GND 4 0 -500 200 U 50 50 1 1 W
-X V_Sense 5 850 -200 300 L 50 50 1 1 I
-X VCC 6 0 500 200 D 50 50 1 1 W
-X I_Sense 7 -850 150 300 R 50 50 1 1 I
-X Drv_Coll 8 850 200 300 L 50 50 1 1 I
+S -550 -350 550 350 1 0 0 N
+X VBB 1 -850 150 300 R 50 50 1 1 W
+X CS/LWAKE 2 -850 50 300 R 50 50 1 1 I
+X VSS 3 -850 -50 300 R 50 50 1 1 W
+X LIN 4 -850 -150 300 R 50 50 1 1 B
+X RXD 5 850 -150 300 L 50 50 1 1 O
+X TXD 6 850 -50 300 L 50 50 1 1 I
+X N_RESET 7 850 50 300 L 50 50 1 1 I
+X VREG 8 850 150 300 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
@@ -303,37 +231,4 @@ X ~ 2 0 -250 100 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TH8080
-#
-DEF TH8080 U 0 40 Y Y 1 F N
-F0 "U" 0 -100 50 H V C CNN
-F1 "TH8080" 0 100 50 H V C CNN
-F2 "MODULE" 0 0 50 H I C CNN
-F3 "DOCUMENTATION" 0 0 50 H I C CNN
-DRAW
-S -450 -300 450 300 1 0 0 N
-X RXD 1 -750 100 300 R 50 50 1 1 I
-X VCC 3 -750 0 300 R 50 50 1 1 W
-X TXD 4 -750 -100 300 R 50 50 1 1 O
-X GND 5 750 -100 300 L 50 50 1 1 W
-X BUS 6 750 0 300 L 50 50 1 1 B
-X VS 7 750 100 300 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# TPS769XX
-#
-DEF TPS769XX U 0 40 Y Y 1 F N
-F0 "U" 150 300 60 H V C CNN
-F1 "TPS769XX" 300 -200 60 H V C CNN
-DRAW
-S -250 200 250 -100 0 1 0 N
-X IN 1 -450 150 200 R 50 50 1 1 I
-X GND 2 0 -300 200 U 50 50 1 1 W
-X EN 3 -450 0 200 R 50 50 1 1 I L
-X NC/FB 4 450 0 200 L 50 30 1 1 I
-X OUT 5 450 150 200 L 50 50 1 1 w
-ENDDRAW
-ENDDEF
-#
 #End Library
diff --git a/hardware/kicad/i-bus bluetooth soc.pro b/hardware/kicad/i-bus bluetooth soc.pro
index ecf5d9c..24e8a14 100644
--- a/hardware/kicad/i-bus bluetooth soc.pro
+++ b/hardware/kicad/i-bus bluetooth soc.pro
@@ -1,11 +1,6 @@
-update=Mon 17 Feb 2014 12:45:17 PM CST
+update=Wed 19 Feb 2014 11:02:44 PM CST
 version=1
-last_client=kicad
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
+last_client=eeschema
 [pcbnew]
 version=1
 PadDrlX=320
@@ -24,7 +19,6 @@ TxtLar=120
 MSegLar=150
 LastNetListRead=
 [pcbnew/libraries]
-LibDir=
 LibName1=sockets
 LibName2=connect
 LibName3=discret
@@ -36,6 +30,15 @@ LibName8=led
 LibName9=dip_sockets
 LibName10=pga_sockets
 LibName11=valves
+LibName12=guan
+LibDir=
+[general]
+version=1
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
 [eeschema]
 version=1
 LibDir=
@@ -98,9 +101,6 @@ LibName27=opto
 LibName28=atmel
 LibName29=contrib
 LibName30=valves
-LibName31=TH8080
-LibName32=CC2541
-LibName33=TLV70033
-LibName34=guan
-[general]
-version=1
+LibName31=CC2541
+LibName32=guan
+LibName33=MCP2025
diff --git a/hardware/kicad/i-bus bluetooth soc.sch b/hardware/kicad/i-bus bluetooth soc.sch
index 63bd2f9..b025b89 100644
--- a/hardware/kicad/i-bus bluetooth soc.sch
+++ b/hardware/kicad/i-bus bluetooth soc.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon 17 Feb 2014 01:35:22 PM CST
+EESchema Schematic File Version 2  date Wed 19 Feb 2014 11:02:51 PM CST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -29,10 +29,9 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:TH8080
 LIBS:CC2541
-LIBS:TLV70033
 LIBS:guan
+LIBS:MCP2025
 LIBS:i-bus bluetooth soc-cache
 EELAYER 25  0
 EELAYER END
@@ -40,7 +39,7 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "17 feb 2014"
+Date "20 feb 2014"
 Rev ""
 Comp ""
 Comment1 ""
@@ -48,859 +47,662 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 8800 5000
-NoConn ~ 8800 4900
-NoConn ~ 8800 4800
-NoConn ~ 8800 4500
-NoConn ~ 8800 4400
-NoConn ~ 8800 3100
-NoConn ~ 8800 3000
-NoConn ~ 8800 2700
-NoConn ~ 8800 2600
-NoConn ~ 8800 2500
-NoConn ~ 8800 2400
-NoConn ~ 8800 2000
-NoConn ~ 8800 1900
-NoConn ~ 8800 1600
-NoConn ~ 8800 1500
-Text Label 3250 4850 0    60   ~ 0
-AVDD1,2,4
-Wire Wire Line
-	1400 4850 3600 4850
-Wire Wire Line
-	1400 4850 1400 4800
-Connection ~ 3250 4850
-Wire Wire Line
-	3250 4900 3250 4850
-Connection ~ 2900 4850
-Wire Wire Line
-	2900 4850 2900 4900
-Connection ~ 2550 4850
-Wire Wire Line
-	2550 4850 2550 4900
-Wire Wire Line
-	1850 5300 1850 5350
-Wire Wire Line
-	2200 5300 2200 5350
-Wire Wire Line
-	1500 5300 1500 5350
-Wire Wire Line
-	3600 5300 3600 5350
-Wire Wire Line
-	8200 2400 8100 2400
-Wire Wire Line
-	7550 2450 7550 2200
-Wire Wire Line
-	7550 2200 7600 2200
-Wire Wire Line
-	8600 2100 8800 2100
-Wire Wire Line
-	8250 1800 8800 1800
-Wire Wire Line
-	6350 1600 6750 1600
-Wire Wire Line
-	8800 4600 8500 4600
-Wire Wire Line
-	8500 4600 8500 3100
-Wire Wire Line
-	8500 3100 8350 3100
-Wire Wire Line
-	8400 2650 8400 2700
 Wire Wire Line
-	8400 2700 8350 2700
+	2250 1150 2250 1100
+Connection ~ 2250 1800
 Wire Wire Line
-	8350 2800 8800 2800
+	2250 1850 2250 1700
 Wire Wire Line
-	8800 2900 8350 2900
+	2250 1700 2100 1700
 Wire Wire Line
-	8700 1350 8700 1400
+	2100 1600 2400 1600
+Connection ~ 4500 1600
 Wire Wire Line
-	8250 4500 8250 3800
+	4500 1500 4500 1650
 Wire Wire Line
-	8250 4500 5750 4500
+	4100 1600 4500 1600
+Connection ~ 7400 6100
+Connection ~ 7050 6100
 Wire Wire Line
-	5750 4500 5750 3550
+	7050 6100 7050 6150
+Connection ~ 7750 6100
 Wire Wire Line
-	5750 3550 5850 3550
-Connection ~ 6500 4300
+	7750 6100 7750 6150
 Wire Wire Line
-	6300 4250 6300 4300
+	9150 6150 9150 6100
 Wire Wire Line
-	6300 4300 7850 4300
-Connection ~ 7150 4300
+	7400 6100 7400 6150
 Wire Wire Line
-	6700 4300 6700 4250
+	8100 6550 8100 6600
 Wire Wire Line
-	8250 3800 8800 3800
+	8450 6550 8450 6600
 Wire Wire Line
-	8550 5150 8550 4200
+	8800 6550 8800 6600
+Connection ~ 8000 5200
 Wire Wire Line
-	8550 4200 8800 4200
+	8200 5200 7550 5200
 Wire Wire Line
-	2400 4150 2400 4050
+	7550 5200 7550 5150
 Wire Wire Line
-	2850 3600 3100 3600
+	7550 1600 7650 1600
+Connection ~ 7000 1900
 Wire Wire Line
-	1950 3600 1900 3600
-Connection ~ 7850 4300
+	7050 1900 7000 1900
 Wire Wire Line
-	7850 4250 7850 4350
-Connection ~ 7850 3700
+	8250 1800 8100 1800
 Wire Wire Line
-	7800 3700 7850 3700
+	8100 1800 8100 1900
 Wire Wire Line
-	7150 3850 7150 3400
+	8100 1900 8050 1900
 Wire Wire Line
-	7150 3400 8800 3400
+	8250 4200 7900 4200
 Wire Wire Line
-	8800 3500 7850 3500
+	7900 4200 7900 2700
 Wire Wire Line
-	8750 5750 8750 5650
+	7900 2700 7800 2700
 Wire Wire Line
-	8700 1400 8800 1400
-Connection ~ 8700 2200
+	7800 2500 8050 2500
 Wire Wire Line
-	8700 2000 8700 5100
-Connection ~ 8700 4300
+	8050 2500 8050 2700
 Wire Wire Line
-	8800 4300 8700 4300
-Connection ~ 8700 4000
+	8050 2700 8250 2700
 Wire Wire Line
-	8700 4000 8800 4000
-Connection ~ 8700 3600
+	5950 2450 5950 2500
 Wire Wire Line
-	8700 3600 8800 3600
+	5300 3250 5250 3250
 Wire Wire Line
-	8700 2200 8800 2200
-Connection ~ 2450 1200
+	5250 3250 5250 3950
 Wire Wire Line
-	1400 1250 1400 1200
-Connection ~ 1550 1800
+	5250 3950 7650 3950
 Wire Wire Line
-	1400 1750 1400 1800
+	7650 3950 7650 3200
+Connection ~ 6150 3800
 Wire Wire Line
-	1400 1800 1600 1800
-Connection ~ 3850 2750
+	5950 3800 5950 3750
 Wire Wire Line
-	4150 1850 4150 2750
+	7650 3200 8250 3200
+Connection ~ 8200 5200
 Wire Wire Line
-	1550 2750 1550 2550
+	8000 5150 8000 5200
 Wire Wire Line
-	3550 2750 3550 2700
-Connection ~ 3550 2150
+	6600 3750 6600 3800
+Connection ~ 6600 3200
 Wire Wire Line
-	3550 1900 3550 2200
+	6650 3200 6600 3200
 Wire Wire Line
-	4150 1450 4150 1300
+	7300 3350 7300 3000
 Wire Wire Line
-	4150 1300 3550 1300
-Connection ~ 3850 2000
+	8200 4750 8200 4700
 Wire Wire Line
-	3850 2050 3850 1950
+	8200 4700 8250 4700
 Wire Wire Line
-	3300 1750 3350 1750
+	8250 4600 8150 4600
+Connection ~ 8150 3600
 Wire Wire Line
-	3300 1850 3350 1850
+	8150 3600 8250 3600
+Connection ~ 8150 3400
 Wire Wire Line
-	3300 2150 3550 2150
+	8150 3400 8250 3400
+Connection ~ 8150 2800
 Wire Wire Line
-	1550 2150 1550 2100
+	8150 2800 8250 2800
 Wire Wire Line
-	1550 2100 1600 2100
-Connection ~ 6550 1600
-Connection ~ 6550 1800
+	8150 1700 8250 1700
 Wire Wire Line
-	6750 1800 6350 1800
+	8150 3100 8250 3100
+Connection ~ 8150 3100
 Wire Wire Line
-	6550 1900 6550 1800
+	8150 3500 8250 3500
+Connection ~ 8150 3500
 Wire Wire Line
-	6550 1500 6550 1600
+	8250 3800 8150 3800
+Connection ~ 8150 3800
 Wire Wire Line
-	3350 1850 3350 1400
+	8150 4600 8150 1350
+Connection ~ 8150 1700
 Wire Wire Line
-	3350 1400 1550 1400
-Connection ~ 3350 1750
+	8250 900  8150 900 
 Wire Wire Line
-	3300 2000 3850 2000
+	8200 5150 8200 5250
 Wire Wire Line
-	3850 1350 3850 1250
+	7300 3000 8250 3000
 Wire Wire Line
-	3550 1300 3550 1400
-Connection ~ 3850 1300
+	8250 2900 6600 2900
 Wire Wire Line
-	2450 2800 2450 2450
-Connection ~ 2450 2750
+	6600 2900 6600 3350
 Wire Wire Line
-	3850 2450 3850 2750
-Connection ~ 3550 2750
+	7250 3200 7300 3200
+Connection ~ 7300 3200
 Wire Wire Line
-	1150 2550 1150 2750
+	7300 3850 7300 3750
+Connection ~ 7300 3800
 Wire Wire Line
-	1150 2750 4150 2750
-Connection ~ 1550 2750
+	8250 3700 8000 3700
 Wire Wire Line
-	1550 1400 1550 1800
+	8000 3700 8000 4650
 Wire Wire Line
-	2450 1450 2450 1150
+	8250 3300 7700 3300
 Wire Wire Line
-	1150 2150 1150 1200
+	6150 3800 6150 3750
+Connection ~ 6600 3800
 Wire Wire Line
-	1150 1200 2450 1200
-Connection ~ 1400 1200
+	7300 3800 5750 3800
 Wire Wire Line
-	8250 1700 8450 1700
+	5750 3800 5750 3750
+Connection ~ 5950 3800
 Wire Wire Line
-	8450 1700 8450 1550
+	5300 3050 5200 3050
 Wire Wire Line
-	8700 3300 8800 3300
-Connection ~ 8700 3300
+	5200 3050 5200 4000
 Wire Wire Line
-	8700 3900 8800 3900
-Connection ~ 8700 3900
+	5200 4000 7700 4000
 Wire Wire Line
-	8700 4100 8800 4100
-Connection ~ 8700 4100
+	7700 4000 7700 3300
 Wire Wire Line
-	8700 5100 8800 5100
+	8150 900  8150 850 
 Wire Wire Line
-	8800 5200 8750 5200
+	8250 2400 7800 2400
 Wire Wire Line
-	8750 5200 8750 5250
+	7800 2300 8250 2300
 Wire Wire Line
-	7850 3500 7850 3850
+	7800 2200 7850 2200
 Wire Wire Line
-	7200 3700 7150 3700
-Connection ~ 7150 3700
+	7850 2200 7850 2150
 Wire Wire Line
-	7150 4250 7150 4300
+	7800 2600 7950 2600
 Wire Wire Line
-	1900 3550 1900 3750
+	7950 2600 7950 4100
 Wire Wire Line
-	1900 3750 1950 3750
-Connection ~ 1900 3600
+	7950 4100 8250 4100
 Wire Wire Line
-	3100 3550 3100 3650
-Connection ~ 3100 3600
+	8050 1600 8250 1600
 Wire Wire Line
-	2400 4100 3100 4100
+	7050 1600 7000 1600
 Wire Wire Line
-	3100 4100 3100 4050
-Connection ~ 2400 4100
+	7000 1600 7000 1950
 Wire Wire Line
-	8550 5650 8550 5700
-Connection ~ 8750 5700
+	7650 1900 7550 1900
 Wire Wire Line
-	8800 3700 8200 3700
+	9150 6550 9150 6600
 Wire Wire Line
-	6500 4300 6500 4250
-Connection ~ 6700 4300
+	7050 6550 7050 6600
 Wire Wire Line
-	8200 3700 8200 4450
+	7750 6550 7750 6600
 Wire Wire Line
-	8200 4450 5800 4450
+	7400 6550 7400 6600
 Wire Wire Line
-	5800 4450 5800 3750
+	8100 6100 8100 6150
+Connection ~ 8100 6100
 Wire Wire Line
-	5800 3750 5850 3750
+	8450 6100 8450 6150
+Connection ~ 8450 6100
 Wire Wire Line
-	6500 2950 6500 3000
+	8800 6150 8800 6100
+Connection ~ 8800 6100
 Wire Wire Line
-	8800 1700 8550 1700
+	6950 6050 6950 6100
 Wire Wire Line
-	8800 3200 8600 3200
+	6950 6100 9150 6100
 Wire Wire Line
-	8600 3200 8600 3000
+	2250 1800 2400 1800
 Wire Wire Line
-	8600 3000 8350 3000
+	4500 2050 4500 2100
 Wire Wire Line
-	8350 3200 8450 3200
+	2250 1550 2250 1600
+Connection ~ 2250 1600
 Wire Wire Line
-	8450 3200 8450 4700
+	2100 1800 2150 1800
 Wire Wire Line
-	8450 4700 8800 4700
+	2150 1800 2150 1950
 Wire Wire Line
-	6750 1700 6350 1700
+	2150 1950 2350 1950
 Wire Wire Line
-	8250 1600 8550 1600
+	2350 1950 2350 1900
 Wire Wire Line
-	8550 1600 8550 1700
-Wire Wire Line
-	8600 2400 8650 2400
-Wire Wire Line
-	8650 2400 8650 2300
-Wire Wire Line
-	8650 2300 8800 2300
-Wire Wire Line
-	7600 2400 7550 2400
-Connection ~ 7550 2400
-Wire Wire Line
-	8200 2100 8150 2100
-Wire Wire Line
-	8150 2100 8150 2200
-Wire Wire Line
-	8150 2200 8100 2200
-Wire Wire Line
-	8100 5650 8100 5700
-Wire Wire Line
-	8100 5700 8750 5700
-Connection ~ 8550 5700
-Wire Wire Line
-	3250 5300 3250 5350
-Wire Wire Line
-	2900 5300 2900 5350
-Wire Wire Line
-	2550 5300 2550 5350
-Wire Wire Line
-	1850 4850 1850 4900
-Wire Wire Line
-	3600 4850 3600 4900
-Wire Wire Line
-	2200 4900 2200 4850
-Connection ~ 2200 4850
-Wire Wire Line
-	1500 4900 1500 4850
-Connection ~ 1500 4850
-Connection ~ 1850 4850
-Text Label 1500 4850 0    60   ~ 0
+	2350 1900 2400 1900
+$Comp
+L GND #PWR01
+U 1 1 53058922
+P 2250 1100
+F 0 "#PWR01" H 2250 1100 30  0001 C CNN
+F 1 "GND" H 2250 1030 30  0001 C CNN
+	1    2250 1100
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C1
+U 1 1 530588C6
+P 2250 1350
+F 0 "C1" H 2300 1450 50  0000 L CNN
+F 1 "100 uF" H 2300 1250 50  0000 L CNN
+	1    2250 1350
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 53058814
+P 4500 2100
+F 0 "#PWR02" H 4500 2100 30  0001 C CNN
+F 1 "GND" H 4500 2030 30  0001 C CNN
+	1    4500 2100
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C2
+U 1 1 53058806
+P 4500 1850
+F 0 "C2" H 4550 1950 50  0000 L CNN
+F 1 "10 uF" H 4550 1750 50  0000 L CNN
+	1    4500 1850
+	1    0    0    -1  
+$EndComp
+Text Label 8250 1500 2    60   ~ 0
+CS
+NoConn ~ 8250 1300
+NoConn ~ 8250 1200
+Text Label 2400 1700 2    60   ~ 0
+CS
+Text Label 4100 1900 0    60   ~ 0
+RX-1
+Text Label 4100 1800 0    60   ~ 0
+TX-1
+Text Label 8250 2100 2    60   ~ 0
+RX-1
+Text Label 8250 2200 2    60   ~ 0
+TX-1
+Text Label 4100 1700 0    60   ~ 0
+RESET
+$Comp
+L +3.3V #PWR03
+U 1 1 53057E6B
+P 4500 1500
+F 0 "#PWR03" H 4500 1460 30  0001 C CNN
+F 1 "+3.3V" H 4500 1610 30  0000 C CNN
+	1    4500 1500
+	1    0    0    -1  
+$EndComp
+$Comp
+L MCP2025 U1
+U 1 1 53057E3F
+P 3250 1750
+F 0 "U1" H 3250 1650 50  0000 C CNN
+F 1 "MCP2025" H 3250 1950 50  0000 C CNN
+F 2 "MODULE" H 3250 1750 50  0001 C CNN
+F 3 "DOCUMENTATION" H 3250 1750 50  0001 C CNN
+	1    3250 1750
+	1    0    0    -1  
+$EndComp
+NoConn ~ 8250 4500
+NoConn ~ 8250 4400
+NoConn ~ 8250 4300
+NoConn ~ 8250 4000
+NoConn ~ 8250 3900
+NoConn ~ 8250 2600
+NoConn ~ 8250 2500
+NoConn ~ 8250 2000
+NoConn ~ 8250 1900
+NoConn ~ 8250 1400
+NoConn ~ 8250 1100
+NoConn ~ 8250 1000
+Text Label 8800 6100 0    60   ~ 0
+AVDD1,2,4
+Text Label 7050 6100 0    60   ~ 0
 DVDD1
-Text Label 2900 4850 0    60   ~ 0
+Text Label 8450 6100 0    60   ~ 0
 AVDD6
-Text Label 2200 4850 0    60   ~ 0
+Text Label 7750 6100 0    60   ~ 0
 AVDD3
-Text Label 2550 4850 0    60   ~ 0
+Text Label 8100 6100 0    60   ~ 0
 AVDD5
-Text Label 1850 4850 0    60   ~ 0
+Text Label 7400 6100 0    60   ~ 0
 DVDD2
 $Comp
-L +3.3V #+3.3V01
+L +3.3V #+04
 U 1 1 530255BC
-P 1400 4800
-F 0 "#+3.3V01" H 1400 4760 30  0001 C CNN
-F 1 "+3.3V" H 1400 4910 30  0000 C CNN
-	1    1400 4800
+P 6950 6050
+F 0 "#+04" H 6950 6010 30  0001 C CNN
+F 1 "+3.3V" H 6950 6160 30  0000 C CNN
+	1    6950 6050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND02
+L GND #GND05
 U 1 1 53025587
-P 3600 5350
-F 0 "#GND02" H 3600 5350 30  0001 C CNN
-F 1 "GND" H 3600 5280 30  0001 C CNN
-	1    3600 5350
+P 9150 6600
+F 0 "#GND05" H 9150 6600 30  0001 C CNN
+F 1 "GND" H 9150 6530 30  0001 C CNN
+	1    9150 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND03
+L GND #GND06
 U 1 1 53025585
-P 3250 5350
-F 0 "#GND03" H 3250 5350 30  0001 C CNN
-F 1 "GND" H 3250 5280 30  0001 C CNN
-	1    3250 5350
+P 8800 6600
+F 0 "#GND06" H 8800 6600 30  0001 C CNN
+F 1 "GND" H 8800 6530 30  0001 C CNN
+	1    8800 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND04
+L GND #GND07
 U 1 1 53025583
-P 1500 5350
-F 0 "#GND04" H 1500 5350 30  0001 C CNN
-F 1 "GND" H 1500 5280 30  0001 C CNN
-	1    1500 5350
+P 7050 6600
+F 0 "#GND07" H 7050 6600 30  0001 C CNN
+F 1 "GND" H 7050 6530 30  0001 C CNN
+	1    7050 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND05
+L GND #GND08
 U 1 1 53025580
-P 2900 5350
-F 0 "#GND05" H 2900 5350 30  0001 C CNN
-F 1 "GND" H 2900 5280 30  0001 C CNN
-	1    2900 5350
+P 8450 6600
+F 0 "#GND08" H 8450 6600 30  0001 C CNN
+F 1 "GND" H 8450 6530 30  0001 C CNN
+	1    8450 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND06
+L GND #GND09
 U 1 1 5302557E
-P 2200 5350
-F 0 "#GND06" H 2200 5350 30  0001 C CNN
-F 1 "GND" H 2200 5280 30  0001 C CNN
-	1    2200 5350
+P 7750 6600
+F 0 "#GND09" H 7750 6600 30  0001 C CNN
+F 1 "GND" H 7750 6530 30  0001 C CNN
+	1    7750 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND07
+L GND #GND010
 U 1 1 5302557C
-P 2550 5350
-F 0 "#GND07" H 2550 5350 30  0001 C CNN
-F 1 "GND" H 2550 5280 30  0001 C CNN
-	1    2550 5350
+P 8100 6600
+F 0 "#GND010" H 8100 6600 30  0001 C CNN
+F 1 "GND" H 8100 6530 30  0001 C CNN
+	1    8100 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND08
+L GND #GND011
 U 1 1 53025577
-P 1850 5350
-F 0 "#GND08" H 1850 5350 30  0001 C CNN
-F 1 "GND" H 1850 5280 30  0001 C CNN
-	1    1850 5350
+P 7400 6600
+F 0 "#GND011" H 7400 6600 30  0001 C CNN
+F 1 "GND" H 7400 6530 30  0001 C CNN
+	1    7400 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C15
+L C C13
 U 1 1 5302556A
-P 3600 5100
-F 0 "C15" H 3650 5200 50  0000 L CNN
-F 1 "220 pF" H 3650 5000 50  0000 L CNN
-	1    3600 5100
+P 9150 6350
+F 0 "C13" H 9200 6450 50  0000 L CNN
+F 1 "220 pF" H 9200 6250 50  0000 L CNN
+	1    9150 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C14
+L C C12
 U 1 1 5302555B
-P 3250 5100
-F 0 "C14" H 3300 5200 50  0000 L CNN
-F 1 "100 nF" H 3300 5000 50  0000 L CNN
-	1    3250 5100
+P 8800 6350
+F 0 "C12" H 8850 6450 50  0000 L CNN
+F 1 "100 nF" H 8850 6250 50  0000 L CNN
+	1    8800 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C9
+L C C7
 U 1 1 53025558
-P 1500 5100
-F 0 "C9" H 1550 5200 50  0000 L CNN
-F 1 "1 uF" H 1550 5000 50  0000 L CNN
-	1    1500 5100
+P 7050 6350
+F 0 "C7" H 7100 6450 50  0000 L CNN
+F 1 "1 uF" H 7100 6250 50  0000 L CNN
+	1    7050 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C13
+L C C11
 U 1 1 53025554
-P 2900 5100
-F 0 "C13" H 2950 5200 50  0000 L CNN
-F 1 "100 nF" H 2950 5000 50  0000 L CNN
-	1    2900 5100
+P 8450 6350
+F 0 "C11" H 8500 6450 50  0000 L CNN
+F 1 "100 nF" H 8500 6250 50  0000 L CNN
+	1    8450 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C11
+L C C9
 U 1 1 5302554C
-P 2200 5100
-F 0 "C11" H 2250 5200 50  0000 L CNN
-F 1 "100 nF" H 2250 5000 50  0000 L CNN
-	1    2200 5100
+P 7750 6350
+F 0 "C9" H 7800 6450 50  0000 L CNN
+F 1 "100 nF" H 7800 6250 50  0000 L CNN
+	1    7750 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C12
+L C C10
 U 1 1 53025546
-P 2550 5100
-F 0 "C12" H 2600 5200 50  0000 L CNN
-F 1 "100 nF" H 2600 5000 50  0000 L CNN
-	1    2550 5100
+P 8100 6350
+F 0 "C10" H 8150 6450 50  0000 L CNN
+F 1 "100 nF" H 8150 6250 50  0000 L CNN
+	1    8100 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C10
+L C C8
 U 1 1 5302553D
-P 1850 5100
-F 0 "C10" H 1900 5200 50  0000 L CNN
-F 1 "100 nF" H 1900 5000 50  0000 L CNN
-	1    1850 5100
+P 7400 6350
+F 0 "C8" H 7450 6450 50  0000 L CNN
+F 1 "100 nF" H 7450 6250 50  0000 L CNN
+	1    7400 6350
 	1    0    0    -1  
 $EndComp
-Text Label 8100 5250 0    60   ~ 0
+Text Label 7550 4750 0    60   ~ 0
 RESET
 $Comp
-L C C8
+L C C5
 U 1 1 53025324
-P 8100 5450
-F 0 "C8" H 8150 5550 50  0000 L CNN
-F 1 "1000 pF" H 8150 5350 50  0000 L CNN
-	1    8100 5450
+P 7550 4950
+F 0 "C5" H 7600 5050 50  0000 L CNN
+F 1 "1000 pF" H 7600 4850 50  0000 L CNN
+	1    7550 4950
 	1    0    0    -1  
 $EndComp
-Text Label 8350 3000 0    60   ~ 0
+Text Label 7800 2500 0    60   ~ 0
 RESET
 $Comp
-L GND #GND09
+L GND #GND012
 U 1 1 53025220
-P 7550 2450
-F 0 "#GND09" H 7550 2450 30  0001 C CNN
-F 1 "GND" H 7550 2380 30  0001 C CNN
-	1    7550 2450
+P 7000 1950
+F 0 "#GND012" H 7000 1950 30  0001 C CNN
+F 1 "GND" H 7000 1880 30  0001 C CNN
+	1    7000 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R6
+L R R2
 U 1 1 53025214
-P 7850 2400
-F 0 "R6" V 7930 2400 50  0000 C CNN
-F 1 "2.21 K" V 7850 2400 50  0000 C CNN
-	1    7850 2400
+P 7300 1900
+F 0 "R2" V 7380 1900 50  0000 C CNN
+F 1 "2.21 K" V 7300 1900 50  0000 C CNN
+	1    7300 1900
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R5
+L R R1
 U 1 1 53025209
-P 7850 2200
-F 0 "R5" V 7930 2200 50  0000 C CNN
-F 1 "2.21 K" V 7850 2200 50  0000 C CNN
-	1    7850 2200
+P 7300 1600
+F 0 "R1" V 7380 1600 50  0000 C CNN
+F 1 "2.21 K" V 7300 1600 50  0000 C CNN
+	1    7300 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L LED D3
+L LED D2
 U 1 1 53024A45
-P 8400 2400
-F 0 "D3" H 8400 2500 50  0000 C CNN
-F 1 "LED" H 8400 2300 50  0000 C CNN
-	1    8400 2400
+P 7850 1900
+F 0 "D2" H 7850 2000 50  0000 C CNN
+F 1 "LED" H 7850 1800 50  0000 C CNN
+	1    7850 1900
 	-1   0    0    -1  
 $EndComp
 $Comp
-L LED D2
+L LED D1
 U 1 1 53024A30
-P 8400 2100
-F 0 "D2" H 8400 2200 50  0000 C CNN
-F 1 "LED" H 8400 2000 50  0000 C CNN
-	1    8400 2100
+P 7850 1600
+F 0 "D1" H 7850 1700 50  0000 C CNN
+F 1 "LED" H 7850 1500 50  0000 C CNN
+	1    7850 1600
 	-1   0    0    -1  
 $EndComp
 $Comp
 L CONN_6 J2
 U 1 1 53024818
-P 8000 2950
-F 0 "J2" V 7950 2950 60  0000 C CNN
-F 1 "CONN_6" V 8050 2950 60  0000 C CNN
-	1    8000 2950
+P 7450 2450
+F 0 "J2" V 7400 2450 60  0000 C CNN
+F 1 "CONN_6" V 7500 2450 60  0000 C CNN
+	1    7450 2450
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #GND010
+L GND #GND013
 U 1 1 5302478B
-P 8400 2650
-F 0 "#GND010" H 8400 2650 30  0001 C CNN
-F 1 "GND" H 8400 2580 30  0001 C CNN
-	1    8400 2650
+P 7850 2150
+F 0 "#GND013" H 7850 2150 30  0001 C CNN
+F 1 "GND" H 7850 2080 30  0001 C CNN
+	1    7850 2150
 	-1   0    0    1   
 $EndComp
-Text Label 8350 3100 0    60   ~ 0
+Text Label 7800 2600 0    60   ~ 0
 DC
-Text Label 8350 3200 0    60   ~ 0
+Text Label 7800 2700 0    60   ~ 0
 DD
-Text Label 8350 2800 0    60   ~ 0
-TX0
-Text Label 8350 2900 0    60   ~ 0
-RX0
-NoConn ~ 6700 2750
+Text Label 7800 2300 0    60   ~ 0
+TX-0
+Text Label 7800 2400 0    60   ~ 0
+RX-0
+NoConn ~ 6150 2250
 $Comp
 L ANTENNA-NC A1
 U 1 1 5302431F
-P 6500 2750
-F 0 "A1" H 6600 2600 60  0000 C CNN
-F 1 "2450AT42A100" H 6500 3150 60  0000 C CNN
-	1    6500 2750
+P 5950 2250
+F 0 "A1" H 6050 2100 60  0000 C CNN
+F 1 "2450AT42A100" H 5950 2650 60  0000 C CNN
+	1    5950 2250
 	1    0    0    -1  
 $EndComp
 $Comp
 L BALUN-JTI FL1
 U 1 1 5302422F
-P 6500 3650
-F 0 "FL1" H 6500 3600 60  0000 C CNN
-F 1 "2450BM15A0002" H 6550 2900 60  0000 C CNN
-	1    6500 3650
+P 5950 3150
+F 0 "FL1" H 5950 3100 60  0000 C CNN
+F 1 "2450BM15A0002" H 6000 2400 60  0000 C CNN
+	1    5950 3150
 	1    0    0    -1  
 $EndComp
-NoConn ~ 2850 3750
 $Comp
-L TPS769XX U4
-U 1 1 53023E98
-P 2400 3750
-F 0 "U4" H 2550 4050 60  0000 C CNN
-F 1 "TPS76933" H 2700 3550 60  0000 C CNN
-	1    2400 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C6
+L C C4
 U 1 1 53019A14
-P 7850 4050
-F 0 "C6" H 7900 4150 50  0000 L CNN
-F 1 "12 pF" H 7900 3950 50  0000 L CNN
-	1    7850 4050
+P 7300 3550
+F 0 "C4" H 7350 3650 50  0000 L CNN
+F 1 "12 pF" H 7350 3450 50  0000 L CNN
+	1    7300 3550
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C7
+L C C3
 U 1 1 53019A10
-P 7150 4050
-F 0 "C7" H 7200 4150 50  0000 L CNN
-F 1 "12 pF" H 7200 3950 50  0000 L CNN
-	1    7150 4050
+P 6600 3550
+F 0 "C3" H 6650 3650 50  0000 L CNN
+F 1 "12 pF" H 6650 3450 50  0000 L CNN
+	1    6600 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CRYSTAL X1
 U 1 1 530199D3
-P 7500 3700
-F 0 "X1" H 7500 3850 60  0000 C CNN
-F 1 "32 MHz" H 7500 3550 60  0000 C CNN
-F 4 "FA-128 32.0000MF20X-K3" H 7500 3700 60  0001 C CNN "PN"
-	1    7500 3700
+P 6950 3200
+F 0 "X1" H 6950 3350 60  0000 C CNN
+F 1 "32 MHz" H 6950 3050 60  0000 C CNN
+F 4 "FA-128 32.0000MF20X-K3" H 6950 3200 60  0001 C CNN "PN"
+	1    6950 3200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND011
+L GND #GND014
 U 1 1 53019952
-P 7850 4350
-F 0 "#GND011" H 7850 4350 30  0001 C CNN
-F 1 "GND" H 7850 4280 30  0001 C CNN
-	1    7850 4350
+P 7300 3850
+F 0 "#GND014" H 7300 3850 30  0001 C CNN
+F 1 "GND" H 7300 3780 30  0001 C CNN
+	1    7300 3850
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L R R3
 U 1 1 5301993D
-P 8550 5400
-F 0 "R1" V 8630 5400 50  0000 C CNN
-F 1 "56 K 1%" V 8550 5400 50  0000 C CNN
-	1    8550 5400
+P 8000 4900
+F 0 "R3" V 8080 4900 50  0000 C CNN
+F 1 "56 K 1%" V 8000 4900 50  0000 C CNN
+	1    8000 4900
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C4
-U 1 1 530198D4
-P 3100 3850
-F 0 "C4" H 3150 3950 50  0000 L CNN
-F 1 "1 uF" H 3150 3750 50  0000 L CNN
-	1    3100 3850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #GND012
+L GND #GND015
 U 1 1 5301988F
-P 8750 5750
-F 0 "#GND012" H 8750 5750 30  0001 C CNN
-F 1 "GND" H 8750 5680 30  0001 C CNN
-	1    8750 5750
+P 8200 5250
+F 0 "#GND015" H 8200 5250 30  0001 C CNN
+F 1 "GND" H 8200 5180 30  0001 C CNN
+	1    8200 5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C5
+L C C6
 U 1 1 5301987F
-P 8750 5450
-F 0 "C5" H 8800 5550 50  0000 L CNN
-F 1 "1 uF" H 8800 5350 50  0000 L CNN
-	1    8750 5450
+P 8200 4950
+F 0 "C6" H 8250 5050 50  0000 L CNN
+F 1 "1 uF" H 8250 4850 50  0000 L CNN
+	1    8200 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND013
+L GND #GND016
 U 1 1 5301985C
-P 8700 1350
-F 0 "#GND013" H 8700 1350 30  0001 C CNN
-F 1 "GND" H 8700 1280 30  0001 C CNN
-	1    8700 1350
+P 8150 850
+F 0 "#GND016" H 8150 850 30  0001 C CNN
+F 1 "GND" H 8150 780 30  0001 C CNN
+	1    8150 850 
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3.3V #+3.3V014
+L +3.3V #+3.3V017
 U 1 1 53019827
-P 8700 2000
-F 0 "#+3.3V014" H 8700 1960 30  0001 C CNN
-F 1 "+3.3V" H 8700 2110 30  0000 C CNN
-	1    8700 2000
+P 8150 1350
+F 0 "#+3.3V017" H 8150 1310 30  0001 C CNN
+F 1 "+3.3V" H 8150 1460 30  0000 C CNN
+	1    8150 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #GND015
-U 1 1 5301977F
-P 2400 4150
-F 0 "#GND015" H 2400 4150 30  0001 C CNN
-F 1 "GND" H 2400 4080 30  0001 C CNN
-	1    2400 4150
-	1    0    0    -1  
-$EndComp
-$Comp
-L +3.3V #+3.3V016
-U 1 1 53019764
-P 3100 3550
-F 0 "#+3.3V016" H 3100 3510 30  0001 C CNN
-F 1 "+3.3V" H 3100 3660 30  0000 C CNN
-	1    3100 3550
-	1    0    0    -1  
-$EndComp
-$Comp
-L +5V #+5V017
-U 1 1 5301973E
-P 1900 3550
-F 0 "#+5V017" H 1900 3640 20  0001 C CNN
-F 1 "+5V" H 1900 3640 30  0000 C CNN
-	1    1900 3550
-	1    0    0    -1  
-$EndComp
-$Comp
-L +5V #+5V018
-U 1 1 53019726
-P 3850 1250
-F 0 "#+5V018" H 3850 1340 20  0001 C CNN
-F 1 "+5V" H 3850 1340 30  0000 C CNN
-	1    3850 1250
-	1    0    0    -1  
-$EndComp
-$Comp
-L +5V #+5V019
-U 1 1 530196FF
-P 8450 1550
-F 0 "#+5V019" H 8450 1640 20  0001 C CNN
-F 1 "+5V" H 8450 1640 30  0000 C CNN
-	1    8450 1550
-	1    0    0    -1  
-$EndComp
-$Comp
-L CC2541 U1
+L CC2541 U2
 U 1 1 53019544
-P 9800 3300
-F 0 "U1" H 9800 3200 50  0000 C CNN
-F 1 "CC2541" H 9800 3400 50  0000 C CNN
-F 2 "MODULE" H 9800 3300 50  0001 C CNN
-F 3 "DOCUMENTATION" H 9800 3300 50  0001 C CNN
-	1    9800 3300
+P 9250 2800
+F 0 "U2" H 9250 2700 50  0000 C CNN
+F 1 "CC2541" H 9250 2900 50  0000 C CNN
+F 2 "MODULE" H 9250 2800 50  0001 C CNN
+F 3 "DOCUMENTATION" H 9250 2800 50  0001 C CNN
+	1    9250 2800
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R3
-U 1 1 53018EE3
-P 3550 1650
-F 0 "R3" V 3630 1650 50  0000 C CNN
-F 1 "4.7 K" V 3550 1650 50  0000 C CNN
-	1    3550 1650
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R4
-U 1 1 53018E40
-P 3550 2450
-F 0 "R4" V 3630 2450 50  0000 C CNN
-F 1 "1.5 K" V 3550 2450 50  0000 C CNN
-	1    3550 2450
-	1    0    0    -1  
-$EndComp
-$Comp
-L DIODE D1
-U 1 1 53018CD2
-P 3850 2250
-F 0 "D1" H 3850 2350 40  0000 C CNN
-F 1 "DIODE" H 3850 2150 40  0000 C CNN
-	1    3850 2250
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CP1 C2
-U 1 1 53018CB7
-P 4150 1650
-F 0 "C2" H 4200 1750 50  0000 L CNN
-F 1 "100 uF" H 4200 1550 50  0000 L CNN
-	1    4150 1650
-	1    0    0    -1  
-$EndComp
-$Comp
-L INDUCTOR L1
-U 1 1 53018B9E
-P 3850 1650
-F 0 "L1" V 3800 1650 40  0000 C CNN
-F 1 "INDUCTOR" V 3950 1650 40  0000 C CNN
-	1    3850 1650
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C3
-U 1 1 53018A72
-P 1550 2350
-F 0 "C3" H 1600 2450 50  0000 L CNN
-F 1 "470 pF" H 1600 2250 50  0000 L CNN
-	1    1550 2350
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C1
-U 1 1 53018A3D
-P 1150 2350
-F 0 "C1" H 1200 2450 50  0000 L CNN
-F 1 "22 uF" H 1200 2250 50  0000 L CNN
-	1    1150 2350
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #GND020
-U 1 1 53018A16
-P 2450 2800
-F 0 "#GND020" H 2450 2800 30  0001 C CNN
-F 1 "GND" H 2450 2730 30  0001 C CNN
-	1    2450 2800
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R2
-U 1 1 53018863
-P 1400 1500
-F 0 "R2" V 1480 1500 50  0000 C CNN
-F 1 "0.22" V 1400 1500 50  0000 C CNN
-	1    1400 1500
-	1    0    0    -1  
-$EndComp
-$Comp
-L +BATT #+BATT021
-U 1 1 53010E72
-P 2450 1150
-F 0 "#+BATT021" H 2450 1100 20  0001 C CNN
-F 1 "+BATT" H 2450 1250 30  0000 C CNN
-	1    2450 1150
-	1    0    0    -1  
-$EndComp
-$Comp
-L +BATT #+BATT022
-U 1 1 53010DF8
-P 6550 1500
-F 0 "#+BATT022" H 6550 1450 20  0001 C CNN
-F 1 "+BATT" H 6550 1600 30  0000 C CNN
-	1    6550 1500
-	1    0    0    -1  
-$EndComp
-$Comp
-L MC34063 U3
-U 1 1 53010CC4
-P 2450 1950
-F 0 "U3" H 2600 2300 60  0000 L CNN
-F 1 "MC34063" H 2550 1600 60  0000 L CNN
-	1    2450 1950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TH8080 U2
-U 1 1 53010A78
-P 7500 1700
-F 0 "U2" H 7500 1600 50  0000 C CNN
-F 1 "TH8080" H 7500 1800 50  0000 C CNN
-F 2 "MODULE" H 7500 1700 50  0001 C CNN
-F 3 "DOCUMENTATION" H 7500 1700 50  0001 C CNN
-	1    7500 1700
-	-1   0    0    -1  
-$EndComp
-$Comp
-L GND #GND023
+L GND #GND018
 U 1 1 5300FA2A
-P 6550 1900
-F 0 "#GND023" H 6550 1900 30  0001 C CNN
-F 1 "GND" H 6550 1830 30  0001 C CNN
-	1    6550 1900
+P 2250 1850
+F 0 "#GND018" H 2250 1850 30  0001 C CNN
+F 1 "GND" H 2250 1780 30  0001 C CNN
+	1    2250 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3 J1
 U 1 1 5300F9AD
-P 6000 1700
-F 0 "J1" V 5950 1700 50  0000 C CNN
-F 1 "CONN_3" V 6050 1700 40  0000 C CNN
-	1    6000 1700
+P 1750 1700
+F 0 "J1" V 1700 1700 50  0000 C CNN
+F 1 "CONN_3" V 1800 1700 40  0000 C CNN
+	1    1750 1700
 	-1   0    0    1   
 $EndComp
 $EndSCHEMATC