417072b4f0
Conflicts: hardware/jawbreaker/baseband.sch hardware/jawbreaker/frontend.sch hardware/jawbreaker/jawbreaker-cache.lib hardware/jawbreaker/jawbreaker.sch hardware/jawbreaker/mcu.sch
75 lines
1.1 KiB
Plaintext
75 lines
1.1 KiB
Plaintext
<<<<<<< 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
|
|
LIBS:conn
|
|
LIBS:linear
|
|
LIBS:regul
|
|
LIBS:74xx
|
|
LIBS:cmos4000
|
|
LIBS:adc-dac
|
|
LIBS:memory
|
|
LIBS:xilinx
|
|
LIBS:special
|
|
LIBS:microcontrollers
|
|
LIBS:dsp
|
|
LIBS:microchip
|
|
LIBS:analog_switches
|
|
LIBS:motorola
|
|
LIBS:texas
|
|
LIBS:intel
|
|
LIBS:audio
|
|
LIBS:interface
|
|
LIBS:digital-audio
|
|
LIBS:philips
|
|
LIBS:display
|
|
LIBS:cypress
|
|
LIBS:siliconi
|
|
LIBS:opto
|
|
LIBS:atmel
|
|
LIBS:contrib
|
|
LIBS:valves
|
|
LIBS:hackrf
|
|
LIBS:jawbreaker-cache
|
|
EELAYER 25 0
|
|
EELAYER END
|
|
$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"
|
|
Comment2 ""
|
|
Comment3 ""
|
|
Comment4 ""
|
|
$EndDescr
|
|
$Sheet
|
|
S 2550 3300 1050 150
|
|
U 503BB638
|
|
F0 "frontend" 60
|
|
F1 "frontend.sch" 60
|
|
$EndSheet
|
|
$Sheet
|
|
S 2550 2850 1050 150
|
|
U 50370666
|
|
F0 "baseband" 60
|
|
F1 "baseband.sch" 60
|
|
$EndSheet
|
|
$Sheet
|
|
S 2550 2400 1050 150
|
|
U 5037043E
|
|
F0 "mcu/usb/power" 60
|
|
F1 "mcu.sch" 60
|
|
$EndSheet
|
|
$EndSCHEMATC
|