Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
gr-utils/src/python/gr_plot_qt.py
gr-utils/src/python/pyqt_plot.py
gr-utils/src/python/pyqt_plot.ui
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This restores functionality reverted in fd37328c
* 'grc' of http://gnuradio.org/git/jblum:
Added a run options to the "no gui" generate options.
|
|
The user can select between run to completion and prompt for exit.
Also fixed the props dialog is changed function to have better hashes.
Now we hash a tuple of all "relevant" items which is "order aware".
Since xoring the individual hashes proved faulty when 2 params alternated hiding.
(cherry picked from commit fd37328c778ea8014e9ea9d932e61e5d229dd012)
|
|
|
|
|
|
|
|
|
|
This merge adds support for libusb1.0 in the usrp component. To enable,
you must add --with-fusb-tech=libusb1 to your configure command line.
Existing support for libusb0.1 is retained, no changes are needed.
Most of the work was done here by Thomas Tsou.
* 'wip/libusb-1.0' of http://gnuradio.org/git/jcorgan: (32 commits)
Cleanup in preparation for merge
Add required include directory for new header organization
Added config.h headers to fix win32 build
Consolidate conditional headers into libusb_types.h, use automake
Change write_internal_ram in usrp_prims to print signed error code
Allow fusb_sysconfig to build on non-linux libusb-0.12 impls
Comments for usrp_prims
Removed internal functions from external header file
Moved to single generated fusb.h, headers now generated out of lib directory
Added copyright header
Removed preprocessor declrs out of fusb.h and created separate fusb_libusb1_base.h
Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration
Commonized more usrp_prims code and renamed libusb-0.12 files to libusb0
Fixed bug usb_control_transfer bug
Combined additiona usrp_prims code
Fix glitch from previous commit
changes to build on windows / cygwin
Re-added non pkgconfig support for libusb
Autoconf support for checking the required version of libusb based on fusb-tech
Use default arguments instead of overloaded virtual constructors for cleaner interface
...
|
|
Fix trailing whitespace
Use standard include guards
Add more missing config.h includes
Fixup emacs mode strings
Update copyright notices
|
|
|
|
* 'new_eth' of http://gnuradio.org/git/matt: (42 commits)
Fix warnings, mostly from implicitly defined wires or unspecified widths
fullchip sim now compiles again, after moving eth and models over to new simple_gemac
remove unused opencores
remove debugging code
no idea where this came from, it shouldn't be here
Copied wb_1master back from quad radio
Remove old mac. Good riddance.
remove unused port
More xilinx fifos, more clean up of our fifos
might as well use a cascade fifo to help timing and give a little more capacity
fix a typo which caused tx glitches
Untested fixes for getting serdes onto the new fifo system. Compiles, at least
Implement Eth flow control using pause frames
parameterized fifo sizes, some reformatting
remove unused old style fifo
allow control of whether or not to honor flow control, adds some debug lines
debug the rx side
no longer used, replaced by newfifo version
remove special last_line adjustment from ethernet port
Firmware now inserts mac source address value in each frame.
...
|
|
|
|
|
|
simple_gemac
|
|
|
|
|
|
Functionality should not change at all
Conflicts:
usrp2/fpga/top/u2_core/u2_core.v
|
|
|
|
|
|
more sane config options, should be exactly the same memory map
|
|
|
|
|
|
* 'wip/gr-noaa' of http://gnuradio.org/git/jcorgan:
Restored original HRPT GUI script and documented various script choices.
Renamed simplified HRPT script to allow restoring original
General improvements in HRPT receiver
|
|
|
|
|
|
|
|
Added usrp_rx_hrpt_nogui script
Simplified usrp_rx_hrpt script for lower CPU usage
Changed matched filtering taps to be whole symbol
|
|
* 'grc' of http://gnuradio.org/git/jblum:
hash the tuple of hashes to id the current params
|
|
* 'gr-noaa-fixes' of http://gnuradio.org/git/balister:
Add missing cstdio include for gcc 4.4 compatibility.
|
|
|
|
|
|
This reverts commit 06281feea16143ca97a77348f72e1c6dd0616c57.
|
|
* 'grc' of http://gnuradio.org/git/jblum:
Added a run options to the "no gui" generate options.
|
|
|
|
* 'wip/deb' of http://gnuradio.org/git/jcorgan:
Misc. packaging tweaks
Merged Bdale's 3.2.2-1 packaging
|
|
Note gcell/apps/gen_script.py needs to use git
Install gnuradio-config-info in libgnuradio-core0
Add pfb examples to gnuradio-examples
Add missing python files in gnuradio-examples
|
|
The user can select between run to completion and prompt for exit.
Also fixed the props dialog is changed function to have better hashes.
Now we hash a tuple of all "relevant" items which is "order aware".
Since xoring the individual hashes proved faulty when 2 params alternated hiding.
|
|
Conflicts:
.gitignore
|
|
* 'rx_mimo_hb_sync' of http://gnuradio.org/git/matt:
Synchronize the internal phase of the halfband filters to the
|
|
Three-way merge on files (3.2.2->bdale, 3.2.2->3.3git)
Merged control, rules, install, copyright, changelog
File renames to accomodate package renames
3.3git items updated to follow new pattern
Updated copyright notification
Some manual fixups needed
|