Matt Ettus [Fri, 25 Sep 2009 05:34:06 +0000 (22:34 -0700)]
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Johnathan Corgan [Thu, 24 Sep 2009 22:51:26 +0000 (15:51 -0700)]
Merge branch 'rx_mimo_hb_sync' of gnuradio.org/git/matt
* 'rx_mimo_hb_sync' of http://gnuradio.org/git/matt:
Synchronize the internal phase of the halfband filters to the
Matt Ettus [Thu, 24 Sep 2009 19:33:22 +0000 (12:33 -0700)]
Synchronize the internal phase of the halfband filters to the
start of the "run" signal. This is important for MIMO. Bug
reported by Christoph Hein and Hanwen .
Johnathan Corgan [Thu, 24 Sep 2009 18:49:19 +0000 (11:49 -0700)]
Acknowledging the obvious
Johnathan Corgan [Thu, 24 Sep 2009 02:11:36 +0000 (19:11 -0700)]
Fix missing type specifier for mask
Johnathan Corgan [Thu, 24 Sep 2009 01:17:15 +0000 (18:17 -0700)]
Merge branch 'wip/gr-noaa' of gnuradio.org/git/jcorgan into master
* 'wip/gr-noaa' of http://gnuradio.org/git/jcorgan:
Added README and updated configuration requirements
Split HRPT script into live receive and post-processing
Dumps HRPT frames to text file similar to specification document
Added skeleton HRPT decoder block
Updated HRPT receiver to read files recorded as shorts
Add HRPT word output to deframer
Reorganization of directories
Added HRPT deframer block
Changed synchronizer to output sliced bits.
Updated HRPT blocks/scripts for testing. Seeing good minor frame sync's.
Implemented crude timing recovery using zero crossings but no resampling
Work in progress, incomplete
Update rx_poes script to filter prior to PLL.
Created new gr-noaa top-level component.
Johnathan Corgan [Thu, 24 Sep 2009 01:15:59 +0000 (18:15 -0700)]
Merge branch 'grc' of gnuradio.org/git/jblum into master
* 'grc' of http://gnuradio.org/git/jblum:
xor that hash
bug fix for handling loading of dynamic params
Johnathan Corgan [Wed, 23 Sep 2009 18:56:19 +0000 (11:56 -0700)]
Added README and updated configuration requirements
Johnathan Corgan [Wed, 23 Sep 2009 18:40:19 +0000 (11:40 -0700)]
Split HRPT script into live receive and post-processing
Cleanup debug info
Created 'demod_hrpt_file.py'
Updated 'usrp_rx_hrpt.py' with GUI, USRP, and config file
Johnathan Corgan [Mon, 21 Sep 2009 02:57:30 +0000 (19:57 -0700)]
Dumps HRPT frames to text file similar to specification document
Johnathan Corgan [Mon, 21 Sep 2009 02:32:30 +0000 (19:32 -0700)]
Added skeleton HRPT decoder block
Johnathan Corgan [Mon, 21 Sep 2009 02:10:10 +0000 (19:10 -0700)]
Updated HRPT receiver to read files recorded as shorts
Matt Ettus [Mon, 21 Sep 2009 00:30:27 +0000 (17:30 -0700)]
Merge branch 'serdes_newfifo' into new_eth
Johnathan Corgan [Sun, 20 Sep 2009 19:47:34 +0000 (12:47 -0700)]
Add HRPT word output to deframer
Put in half bit width matched filter
Change default sync_alpha to 0.05
Johnathan Corgan [Sun, 20 Sep 2009 16:49:10 +0000 (09:49 -0700)]
Reorganization of directories
Moved apps into own directory
Added (empty) python directory
Johnathan Corgan [Wed, 9 Sep 2009 04:08:29 +0000 (21:08 -0700)]
Added HRPT deframer block
Johnathan Corgan [Tue, 8 Sep 2009 23:52:37 +0000 (16:52 -0700)]
Changed synchronizer to output sliced bits.
Johnathan Corgan [Mon, 7 Sep 2009 20:22:16 +0000 (13:22 -0700)]
Updated HRPT blocks/scripts for testing. Seeing good minor frame sync's.
* Change PLL and SYNC blocks to output floats
* Correct bit sense
* Update RX script to record ascii bits
Johnathan Corgan [Sat, 29 Aug 2009 20:24:58 +0000 (13:24 -0700)]
Implemented crude timing recovery using zero crossings but no resampling
Johnathan Corgan [Sat, 29 Aug 2009 18:12:37 +0000 (11:12 -0700)]
Work in progress, incomplete
* Renamed noaa.carrier_pll_cc to noaa.hrpt_pll_cc
* Added nop noaa.hrpt_sync_cc
* Renamed grc apps to use usrp_ prefix and protocol name
* Installed grc generated scripts to path
Johnathan Corgan [Sat, 22 Aug 2009 20:10:08 +0000 (13:10 -0700)]
Update rx_poes script to filter prior to PLL.
Johnathan Corgan [Sat, 15 Aug 2009 19:30:45 +0000 (12:30 -0700)]
Created new gr-noaa top-level component.
Initial work:
- Carrier recovery/mixer PLL block
- Start of POES grc pipeline, recovers Manchester symbols only
- Start of GOES grc pipeline, recovers BPSK symbols only
Johnathan Corgan [Sun, 20 Sep 2009 03:38:24 +0000 (20:38 -0700)]
Added CVSD encoder/decoder to GRC, example app
Used blks2.cvsd* wrappers, not bare gnuradio.vocoder.cvsd*
Example application sweeps 0-4KHz through encoder/decoder pair configured
as Bluetooth standard
Josh Blum [Sat, 19 Sep 2009 06:27:06 +0000 (23:27 -0700)]
xor that hash
Johnathan Corgan [Sat, 19 Sep 2009 05:30:47 +0000 (22:30 -0700)]
Merge branch 'usrp2-real-fix' of gnuradio.org/git/balister into master
Johnathan Corgan [Sat, 19 Sep 2009 05:27:38 +0000 (22:27 -0700)]
Merge branch 'grc' of gnuradio.org/git/jblum into master
Josh Blum [Sat, 19 Sep 2009 03:37:05 +0000 (20:37 -0700)]
bug fix for handling loading of dynamic params
Josh Blum [Fri, 18 Sep 2009 16:51:33 +0000 (09:51 -0700)]
Re/evaluate the notebook blocks label because we dont garuntee the evaluation priority.
Meaning, we cant garuntee that the notebook block will be evaluated before this param,
without explicitly calling evaluate on it when the value is needed.
Josh Blum [Fri, 18 Sep 2009 09:22:43 +0000 (02:22 -0700)]
put the flow graph errors button into the toolbar
Josh Blum [Fri, 18 Sep 2009 09:10:13 +0000 (02:10 -0700)]
added errors dialog to show all error messages in flow graph
Josh Blum [Fri, 18 Sep 2009 05:58:26 +0000 (22:58 -0700)]
bugfix: exclude disabled children from consideration in valid condition
Eric Blossom [Fri, 18 Sep 2009 05:51:03 +0000 (22:51 -0700)]
Add rxdspno parameter to private interface of quadradio.
This allows control of each Rx DSP pipeline independent of each other.
The public interface remains unchanged, but should have the rxdspno
parameter added as indicated in the FIXMEs. When that is done, the
gr-vrt interface (and any code using it) will need to be updated too.
Josh Blum [Thu, 17 Sep 2009 22:35:17 +0000 (15:35 -0700)]
lower lxml version req to 1.3.6
Philip Balister [Wed, 16 Sep 2009 22:59:19 +0000 (18:59 -0400)]
configure.gnu needs to unset more vars from the environment.
This solves a problem running the usrp2/firmware configure script
when the USB_* vars are set in the environment. Long term fix is
to have the configure.gnu wrapper make sure the quoting is OK for vars
passed on.
Johnathan Corgan [Wed, 16 Sep 2009 14:59:16 +0000 (07:59 -0700)]
Merge branch 'utils' of gnuradio.org/git/trondeau into master
* 'utils' of http://gnuradio.org/git/trondeau:
Fixed slider behavior when the end of the file is reached.
Handling a few exceptions when no file is loaded.
Can now change the size of the symbols. Also fixes some layout issues.
Adding ability to change line width and style (only a handful of current styles enabled).
Removing plot picker that addd nothing to the interface.
Adding a Reload option (Ctrl+R) option to quickly reread the file and reset the state.
Tom Rondeau [Wed, 16 Sep 2009 14:17:31 +0000 (10:17 -0400)]
Fixed slider behavior when the end of the file is reached.
Tom Rondeau [Wed, 16 Sep 2009 14:03:29 +0000 (10:03 -0400)]
Handling a few exceptions when no file is loaded.
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
Matt Ettus [Fri, 11 Sep 2009 06:11:44 +0000 (23:11 -0700)]
Remove old mac. Good riddance.
Matt Ettus [Fri, 11 Sep 2009 04:53:32 +0000 (21:53 -0700)]
remove unused port
Matt Ettus [Fri, 11 Sep 2009 04:52:06 +0000 (21:52 -0700)]
More xilinx fifos, more clean up of our fifos
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
Matt Ettus [Thu, 10 Sep 2009 18:40:18 +0000 (11:40 -0700)]
might as well use a cascade fifo to help timing and give a little more capacity
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
Matt Ettus [Sat, 5 Sep 2009 20:38:13 +0000 (13:38 -0700)]
fix a typo which caused tx glitches
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.
Matt Ettus [Sat, 5 Sep 2009 05:33:30 +0000 (22:33 -0700)]
Untested fixes for getting serdes onto the new fifo system. Compiles, at least
Matt Ettus [Sat, 5 Sep 2009 05:23:27 +0000 (22:23 -0700)]
Implement Eth flow control using pause frames
Not fully tested, but it seems to work without frame errors, sequence
number errors or ethernet overruns. Still of course will get tx underruns
on a slow machine, and the transmitted signal has some issues though.
Matt Ettus [Sat, 5 Sep 2009 05:20:19 +0000 (22:20 -0700)]
parameterized fifo sizes, some reformatting
Matt Ettus [Sat, 5 Sep 2009 05:14:21 +0000 (22:14 -0700)]
remove unused old style fifo
Matt Ettus [Fri, 4 Sep 2009 23:47:43 +0000 (16:47 -0700)]
Merge branch 'new_eth' of gnuradio.org/git/eb into new_eth
Matt Ettus [Fri, 4 Sep 2009 23:43:11 +0000 (16:43 -0700)]
allow control of whether or not to honor flow control, adds some debug lines
Matt Ettus [Fri, 4 Sep 2009 23:37:29 +0000 (16:37 -0700)]
debug the rx side
Matt Ettus [Fri, 4 Sep 2009 23:33:00 +0000 (16:33 -0700)]
no longer used, replaced by newfifo version
Eric Blossom [Fri, 4 Sep 2009 22:58:33 +0000 (15:58 -0700)]
Merge branch 'new_eth' of gnuradio.org/git/matt into new_eth
* 'new_eth' of http://gnuradio.org/git/matt:
Matt Ettus [Fri, 4 Sep 2009 22:53:46 +0000 (15:53 -0700)]
Merge branch 'new_eth' of gnuradio.org/git/eb into new_eth
Eric Blossom [Fri, 4 Sep 2009 22:51:52 +0000 (15:51 -0700)]
Merge branch 'new_eth' of gnuradio.org/git/matt into new_eth
* 'new_eth' of http://gnuradio.org/git/matt:
properly set the address filter
stop sending short ethernet command packets.
Fix problem with commands timing out (specifically stop_rx_streaming)
Fix race condition that caused commands such as stop_rx_streaming to fail.
Fixing a line in the clock recovery algorithm. This works with a bit larger error than there proably should be.
Better fix for broken AC_PROG_F77 macro
Fix Python header check failure due to invalid cached state
waterfall and fft use a common autoscale function
Fix so that the waterfall texture is initialized with a buffer of the same size.
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.
Removed subversion related configuration info.
Expand frequency ranges to match hardware capability.
Modified log power fft block so ref scale is peak to peak.
Adding clock sync algorithm using PFB. This works, but needs a bit more work.
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 22:47:32 +0000 (15:47 -0700)]
remove special last_line adjustment from ethernet port
Matt Ettus [Fri, 4 Sep 2009 22:44:47 +0000 (15:44 -0700)]
Merge branch 'new_eth' of gnuradio.org/git/eb into new_eth
Eric Blossom [Fri, 4 Sep 2009 22:35:01 +0000 (15:35 -0700)]
Firmware now inserts mac source address value in each frame.
The old mac used to do this automatically.
Matt Ettus [Fri, 4 Sep 2009 22:31:26 +0000 (15:31 -0700)]
properly set the address filter
Eric Blossom [Fri, 4 Sep 2009 22:07:06 +0000 (15:07 -0700)]
Merge branch 'new_eth' of gnuradio.org/git/matt into new_eth
* 'new_eth' of http://gnuradio.org/git/matt:
seems to build a decent fpga, but still some issues with a full connection.
Matt Ettus [Fri, 4 Sep 2009 17:29:00 +0000 (10:29 -0700)]
Merge branch 'master' into new_eth
Eric Blossom [Fri, 4 Sep 2009 10:48:15 +0000 (03:48 -0700)]
stop sending short ethernet command packets.