summaryrefslogtreecommitdiff
path: root/gnuradio-core/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-194-12/+6
|\
| * Removing usrp, usrp2, gr-usrp, gr-usrp2. Everything is moving to using UHD. ↵Tom Rondeau2011-10-192-2/+0
| | | | | | | | Also removes related M4 and dependency requirements for USRP-related libs.
| * uhd: updating examples to use args and better default for all UHD examples; ↵Tom Rondeau2011-10-192-10/+6
| | | | | | | | also fixed the wfm_rcv blocks to use new PLL constructor.
* | swig: fix rules for generated index filesJosh Blum2011-10-192-2/+5
| |
* | core: added transcendental to cmake buildJosh Blum2011-10-192-2/+4
| |
* | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-195-0/+239
|\|
| * Merge branch 'master' into nextTom Rondeau2011-10-185-0/+239
| |\ | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/general.i
| | * added transcendental block from jblum/transcendental (reworked for master ↵Tom Rondeau2011-10-185-0/+239
| | | | | | | | | | | | branch).
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-1744-4118/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'next' into dig_ofdmTom Rondeau2011-10-179-59/+80
| |\ \
| * | | 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-143-91/+105
| | | | | | | | | | | | | | | | components like vocoder and digital.
| * | | digital: fixed QA tests for ofdm.Tom Rondeau2011-10-123-202/+0
| | | |
| * | | digital: moved over all c++ blocks to gr-digital. Benchmark tx/rx still working.Tom Rondeau2011-10-1223-2208/+0
| | | |
| * | | digital: removed psk and qam from gnuradio-core; unnecessary now.Tom Rondeau2011-10-123-209/+0
| | | |
| * | | digital: wip: changes to get benchmark_ofdm_tx to produce output (runs but ↵Tom Rondeau2011-10-123-536/+0
| | | | | | | | | | | | | | | | untested/verified).
| * | | digital: wip: moved all OFDM examples and blks2impl to gr-digital.Tom Rondeau2011-10-127-901/+0
| | | |
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-171-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into nextTom Rondeau2011-10-161-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: gr-qtgui/lib/Makefile.am
| | * | build: needed boost_filesystem lib added (found under ubuntu 11.10; they're ↵Tom Rondeau2011-10-151-2/+2
| | | | | | | | | | | | | | | | getting pickier).
* | | | gr: changed the way trellis/gengen generated.i is madeJosh Blum2011-10-151-12/+24
| | | |
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-148-114/+148
|\| | |
| * | | docs: added a page on PFBs and put them in their own doxygen group. Helpful ↵Tom Rondeau2011-10-148-114/+148
| | |/ | |/| | | | | | | explination on how to use them and where to find more info.
* | | gr: the CMakeLists.txt took a chill pillJosh Blum2011-10-0818-232/+232
| | |
* | | gr: minor tweaks for MSVC compatibilityJosh Blum2011-10-081-2/+6
| | |
* | | gr: updated cmakelists after merge for additional filesJosh Blum2011-10-082-3/+5
| | |
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into digitalJosh Blum2011-10-0811-57/+579
|\| |
| * | uhd: adding uhd_rx_nogui app to uhd apps directory.Tom Rondeau2011-10-071-1/+1
| | |
| * | Merge branch 'digital' of github.com:trondeau/gnuradio into digitalTom Rondeau2011-10-068-55/+584
| |\ \
| | * \ Merge branch 'next' into digitalTom Rondeau2011-10-068-55/+584
| | |\ \
| | | * | Formatting and normalizing freq limits.Tom Rondeau2011-10-061-55/+81
| | | | |
| | | * | Added FFF version of pfb_arb_resampler to Python hier block (where only the ↵Tom Rondeau2011-10-061-0/+53
| | | | | | | | | | | | | | | | | | | | rate is required).
| | | * | Added floating point version of arbitrary resampler.Tom Rondeau2011-10-065-0/+432
| | | | |
| * | | | Fixed stupid mistake in new method.Tom Rondeau2011-09-302-2/+3
| | | | |
| * | | | Added a method to get the current timing rate from the pfb clock sync block.Tom Rondeau2011-09-302-0/+10
| |/ / /
| * | | Merge branch 'next' into digitalTom Rondeau2011-09-2642-1990/+418
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ Merge branch 'next' into digitalJosh Blum2011-10-082-29/+21
|\ \ \ \ \
| * | | | | core: make the lib/swig depend on the generated targetsJosh Blum2011-10-031-0/+2
| | | | | |
| * | | | | swig: added python script to auto-extract dependenciesJosh Blum2011-09-291-29/+1
| | | | | |
| * | | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-09-281-0/+18
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'master' into nextJohnathan Corgan2011-09-271-0/+18
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | swig: language independent exception handlerJosh Blum2011-09-271-0/+18
| | | | |
* | | | | Merge branch 'next' into digitalJosh Blum2011-09-2816-153/+474
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | core: add link with librt for shm_* callsJosh Blum2011-09-271-0/+5
| | | | |
| * | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-09-262-1/+24
| |\| | |
| | * | | Merge branch 'master' into nextTom Rondeau2011-09-242-1/+24
| | |\| |
| | | * | Merge branch 'keep1n'Tom Rondeau2011-09-242-1/+24
| | | |\ \
| | | | * | Fixing keep_one_in_n to allow for large values of n. Performs tag ↵Tom Rondeau2011-09-222-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | propagation locally.
| * | | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-09-246-254/+257
| |\| | | |
| | * | | | Merge branch 'master' into nextTom Rondeau2011-09-233-248/+247
| | |\| | |