add discarded carriers
RCS block finished
Merge remote-tracking branch 'stfo/master'

Conflicts:
	docs/html/annotated.html
	docs/html/api_8h.html
	docs/html/api_8h_source.html
	docs/html/classes.html
	docs/html/classgr_1_1radar_1_1crop__matrix__vcvc-members.html
	docs/html/classgr_1_1radar_1_1crop__matrix__vcvc.html
	docs/html/classgr_1_1radar_1_1crop__matrix__vcvc__impl-members.html
	docs/html/classgr_1_1radar_1_1crop__matrix__vcvc__impl.html
	docs/html/classgr_1_1radar_1_1estimator__cw-members.html
	docs/html/classgr_1_1radar_1_1estimator__cw.html
	docs/html/classgr_1_1radar_1_1estimator__cw__impl-members.html
	docs/html/classgr_1_1radar_1_1estimator__cw__impl.html
	docs/html/classgr_1_1radar_1_1estimator__fmcw-members.html
	docs/html/classgr_1_1radar_1_1estimator__fmcw.html
	docs/html/classgr_1_1radar_1_1estimator__fmcw__impl-members.html
	docs/html/classgr_1_1radar_1_1estimator__fmcw__impl.html
	docs/html/classgr_1_1radar_1_1estimator__fsk-members.html
	docs/html/classgr_1_1radar_1_1estimator__fsk.html
	docs/html/classgr_1_1radar_1_1estimator__fsk__impl-members.html
	docs/html/classgr_1_1radar_1_1estimator__fsk__impl.html
	docs/html/classgr_1_1radar_1_1estimator__ofdm-members.html
	docs/html/classgr_1_1radar_1_1estimator__ofdm.html
	docs/html/classgr_1_1radar_1_1estimator__ofdm__impl-members.html
	docs/html/classgr_1_1radar_1_1estimator__ofdm__impl.html
	docs/html/classgr_1_1radar_1_1estimator__sync__pulse__c-members.html
	docs/html/classgr_1_1radar_1_1estimator__sync__pulse__c.html
	docs/html/classgr_1_1radar_1_1estimator__sync__pulse__c__impl-members.html
	docs/html/classgr_1_1radar_1_1estimator__sync__pulse__c__impl.html
	docs/html/classgr_1_1radar_1_1find__max__peak__c-members.html
	docs/html/classgr_1_1radar_1_1find__max__peak__c.html
	docs/html/classgr_1_1radar_1_1find__max__peak__c__impl-members.html
	docs/html/classgr_1_1radar_1_1find__max__peak__c__impl.html
	docs/html/classgr_1_1radar_1_1msg__gate-members.html
	docs/html/classgr_1_1radar_1_1msg__gate.html
	docs/html/classgr_1_1radar_1_1msg__gate__impl-members.html
	docs/html/classgr_1_1radar_1_1msg__gate__impl.html
	docs/html/classgr_1_1radar_1_1msg__manipulator-members.html
	docs/html/classgr_1_1radar_1_1msg__manipulator.html
	docs/html/classgr_1_1radar_1_1msg__manipulator__impl-members.html
	docs/html/classgr_1_1radar_1_1msg__manipulator__impl.html
	docs/html/classgr_1_1radar_1_1ofdm__cyclic__prefix__remover__cvc-members.html
	docs/html/classgr_1_1radar_1_1ofdm__cyclic__prefix__remover__cvc.html
	docs/html/classgr_1_1radar_1_1ofdm__cyclic__prefix__remover__cvc__impl-members.html
	docs/html/classgr_1_1radar_1_1ofdm__cyclic__prefix__remover__cvc__impl.html
	docs/html/classgr_1_1radar_1_1ofdm__divide__vcvc-members.html
	docs/html/classgr_1_1radar_1_1ofdm__divide__vcvc.html
	docs/html/classgr_1_1radar_1_1ofdm__divide__vcvc__impl-members.html
	docs/html/classgr_1_1radar_1_1ofdm__divide__vcvc__impl.html
	docs/html/classgr_1_1radar_1_1os__cfar__2d__vc-members.html
	docs/html/classgr_1_1radar_1_1os__cfar__2d__vc.html
	docs/html/classgr_1_1radar_1_1os__cfar__2d__vc__impl-members.html
	docs/html/classgr_1_1radar_1_1os__cfar__2d__vc__impl.html
	docs/html/classgr_1_1radar_1_1os__cfar__c-members.html
	docs/html/classgr_1_1radar_1_1os__cfar__c.html
	docs/html/classgr_1_1radar_1_1os__cfar__c__impl-members.html
	docs/html/classgr_1_1radar_1_1os__cfar__c__impl.html
	docs/html/classgr_1_1radar_1_1print__results-members.html
	docs/html/classgr_1_1radar_1_1print__results.html
	docs/html/classgr_1_1radar_1_1print__results__impl-members.html
	docs/html/classgr_1_1radar_1_1print__results__impl.html
	docs/html/classgr_1_1radar_1_1qtgui__scatter__plot-members.html
	docs/html/classgr_1_1radar_1_1qtgui__scatter__plot.html
	docs/html/classgr_1_1radar_1_1qtgui__scatter__plot__impl-members.html
	docs/html/classgr_1_1radar_1_1qtgui__scatter__plot__impl.html
	docs/html/classgr_1_1radar_1_1qtgui__spectrogram__plot-members.html
	docs/html/classgr_1_1radar_1_1qtgui__spectrogram__plot.html
	docs/html/classgr_1_1radar_1_1qtgui__spectrogram__plot__impl-members.html
	docs/html/classgr_1_1radar_1_1qtgui__spectrogram__plot__impl.html
	docs/html/classgr_1_1radar_1_1qtgui__time__plot-members.html
	docs/html/classgr_1_1radar_1_1qtgui__time__plot.html
	docs/html/classgr_1_1radar_1_1qtgui__time__plot__impl-members.html
	docs/html/classgr_1_1radar_1_1qtgui__time__plot__impl.html
	docs/html/classgr_1_1radar_1_1scatter__plot-members.html
	docs/html/classgr_1_1radar_1_1scatter__plot.html
	docs/html/classgr_1_1radar_1_1signal__generator__cw__c-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__cw__c.html
	docs/html/classgr_1_1radar_1_1signal__generator__cw__c__impl-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__cw__c__impl.html
	docs/html/classgr_1_1radar_1_1signal__generator__fmcw__c-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__fmcw__c.html
	docs/html/classgr_1_1radar_1_1signal__generator__fmcw__c__impl-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__fmcw__c__impl.html
	docs/html/classgr_1_1radar_1_1signal__generator__fsk__c-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__fsk__c.html
	docs/html/classgr_1_1radar_1_1signal__generator__fsk__c__impl-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__fsk__c__impl.html
	docs/html/classgr_1_1radar_1_1signal__generator__sync__pulse__c-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__sync__pulse__c.html
	docs/html/classgr_1_1radar_1_1signal__generator__sync__pulse__c__impl-members.html
	docs/html/classgr_1_1radar_1_1signal__generator__sync__pulse__c__impl.html
	docs/html/classgr_1_1radar_1_1spectrogram__plot-members.html
	docs/html/classgr_1_1radar_1_1spectrogram__plot.html
	docs/html/classgr_1_1radar_1_1split__cc-members.html
	docs/html/classgr_1_1radar_1_1split__cc.html
	docs/html/classgr_1_1radar_1_1split__cc__impl-members.html
	docs/html/classgr_1_1radar_1_1split__cc__impl.html
	docs/html/classgr_1_1radar_1_1split__fsk__cc-members.html
	docs/html/classgr_1_1radar_1_1split__fsk__cc.html
	docs/html/classgr_1_1radar_1_1split__fsk__cc__impl-members.html
	docs/html/classgr_1_1radar_1_1split__fsk__cc__impl.html
	docs/html/classgr_1_1radar_1_1static__target__simulator__cc-members.html
	docs/html/classgr_1_1radar_1_1static__target__simulator__cc.html
	docs/html/classgr_1_1radar_1_1static__target__simulator__cc__impl-members.html
	docs/html/classgr_1_1radar_1_1static__target__simulator__cc__impl.html
	docs/html/classgr_1_1radar_1_1time__plot-members.html
	docs/html/classgr_1_1radar_1_1time__plot.html
	docs/html/classgr_1_1radar_1_1tracking__singletarget-members.html
	docs/html/classgr_1_1radar_1_1tracking__singletarget.html
	docs/html/classgr_1_1radar_1_1tracking__singletarget__impl-members.html
	docs/html/classgr_1_1radar_1_1tracking__singletarget__impl.html
	docs/html/classgr_1_1radar_1_1transpose__matrix__vcvc-members.html
	docs/html/classgr_1_1radar_1_1transpose__matrix__vcvc.html
	docs/html/classgr_1_1radar_1_1transpose__matrix__vcvc__impl-members.html
	docs/html/classgr_1_1radar_1_1transpose__matrix__vcvc__impl.html
	docs/html/classgr_1_1radar_1_1ts__fft__cc-members.html
	docs/html/classgr_1_1radar_1_1ts__fft__cc.html
	docs/html/classgr_1_1radar_1_1ts__fft__cc__impl-members.html
	docs/html/classgr_1_1radar_1_1ts__fft__cc__impl.html
	docs/html/classgr_1_1radar_1_1usrp__echotimer__cc-members.html
	docs/html/classgr_1_1radar_1_1usrp__echotimer__cc.html
	docs/html/classgr_1_1radar_1_1usrp__echotimer__cc__impl-members.html
	docs/html/classgr_1_1radar_1_1usrp__echotimer__cc__impl.html
	docs/html/crop__matrix__vcvc_8h.html
	docs/html/crop__matrix__vcvc_8h_source.html
	docs/html/crop__matrix__vcvc__impl_8h.html
	docs/html/crop__matrix__vcvc__impl_8h_source.html
	docs/html/dir_53f46d18077ce6af91c5b562062dcdc8.html
	docs/html/dir_97aefd0d527b934f1d99a682da8fe6a9.html
	docs/html/dir_d44c64559bbebec7f509842c48db8b23.html
	docs/html/estimator__cw_8h.html
	docs/html/estimator__cw_8h_source.html
	docs/html/estimator__cw__impl_8h.html
	docs/html/estimator__cw__impl_8h_source.html
	docs/html/estimator__fmcw_8h.html
	docs/html/estimator__fmcw_8h_source.html
	docs/html/estimator__fmcw__impl_8h.html
	docs/html/estimator__fmcw__impl_8h_source.html
	docs/html/estimator__fsk_8h.html
	docs/html/estimator__fsk_8h_source.html
	docs/html/estimator__fsk__impl_8h.html
	docs/html/estimator__fsk__impl_8h_source.html
	docs/html/estimator__ofdm_8h.html
	docs/html/estimator__ofdm_8h_source.html
	docs/html/estimator__ofdm__impl_8h.html
	docs/html/estimator__ofdm__impl_8h_source.html
	docs/html/estimator__sync__pulse__c_8h.html
	docs/html/estimator__sync__pulse__c_8h_source.html
	docs/html/estimator__sync__pulse__c__impl_8h.html
	docs/html/estimator__sync__pulse__c__impl_8h_source.html
	docs/html/files.html
	docs/html/find__max__peak__c_8h.html
	docs/html/find__max__peak__c_8h_source.html
	docs/html/find__max__peak__c__impl_8h.html
	docs/html/find__max__peak__c__impl_8h_source.html
	docs/html/functions.html
	docs/html/functions_d.html
	docs/html/functions_e.html
	docs/html/functions_f.html
	docs/html/functions_func.html
	docs/html/functions_h.html
	docs/html/functions_k.html
	docs/html/functions_m.html
	docs/html/functions_o.html
	docs/html/functions_p.html
	docs/html/functions_q.html
	docs/html/functions_r.html
	docs/html/functions_s.html
	docs/html/functions_t.html
	docs/html/functions_type.html
	docs/html/functions_u.html
	docs/html/functions_vars.html
	docs/html/functions_vars_d.html
	docs/html/functions_vars_k.html
	docs/html/functions_vars_p.html
	docs/html/functions_vars_q.html
	docs/html/functions_vars_r.html
	docs/html/functions_w.html
	docs/html/functions_~.html
	docs/html/globals.html
	docs/html/globals_defs.html
	docs/html/hierarchy.html
	docs/html/index.html
	docs/html/main__page_8dox.html
	docs/html/msg__gate_8h.html
	docs/html/msg__gate_8h_source.html
	docs/html/msg__gate__impl_8h.html
	docs/html/msg__gate__impl_8h_source.html
	docs/html/msg__manipulator_8h.html
	docs/html/msg__manipulator_8h_source.html
	docs/html/msg__manipulator__impl_8h.html
	docs/html/msg__manipulator__impl_8h_source.html
	docs/html/namespacegr.html
	docs/html/namespacegr_1_1radar.html
	docs/html/navtree.js
	docs/html/navtreeindex0.js
	docs/html/navtreeindex1.js
	docs/html/navtreeindex2.js
	docs/html/navtreeindex3.js
	docs/html/ofdm__cyclic__prefix__remover__cvc_8h.html
	docs/html/ofdm__cyclic__prefix__remover__cvc_8h_source.html
	docs/html/ofdm__cyclic__prefix__remover__cvc__impl_8h.html
	docs/html/ofdm__cyclic__prefix__remover__cvc__impl_8h_source.html
	docs/html/ofdm__divide__vcvc_8h.html
	docs/html/ofdm__divide__vcvc_8h_source.html
	docs/html/ofdm__divide__vcvc__impl_8h.html
	docs/html/ofdm__divide__vcvc__impl_8h_source.html
	docs/html/os__cfar__2d__vc_8h.html
	docs/html/os__cfar__2d__vc_8h_source.html
	docs/html/os__cfar__2d__vc__impl_8h.html
	docs/html/os__cfar__2d__vc__impl_8h_source.html
	docs/html/os__cfar__c_8h.html
	docs/html/os__cfar__c_8h_source.html
	docs/html/os__cfar__c__impl_8h.html
	docs/html/os__cfar__c__impl_8h_source.html
	docs/html/print__results_8h.html
	docs/html/print__results_8h_source.html
	docs/html/print__results__impl_8h.html
	docs/html/print__results__impl_8h_source.html
	docs/html/qtgui__scatter__plot_8h.html
	docs/html/qtgui__scatter__plot_8h_source.html
	docs/html/qtgui__scatter__plot__impl_8h.html
	docs/html/qtgui__scatter__plot__impl_8h_source.html
	docs/html/qtgui__spectrogram__plot_8h.html
	docs/html/qtgui__spectrogram__plot_8h_source.html
	docs/html/qtgui__spectrogram__plot__impl_8h.html
	docs/html/qtgui__spectrogram__plot__impl_8h_source.html
	docs/html/qtgui__time__plot_8h.html
	docs/html/qtgui__time__plot_8h_source.html
	docs/html/qtgui__time__plot__impl_8h.html
	docs/html/qtgui__time__plot__impl_8h_source.html
	docs/html/scatter__plot_8h.html
	docs/html/scatter__plot_8h_source.html
	docs/html/search/all_8.js
	docs/html/search/functions_4.js
	docs/html/signal__generator__cw__c_8h.html
	docs/html/signal__generator__cw__c_8h_source.html
	docs/html/signal__generator__cw__c__impl_8h.html
	docs/html/signal__generator__cw__c__impl_8h_source.html
	docs/html/signal__generator__fmcw__c_8h.html
	docs/html/signal__generator__fmcw__c_8h_source.html
	docs/html/signal__generator__fmcw__c__impl_8h.html
	docs/html/signal__generator__fmcw__c__impl_8h_source.html
	docs/html/signal__generator__fsk__c_8h.html
	docs/html/signal__generator__fsk__c_8h_source.html
	docs/html/signal__generator__fsk__c__impl_8h.html
	docs/html/signal__generator__fsk__c__impl_8h_source.html
	docs/html/signal__generator__sync__pulse__c_8h.html
	docs/html/signal__generator__sync__pulse__c_8h_source.html
	docs/html/signal__generator__sync__pulse__c__impl_8h.html
	docs/html/signal__generator__sync__pulse__c__impl_8h_source.html
	docs/html/spectrogram__plot_8h.html
	docs/html/spectrogram__plot_8h_source.html
	docs/html/split__cc_8h.html
	docs/html/split__cc_8h_source.html
	docs/html/split__cc__impl_8h.html
	docs/html/split__cc__impl_8h_source.html
	docs/html/split__fsk__cc_8h.html
	docs/html/split__fsk__cc_8h_source.html
	docs/html/split__fsk__cc__impl_8h.html
	docs/html/split__fsk__cc__impl_8h_source.html
	docs/html/static__target__simulator__cc_8h.html
	docs/html/static__target__simulator__cc_8h_source.html
	docs/html/static__target__simulator__cc__impl_8h.html
	docs/html/static__target__simulator__cc__impl_8h_source.html
	docs/html/time__plot_8h.html
	docs/html/time__plot_8h_source.html
	docs/html/tracking__singletarget_8h.html
	docs/html/tracking__singletarget_8h_source.html
	docs/html/tracking__singletarget__impl_8h.html
	docs/html/tracking__singletarget__impl_8h_source.html
	docs/html/transpose__matrix__vcvc_8h.html
	docs/html/transpose__matrix__vcvc_8h_source.html
	docs/html/transpose__matrix__vcvc__impl_8h.html
	docs/html/transpose__matrix__vcvc__impl_8h_source.html
	docs/html/ts__fft__cc_8h.html
	docs/html/ts__fft__cc_8h_source.html
	docs/html/ts__fft__cc__impl_8h.html
	docs/html/ts__fft__cc__impl_8h_source.html
	docs/html/usrp__echotimer__cc_8h.html
	docs/html/usrp__echotimer__cc_8h_source.html
	docs/html/usrp__echotimer__cc__impl_8h.html
	docs/html/usrp__echotimer__cc__impl_8h_source.html
	examples/simulators/top_block.py
Merge