summaryrefslogtreecommitdiff
path: root/grc/blocks
Commit message (Collapse)AuthorAgeFilesLines
* grc: fixing grc blocks not properly moved in to digital.Tom Rondeau2011-10-268-510/+0
|
* grc: added throttle tag to blocks that throttleJosh Blum2011-10-191-0/+1
|
* Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-193-1/+43
|\
| * Merge branch 'master' into nextTom Rondeau2011-10-183-1/+43
| |\ | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/general.i
| | * added transcendental block from jblum/transcendental (reworked for master ↵Tom Rondeau2011-10-183-1/+43
| | | | | | | | | | | | branch).
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-175-263/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | digital: adding OFDM GRC blocks to gr-digital.Tom Rondeau2011-10-174-262/+0
| | |
| * | Merge branch 'next' into dig_ofdmTom Rondeau2011-10-172-4/+4
| |\ \
| * | | fixed a couple of typos.Tom Rondeau2011-10-141-1/+1
| | | |
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-10-142-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'mergme/grc_work' into nextTom Rondeau2011-10-142-4/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * grc: rename complex/float ports so its obviousJosh Blum2011-10-122-4/+4
| | |
| * | Merge branch 'next' into digitalTom Rondeau2011-09-2610-633/+81
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | gr: the CMakeLists.txt took a chill pillJosh Blum2011-10-081-2/+2
| | | |
* | | | Merge branch 'next' into digitalJosh Blum2011-09-2810-633/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum2011-09-0510-633/+81
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: gr-trellis/src/lib/trellis_permutation.h
| | * | | Merge branch 'master' into nextTom Rondeau2011-09-029-633/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | Merge branch 'turbo'Tom Rondeau2011-09-029-633/+0
| | | |\ \
| | | | * | updated Makefile.am and block_tree.xml to reflect changes inAchilleas Anastasopoulos2011-06-129-633/+0
| | | | | | | | | | | | | | | | | | | | | | | | grc file for gr-trellis
| | * | | | Merge branch 'master' into nextTom Rondeau2011-08-301-1/+1
| | |\| | |
| | | * | | Merge branch 'maint'Tom Rondeau2011-08-301-1/+1
| | | |\ \ \
| | | | * | | GRC: fixed error in XML format; need to declare XML type first.Tom Rondeau2011-08-301-1/+1
| | | | | | |
| | | * | | | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2011-08-271-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'master' into nextTom Rondeau2011-08-273-0/+81
| | |\| | | |
| | | * | | | grc: adding ctcss squelch block to GRC.Tom Rondeau2011-08-273-0/+81
| | | | |/ / | | | |/| |
* | | | | | Merge branch 'digital' of git://github.com/trondeau/gnuradio into digitalJosh Blum2011-09-1512-728/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | grc: removing more blocks from general grc tree that are now in digital.Tom Rondeau2011-09-131-12/+0
| | | | | |
| * | | | | digital: fixed GRC blocks for blocks moved to gr-digital.Tom Rondeau2011-09-1211-716/+0
| | | | | |
* | | | | | Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum2011-09-059-186/+123
|\| | | | | | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | grc: moved GRC blocks that were put into gr-digital into gr-digital/grc and ↵Tom Rondeau2011-09-014-162/+0
| | | | | | | | | | | | | | | | | | | | refactored for new API.
| * | | | Fixing GRC files for new API to loop blocks.Tom Rondeau2011-09-013-24/+12
| | | | |
| * | | | Merge remote branch 'mbant/cpm' into digitalTom Rondeau2011-08-304-0/+111
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | fixed some XML glitchesMartin Braun2010-12-102-5/+5
| | | | |
| | * | | Forgot to add GRC blocks to block_tree, fixedMartin Braun2010-12-101-0/+2
| | | | |
| | * | | Added GRC blocks to MakefileMartin Braun2010-12-102-8/+10
| | | | |
| | * | | All CPM stuff included (C++/GRC/Python), tests passMartin Braun2010-12-092-0/+107
| | | | |
* | | | | gr: squashed cmakelists.txt into one commitJosh Blum2011-07-201-0/+22
|/ / / /
* | | | Merge branch '8psk' into nextTom Rondeau2011-07-171-1/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Conflicts: gr-msdd6000/src/Makefile.swig.gen
| * | | Merge branch 'master' into 8pskTom Rondeau2011-06-033-0/+53
| |\ \ \ | | | |/ | | |/|
| * | | filter: Adding a concept of output samples per symbol to the PFB clock ↵Tom Rondeau2011-05-181-1/+6
| | | | | | | | | | | | | | | | recovery alg, mostly so you can pass on 2+ samples per symbol to a follow-on equalizer.
* | | | gnuradio-core: add accessors for gain property of quadrature_demod_cfAlexandru Csete2011-07-011-0/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: fixing DC blocker block to handle i/o type.Tom Rondeau2011-06-021-14/+16
| | |
* | | grc: adding DC blocker GRC block.Tom Rondeau2011-05-253-0/+51
|/ /
* | core: adding get/set sensitivity accessors to frequency_modulator_fc block.Tom Rondeau2011-05-121-0/+1
| |
* | grc: fixing grc block for dxpsk2 demods to use the right parameters.Tom Rondeau2011-04-121-4/+11
| |
* | Adding GRC block for the PFB channelizer filterbank.Tom Rondeau2011-04-123-0/+55
| |
* | Adding GRC block for the PFB synthesis filterbank.Tom Rondeau2011-04-123-0/+45
| |
* | grc: added int to float supportJosh Blum2011-04-093-0/+23
| |
* | Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grcJosh Blum2011-03-1423-1902/+128
|\ \ | | | | | | | | | | | | Conflicts: grc/grc_gnuradio/Makefile.am
| * | qtgui-grc: minor tweaks to the various thingsJosh Blum2011-03-071-2/+5
| | |