Statistics
| Branch: | Tag: | Revision:

root / usrp @ f914499f

# Date Author Comment
21b64f07 04/08/2011 07:37 pm Tom Rondeau

Merge branch 'master' into constell_obj

Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen

2431806a 03/30/2011 10:36 pm Don Ward

usrp: cleanup misc usage

8cee6c5f 03/25/2011 05:53 pm Tom Rondeau

Merge branch 'master' of gnuradio.org:gnuradio

64dac6a1 03/25/2011 03:53 pm Don Ward

Fixing missing include files and various other patches for Windows build issues.

972fc99a 03/20/2011 04:31 pm Tom Rondeau

Merge branch 'master' of gnuradio.org:gnuradio

3c3aff08 02/27/2011 10:35 pm Tom Rondeau

Fixing missing header file (in prep for future GCC's). ptrdiff_t is defined in stddef.h.

315f45c2 02/27/2011 08:40 pm Ben Reynwar

Removing docstring generation from this branch.

44ad2b33 01/30/2011 08:36 pm Ben Reynwar

Fixed Makefiles to generate swig_doc.i

55685f7a 12/07/2010 07:16 am Eric Blossom

Merge branch 'next' into guile-next

  • next: (116 commits)
    Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted....
e13783ae 12/07/2010 01:57 am Tom Rondeau

Merge branch 'master' into next

  • master:
    Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted....
6df0423f 12/04/2010 07:34 am Eric Blossom

Regenerated Makefile.swig.gen's

b005e7d9 11/25/2010 03:13 am Eric Blossom

Update .gitignore's

d692a41f 11/25/2010 01:29 am Eric Blossom

Major Makefile.am housecleaning. Passes distcheck.

Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files...

ff877cab 11/19/2010 03:07 pm Rob Savoye

regenerated

9edc59fc 11/18/2010 03:00 am Eric Blossom

Merge remote branch 'gnuradio.org/next' into test

  • gnuradio.org/next:
    distcheck fix for gr-uhd
    Keep doxygen 1.7.1 from crashing.
    uhd: swig changes for templated ranges
75f3bce0 11/18/2010 02:52 am Eric Blossom

Keep doxygen 1.7.1 from crashing.

8c81cf7d 11/17/2010 05:40 am Eric Blossom

Fix guile related problem with gr-usrp

8180bb1d 11/17/2010 05:33 am Eric Blossom

regenerated

df92b7c6 11/10/2010 09:01 pm Eric Blossom

regenerated

2b11c904 11/10/2010 08:15 pm Rob Savoye

regenerated

2c54f4a5 11/10/2010 08:15 pm Eric Blossom

additional regenerated files

6421d470 11/10/2010 08:13 pm Eric Blossom

regenerate

1e34972f 11/10/2010 08:13 pm Eric Blossom

Rengenerate Makefile.swig.gen's

9a55e397 11/10/2010 08:10 pm Eric Blossom

gitignore swig generated files

f97d37a2 11/10/2010 08:10 pm Eric Blossom

Update generated files

ed409420 11/10/2010 08:10 pm Rob Savoye

regenerated after changes to the template

ff6ce4dc 11/10/2010 05:25 am Tom Rondeau

Updated doxygen Doxyfile for newer versions.

cb2fa9a5 10/10/2010 01:10 am Michael Dickens

rearrange includes to always be: internal GR, external, with GR.

f6337c62 08/05/2010 01:54 am Johnathan Corgan

Merge branch 'maint'

  • maint:
    usrp2: fixes for gcc 4.5.0 compatibility
    formatting change: move break statements
    Fix unitialized variable pointed to by compiler warning
e2073dd5 08/04/2010 06:08 pm Eric Blossom

formatting change: move break statements

8648ea8a 08/04/2010 06:05 pm Eric Blossom

Fix unitialized variable pointed to by compiler warning

f108f960 06/22/2010 12:04 am Jason Abele

Add RFX2200 to burn-db-eeprom

57d0cc85 06/22/2010 12:04 am Jason Abele

Copy paste for RFX2200 in USRP1

5fc70838 06/05/2010 05:38 am Jason Abele

Fixed WBX RX PLL enable

937b74e9 06/05/2010 05:38 am Jason Abele

Refactor WBX and adf4350 to avoid passing usrp pointer

9004b452 06/05/2010 05:38 am Jason Abele

Clean up annoying class structure in wbx

1e44cf9e 06/05/2010 05:38 am Jason Abele

Fixing wbx to use _refclk_freq()

cf80eaf2 06/05/2010 05:38 am Jason Abele

Typo in error message

ad13c00a 05/29/2010 03:02 am Johnathan Corgan

Make C++ shared libraries versioned

6f9093ed 05/19/2010 10:26 pm Eric Blossom

Remove bogus check for existence of prefix directory.

c1c29651 05/12/2010 01:00 am Johnathan Corgan

Merge branch 'master' into wip/burx_support

  • master: (39 commits)
    Add gru.hexshort to deal with short hex constants
    Assign USB PID for Hans de Bok
    Add missing buffer allocator hint to gr_ofdm_sampler.cc
    Really fix the missing include for boost::bind...
42e7489a 05/11/2010 09:13 pm Johnathan Corgan

usrp: Cleanup for merge of bitshark daughterboard code

Removed unused variable
Set default bandwidth to 8M in constructor

591c12fc 05/10/2010 05:42 pm Eric Blossom

Assign USB PID for Hans de Bok

ac2b84b9 04/27/2010 05:41 am Johnathan Corgan

Remove mblock library. We hardly knew 'ye.

a40feb1d 04/26/2010 08:04 pm Johnathan Corgan

Further updates for removing omnithreads

Updates README
Removes Darwin specific variable in usrp.pc

a712b478 04/19/2010 09:35 pm Michael Dickens

initial move from mld_threads to gruel:: namespace threads and such

aeba8101 04/16/2010 10:32 pm Johnathan Corgan

Merge commit 'jabele/wbx_tuning'

  • commit 'jabele/wbx_tuning':
    Fix WBX tuning to allow DDC use in reaching 50MHz
23fcf0cc 04/16/2010 10:00 pm Jason Abele

Fix WBX tuning to allow DDC use in reaching 50MHz

ff0b9ca8 04/15/2010 03:05 pm Johnathan Corgan

Merge branch 'usrp-eeprom' of git://gnuradio.org/jabele

  • 'usrp-eeprom' of git://gnuradio.org/jabele:
    Increase sleep to prevent eeprom problems
75e55b81 04/14/2010 10:07 pm Jason Abele

Increase sleep to prevent eeprom problems

da8ebdb3 04/14/2010 08:55 pm Eric Blossom

Add pid for ThinkRF

d5fe3b38 03/31/2010 12:54 am JohnOrlando

Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1.

97275c32 03/02/2010 04:08 pm Johnathan Corgan

Add README for new FPGA hosting location

a2c00f5c 02/28/2010 08:47 pm Johnathan Corgan

Remove usrp1 and usrp2 FPGA files. These are now hosted at:

git://ettus.sourcerepo.com/ettus/fpga.git

...under the 'usrp1' and 'usrp2' top-level directories.

5c4b4752 02/19/2010 11:39 pm Jason Abele

Clarified copyright and licensing

a33cbffa 02/10/2010 06:01 pm Jason Abele

Fixed creation of burn-usrp2-eeprom, burn-usrp4-eeprom

Added $prefix from configure to paths

54c9f640 01/18/2010 08:27 pm Eric Blossom

Remove unnecessary implementation of flexrf::refclk_freq.

Apply patch from Alexander Chemeris <>

b5709abe 01/18/2010 08:23 pm Eric Blossom

Remove assert(dac_rate() == 128000000).

Applied patch from Alexander Chemeris <>
that allows non 64MHz clocking on USRP1.

354c5c4e 01/05/2010 11:12 pm Jason Abele

Remove wbxng tx gain dependence on pga gain

dab3f51b 01/04/2010 07:30 pm Jason Abele

Added antenna select support for new board rev

5a85f270 01/04/2010 07:20 pm Jason Abele

Fixing bad tuning range code

82934424 01/04/2010 07:20 pm Jason Abele

WBXNG: Can not enable/disable ADF4350 from set_enable()
Incorrect powerdown in RX deconstructor
Expanded range of frequencies to attempt locking

e23bf51d 01/04/2010 07:20 pm Jason Abele

WBXNG: power on/off TXMOD and Synth/VCO with set_enable
No similar function on RX, so RX is always on?

a6462b15 01/04/2010 07:20 pm Jason Abele

WBXNG: set ADF4350 to low spur mode

a198e513 12/01/2009 02:57 pm Thomas Tsou

usrp: Corrected error message

0cff0135 11/26/2009 07:28 pm Matt Ettus

same bug as on the U2, found by Stephen Lai

5787a2c4 11/11/2009 08:38 pm Eric Blossom

Add USB PID for HPSDR HERMES device.

f9c3bfb8 11/02/2009 10:29 pm Thomas Tsou

usrp: Cleanup of usrp_basic

Version specific libusb calls are pushed out of usrp_basic into
usrp_prims where they belong. This leads to a single usrp_basic
file. A new function in usrp_prims, usrp_deinit(), handles
shutdown specific to version 1.0.

097191b3 11/02/2009 10:09 pm Thomas Tsou

usrp: Check return value in fusb_libusb1 _reap()

The old fusb_libusb1 _reap() call always returned true except on
error. With this commit it checks that a transfer is actually
reaped and returns false otherwise.

78a7ce34 10/30/2009 03:26 am Jason Abele

Fixing prescaler and disable aux synth output on wbxng

b4dce8e6 10/27/2009 04:13 pm Michael Dickens

updated usrp.pc file to reflect the correct version of libusb

36a02055 10/19/2009 03:25 pm Johnathan Corgan

Merge branch 'osx_10.6_64_fixes' of http://gnuradio.org/git/michaelld

This merge adds support for OSX 10.6 in gr-audio-osx and usrp.

Conflicts:
usrp/host/lib/usrp_prims_libusb0.cc

5d311c58 10/19/2009 02:21 pm Michael Dickens

moved all 'fprintf (stderr, ...)' calls to std::cerr, for 'universal' OSX printing of long and pointer types

0f422608 10/16/2009 01:32 am Thomas Tsou

usrp: Fixed firmware load regression

This fixes a bug from "Applied libusb-1.0 patch set from Thomas
Tsou <>" b5aa407ec2b1bdebc1c950a9428789fe50327776

The bus rescan after firmware load was stomped with the addition of
libusb-1.0 support causing the subsequent device open to fail....

84ba6407 10/16/2009 01:32 am Thomas Tsou

usrp: Corrected error message

8c339e7c 10/16/2009 01:31 am Thomas Tsou

usrp: Added missing return values

11cb05e1 10/15/2009 01:43 pm Michael Dickens

OSX 10.6 x86_64 fixes for configure and libusb; Audio is next

c39a8c44 10/13/2009 08:32 pm Johnathan Corgan

Merge branch 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou

This merge fixes libusb build machinery to work for Cygwin, Darwin, Ubuntu,
and F11.

  • 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou:
    usrp: Applied patch from Michael Dickens for Darwin libusb...
6b0bbd51 10/13/2009 08:07 pm Johnathan Corgan

Change calculation of docdir to remove trailer when in git development

1a8a8124 10/12/2009 05:26 pm Thomas Tsou

usrp: Disabled libusb-1.0 debug output by default

Debug output may generate excessive amounts of information.

58f84719 10/10/2009 11:48 pm Johnathan Corgan

#include "config.h" in db_wbxng.cc (for timespec, nanosleep, etc.)

Patch-by: Don Ward <>

665e6c8d 10/09/2009 07:10 pm Thomas Tsou

usrp: Enable debug output

This only works if libusb-1.0 is compiled with debug logging.

ee76323c 10/09/2009 07:08 pm Thomas Tsou

usrp: Reorg of libusb error reporting

Error messages rather than error codes are reported. Version specific
libusb error messages originate from their respective calls.

d92ca50e 10/09/2009 05:38 pm Thomas Tsou

usrp: Added error checking on hash transfers

82d944f7 10/08/2009 09:21 pm Michael Dickens

augmented search for libusb

3a7863d3 10/07/2009 02:29 am Johnathan Corgan

Merge branch 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou

  • 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou:
    usrp: Corrected build fix for libusb
    usrp: Removed unused file
fc6d4f39 10/07/2009 01:17 am Johnathan Corgan

Merge branch 'wip/wbxng' of :jcorgan

69caa7dc 10/07/2009 12:50 am Johnathan Corgan

Clean up for work-in-progress

Copyright updates
Trailing whitespace cleanup
Move private headers out of install
Use standard include guards
Code cleanup

bf0bbd9d 10/05/2009 09:37 pm Jason Abele

Integrated gain control for TX and RX of wbxng

48e2124c 10/05/2009 09:37 pm Jason Abele

Enabled RX Baseband

9aff67ee 10/05/2009 09:37 pm Jason Abele

First Functional TX modulator

a85e0396 10/05/2009 09:37 pm Jason Abele

Locking, controllable synthesizer on TX and RX

set Charge Pump Current (Icp) per design guide on schem
set R divider to 3, so that PFD inputs are ~21MHz
set RF output enable even when looking for AUX
e4b5ce36 10/05/2009 09:37 pm Jason Abele

Able to tune RX VCO, observe R and N divider output on MUXOUT

16951928 10/05/2009 09:37 pm Jason Abele

twiddling gpio successfully

ba4f8351 10/05/2009 09:37 pm Jason Abele

Clean build

052e7a2c 10/05/2009 09:37 pm Jason Abele

Initial compile of wbxng, properly sets db IDs

d155857d 10/03/2009 08:33 pm Thomas Tsou

Merge branch 'master' into libusb-1.0

97522141 10/03/2009 08:24 pm Thomas Tsou

usrp: Removed unused file

0aba3485 10/03/2009 07:59 pm Johnathan Corgan

Fix missing update from last commit

d894a95e 10/03/2009 05:08 pm Thomas Tsou

usrp: Build fix for non-pkgconfig installs of libusb