From 4c050ed5433db22f5c90c01974444e49d23b05f1 Mon Sep 17 00:00:00 2001
From: Will Code <willcode4@gmail.com>
Date: Thu, 27 Sep 2012 15:30:42 -0400
Subject: [PATCH 1/3] Revert "minor capacitor correction for 1V8 regulation"

This reverts commit 9c23f65fea2b52ad3146d1fdfcd9ebf10ce4feb4.
---
 hardware/jawbreaker/baseband.sch         |  4 ++--
 hardware/jawbreaker/frontend.sch         |  4 ++--
 hardware/jawbreaker/jawbreaker-cache.lib |  2 +-
 hardware/jawbreaker/jawbreaker.sch       |  4 ++--
 hardware/jawbreaker/mcu.sch              | 28 ++++++++++++------------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/hardware/jawbreaker/baseband.sch b/hardware/jawbreaker/baseband.sch
index 57ca0b69..3fa2cb98 100644
--- a/hardware/jawbreaker/baseband.sch
+++ b/hardware/jawbreaker/baseband.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sat Sep 22 23:30:21 2012
+EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 3 4
 Title "jawbreaker baseband"
-Date "23 sep 2012"
+Date "19 sep 2012"
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/frontend.sch b/hardware/jawbreaker/frontend.sch
index 7f22adc9..50516750 100644
--- a/hardware/jawbreaker/frontend.sch
+++ b/hardware/jawbreaker/frontend.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sat Sep 22 23:30:21 2012
+EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 2 4
 Title ""
-Date "23 sep 2012"
+Date "19 sep 2012"
 Rev ""
 Comp ""
 Comment1 ""
diff --git a/hardware/jawbreaker/jawbreaker-cache.lib b/hardware/jawbreaker/jawbreaker-cache.lib
index f92880d0..b6835020 100644
--- a/hardware/jawbreaker/jawbreaker-cache.lib
+++ b/hardware/jawbreaker/jawbreaker-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Sat Sep 22 23:30:21 2012
+EESchema-LIBRARY Version 2.3  Date: Wed Sep 19 09:57:14 2012
 #encoding utf-8
 #
 # +1.8V
diff --git a/hardware/jawbreaker/jawbreaker.sch b/hardware/jawbreaker/jawbreaker.sch
index 40f86ae0..605bfdb6 100644
--- a/hardware/jawbreaker/jawbreaker.sch
+++ b/hardware/jawbreaker/jawbreaker.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sat Sep 22 23:30:21 2012
+EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 4
 Title "jawbreaker"
-Date "23 sep 2012"
+Date "19 sep 2012"
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/mcu.sch b/hardware/jawbreaker/mcu.sch
index d5150558..3a26c2e2 100644
--- a/hardware/jawbreaker/mcu.sch
+++ b/hardware/jawbreaker/mcu.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sat Sep 22 23:30:21 2012
+EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 4 4
 Title "jawbreaker mcu/usb/power"
-Date "23 sep 2012"
+Date "19 sep 2012"
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
@@ -45,18 +45,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L C C125
-U 1 1 505E9E4C
-P 14300 900
-F 0 "C125" H 14350 1000 50  0000 L CNN
-F 1 "33pF" H 14350 800 50  0000 L CNN
-F 4 "Murata" H 17450 700 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H330JZ01D" H 17450 700 60  0001 C CNN "Part Number"
-F 6 "CAP CER 33PF 50V 5% NP0 0402" H 17450 700 60  0001 C CNN "Description"
-	1    14300 900 
-	0    1    1    0   
-$EndComp
 Wire Wire Line
 	9700 5300 10400 5300
 Wire Wire Line
@@ -2149,6 +2137,18 @@ F 6 "RES 39 OHM 1/16W 5% 0402 SMD" H 9800 9000 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
+L C C125
+U 1 1 503F91B4
+P 14300 900
+F 0 "C125" H 14350 1000 50  0000 L CNN
+F 1 "22pF" H 14350 800 50  0000 L CNN
+F 4 "Murata" H 14300 900 60  0001 C CNN "Manufacturer"
+F 5 "GRM1555C1H220JA01D" H 14300 900 60  0001 C CNN "Part Number"
+F 6 "CAP CER 22PF 50V 5% NP0 0402" H 14300 900 60  0001 C CNN "Description"
+	1    14300 900 
+	0    1    1    0   
+$EndComp
+$Comp
 L R R46
 U 1 1 503F8429
 P 13200 650

From 4c9df75d844e9b9bdd93284aa9d012bd454fc30d Mon Sep 17 00:00:00 2001
From: Will Code <willcode4@gmail.com>
Date: Sat, 13 Oct 2012 16:27:02 -0400
Subject: [PATCH 2/3] max2837: fix a couple math errors in the def file

---
 firmware/common/max2837_regs.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firmware/common/max2837_regs.def b/firmware/common/max2837_regs.def
index 42dbec34..85dd71e6 100644
--- a/firmware/common/max2837_regs.def
+++ b/firmware/common/max2837_regs.def
@@ -135,7 +135,7 @@ __MREG__(MAX2837_LPF_MODE_SEL,6,9,1) // set to enable mode in reg 2 ModeCtrl
 __MREG__(MAX2837_LNAgain_SPI_EN,8,0,1)  // set to override pin control of LNA
 __MREG__(MAX2837_VGAgain_SPI_EN,8,1,1)  // set to override pin control of VGA
 __MREG__(MAX2837_EN_Bias_Trim,8,2,1)    // route bias current to bondpad
