summaryrefslogtreecommitdiff
path: root/grc
AgeCommit message (Collapse)Author
2012-02-02Merge branch 'master' into nextJohnathan Corgan
2012-02-02Merge branch 'maint'Johnathan Corgan
2012-02-02grc: better error for import gr failJosh Blum
2012-02-02grc: fix install permissions on grc_setup_freedesktopJosh Blum
2012-01-16Merge branch 'master' into nextTom Rondeau
Conflicts: grc/blocks/Makefile.am
2012-01-16core: the burst_tag block can have user-defined keys and values for the tags ↵Marcus Leech
when a burst is on or off instead of static values. Defaults are the same. Use set_true_tag and set_false_tag to override these.
2011-12-08Removed autotools, gr-waveform, some cleanupJohnathan Corgan
Nick Foster owes Nick Corgan a six-pack of beer!
2011-12-07grc: fix typosTimo Juhani Lindfors
2011-12-04Merge branch 'more_swigness_docs'Tom Rondeau
2011-11-30grc: force param text to black to guarantee readabilityJosh Blum
2011-11-17grc: replaced doxygen extracted docs with python docstringsJosh Blum
2011-10-29grc: fix bug when displaying string paramsJosh Blum
If the param contents evald successfully but not to a string, it would display None. This patch forces an exception, so the string will get auto-quoted and interpreted correctly.
2011-10-26grc: fixing grc blocks not properly moved in to digital.Tom Rondeau
2011-10-25grc: correlate access code was also moved to gr-digital; fixing bug in grc ↵Tom Rondeau
block.
2011-10-25grc: tell the packet utility to look in gr.digital for packet_utils.Tom Rondeau
2011-10-23cmake: make python checks optional for cross buildsJosh Blum
2011-10-19Merge branch 'master' into nextJosh Blum
2011-10-19grc: tweaks for colors, added 64 int, vector darkenJosh Blum
2011-10-19grc: added throttle tag to blocks that throttleJosh Blum
2011-10-19Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-10-19Removing usrp, usrp2, gr-usrp, gr-usrp2. Everything is moving to using UHD. ↵Tom Rondeau
Also removes related M4 and dependency requirements for USRP-related libs.
2011-10-19Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-10-19grc: dont set the HLKM stuff unless win32Josh Blum
2011-10-19cmake: fix that component depends on component hackJosh Blum
2011-10-18Merge branch 'master' into nextTom Rondeau
Conflicts: gnuradio-core/src/lib/general/general.i
2011-10-18added transcendental block from jblum/transcendental (reworked for master ↵Tom Rondeau
branch).
2011-10-17Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
Conflicts: gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h gr-digital/include/digital_ofdm_cyclic_prefixer.h gr-digital/include/digital_ofdm_frame_acquisition.h gr-digital/include/digital_ofdm_frame_sink.h gr-digital/include/digital_ofdm_insert_preamble.h gr-digital/include/digital_ofdm_mapper_bcv.h gr-digital/include/digital_ofdm_sampler.h
2011-10-17digital: adding OFDM GRC blocks to gr-digital.Tom Rondeau
2011-10-17Merge branch 'next' into dig_ofdmTom Rondeau
2011-10-14Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-10-14Merge branch 'mergme/grc_work' into nextTom Rondeau
2011-10-14fixed a couple of typos.Tom Rondeau
2011-10-14docs: Updated some docs and made it so GRC can pull docs in from other ↵Tom Rondeau
components like vocoder and digital.
2011-10-12grc: append index to duplicated portsJosh Blum
2011-10-12grc: rename complex/float ports so its obviousJosh Blum
2011-10-12grc: added new IO typesJosh Blum
Added all complex/real float/integer types. Used volk naming convention: fc32, etc... The port type checking now relies on IO size, therefore a short vector of length 2 can connect to a complex short, a float can connect to an int. Basically, the same size checking done in gnuradio runtime.
2011-10-08gr: the CMakeLists.txt took a chill pillJosh Blum
2011-09-28Merge branch 'next' into digitalJosh Blum
Conflicts: gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc gnuradio-core/src/lib/general/gr_pll_refout_cc.cc gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
2011-09-26Merge branch 'next' into digitalTom Rondeau
Conflicts: gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc gnuradio-core/src/lib/general/gr_pll_refout_cc.cc gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py gr-digital/lib/digital_constellation_receiver_cb.cc gr-digital/python/Makefile.am gr-digital/python/__init__.py gr-digital/python/generic_mod_demod.py gr-digital/python/pkt.py gr-digital/python/psk2.py gr-digital/python/qam.py
2011-09-22Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum
Conflicts: gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h volk/bootstrap
2011-09-22Merge branch 'master' into nextTom Rondeau
2011-09-22Merge branch 'maint'Tom Rondeau
2011-09-22grc: one line fix to fix port duplicator when removing portsJosh Blum
was an issue when removing more than one port
2011-09-15Merge branch 'digital' of git://github.com/trondeau/gnuradio into digitalJosh Blum
2011-09-13grc: removing more blocks from general grc tree that are now in digital.Tom Rondeau
2011-09-12digital: fixed GRC blocks for blocks moved to gr-digital.Tom Rondeau
2011-09-11grc: only perform python checks when not building crossJosh Blum
2011-09-05Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum
Conflicts: gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h gr-digital/lib/digital_constellation.h gr-digital/lib/digital_constellation_receiver_cb.h gr-digital/lib/digital_fll_band_edge_cc.h gr-digital/lib/digital_mpsk_receiver_cc.h
2011-09-05Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum
Conflicts: gr-trellis/src/lib/trellis_permutation.h
2011-09-02Merge branch 'master' into nextTom Rondeau
* master: Minor fixes in turbo GRC blocks Minor fixes in turbo GRC blocks and one more example added. Added pccc combined turbo decoder and corresponding GRC block More examples and turbo decoder blocks added. Added more turbo encoder/decoder blocks and examples. Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc blocks related to trellis inside the gr-trellis/grc directory added grc directory in gr-trellis updated Makefile.am and block_tree.xml to reflect changes in grc file for gr-trellis Moved grc files from grc/block to gr-trellis/grc