summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib/general
AgeCommit message (Collapse)Author
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
2011-08-17Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum
Conflicts: gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h gnuradio-core/src/lib/general/gr_pll_refout_cc.h gr-digital/lib/digital_constellation_receiver_cb.cc gr-digital/lib/digital_constellation_receiver_cb.h gr-digital/lib/digital_costas_loop_cc.h
2011-08-14Convering the PLL refout block to use the gri_control_loop class to take ↵Tom Rondeau
care of the internal loop. The error and what to do with the phase and freq are left to this block. It also changes the interface so that the PLL's gains are determined by the loop bandwidth.
2011-08-14Adding a control_loop class that takes care of setting the loop gains and ↵Tom Rondeau
the standard loop advance function. This should be used as a parent class of any block that uses a 2nd order control loop (like the PLL, clock recovery, etc blocks).
2011-07-30digital: moved fll_band_edge out of gnruadio-core.Tom Rondeau
2011-07-30core: made significant improvements in FLL algorithm. Now converges very nicely.Tom Rondeau
2011-07-28Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum
Conflicts: gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h gnuradio-core/src/lib/general/gr_costas_loop_cc.h gnuradio-core/src/lib/general/gr_lms_dfe_cc.h gnuradio-core/src/lib/general/gr_lms_dfe_ff.h gr-digital/lib/Makefile.am gr-digital/lib/digital_binary_slicer_fb.h gr-digital/lib/digital_clock_recovery_mm_cc.h gr-digital/lib/digital_clock_recovery_mm_ff.h gr-digital/lib/digital_correlate_access_code_bb.h gr-digital/lib/digital_crc32.h gr-digital/lib/digital_mpsk_receiver_cc.h 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-07-26Merge branch 'master' into nextJohnathan Corgan
2011-07-26Merge branch 'maint'Johnathan Corgan
2011-07-26core: added missing io.h includes on cc filesJosh Blum
Added to the cc files which were missing io.h and required compatibility declarations in io.h to compile. Applies to compiling under MSVC with cmake work branch.
2011-07-26core: added missing config.h includes on cc filesJosh Blum
Added to the cc files which were missing config.h and required compatibility functions defined in config.h. Applies to compiling under MSVC with cmake work branch.
2011-07-24digital: moving mpsk_receiver from gnuradio-core to gr-digital. Added QA ↵Tom Rondeau
code for it.
2011-07-24digital: moved CRC32 from gnuradio-core to gr-digital. Also added QA code ↵Tom Rondeau
for it.
2011-07-21digital: moving correlate_access_code to gr-digital.Tom Rondeau
2011-07-20gr: squashed cmakelists.txt into one commitJosh Blum