Age | Commit message (Collapse) | Author |
|
Conflicts:
grc/blocks/Makefile.am
|
|
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.
|
|
Nick Foster owes Nick Corgan a six-pack of beer!
|
|
|
|
|
|
|
|
Conflicts:
gnuradio-core/src/lib/general/general.i
|
|
branch).
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
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
|
|
|
|
|
|
|
|
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
|
|
Conflicts:
gr-trellis/src/lib/trellis_permutation.h
|
|
* master:
Minor fixes in turbo GRC blocks
Minor fixes in turbo GRC blocks and one more example added.
Added pccc combined turbo decoder and corresponding GRC block
More examples and turbo decoder blocks added.
Added more turbo encoder/decoder blocks and examples.
Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc blocks related to trellis inside the gr-trellis/grc directory
added grc directory in gr-trellis
updated Makefile.am and block_tree.xml to reflect changes in grc file for gr-trellis
Moved grc files from grc/block to gr-trellis/grc
|
|
|
|
refactored for new API.
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
gr-msdd6000/src/Makefile.swig.gen
|
|
Date: Tue, 17 May 2011 21:52:02 +0200
Message-ID: <BANLkTikyEo58UT4QYHRRsrQbzSXcxo2T5A@mail.gmail.com>
From: Alexandru Csete <oz9aec@gmail.com>
To: patch-gnuradio@gnu.org
Subject: [Patch-gnuradio] set/get gain for quadrature_demod
Greetings,
The attached patch adds set/get gain accessors to the
quadrature_demod_cf block, inspired by the similar changes to the
frequency_modulator block few days ago.
Alex
|
|
grc file for gr-trellis
|
|
|
|
|
|
|
|
recovery alg, mostly so you can pass on 2+ samples per symbol to a follow-on equalizer.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
grc/grc_gnuradio/Makefile.am
|
|
* jblum/wip/gr-audio:
audio: high prio for platform specific audio osx
audio: added windows and osx audio source files
audio: added config checks for other audios, added jack and port
audio: make prefs look like old audio, removed old audio.py
audio: register arches with priorities, ex: prefer alsa over oss
audio: added oss support to gr-audio
audio: use conf files to specify default arch
audio: moved the grc audio blocks into gr-audio dir
audio: moved alsa support files into subdirectory
audio: work on swig support, it imports
audio: work to get alsa support in, lets see if this works before adding more
audio: added audio factory registry and top level includes
audio: skeleton for gr-audio component
|
|
Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files.
When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change.
Minor change: the freedesktop files are always installed now.
This does not mean that they are installed properly with xdg,
it just means that the runtime can have access to the icons.
|