Age | Commit message (Collapse) | Author |
|
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/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
|
|
* 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
|
|
|
|
gr-digital. Reworked build system to include this in the libraries and modules built.
|
|
built into full library yet. Passes distcheck.
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
config/Makefile.am
configure.ac
|
|
|
|
|
|
|
|
|
|
Conflicts:
gr-msdd6000/src/Makefile.swig.gen
|
|
|
|
|
|
|
|
This begins a transition of examples from a separate gnuradio-examples component
into an examples directory with the component they go with. In this commit:
gnuradio-examples/c++/audio/ => gr-audio/examples/c++
gnuradio-examples/python/audio => gr-audio/examples/python
The system installation directory remains $PREFIX/share/gnuradio/examples/audio
|
|
|
|
One step (of many) to convert GNU Radio to use new Ettus Research UHD driver.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
gr-qtgui/lib/qtgui_time_sink_c.cc
gr-trellis/src/lib/Makefile.am
gr-trellis/src/lib/calc_metric.h
gr-trellis/src/lib/trellis.i
gr-trellis/src/lib/trellis_constellation_metrics_cf.i
gr-trellis/src/lib/trellis_metric_type.h
gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
|
|
|
|
|
|
|
|
this should make that better understood.
|
|
|
|
|
|
not run if --disable-volk is used.
|
|
Rather than simply exec-ing the application w/ "python",
use the same interpreter that executed grc w/ full path.
Added code to handle the following exceptions:
- for a wx app on mac osx, use the pythonw interpreter
(this was in the m4 file, but its easier as a runtime check)
- for a no gui app on linux, prepend xterm cuz its nice
(we were already doing that but its now restricted to linux)
|
|
|
|
been a requirement for a while (FormLayout introduced in 4.4) but nevery required by configure.
|
|
|
|
work with Guile yet. Changed Python QA to complete properly.
|
|
|
|
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
|
|
|