summaryrefslogtreecommitdiff
path: root/grc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'jblum/mergeme/qtgui/grc' into nextJohnathan Corgan2011-03-1434-2288/+196
|\
| * Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grcJosh Blum2011-03-1434-2288/+196
| |\
| | * qtgui-grc: added suport in main template for theme iconJosh Blum2011-03-071-1/+2
| | * qtgui-grc: minor tweaks to the various thingsJosh Blum2011-03-072-2/+6
| | * grc: added function args to probe block and documentationJosh Blum2011-03-075-5/+29
| | * grc: rework the probe blocks and how they fit into grcJosh Blum2011-03-0613-380/+92
| | * qtgui-grc: use a vboxlayout for the top_layoutJosh Blum2011-03-041-1/+1
| | * qtgui-grc: enable start/stop control through qt widgetsJosh Blum2011-03-012-1/+3
| | * grc: work on generator for gui flowgraphs to simplify generationJosh Blum2011-03-016-129/+20
| | * grc: moved wxgui blocks and python into gr-wxgui/grcJosh Blum2011-03-0119-1781/+1
| | * qtgui: work on variable chooserJosh Blum2011-03-011-1/+0
| | * grc: added tabbed widget in qtgui for grcJosh Blum2011-03-014-6/+38
| | * qtgui: created a forms module with a slider and text box, implemented in grcJosh Blum2011-03-013-129/+10
| | * grc: added qtgui support to grc (just added sink)Josh Blum2011-03-015-0/+142
* | | Merge remote branch 'jblum/wip/grc/kill_process' into nextJohnathan Corgan2011-03-143-23/+23
|\ \ \ | |/ / |/| |
| * | grc: swap store the subprocess object rather than the pid when executingJosh Blum2011-03-133-23/+23
| |/
* | Merge remote branch 'jblum/wip/gr-audio' into wip/gr-audioJohnathan Corgan2011-03-144-174/+0
|\ \
| * | audio: moved the grc audio blocks into gr-audio dirJosh Blum2011-03-094-174/+0
| |/
* / grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grcJosh Blum2011-03-1323-1738/+12
|/
* Merge branch 'master' into nextTom Rondeau2011-01-171-0/+2
|\
| * Adding new accessor for Goertzel filter to GRC block. Thanks to Marcus Leech ...Tom Rondeau2011-01-171-0/+2
* | Merge branch 'next' into guile.Eric Blossom2010-12-211-1/+4
|\ \
| * | Create method to set rate on pfb_arb_resamp after it has been created.Matt Ettus2010-12-111-1/+4
* | | Major Makefile.am housecleaning. Passes distcheck.Eric Blossom2010-11-242-5/+5
|/ /
* | Merge branch 'master' into nextTom Rondeau2010-11-071-0/+7
|\|
| * Adds a new parameter "y_axis_label" to scopesink2 and the GRC .xml file that ...Marcus Leech2010-10-171-0/+7
* | uhd: added ref clock option to single usrp blocks, minor grc fix on empty opt...Josh Blum2010-10-281-1/+1
* | Merge branch 'master' into nextJohnathan Corgan2010-07-211-0/+5
|\|
| * gnuradio-core: export missing public methods in gr.agc2Alexandru Csete2010-07-211-0/+5
* | Merge branch 'master' into nextJohnathan Corgan2010-07-052-1/+40
|\|
| * Merge branch 'patches/marcus/stripchart'Johnathan Corgan2010-07-051-0/+22
| |\
| | * gr-wxgui: adds stripchart trigger mode to graphics sinksMarcus D Leech2010-05-161-0/+22
| * | Merge branch 'patches/marcus/file_sink'Johnathan Corgan2010-07-051-1/+18
| |\ \
| | * | gnuradio-core: adds configurable flush to file sinkMarcus D Leech2010-05-161-1/+18
| | |/
* | | Merge branch 'master' into nextJohnathan Corgan2010-06-243-11/+32
|\| |
| * | grc: move grc_setup_freedesktop into libexec directory (not in users path).Josh Blum2010-06-243-11/+32
* | | Merge branch 'master' into nextJohnathan Corgan2010-06-242-35/+41
|\| |
| * | grc: expanded nports ability to have multiple port duplicators per sideJosh Blum2010-06-242-35/+41
* | | Merge branch 'master' into nextJohnathan Corgan2010-06-223-0/+50
|\| |
| * | Merge branch 'patches/marcus/gr_and_const'Johnathan Corgan2010-06-223-0/+50
| |\ \
| | * | grc: adds gr.and_const to block treeMarcus D Leech2010-05-163-0/+50
| | |/
* | | Merge branch 'master' into nextJohnathan Corgan2010-06-211-1/+1
|\| |
| * | grc: fix broken variable config when using bool typeJohann Chiang2010-06-211-1/+1
* | | Merge branch 'master' into nextJohnathan Corgan2010-05-272-2/+40
|\| |
| * | Merge remote branch 'ets/grc-usrp2-clock-source'Johnathan Corgan2010-05-272-2/+40
| |\ \
| | * | Add USRP2 clock source parameter to GRC blocks.Eric Schneider2010-05-272-2/+40
* | | | Merge branch 'master' into nextJohnathan Corgan2010-05-242-24/+28
|\| | |
| * | | Merge remote branch 'gnuradio/wip/udp_source_sink'Johnathan Corgan2010-05-232-24/+28
| |\ \ \
| | * | | grc: update UDP source and sink block wrappersJohnathan Corgan2010-05-212-24/+28
| | | |/ | | |/|
* | | | Merge remote branch 'jblum/uhd' into nextJohnathan Corgan2010-05-211-1/+1
|\ \ \ \ | |/ / / |/| | |