Age | Commit message (Collapse) | Author |
|
|
|
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:
gr-qtgui/lib/Makefile.am
|
|
|
|
|
|
|
|
|
|
and color not working yet).
|
|
|
|
|
|
backwards compatability to 5.2). This wip works for just the fft plots.
|
|
|
|
Conflicts:
gr-digital/include/digital_constellation.h
|
|
|
|
|
|
the default behavior for the qtgui_sink_f to turn the constellation plot off by default (doesn't make sense with out the Q part, too).
|
|
|
|
|
|
|
|
Conflicts:
gr-qtgui/apps/usrp_display.py
|
|
|
|
|
|
|
|
python modules are not available.
|
|
|
|
|
|
|
|
* master:
Fixed warnings generated from improper includes in swig interface file.
Fixed doxygen warning in gr-uhd
|
|
|
|
|
|
|
|
Conflicts:
gr-msdd6000/src/Makefile.swig.gen
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
in GRC.
|
|
set_output_multiple instead of forecast. The result is that multiple streams maintain constant relationship, which they did not before. This should also prevent us from having to keep so much book-keeping of the indecies, and we will hopefully be able to clean this up soon.
|
|
|
|
|