Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | grc: adding new inputs to channelizer and synthesizer xml. | Tom Rondeau | 2012-02-28 | 2 | -1/+20 | |
| |/ / | ||||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2012-02-14 | 3 | -69/+0 | |
|\| | | ||||||
| * | | Merge branch 'maint' | Johnathan Corgan | 2012-02-14 | 3 | -69/+0 | |
| |\| | ||||||
| | * | Fixed GRC bindings for vocoder (this also fixes GRC example cvsd_sweep) | Martin Braun | 2012-02-14 | 3 | -69/+0 | |
| | | | ||||||
* | | | Merge branch 'master' into next | Tom Rondeau | 2012-02-06 | 2 | -3/+17 | |
|\| | | ||||||
| * | | grc: add nthread parameter to FFT-based blocks. | Tom Rondeau | 2012-02-06 | 2 | -3/+17 | |
| | | | ||||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2012-02-02 | 2 | -4/+13 | |
|\| | | ||||||
| * | | Merge branch 'maint' | Johnathan Corgan | 2012-02-02 | 2 | -4/+13 | |
| |\| | ||||||
| | * | grc: better error for import gr fail | Josh Blum | 2012-02-02 | 1 | -2/+11 | |
| | | | ||||||
| | * | grc: fix install permissions on grc_setup_freedesktop | Josh Blum | 2012-02-02 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into next | Tom Rondeau | 2012-01-16 | 2 | -0/+88 | |
|\| | | | | | | | | | | | | | | Conflicts: grc/blocks/Makefile.am | |||||
| * | | core: the burst_tag block can have user-defined keys and values for the tags ↵ | Marcus Leech | 2012-01-16 | 3 | -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 cleanup | Johnathan Corgan | 2011-12-08 | 16 | -513/+0 | |
|/ | | | | Nick Foster owes Nick Corgan a six-pack of beer! | |||||
* | grc: fix typos | Timo Juhani Lindfors | 2011-12-07 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'more_swigness_docs' | Tom Rondeau | 2011-12-04 | 9 | -117/+13 | |
|\ | ||||||
| * | grc: replaced doxygen extracted docs with python docstrings | Josh Blum | 2011-11-17 | 9 | -117/+13 | |
| | | ||||||
* | | grc: force param text to black to guarantee readability | Josh Blum | 2011-11-30 | 2 | -4/+12 | |
|/ | ||||||
* | grc: fix bug when displaying string params | Josh Blum | 2011-10-29 | 1 | -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 Rondeau | 2011-10-26 | 8 | -510/+0 | |
| | ||||||
* | grc: correlate access code was also moved to gr-digital; fixing bug in grc ↵ | Tom Rondeau | 2011-10-25 | 1 | -2/+2 | |
| | | | | block. | |||||
* | grc: tell the packet utility to look in gr.digital for packet_utils. | Tom Rondeau | 2011-10-25 | 1 | -1/+2 | |
| | ||||||
* | cmake: make python checks optional for cross builds | Josh Blum | 2011-10-23 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into next | Josh Blum | 2011-10-19 | 2 | -9/+13 | |
|\ | ||||||
| * | grc: tweaks for colors, added 64 int, vector darken | Josh Blum | 2011-10-19 | 2 | -9/+13 | |
| | | ||||||
* | | grc: added throttle tag to blocks that throttle | Josh Blum | 2011-10-19 | 4 | -3/+8 | |
| | | ||||||
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-19 | 3 | -10/+1 | |
|\ \ | ||||||
| * | | Removing usrp, usrp2, gr-usrp, gr-usrp2. Everything is moving to using UHD. ↵ | Tom Rondeau | 2011-10-19 | 3 | -10/+1 | |
| | | | | | | | | | | | | Also removes related M4 and dependency requirements for USRP-related libs. | |||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-19 | 3 | -1/+43 | |
|\| | | ||||||
| * | | Merge branch 'master' into next | Tom Rondeau | 2011-10-18 | 3 | -1/+43 | |
| |\| | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/general.i | |||||
| | * | added transcendental block from jblum/transcendental (reworked for master ↵ | Tom Rondeau | 2011-10-18 | 3 | -1/+43 | |
| | | | | | | | | | | | | branch). | |||||
* | | | grc: dont set the HLKM stuff unless win32 | Josh Blum | 2011-10-19 | 1 | -0/+4 | |
| | | | ||||||
* | | | cmake: fix that component depends on component hack | Josh Blum | 2011-10-19 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-17 | 6 | -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 Rondeau | 2011-10-17 | 4 | -262/+0 | |
| | | | ||||||
| * | | Merge branch 'next' into dig_ofdm | Tom Rondeau | 2011-10-17 | 7 | -46/+66 | |
| |\ \ | ||||||
| * | | | fixed a couple of typos. | Tom Rondeau | 2011-10-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | docs: Updated some docs and made it so GRC can pull docs in from other ↵ | Tom Rondeau | 2011-10-14 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | components like vocoder and digital. | |||||
* | | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-14 | 7 | -46/+66 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge branch 'mergme/grc_work' into next | Tom Rondeau | 2011-10-14 | 7 | -46/+66 | |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||||
| | * | grc: append index to duplicated ports | Josh Blum | 2011-10-12 | 1 | -4/+10 | |
| | | | ||||||
| | * | grc: rename complex/float ports so its obvious | Josh Blum | 2011-10-12 | 2 | -4/+4 | |
| | | | ||||||
| | * | grc: added new IO types | Josh Blum | 2011-10-12 | 4 | -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 digital | Tom Rondeau | 2011-09-26 | 11 | -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 pill | Josh Blum | 2011-10-08 | 5 | -38/+38 | |
| | | | | ||||||
* | | | | Merge branch 'next' into digital | Josh Blum | 2011-09-28 | 12 | -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 next | Josh Blum | 2011-09-22 | 1 | -1/+1 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h volk/bootstrap | |||||
| | * | | | Merge branch 'master' into next | Tom Rondeau | 2011-09-22 | 1 | -1/+1 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | Merge branch 'maint' | Tom Rondeau | 2011-09-22 | 1 | -1/+1 | |
| | | |\ \ | ||||||
| | | | * | | grc: one line fix to fix port duplicator when removing ports | Josh Blum | 2011-09-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | was an issue when removing more than one port | |||||
| * | | | | | grc: only perform python checks when not building cross | Josh Blum | 2011-09-11 | 1 | -4/+10 | |
| | | | | | |