summaryrefslogtreecommitdiff
path: root/grc
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | grc: adding new inputs to channelizer and synthesizer xml.Tom Rondeau2012-02-282-1/+20
| |/ /
* | | Merge branch 'master' into nextJohnathan Corgan2012-02-143-69/+0
|\| |
| * | Merge branch 'maint'Johnathan Corgan2012-02-143-69/+0
| |\|
| | * Fixed GRC bindings for vocoder (this also fixes GRC example cvsd_sweep)Martin Braun2012-02-143-69/+0
| | |
* | | Merge branch 'master' into nextTom Rondeau2012-02-062-3/+17
|\| |
| * | grc: add nthread parameter to FFT-based blocks.Tom Rondeau2012-02-062-3/+17
| | |
* | | Merge branch 'master' into nextJohnathan Corgan2012-02-022-4/+13
|\| |
| * | Merge branch 'maint'Johnathan Corgan2012-02-022-4/+13
| |\|
| | * grc: better error for import gr failJosh Blum2012-02-021-2/+11
| | |
| | * grc: fix install permissions on grc_setup_freedesktopJosh Blum2012-02-021-2/+2
| | |
* | | Merge branch 'master' into nextTom Rondeau2012-01-162-0/+88
|\| | | | | | | | | | | | | | Conflicts: grc/blocks/Makefile.am
| * | core: the burst_tag block can have user-defined keys and values for the tags ↵Marcus Leech2012-01-163-0/+89
| |/ | | | | | | 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.
* / Removed autotools, gr-waveform, some cleanupJohnathan Corgan2011-12-0816-513/+0
|/ | | | Nick Foster owes Nick Corgan a six-pack of beer!
* grc: fix typosTimo Juhani Lindfors2011-12-071-2/+2
|
* Merge branch 'more_swigness_docs'Tom Rondeau2011-12-049-117/+13
|\
| * grc: replaced doxygen extracted docs with python docstringsJosh Blum2011-11-179-117/+13
| |
* | grc: force param text to black to guarantee readabilityJosh Blum2011-11-302-4/+12
|/
* grc: fix bug when displaying string paramsJosh Blum2011-10-291-0/+1
| | | | | | 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.
* grc: fixing grc blocks not properly moved in to digital.Tom Rondeau2011-10-268-510/+0
|
* grc: correlate access code was also moved to gr-digital; fixing bug in grc ↵Tom Rondeau2011-10-251-2/+2
| | | | block.
* grc: tell the packet utility to look in gr.digital for packet_utils.Tom Rondeau2011-10-251-1/+2
|
* cmake: make python checks optional for cross buildsJosh Blum2011-10-231-1/+1
|
* Merge branch 'master' into nextJosh Blum2011-10-192-9/+13
|\
| * grc: tweaks for colors, added 64 int, vector darkenJosh Blum2011-10-192-9/+13
| |
* | grc: added throttle tag to blocks that throttleJosh Blum2011-10-194-3/+8
| |
* | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-193-10/+1
|\ \
| * | Removing usrp, usrp2, gr-usrp, gr-usrp2. Everything is moving to using UHD. ↵Tom Rondeau2011-10-193-10/+1
| | | | | | | | | | | | Also removes related M4 and dependency requirements for USRP-related libs.
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-193-1/+43
|\| |
| * | Merge branch 'master' into nextTom Rondeau2011-10-183-1/+43
| |\| | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/general.i
| | * added transcendental block from jblum/transcendental (reworked for master ↵Tom Rondeau2011-10-183-1/+43
| | | | | | | | | | | | branch).
* | | grc: dont set the HLKM stuff unless win32Josh Blum2011-10-191-0/+4
| | |
* | | cmake: fix that component depends on component hackJosh Blum2011-10-191-2/+2
| | |
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-176-264/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | digital: adding OFDM GRC blocks to gr-digital.Tom Rondeau2011-10-174-262/+0
| | |
| * | Merge branch 'next' into dig_ofdmTom Rondeau2011-10-177-46/+66
| |\ \
| * | | fixed a couple of typos.Tom Rondeau2011-10-141-1/+1
| | | |
| * | | docs: Updated some docs and made it so GRC can pull docs in from other ↵Tom Rondeau2011-10-141-1/+4
| | | | | | | | | | | | | | | | components like vocoder and digital.
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-147-46/+66
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'mergme/grc_work' into nextTom Rondeau2011-10-147-46/+66
| |\ \ \ | | |/ / | |/| / | | |/
| | * grc: append index to duplicated portsJosh Blum2011-10-121-4/+10
| | |
| | * grc: rename complex/float ports so its obviousJosh Blum2011-10-122-4/+4
| | |
| | * grc: added new IO typesJosh Blum2011-10-124-38/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'next' into digitalTom Rondeau2011-09-2611-634/+82
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | gr: the CMakeLists.txt took a chill pillJosh Blum2011-10-085-38/+38
| | | |
* | | | Merge branch 'next' into digitalJosh Blum2011-09-2812-638/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum2011-09-221-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h volk/bootstrap
| | * | | Merge branch 'master' into nextTom Rondeau2011-09-221-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'maint'Tom Rondeau2011-09-221-1/+1
| | | |\ \
| | | | * | grc: one line fix to fix port duplicator when removing portsJosh Blum2011-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | was an issue when removing more than one port
| * | | | | grc: only perform python checks when not building crossJosh Blum2011-09-111-4/+10
| | | | | |