summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib/general
AgeCommit message (Collapse)Author
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-14Merge branch 'master' into nextTom Rondeau
2011-12-14core: API exposure patch.Nick Foster
2011-12-11Merge branch 'master' into nextJohnathan Corgan
Conflicts: config/lf_warnings.m4 volk/config/lf_warnings.m4
2011-12-11docs: fixing format of link in simply_framer_sync. Helps older Doxygen ↵Tom Rondeau
versions understand the link format.
2011-12-08Merge branch 'master' into nextJohnathan Corgan
2011-12-08gnuradio-core: fix typo in documentationTimo Juhani Lindfors
2011-12-08Removed autotools, gr-waveform, some cleanupJohnathan Corgan
Nick Foster owes Nick Corgan a six-pack of beer!
2011-12-06Fixed warnings generated by variable declaration order.Tom Rondeau
2011-10-25I'm sorry but llrintf had one of the best conversions of all timeJosh Blum
2011-10-24core: really fixed this on 32-bit machines (actually tested). Forced to ↵Tom Rondeau
promote to a 64-bit int to handle the overflow, so this is going to take a hit on 32-bit machines.
2011-10-24core: fixed float_to_int for 32-bit machines.Tom Rondeau
2011-10-23core: Added type conversion int->float (issue #192). Added with a gri file ↵Tom Rondeau
and also added a gri file for float->int to perform function inside gr_float_to_int. Also added QA code for the new block.
2011-10-20build: fixed missing file in Makefile.am.Tom Rondeau
2011-10-19Somehow, these headers got duplicated. Removed from core, are in gr-digital.Tom Rondeau
2011-10-19tags: made tags object orientedJosh Blum
2011-10-19core: added transcendental to cmake buildJosh Blum
2011-10-19Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh 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-14fixed a couple of typos.Tom Rondeau
2011-10-12digital: moved over all c++ blocks to gr-digital. Benchmark tx/rx still working.Tom Rondeau
2011-10-08gr: the CMakeLists.txt took a chill pillJosh Blum
2011-10-08gr: minor tweaks for MSVC compatibilityJosh 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-26Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-09-24Merge branch 'master' into nextTom Rondeau
2011-09-24Merge branch 'keep1n'Tom Rondeau
2011-09-24Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum
2011-09-24Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-09-23fixing PLL's using new control_loop class so their output update is done at ↵Tom Rondeau
the right time; were lagging by a sample before.
2011-09-23Merge branch 'master' into nextTom Rondeau
2011-09-23Merge branch 'maint'Tom Rondeau
2011-09-23fixing PLL's so their output update is done at the right time; were lagging ↵Tom Rondeau
by a sample before.
2011-09-22Fixing keep_one_in_n to allow for large values of n. Performs tag ↵Tom Rondeau
propagation locally.
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-21core: Doxygen comments for added tag name parameter.Tom Rondeau
2011-09-12cmake: updates to build after latest next mergeJosh Blum
2011-09-12Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-09-09Merge branch 'master' into nextTom Rondeau
Fixed some strange conflicts where a Makefile.am and .gitignore were disappeared.
2011-09-09Merge branch 'correlate_tag'Tom Rondeau
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-03Add gr_correlate_access_code_tag_bb, issues tags instead of annotating samplesNick Foster
correlate_access_code_tag_bb: modified to account for correlator lag.
2011-08-30Merge remote branch 'mbant/cpm' into digitalTom Rondeau
Conflicts: gnuradio-core/src/lib/general/Makefile.am gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/hier/Makefile.am grc/blocks/Makefile.am
2011-08-29Updating all three PLL blocks to use new control_loop parent class.Tom Rondeau
2011-08-17small tweaks for windows buildingJosh Blum