summaryrefslogtreecommitdiff
path: root/grc
AgeCommit message (Collapse)Author
2011-03-14Merge remote branch 'jblum/mergeme/qtgui/grc' into nextJohnathan Corgan
* jblum/mergeme/qtgui/grc: (27 commits) qtgui: removed python directory that was added, never used qtgui-grc: added suport in main template for theme icon qtgui-grc: minor tweaks to the various things qtgui-grc: added read-only thermo widget to range block qtgui-grc: fix for list option working in chooser block qtgui-grc: added check for pyqwt in config grc: added function args to probe block and documentation grc: rework the probe blocks and how they fit into grc qtgui-grc: moved slider to range, added knob and gui tweaks qtgui-grc: use a vboxlayout for the top_layout qtgui-grc: made slider widget components (counter/slider) optional qtgui-grc: add engineering notation to entry and label + other tweaks qtgui-grc: enable start/stop control through qt widgets qtgui-grc: rename the text entry and label blocks grc-qtgui: creaded check box widget with qtgui, cleanup label code grc-qtgui: added variable text box and static text widgets grc-qtgui: pick correct signal overload for variable chooser grc-qtgui: added radio button support, tweaks, more options grc-qtgui: work on variable chooser block grc: work on generator for gui flowgraphs to simplify generation ...
2011-03-14Merge remote branch 'jblum/wip/grc/kill_process' into nextJohnathan Corgan
* jblum/wip/grc/kill_process: grc: swap store the subprocess object rather than the pid when executing
2011-03-14Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grcJosh Blum
Conflicts: grc/grc_gnuradio/Makefile.am
2011-03-14Merge remote branch 'jblum/wip/gr-audio' into wip/gr-audioJohnathan Corgan
* jblum/wip/gr-audio: audio: high prio for platform specific audio osx audio: added windows and osx audio source files audio: added config checks for other audios, added jack and port audio: make prefs look like old audio, removed old audio.py audio: register arches with priorities, ex: prefer alsa over oss audio: added oss support to gr-audio audio: use conf files to specify default arch audio: moved the grc audio blocks into gr-audio dir audio: moved alsa support files into subdirectory audio: work on swig support, it imports audio: work to get alsa support in, lets see if this works before adding more audio: added audio factory registry and top level includes audio: skeleton for gr-audio component
2011-03-13grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grcJosh Blum
Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files. When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change. Minor change: the freedesktop files are always installed now. This does not mean that they are installed properly with xdg, it just means that the runtime can have access to the icons.
2011-03-13grc: swap store the subprocess object rather than the pid when executingJosh Blum
For some reason os.kill(p.pid, SIGKILL) does not work on windows. However, the subprocess p.kill() works just fine for both systems.
2011-03-09audio: moved the grc audio blocks into gr-audio dirJosh Blum
2011-03-07qtgui-grc: added suport in main template for theme iconJosh Blum
2011-03-07qtgui-grc: minor tweaks to the various thingsJosh Blum
2011-03-07grc: added function args to probe block and documentationJosh Blum
2011-03-06grc: rework the probe blocks and how they fit into grcJosh Blum
Removed the source on all probe blocks. Advertise the probe-able function in the docs. Added missing signal probe block. Removed probe function and variable sink blocks. Removed all supporting grc_gnuradio python files. Added variable_function_probe block that can probe arbitrary functions on a block. All the code needed by the function probe is available is the make tag. To display the value of a probe block, use the variable probe block, and a gui widget. To disply the value of a stream, do the same but use the signal probe block. Simple see :-) If more types other than floats need to be read from the stream, the signal probe should be extended.
2011-03-04qtgui-grc: use a vboxlayout for the top_layoutJosh Blum
2011-03-01qtgui-grc: enable start/stop control through qt widgetsJosh Blum
2011-03-01grc: work on generator for gui flowgraphs to simplify generationJosh Blum
generator does not differentiate between notebooks and controls, they are all block, but block are now sorted by variables present in the make also adjusted categories listed in the wx and qt widget related blocks
2011-03-01grc: moved wxgui blocks and python into gr-wxgui/grcJosh Blum
Prefixed wxgui blocks with WX GUI in the block names. Added category to wxgui variables blocks (not in the main block tree.xml)
2011-03-01qtgui: work on variable chooserJosh Blum
2011-03-01grc: added tabbed widget in qtgui for grcJosh Blum
created gui_hint type to handle tab descriptor + position markup, and to handle the generation of the name of the parent widget. No support python modules required in gr-qtgui.
2011-03-01qtgui: created a forms module with a slider and text box, implemented in grcJosh Blum
2011-03-01grc: added qtgui support to grc (just added sink)Josh Blum
2011-01-17Merge branch 'master' into nextTom Rondeau
* master: Adding new accessor for Goertzel filter to GRC block. Thanks to Marcus Leech for the last three modifications. Adding accessors to Goertzel filter GR block to call setparms from implementation file for (re)setting parameters. Adding accessor function to Goertzel filter implementaiton to set/reset its parameters.
2011-01-17Adding new accessor for Goertzel filter to GRC block. Thanks to Marcus Leech ↵Tom Rondeau
for the last three modifications.
2010-12-21Merge branch 'next' into guile.Eric Blossom
Passes distcheck. * next: (32 commits) volk: Fix for popcnt's 64/32-bit issues. Using a copy of config.guess and config.sub instead of sym links. Including time header to qa files. Changed python env variable to more globally usable version. gr_uhd: Quick fix for make distcheck failures if UHD is not installed. PFB resampler: fix it this way to avoid the signed/unsigned warning. PFB resampler: fixes bug where filter could be looking past the number of inputs. resampler PFB: Sets relative rate when rate is changed. Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC. volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags. volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit. volk: May be a hack, but it was required for my 32-bit Fedora 13 to work. volk: Removing unnecessary shell script; last commit takes care if its functions. volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script. volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error. volk: Adding a few more generic-only test cases. volk: adding generic QA test for 16sc_magnitude_32f. volk: modified the configure scripts to output which architectures it will be building based on the configure tests. uhd: update notes in grc blocks for addressing scheme volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps). ...
2010-12-11Create method to set rate on pfb_arb_resamp after it has been created.Matt Ettus
Allow it to be called from GRC.
2010-11-24Major Makefile.am housecleaning. Passes distcheck.Eric Blossom
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 such that they remove exactly the generated files.
2010-11-07Merge branch 'master' into nextTom Rondeau
* master: Sneaking in a few warning fixes to this branch. Adding ability for FIR filter with internal buffer to decimate. Adds a new parameter "y_axis_label" to scopesink2 and the GRC .xml file that contains the string for the Y axis label. It defaults to 'Counts' to be consistent with the old version. Adding ccf version of fir filter to gitignore. Removing nonexistent gri .i file from Makefile. Got a bit carried away with the copy/paste. Removing ccf version of filter that is now autogenerated. Fixing up filters a bit to pass QA tests for all versions. Fixes Makefile for fir filter generators. Using generators to make gri_fir_filter_with_buffer_XXX into all possible in/out/tap types we support. Work on examples for the synthesize filterbank block. The cleans up the simple example and adds a new example that synthesizes a number of signals and then channelizes them again. It displays the synthesized PSD as well as the PSD and time waveform of one of the channels that's specified in teh code. Adding QA code for fir filter with buffer. Cleaning up synthesis filter and using new FIR filter with buffer. Cleaning up the new FIR filter implementation. Protects against some corner cases and adds filterN. Adding a test example for the synthesis filter. Adding a FIR filter implemented with its own internal buffer. This one keeps its own delay line and just takes in input samples instead of a pointer to an external buffer. rearrange includes to always be: internal GR, external, with GR. Can now set more channels than input signals. Empty channels are established as the outtermost channels (around fs/2 and -fs/2). Fixing ordering so that the input channels line up in the output signal properly. Adding the synthesis filterbank (the opposite of the channelizer). It's ugly right now and uses a lot of memory to handle the buffers for each filter/input stream.
2010-10-28uhd: added ref clock option to single usrp blocks, minor grc fix on empty ↵Josh Blum
option keys
2010-10-17Adds a new parameter "y_axis_label" to scopesink2 and the GRC .xml file that ↵Marcus Leech
contains the string for the Y axis label. It defaults to 'Counts' to be consistent with the old version.
2010-07-21Merge branch 'master' into nextJohnathan Corgan
* master: gnuradio-core: export missing public methods in gr.agc2 wxgui: fix to use wx.Colour which is the actual name of the class (wx python wrapper may be missing wx.Color wrapper) From my reading, we should never need to define the timespec struct (so we will wait until this bites me). Checking for clock_gettime and timespec defined; use gettimeofday if not, but put it into a timespec structure. Reformatting highResTimeFunction.h for better readibility.
2010-07-21gnuradio-core: export missing public methods in gr.agc2Alexandru Csete
Alexandru Csete: The gr_agc2 block has public methods to set and get the AGC levels and rates; however, only a few of these interfaces are exported to Python and none of them are available in GRC. The attached patch adds the missing public methods to gri_agc2_cc.i and gri_agc2_ff.i and defines the corresponding callbacks in the gr_agc2_xx.xml GRC block.
2010-07-05Merge branch 'master' into nextJohnathan Corgan
2010-07-05Merge branch 'patches/marcus/stripchart'Johnathan Corgan
Conflicts: gr-wxgui/src/python/scope_window.py * Adds new scope window trigger, TRIG_MODE_STRIPCHART * Allows config file selection of whether background window sinks still run * Allows config file selection of default trigger mode * Allows config file selection of default waterfall sink color mode [wxgui] #Setting this to true prevents the window sinks from stopping when they #are not displayed, as when they are in a notebook with a hidden tab. run_always = False # Default scope trigger mode. # # 0 = Freerun # 1 = Auto (default) # 2 = Normal # 3 = Stripchart trig_mode = 1 # Default waterfall sink color mode. Valid choices are 'rgb1', 'rbg2', # 'rgb3', or 'gray' waterfall_color = rgb1
2010-07-05Merge branch 'patches/marcus/file_sink'Johnathan Corgan
2010-06-24Merge branch 'master' into nextJohnathan Corgan
* master: grc: move grc_setup_freedesktop into libexec directory (not in users path).
2010-06-24grc: move grc_setup_freedesktop into libexec directory (not in users path).Josh Blum
Renamed grc desktop file to simplify name and updated install script.
2010-06-24Merge branch 'master' into nextJohnathan Corgan
* master: added python script to fix copyright years based on git log grc: expanded nports ability to have multiple port duplicators per side
2010-06-24grc: expanded nports ability to have multiple port duplicators per sideJosh Blum
2010-06-22Merge branch 'master' into nextJohnathan Corgan
2010-06-22Merge branch 'patches/marcus/gr_and_const'Johnathan Corgan
* patches/marcus/gr_and_const: grc: adds gr.and_const to block tree
2010-06-21Merge branch 'master' into nextJohnathan Corgan
* master: grc: fix broken variable config when using bool type
2010-06-21grc: fix broken variable config when using bool typeJohann Chiang
2010-05-27Merge branch 'master' into nextJohnathan Corgan
* master: Add USRP2 clock source parameter to GRC blocks. Refactor Makefile.am to move common files from 3 libraries into a single variable.
2010-05-27Merge remote branch 'ets/grc-usrp2-clock-source'Johnathan Corgan
* ets/grc-usrp2-clock-source: Add USRP2 clock source parameter to GRC blocks.
2010-05-27Add USRP2 clock source parameter to GRC blocks.Eric Schneider
2010-05-24Merge branch 'master' into nextJohnathan Corgan
* master: gnuradio-core: update copyrights gnuradio-core: allow swig to handle exceptions in UDP source/sink grc: update UDP source and sink block wrappers Simplify USE_SELECT usage Return immediately when using d_residual. Defend against a peer that sends an invalid message length. Move initialization of select timeout Correct update of d_temp_offset (parallel construction) Identify memory leaks that occur on error conditions Use -1 as file descriptor "not open" value instead of 0 Add additional conditionalization of networking includes Flush pending errors in gr_udp_sink on disconnect() Rework UDP source and sink, with incompatible API changes Updates to udp source/sink (select(), wait, cleanup) Discard data in gr_udp_sink until receiver is started. Use getaddrinfo in gr_udp_{source,sink} Changes to gr_udp_{source,sink} for MinGW Ignore ENOPROTOOPT return from setsockopt(SO_LINGER)
2010-05-23Merge remote branch 'gnuradio/wip/udp_source_sink'Johnathan Corgan
* gnuradio/wip/udp_source_sink: gnuradio-core: update copyrights gnuradio-core: allow swig to handle exceptions in UDP source/sink grc: update UDP source and sink block wrappers Simplify USE_SELECT usage Return immediately when using d_residual. Defend against a peer that sends an invalid message length. Move initialization of select timeout Correct update of d_temp_offset (parallel construction) Identify memory leaks that occur on error conditions Use -1 as file descriptor "not open" value instead of 0 Add additional conditionalization of networking includes Flush pending errors in gr_udp_sink on disconnect() Rework UDP source and sink, with incompatible API changes Updates to udp source/sink (select(), wait, cleanup) Discard data in gr_udp_sink until receiver is started. Use getaddrinfo in gr_udp_{source,sink} Changes to gr_udp_{source,sink} for MinGW Ignore ENOPROTOOPT return from setsockopt(SO_LINGER)
2010-05-21Merge remote branch 'jblum/uhd' into nextJohnathan Corgan
* jblum/uhd: using the send and recv full buffer modes, avoids extra loop in implementation Added call to get access to the underlying uhd simple usrp object. added docs to uhd grc blocks, added pkg config path to make support easier typo fix, called variable ant, not antenna added to uhd grc files, also removed warning for grc generator with uhd blocks added more access methods to uhd source and sink fix for paradigm shift Use simple usrp from uhd. gr-uhd working with io type added swig includes and tune result return using new streaming api added set center freq call Added samp rate param and using the simple device from uhd removed timeout from here Got the source and sink working with current uhd. Added the uhd simple sink lib block, swig wrapper, grc wrapper. using samples prop, added unchecked in files for utils and grc rx wrapper recv noise with uhd Created simple source (with nothing in it) and some swig build stuff. Created gr uhd skeleton build.
2010-05-21grc: update UDP source and sink block wrappersJohnathan Corgan
2010-05-18grc: rename execution binary from 'grc' to 'gnuradio-companion'Johnathan Corgan
This change resolves a conflict with the Generic Colorizer application which also uses the binary name 'grc'. Interested users can add an alias to their shell environment to run gnuradio-companion when grc is invoked.
2010-05-18gnuradio-core: removed gr.dd_mpsk_sync_cc block as obsoleteJohnathan Corgan
2010-05-16gr-wxgui: adds stripchart trigger mode to graphics sinksMarcus D Leech