-__MREG__(MAX2837_BIAS_TRIM_SPI,8,7,3)   // down=00000, up=11111, nom=10000
+__MREG__(MAX2837_BIAS_TRIM_SPI,8,7,5)   // down=00000, up=11111, nom=10000
 __MREG__(MAX2837_BIAS_TRIM_CNTRL,8,8,1) // enable BIAS_TRIM_SPI value
 __MREG__(MAX2837_RX_IQERR_SPI_EN,8,9,1) // ???
 
@@ -388,7 +388,7 @@ __MREG__(MAX2837_TXVGA_GAIN,29,9,6)    // 0 = min atten, 63 = max atten
 
 /* REG 30 */
 __MREG__(MAX2837_TXLO_IQ,30,4,5)
-__MREG__(MAX2837_TXLO_IQ_SPI_EN,30,5,5)
+__MREG__(MAX2837_TXLO_IQ_SPI_EN,30,5,1)
 __MREG__(MAX2837_TXLO_BUFF_BIAS,30,7,2)
 #define MAX2837_TXLO_BUFF_BIAS_1_0mA 0
 #define MAX2837_TXLO_BUFF_BIAS_1_5mA 1

From 283715df0c471f3fb16e6f240cacd1e36300b4ab Mon Sep 17 00:00:00 2001
From: Will Code <willcode4@gmail.com>
Date: Sat, 13 Oct 2012 20:51:26 -0400
Subject: [PATCH 3/3] Update files that got out of sync somehow.

---
 hardware/jawbreaker/baseband.sch         |  8 --------
 hardware/jawbreaker/frontend.sch         |  9 ---------
 hardware/jawbreaker/jawbreaker-cache.lib |  4 ----
 hardware/jawbreaker/jawbreaker.sch       |  8 --------
 hardware/jawbreaker/mcu.sch              | 23 -----------------------
 5 files changed, 52 deletions(-)

diff --git a/hardware/jawbreaker/baseband.sch b/hardware/jawbreaker/baseband.sch
index 7734b22b..208c17c7 100644
--- a/hardware/jawbreaker/baseband.sch
+++ b/hardware/jawbreaker/baseband.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -41,11 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 3 4
 Title "jawbreaker baseband"
-<<<<<<< HEAD
-Date "19 sep 2012"
-=======
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/frontend.sch b/hardware/jawbreaker/frontend.sch
index 90ae547c..568a6dc2 100644
--- a/hardware/jawbreaker/frontend.sch
+++ b/hardware/jawbreaker/frontend.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -40,13 +36,8 @@ EELAYER END
 $Descr User 17000 11000
 encoding utf-8
 Sheet 2 4
-<<<<<<< HEAD
-Title ""
-Date "19 sep 2012"
-=======
 Title "jawbreaker frontend"
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/jawbreaker-cache.lib b/hardware/jawbreaker/jawbreaker-cache.lib
index 42bfbf71..fee43e49 100644
--- a/hardware/jawbreaker/jawbreaker-cache.lib
+++ b/hardware/jawbreaker/jawbreaker-cache.lib
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema-LIBRARY Version 2.3  Date: Wed Sep 19 09:57:14 2012
-=======
 EESchema-LIBRARY Version 2.3  Date: Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 #encoding utf-8
 #
 # +1.8V
diff --git a/hardware/jawbreaker/jawbreaker.sch b/hardware/jawbreaker/jawbreaker.sch
index 44ed7607..b4f28787 100644
--- a/hardware/jawbreaker/jawbreaker.sch
+++ b/hardware/jawbreaker/jawbreaker.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -41,11 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 4
 Title "jawbreaker"
-<<<<<<< HEAD
-Date "19 sep 2012"
-=======
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/mcu.sch b/hardware/jawbreaker/mcu.sch
index 81fd81a8..42bdcbb2 100644
--- a/hardware/jawbreaker/mcu.sch
+++ b/hardware/jawbreaker/mcu.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -41,11 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 4 4
 Title "jawbreaker mcu/usb/power"
-<<<<<<< HEAD
-Date "19 sep 2012"
-=======
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
@@ -53,8 +45,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-<<<<<<< HEAD
-=======
 $Comp
 L R R65
 U 1 1 506B55A7
@@ -92,7 +82,6 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 17450 700 60  0001 C CNN "Description"
 	1    14300 900 
 	0    1    1    0   
 $EndComp
->>>>>>> upstream/master
 Wire Wire Line
 	9700 5300 10400 5300
 Wire Wire Line
@@ -2185,18 +2174,6 @@ F 6 "RES 39 OHM 1/16W 5% 0402 SMD" H 9800 9000 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C125
-U 1 1 503F91B4
-P 14300 900
-F 0 "C125" H 14350 1000 50  0000 L CNN
-F 1 "22pF" H 14350 800 50  0000 L CNN
-F 4 "Murata" H 14300 900 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H220JA01D" H 14300 900 60  0001 C CNN "Part Number"
-F 6 "CAP CER 22PF 50V 5% NP0 0402" H 14300 900 60  0001 C CNN "Description"
-	1    14300 900 
-	0    1    1    0   
-$EndComp
-$Comp
 L R R46
 U 1 1 503F8429
 P 13200 650