Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update files that got out of sync somehow.

Browse Source
This commit is contained in:
Will Code
2012-10-13 20:51:26 -04:00
parent 4c9df75d84
commit 283715df0c
5 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/jawbreaker/baseband.sch
View File

@ -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 EESchema Schematic File Version 2 date Tue Oct 2 15:08:35 2012
>>>>>>> upstream/master
LIBS:power LIBS:power
LIBS:device LIBS:device
LIBS:transistors LIBS:transistors
@ -41,11 +37,7 @@ $Descr User 17000 11000
encoding utf-8 encoding utf-8
Sheet 3 4 Sheet 3 4
Title "jawbreaker baseband" Title "jawbreaker baseband"
<<<<<<< HEAD
Date "19 sep 2012"
=======
Date "2 oct 2012" Date "2 oct 2012"
>>>>>>> upstream/master
Rev "" Rev ""
Comp "Copyright 2012 Michael Ossmann" Comp "Copyright 2012 Michael Ossmann"
Comment1 "License: GPL v2" Comment1 "License: GPL v2"

9
hardware/jawbreaker/frontend.sch
View File

@ -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 EESchema Schematic File Version 2 date Tue Oct 2 15:08:35 2012
>>>>>>> upstream/master
LIBS:power LIBS:power
LIBS:device LIBS:device
LIBS:transistors LIBS:transistors
@ -40,13 +36,8 @@ EELAYER END
$Descr User 17000 11000 $Descr User 17000 11000
encoding utf-8 encoding utf-8
Sheet 2 4 Sheet 2 4
<<<<<<< HEAD
Title ""
Date "19 sep 2012"
=======
Title "jawbreaker frontend" Title "jawbreaker frontend"
Date "2 oct 2012" Date "2 oct 2012"
>>>>>>> upstream/master
Rev "" Rev ""
Comp "Copyright 2012 Michael Ossmann" Comp "Copyright 2012 Michael Ossmann"
Comment1 "License: GPL v2" Comment1 "License: GPL v2"

4
hardware/jawbreaker/jawbreaker-cache.lib
View File

@ -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 EESchema-LIBRARY Version 2.3 Date: Tue Oct 2 15:08:35 2012
>>>>>>> upstream/master
#encoding utf-8 #encoding utf-8
# #
# +1.8V # +1.8V

8
hardware/jawbreaker/jawbreaker.sch
View File

@ -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 EESchema Schematic File Version 2 date Tue Oct 2 15:08:35 2012
>>>>>>> upstream/master
LIBS:power LIBS:power
LIBS:device LIBS:device
LIBS:transistors LIBS:transistors
@ -41,11 +37,7 @@ $Descr User 17000 11000
encoding utf-8 encoding utf-8
Sheet 1 4 Sheet 1 4
Title "jawbreaker" Title "jawbreaker"
<<<<<<< HEAD
Date "19 sep 2012"
=======
Date "2 oct 2012" Date "2 oct 2012"
>>>>>>> upstream/master
Rev "" Rev ""
Comp "Copyright 2012 Michael Ossmann" Comp "Copyright 2012 Michael Ossmann"
Comment1 "License: GPL v2" Comment1 "License: GPL v2"

23
hardware/jawbreaker/mcu.sch
View File

@ -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 EESchema Schematic File Version 2 date Tue Oct 2 15:08:35 2012
>>>>>>> upstream/master
LIBS:power LIBS:power
LIBS:device LIBS:device
LIBS:transistors LIBS:transistors
@ -41,11 +37,7 @@ $Descr User 17000 11000
encoding utf-8 encoding utf-8
Sheet 4 4 Sheet 4 4
Title "jawbreaker mcu/usb/power" Title "jawbreaker mcu/usb/power"
<<<<<<< HEAD
Date "19 sep 2012"
=======
Date "2 oct 2012" Date "2 oct 2012"
>>>>>>> upstream/master
Rev "" Rev ""
Comp "Copyright 2012 Michael Ossmann" Comp "Copyright 2012 Michael Ossmann"
Comment1 "License: GPL v2" Comment1 "License: GPL v2"
@ -53,8 +45,6 @@ Comment2 ""
Comment3 "" Comment3 ""
Comment4 "" Comment4 ""
$EndDescr $EndDescr
<<<<<<< HEAD
=======
$Comp $Comp
L R R65 L R R65
U 1 1 506B55A7 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 1 14300 900
0 1 1 0 0 1 1 0
$EndComp $EndComp
>>>>>>> upstream/master
Wire Wire Line Wire Wire Line
9700 5300 10400 5300 9700 5300 10400 5300
Wire Wire Line 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 0 -1 -1 0
$EndComp $EndComp
$Comp $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 L R R46
U 1 1 503F8429 U 1 1 503F8429
P 13200 650 P 13200 650