summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-17Merge branch 'master' into nextTom Rondeau
2011-10-17Merge branch 'maint'Tom Rondeau
2011-10-17qtgui: missed something before.Tom Rondeau
2011-10-17Merge branch 'master' into nextTom Rondeau
2011-10-17Merge branch 'maint'Tom Rondeau
2011-10-17qtgui: a few more fixes for qwt 5.2/6.0.Tom Rondeau
2011-10-17digital: adding OFDM GRC blocks to gr-digital.Tom Rondeau
2011-10-17Merge branch 'master' into nextTom Rondeau
2011-10-17Merge branch 'maint'Tom Rondeau
2011-10-17build: fixed last warning generated from bootstrap under autoconf 2.68.Tom Rondeau
2011-10-17ofdm: removed old ofdm examples directory. All examples are now in gr-digital.Tom Rondeau
2011-10-17Merge branch 'next' into dig_ofdmTom Rondeau
2011-10-17Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-10-16Merge branch 'master' into nextTom Rondeau
Conflicts: gr-qtgui/lib/Makefile.am
2011-10-16Merge branch 'maint'Tom Rondeau
2011-10-16qtgui: more compatability issues.Tom Rondeau
2011-10-16qtgui: wip: working to make plots backwards compatible with qwt 5.2.Tom Rondeau
2011-10-16qtgui: adjusting intensity knobs and auto scale in waterfall works in qwt6.Tom Rondeau
2011-10-16qtgui: fixed waterfall color map issue under qwt6.Tom Rondeau
2011-10-16qtgui: waterfall plot mostly working under qwt6 (plots, but updates to scale ↵Tom Rondeau
and color not working yet).
2011-10-16qtgui: constellation plot working again under qwt6.Tom Rondeau
2011-10-16qtgui: Time domain plot working againt under qwt6.Tom Rondeau
2011-10-15qtgui: wip: updating qtgui to work with QWT 6 (and trying to maintain ↵Tom Rondeau
backwards compatability to 5.2). This wip works for just the fft plots.
2011-10-15qtgui: avoids a simple warning.Tom Rondeau
2011-10-15build: needed boost_filesystem lib added (found under ubuntu 11.10; they're ↵Tom Rondeau
getting pickier).
2011-10-15config: fixing up for new rules in automake.Tom Rondeau
2011-10-15build: fixed a bug with missing boost filesystem lib.Tom Rondeau
2011-10-15config: fixed qwt checks to be available over more versions.Tom Rondeau
2011-10-15gr: changed the way trellis/gengen generated.i is madeJosh Blum
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-14digital: added set_freq function to narrownband tunnel's main top block.Tom Rondeau
2011-10-14digital: wip: working on tunnel.py for OFDM.Tom Rondeau
2011-10-14digital: renamed OFDM benchmark codes; no real need to say what they are in ↵Tom Rondeau
an ofdm directory.
2011-10-14digital: fixed narrowband channel model adder to take a signal amplitude to ↵Tom Rondeau
determine the SNR.
2011-10-14digital: add channel model for OFDM signals to a file.Tom Rondeau
2011-10-14digital: removed unnecessary benchmark_ofdm.pyTom Rondeau
2011-10-14digital: fixed OFDM benchmark code to work over-the-air with UHD.Tom Rondeau
2011-10-14docs: added a page on PFBs and put them in their own doxygen group. Helpful ↵Tom Rondeau
explination on how to use them and where to find more info.
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-12Merge branch 'dig_ofdm' of github.com:trondeau/gnuradio into dig_ofdmTom Rondeau
2011-10-12digital: changed modulation_utils2 to modulation_utils and update all files ↵Tom Rondeau
using it.
2011-10-12digital: fixed QA tests for ofdm.Tom Rondeau
2011-10-12digital: OFDM using new psk and qam modules for constellations. Also, ↵Tom Rondeau
psk2->psk updated in all files and examples.
2011-10-12digital: sneaking in a fix to cpm.py here. Working with benchmark_tx. Also ↵Tom Rondeau
adding some print statements to benchmark script to indicate what type of source/sink is being used.
2011-10-12digital: moved over all c++ blocks to gr-digital. Benchmark tx/rx still working.Tom Rondeau
2011-10-12grc: append index to duplicated portsJosh Blum
2011-10-12grc: rename complex/float ports so its obviousJosh Blum