Johnathan Corgan [Thu, 1 Oct 2009 20:51:03 +0000 (13:51 -0700)]
Cleanup in preparation for merge
Fix trailing whitespace
Use standard include guards
Add more missing config.h includes
Fixup emacs mode strings
Update copyright notices
Johnathan Corgan [Thu, 1 Oct 2009 19:47:24 +0000 (12:47 -0700)]
Add required include directory for new header organization
Thomas Tsou [Thu, 1 Oct 2009 17:33:33 +0000 (13:33 -0400)]
Added config.h headers to fix win32 build
Johnathan Corgan [Wed, 30 Sep 2009 01:29:44 +0000 (18:29 -0700)]
Consolidate conditional headers into libusb_types.h, use automake
Thomas Tsou [Wed, 23 Sep 2009 21:50:48 +0000 (17:50 -0400)]
Change write_internal_ram in usrp_prims to print signed error code
ttsou [Thu, 17 Sep 2009 15:24:55 +0000 (11:24 -0400)]
Allow fusb_sysconfig to build on non-linux libusb-0.12 impls
ttsou [Wed, 16 Sep 2009 20:39:35 +0000 (16:39 -0400)]
Comments for usrp_prims
ttsou [Wed, 16 Sep 2009 00:28:04 +0000 (20:28 -0400)]
Removed internal functions from external header file
ttsou [Tue, 15 Sep 2009 01:42:03 +0000 (21:42 -0400)]
Moved to single generated fusb.h, headers now generated out of lib directory
ttsou [Mon, 14 Sep 2009 23:56:53 +0000 (19:56 -0400)]
Added copyright header
ttsou [Mon, 14 Sep 2009 23:50:26 +0000 (19:50 -0400)]
Removed preprocessor declrs out of fusb.h and created separate fusb_libusb1_base.h
ttsou [Mon, 14 Sep 2009 22:51:28 +0000 (18:51 -0400)]
Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration
ttsou [Mon, 14 Sep 2009 18:43:37 +0000 (14:43 -0400)]
Commonized more usrp_prims code and renamed libusb-0.12 files to libusb0
ttsou [Mon, 14 Sep 2009 05:16:52 +0000 (01:16 -0400)]
Fixed bug usb_control_transfer bug
ttsou [Mon, 14 Sep 2009 04:08:02 +0000 (00:08 -0400)]
Combined additiona usrp_prims code
ttsou [Sun, 13 Sep 2009 22:44:04 +0000 (18:44 -0400)]
Fix glitch from previous commit
U-CERVELO\ttsou [Fri, 11 Sep 2009 19:35:28 +0000 (15:35 -0400)]
changes to build on windows / cygwin
ttsou [Thu, 10 Sep 2009 21:29:04 +0000 (17:29 -0400)]
Re-added non pkgconfig support for libusb
ttsou [Thu, 10 Sep 2009 20:33:49 +0000 (16:33 -0400)]
Autoconf support for checking the required version of libusb based on fusb-tech
ttsou [Thu, 10 Sep 2009 19:08:16 +0000 (15:08 -0400)]
Use default arguments instead of overloaded virtual constructors for cleaner interface
ttsou [Thu, 10 Sep 2009 18:23:10 +0000 (14:23 -0400)]
Integrated more usrp_prims code
Thomas Tsou [Wed, 9 Sep 2009 22:52:34 +0000 (18:52 -0400)]
Fixed swig and usrp apps to work with libusb-0.12 and libusb-1.0 plus minor cleanup
ttsou [Wed, 9 Sep 2009 18:46:57 +0000 (14:46 -0400)]
Intermediate fix to simplify usrp_one_time_init api
ttsou [Wed, 9 Sep 2009 15:02:41 +0000 (11:02 -0400)]
Added autotools header generation and build time version checking
ttsou [Fri, 28 Aug 2009 15:42:41 +0000 (11:42 -0400)]
Added libusb1 specific usrp_prims and usrp_basic
ttsou [Thu, 27 Aug 2009 22:13:54 +0000 (18:13 -0400)]
first shot at re-adding libusb-0.12 support
ttsou [Wed, 26 Aug 2009 14:46:56 +0000 (10:46 -0400)]
Modify apps and swig to reflect libusb_context use
ttsou [Tue, 25 Aug 2009 23:52:29 +0000 (19:52 -0400)]
Additional comments for reaping transactions
ttsou [Tue, 25 Aug 2009 23:30:39 +0000 (19:30 -0400)]
Additional comments for reaping transactions
ttsou [Tue, 25 Aug 2009 22:46:14 +0000 (18:46 -0400)]
non-blocking reap and fusb default buffer size change
ttsou [Tue, 25 Aug 2009 18:53:34 +0000 (14:53 -0400)]
Fix for simultaneous tx-rx using libusb_contexts
Johnathan Corgan [Tue, 18 Aug 2009 03:46:30 +0000 (23:46 -0400)]
Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:
This patch set updates the usrp to support libusb-1.0. Asynchronous I/O
through libusb is added with fusb_libusb1.*, which is heavily based on
fusb_linux.*. In short, URB's and ioctl calls are replaced with
libusb_transfer structs and native calls. Transfer reaping is handled by
libusb and associated callbacks. I get 32Mb/s on all of my machines using
test_usrp_standard_rx or tx. Due to the API rewrite in 1.0 from 0.12, there
are alot of changes, many are simply name changes.
Known Issues:
Transmit and receive both work, but not at same time
(e.g. usrp_benchmark_usb.py). libusb does not create any internal threads,
so for a single session fusb_libusb1 works in the same manner as
fusb_linux with the callback called at controlled times. With multiple
libusb sessions the callback may occur at any time and threading issues
come into play causing behavior to become undefined. The use of separate
libusb_contexts _might_ solve this issue; I have not had the time to look
into it.
Philip Balister [Tue, 15 Sep 2009 18:50:22 +0000 (14:50 -0400)]
Fix doxygen warnings.
Johnathan Corgan [Tue, 15 Sep 2009 15:41:21 +0000 (08:41 -0700)]
Merge branch 'grc' of gnuradio.org/git/jblum into master
* 'grc' of http://gnuradio.org/git/jblum:
fixed issue where entry boxes lost focus (mishandling of hide changing)
fixed bool converter in forms to work with non bool options
tweaked key handling callbacks
fix for uniformity convention with gtk signal name strings
Simply Actions module imports, using module prefix.
Reworked actions api and actions objects:
Move key press extraction logic into actions module.
rename variable, use keysyms in props dialog
use the keymap's translate_keyboard_state, use the key value rather than name
ignore irrelevant modifiers and events pending
properties dialog with ok/cancel buttons
Josh Blum [Tue, 15 Sep 2009 05:37:55 +0000 (22:37 -0700)]
fixed issue where entry boxes lost focus (mishandling of hide changing)
Josh Blum [Tue, 15 Sep 2009 05:27:50 +0000 (22:27 -0700)]
fixed bool converter in forms to work with non bool options
Eric Blossom [Sun, 13 Sep 2009 19:30:29 +0000 (12:30 -0700)]
updated top-level .gitignore
Josh Blum [Sun, 13 Sep 2009 10:25:56 +0000 (03:25 -0700)]
tweaked key handling callbacks
Josh Blum [Sun, 13 Sep 2009 09:39:40 +0000 (02:39 -0700)]
fix for uniformity convention with gtk signal name strings
Josh Blum [Sun, 13 Sep 2009 09:29:26 +0000 (02:29 -0700)]
Simply Actions module imports, using module prefix.
Josh Blum [Sun, 13 Sep 2009 09:14:27 +0000 (02:14 -0700)]
Reworked actions api and actions objects:
Created standardized Action object for all gui actions.
Actions module constants are actual Action objects (not strings).
Keypresses, labels, tooltips, stock icons, etc all associate in the Action constructor.
Usage of the action's signaling call () eliminated the need for a reference to handle_states.
Josh Blum [Sun, 13 Sep 2009 07:04:58 +0000 (00:04 -0700)]
Move key press extraction logic into actions module.
Replaced xml encode with gtk escape text.
Added templates for category and docs tool tips.
Other various code tweaks in gui modules.
Eric Blossom [Sat, 12 Sep 2009 06:02:21 +0000 (23:02 -0700)]
add u2_flash_tool to EXTRA_DIST
Josh Blum [Fri, 11 Sep 2009 00:38:53 +0000 (17:38 -0700)]
rename variable, use keysyms in props dialog
Josh Blum [Thu, 10 Sep 2009 23:17:25 +0000 (16:17 -0700)]
use the keymap's translate_keyboard_state, use the key value rather than name
Josh Blum [Thu, 10 Sep 2009 21:47:53 +0000 (14:47 -0700)]
ignore irrelevant modifiers and events pending
Josh Blum [Thu, 10 Sep 2009 04:35:58 +0000 (21:35 -0700)]
properties dialog with ok/cancel buttons
Johnathan Corgan [Thu, 10 Sep 2009 00:38:27 +0000 (17:38 -0700)]
Merge branch 'grc' of gnuradio.org/git/jblum into master
* 'grc' of http://gnuradio.org/git/jblum:
use show signal to perform initial gui update
Fixed the usrp and usrp2 probe scripts to work with the new gui param api.
propsdialog tweaks
more code cleanup for properties dialog
Rework the params/properties dialog and param gui class:
renamed params dialog to props dialog
remove unused imports, copyright date update, tweak
Created recursive create labels and shapes method for gui element.
replaced dict[rot] storage of areas and lines with a single list for the current rotation
standardized the Element inheritance __init__ usage in gui
better error msg for empty statements
Implement a recursive validation api in the base Element class.
Johnathan Corgan [Thu, 10 Sep 2009 00:37:01 +0000 (17:37 -0700)]
Merge branch 'forms' of gnuradio.org/git/jblum into master
* 'forms' of http://gnuradio.org/git/jblum:
set text box bg color on change
Round the slider's value, but not the internal representation.
Johnathan Corgan [Thu, 10 Sep 2009 00:11:02 +0000 (17:11 -0700)]
Merge branch 'usrp_siggen' of gnuradio.org/git/jblum into master
* 'usrp_siggen' of http://gnuradio.org/git/jblum:
only import usrp and usrp2 modules in the setup methods
updated digital to use installed usrp options
tweaked ampl slider params
copied usrp_siggen stuff from experimental gui into gnuradio tree
Johnathan Corgan [Thu, 10 Sep 2009 00:09:44 +0000 (17:09 -0700)]
Added missing file to ignores.
Josh Blum [Thu, 10 Sep 2009 00:07:15 +0000 (17:07 -0700)]
only import usrp and usrp2 modules in the setup methods
Josh Blum [Wed, 9 Sep 2009 21:59:44 +0000 (14:59 -0700)]
updated digital to use installed usrp options
Josh Blum [Wed, 9 Sep 2009 21:13:52 +0000 (14:13 -0700)]
tweaked ampl slider params
Josh Blum [Wed, 9 Sep 2009 20:57:38 +0000 (13:57 -0700)]
set text box bg color on change
Josh Blum [Wed, 9 Sep 2009 20:05:38 +0000 (13:05 -0700)]
Round the slider's value, but not the internal representation.
Now, the slider can operate on any step size without killing the precision for other forms.
Josh Blum [Wed, 9 Sep 2009 19:33:10 +0000 (12:33 -0700)]
copied usrp_siggen stuff from experimental gui into gnuradio tree
Josh Blum [Wed, 9 Sep 2009 06:04:38 +0000 (23:04 -0700)]
use show signal to perform initial gui update
Eric Blossom [Tue, 8 Sep 2009 19:40:05 +0000 (12:40 -0700)]
removed qr_fft.py from gr-utils
Josh Blum [Sun, 6 Sep 2009 08:58:25 +0000 (01:58 -0700)]
Fixed the usrp and usrp2 probe scripts to work with the new gui param api.
Also fixed the scripts to work since they were broken by previous changes.
Get input in param class now pases a param instance (self) into the object.
Josh Blum [Sun, 6 Sep 2009 08:17:35 +0000 (01:17 -0700)]
propsdialog tweaks
Josh Blum [Sun, 6 Sep 2009 06:49:34 +0000 (23:49 -0700)]
more code cleanup for properties dialog
Josh Blum [Sun, 6 Sep 2009 06:41:49 +0000 (23:41 -0700)]
Rework the params/properties dialog and param gui class:
Better handles dynamic changes and subsequent code cleanup.
Josh Blum [Sun, 6 Sep 2009 04:11:51 +0000 (21:11 -0700)]
renamed params dialog to props dialog
Johnathan Corgan [Sat, 5 Sep 2009 18:29:10 +0000 (11:29 -0700)]
Add missing cstdio includes for gcc 4.4 compatibility
Josh Blum [Sat, 5 Sep 2009 09:38:46 +0000 (02:38 -0700)]
remove unused imports, copyright date update, tweak
Josh Blum [Sat, 5 Sep 2009 09:21:37 +0000 (02:21 -0700)]
Created recursive create labels and shapes method for gui element.
Replaces update methods in the gui classes and simplifies calls.
The master update method in flow graph calls create labels and shapes.
Josh Blum [Sat, 5 Sep 2009 09:01:41 +0000 (02:01 -0700)]
replaced dict[rot] storage of areas and lines with a single list for the current rotation
Josh Blum [Sat, 5 Sep 2009 08:54:41 +0000 (01:54 -0700)]
standardized the Element inheritance __init__ usage in gui
Josh Blum [Sat, 5 Sep 2009 07:54:56 +0000 (00:54 -0700)]
better error msg for empty statements
Josh Blum [Sat, 5 Sep 2009 07:45:14 +0000 (00:45 -0700)]
Implement a recursive validation api in the base Element class.
The rewrite and validate methods will invoke themselves on the child elements.
The error messages are now a super-list of element and child error messages.
As a side-effect, this cleans up code in base Block and Flowgraph class.
Johnathan Corgan [Fri, 4 Sep 2009 22:47:49 +0000 (15:47 -0700)]
Merge branch 'grc' from gnuradio.org/git/jblum.git into master
we dont use test() -> remove it
Made the window for the pass band filters integers (take firdes.WIN_XXX).
Evaluation fix in param.to_code().
Removed the flagging api and usage from the base classes.
added ref scale param to fft and waterfall
Switched the python classes to inherit from the base and gui classes.
port and param types from an overloaded method
todo
Replaced TYPES in Port and Param with types parameter.
made is_virtual_xxx a block level function, used by port and param classes
added stream id type and checking in evaluate
avoid loops
Recursive resolution of virtual sources.
added virtual source and added stream ids, logic to clone in port
added rewrite methods to element to separate from validation logic
Added virtual sink and logic to clone port.
removed repurposing of pads
Work on command line options for generated code.
renamed the colors dialog to types
use pkgpythondir
...
Eric Blossom [Fri, 4 Sep 2009 10:48:15 +0000 (03:48 -0700)]
stop sending short ethernet command packets.
Eric Blossom [Fri, 4 Sep 2009 10:32:32 +0000 (03:32 -0700)]
Fix problem with commands timing out (specifically stop_rx_streaming)
After fixing the race, this change uses Tom's idea to stop enqueuing
data when trying to stop, and adds a new flush_rx_samples method
to drop any samples that may have already been accumulated.
I ran Tom's test case 500 times with 0 failures ;-)
Eric Blossom [Fri, 4 Sep 2009 08:51:29 +0000 (01:51 -0700)]
Fix race condition that caused commands such as stop_rx_streaming to fail.
This fixes the bulk of the problem. Next step is to drop data packets
while waiting for the reply.
Johnathan Corgan [Fri, 4 Sep 2009 03:09:06 +0000 (20:09 -0700)]
Merge branch 'sync' from gnuradio.org/git/trondeau.git into master
* Fixing a line in the clock recovery algorithm. This works with a bit larger error than there proably should be.
* Adding clock sync algorithm using PFB. This works, but needs a bit more work.
Tom Rondeau [Fri, 4 Sep 2009 02:50:43 +0000 (22:50 -0400)]
Fixing a line in the clock recovery algorithm. This works with a bit larger error than there proably should be.
Johnathan Corgan [Fri, 4 Sep 2009 00:12:40 +0000 (17:12 -0700)]
Better fix for broken AC_PROG_F77 macro
* Move AC_PROG_CC into GR_FORTRAN macro definition
Josh Blum [Thu, 3 Sep 2009 22:46:07 +0000 (15:46 -0700)]
we dont use test() -> remove it
Johnathan Corgan [Thu, 3 Sep 2009 19:53:02 +0000 (12:53 -0700)]
Fix Python header check failure due to invalid cached state
* GR_FORTRAN macro leaves $ac_ext=f on some systems
* Restore by invoking AC_PROG_CC
Reported-by: Szymon Jakubczak <szym@csail.mit.edu>
Signed-off-by: Johnathan Corgan <jcorgan@corganenterprises.com>
Josh Blum [Thu, 3 Sep 2009 18:37:27 +0000 (11:37 -0700)]
Made the window for the pass band filters integers (take firdes.WIN_XXX).
Now a window can be controlled by a variable such as a chooser.
Josh Blum [Wed, 2 Sep 2009 23:58:15 +0000 (16:58 -0700)]
Evaluation fix in param.to_code().
Dont force an evaluation in to code unless the type is string or list.
Not doing so forces the variables to call evaluate before the namespace was bootstrapped.
This fixes a bug that came up when the validate was replaced with rewrite in flowgraph.import_data().
By replacing the validate, evaluate was only called once, and the namespace was not bootstrapped.
Johnathan Corgan [Wed, 2 Sep 2009 21:38:37 +0000 (14:38 -0700)]
Merge branch 'wxgui_fix' from gnuradio.org/git/jblum.git into master
* waterfall and fft use a common autoscale function
* Fix so that the waterfall texture is initialized with a buffer of the same size.
Johnathan Corgan [Wed, 2 Sep 2009 21:34:18 +0000 (14:34 -0700)]
Merge branch 'lo_fix' from gnuradio.org/git/jblum.git into master
* Modifications to usrp2 source and sink so that set center freq is called afer set lo offset.
* Modifications to the usrp blocks and wrapper so that the lo offset is set with the lo frequency.
Josh Blum [Wed, 2 Sep 2009 21:18:28 +0000 (14:18 -0700)]
waterfall and fft use a common autoscale function
Josh Blum [Wed, 2 Sep 2009 21:06:34 +0000 (14:06 -0700)]
Fix so that the waterfall texture is initialized with a buffer of the same size.
If the fft size was a non power of two, the buffer would be a different size.
This would cause a segfault. Particularly because fft_window was throwing out a bin.
Josh Blum [Wed, 2 Sep 2009 20:41:56 +0000 (13:41 -0700)]
Modifications to usrp2 source and sink so that set center freq is called afer set lo offset.
Josh Blum [Wed, 2 Sep 2009 20:16:47 +0000 (13:16 -0700)]
Removed the flagging api and usage from the base classes.
Far better to flag the namespace for renewing once in the flowgraph.py
Josh Blum [Wed, 2 Sep 2009 19:26:09 +0000 (12:26 -0700)]
added ref scale param to fft and waterfall
Josh Blum [Wed, 2 Sep 2009 19:07:14 +0000 (12:07 -0700)]
Modifications to the usrp blocks and wrapper so that the lo offset is set with the lo frequency.
Johnathan Corgan [Wed, 2 Sep 2009 17:14:02 +0000 (10:14 -0700)]
Removed subversion related configuration info.
* Don't call GR_SUBVERSION in configure.ac
* Remove --svn* options from gnuradio-config-info
Johnathan Corgan [Wed, 2 Sep 2009 16:33:32 +0000 (09:33 -0700)]
Merge branch 'wxgui' from gnuradio.org/git/jblum.git into master
* Modified log power fft block so ref scale is peak to peak.
* Tweaked fft sink autoscale routine to come up with better numbers.
* Modified scope sink ac couple block to use constant tap. The previous
tap calculation would cause failure for very small sample rates.
Johnathan Corgan [Wed, 2 Sep 2009 15:05:04 +0000 (08:05 -0700)]
Expand frequency ranges to match hardware capability.
* Corresponds to SVN r11620:11622
* Fixes ticket 405
Reported-by: Dimitris Symeonidis <azimout@gmail.com>
Fixed-by: Matt Ettus <matt@ettus.com>
Josh Blum [Tue, 1 Sep 2009 01:18:22 +0000 (18:18 -0700)]
Modified log power fft block so ref scale is peak to peak.
Tweaked fft sink autoscale routine to come up with better numbers.
Modified scope sink ac couple block to use constant tap.
The previous tap calculation would cause failure for very small sample rates.
Tom [Mon, 31 Aug 2009 00:32:23 +0000 (20:32 -0400)]
Adding clock sync algorithm using PFB. This works, but needs a bit more work.
Josh Blum [Sun, 30 Aug 2009 17:34:10 +0000 (10:34 -0700)]
Switched the python classes to inherit from the base and gui classes.
Use only **kwargs so all contructor parameters must be passed with keys.
Moved gui input forms classes from base to gui param module.
Josh Blum [Sun, 30 Aug 2009 16:35:55 +0000 (09:35 -0700)]
port and param types from an overloaded method
Josh Blum [Sat, 29 Aug 2009 08:44:17 +0000 (01:44 -0700)]
todo
Josh Blum [Sat, 29 Aug 2009 08:04:58 +0000 (01:04 -0700)]
Replaced TYPES in Port and Param with types parameter.
Replaced odict in options for storing options with a list.
Fix virtual port check in flow graph template.
Josh Blum [Sat, 29 Aug 2009 04:06:19 +0000 (21:06 -0700)]
made is_virtual_xxx a block level function, used by port and param classes