mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-09-28 23:10:51 +00:00
Changing nouns of variables of freq_xlating_fir_filter. Improving configuration files.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@216 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
parent
6f7b4f5aea
commit
721004b838
@ -13,17 +13,17 @@ GNSS-SDR.internal_fs_hz=4000000
|
|||||||
ControlThread.wait_for_flowgraph=false
|
ControlThread.wait_for_flowgraph=false
|
||||||
|
|
||||||
;######### SIGNAL_SOURCE CONFIG ############
|
;######### SIGNAL_SOURCE CONFIG ############
|
||||||
;#implementation: Use File_Signal_Source or UHD_Signal_Source or GN3S_Signal_Source (experimental)
|
;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental)
|
||||||
SignalSource.implementation=File_Signal_Source
|
SignalSource.implementation=File_Signal_Source
|
||||||
|
|
||||||
;#filename: path to file with the captured GNSS signal samples to be processed
|
;#filename: path to file with the captured GNSS signal samples to be processed
|
||||||
SignalSource.filename=../data/my_capture.dat
|
;SignalSource.filename=../data/my_capture.dat
|
||||||
|
|
||||||
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
||||||
SignalSource.item_type=gr_complex
|
SignalSource.item_type=gr_complex
|
||||||
|
|
||||||
;#sampling_frequency: Original Signal sampling frequency in [Hz]
|
;#sampling_frequency: Original Signal sampling frequency in [Hz]
|
||||||
SignalSource.sampling_frequency=8000000
|
SignalSource.sampling_frequency=4000000
|
||||||
|
|
||||||
;#freq: RF front-end center frequency in [Hz]
|
;#freq: RF front-end center frequency in [Hz]
|
||||||
SignalSource.freq=1575420000
|
SignalSource.freq=1575420000
|
||||||
@ -53,22 +53,25 @@ SignalSource.enable_throttle_control=false
|
|||||||
|
|
||||||
;######### SIGNAL_CONDITIONER CONFIG ############
|
;######### SIGNAL_CONDITIONER CONFIG ############
|
||||||
;## It holds blocks to change data type, filter and resample input data.
|
;## It holds blocks to change data type, filter and resample input data.
|
||||||
;#implementation: Pass_Through disables this block and the Data_Type_adapter, Input_Filter and Resampler blocks
|
|
||||||
;#implementation: Signal_Conditioner enables this block. Then you have to configure Data_Type_adapter, Input_Filter and Resampler blocks
|
;#implementation: Use [Pass_Through] or [Signal_Conditioner]
|
||||||
SignalConditioner.implementation=Signal_Conditioner
|
;#[Pass_Through] disables this block and the [DataTypeAdapter], [InputFilter] and [Resampler] blocks
|
||||||
;SignalConditioner.implementation=Pass_Through
|
;#[Signal_Conditioner] enables this block. Then you have to configure [DataTypeAdapter], [InputFilter] and [Resampler] blocks
|
||||||
|
;SignalConditioner.implementation=Signal_Conditioner
|
||||||
|
SignalConditioner.implementation=Pass_Through
|
||||||
|
|
||||||
;######### DATA_TYPE_ADAPTER CONFIG ############
|
;######### DATA_TYPE_ADAPTER CONFIG ############
|
||||||
;## Changes the type of input data. Please disable it in this version.
|
;## Changes the type of input data. Please disable it in this version.
|
||||||
;#implementation: Pass_Through disables this block
|
;#implementation: [Pass_Through] disables this block
|
||||||
DataTypeAdapter.implementation=Pass_Through
|
DataTypeAdapter.implementation=Pass_Through
|
||||||
|
|
||||||
;######### INPUT_FILTER CONFIG ############
|
;######### INPUT_FILTER CONFIG ############
|
||||||
;## Filter the input data. Can be combined with frequency translation for IF signals
|
;## Filter the input data. Can be combined with frequency translation for IF signals
|
||||||
|
|
||||||
;#implementation: Pass_Through disables this block
|
;#implementation: Use [Pass_Through] or [Fir_Filter] or [Freq_Xlating_Fir_Filter]
|
||||||
;#implementation: Fir_Filter enables a FIR Filter
|
;#[Pass_Through] disables this block
|
||||||
;#implementation: Freq_Xlating_Fir_Filter enables FIR filter and a composite frequency translation that shifts center_frequency down to zero Hz.
|
;#[Fir_Filter] enables a FIR Filter
|
||||||
|
;#[Freq_Xlating_Fir_Filter] enables FIR filter and a composite frequency translation that shifts IF down to zero Hz.
|
||||||
|
|
||||||
;InputFilter.implementation=Fir_Filter
|
;InputFilter.implementation=Fir_Filter
|
||||||
;InputFilter.implementation=Freq_Xlating_Fir_Filter
|
;InputFilter.implementation=Freq_Xlating_Fir_Filter
|
||||||
@ -129,25 +132,26 @@ InputFilter.filter_type=bandpass
|
|||||||
InputFilter.grid_density=16
|
InputFilter.grid_density=16
|
||||||
|
|
||||||
;#The following options are used only in Freq_Xlating_Fir_Filter implementation.
|
;#The following options are used only in Freq_Xlating_Fir_Filter implementation.
|
||||||
;#InputFilter.center_frequency is the frequency (in Hz) shifted down to zero Hz
|
;#InputFilter.IF is the intermediate frequency (in Hz) shifted down to zero Hz
|
||||||
|
|
||||||
InputFilter.sampling_frequency=8000000
|
InputFilter.sampling_frequency=4000000
|
||||||
InputFilter.center_frequency=0
|
InputFilter.IF=0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;######### RESAMPLER CONFIG ############
|
;######### RESAMPLER CONFIG ############
|
||||||
;## Resamples the input data.
|
;## Resamples the input data.
|
||||||
|
|
||||||
;#implementation: Pass_Through disables this block
|
;#implementation: Use [Pass_Through] or [Direct_Resampler]
|
||||||
;#implementation: Direct_Resampler enables a resampler that implements a nearest neigbourhood interpolation
|
;#[Pass_Through] disables this block
|
||||||
Resampler.implementation=Direct_Resampler
|
;#[Direct_Resampler] enables a resampler that implements a nearest neigbourhood interpolation
|
||||||
;Resampler.implementation=Pass_Through
|
;Resampler.implementation=Direct_Resampler
|
||||||
|
Resampler.implementation=Pass_Through
|
||||||
|
|
||||||
;#dump: Dump the filtered data to a file.
|
;#dump: Dump the resamplered data to a file.
|
||||||
InputFilter.dump=false
|
Resampler.dump=false
|
||||||
;#dump_filename: Log path and filename.
|
;#dump_filename: Log path and filename.
|
||||||
InputFilter.dump=../data/resampler.dat
|
Resampler.dump_filename=../data/resampler.dat
|
||||||
|
|
||||||
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
||||||
Resampler.item_type=gr_complex
|
Resampler.item_type=gr_complex
|
||||||
@ -162,6 +166,7 @@ Resampler.sample_freq_out=4000000
|
|||||||
;######### CHANNELS GLOBAL CONFIG ############
|
;######### CHANNELS GLOBAL CONFIG ############
|
||||||
;#count: Number of available satellite channels.
|
;#count: Number of available satellite channels.
|
||||||
Channels.count=5
|
Channels.count=5
|
||||||
|
;#in_acquisition: Number of channels simultaneously acquiring
|
||||||
Channels.in_acquisition=1
|
Channels.in_acquisition=1
|
||||||
|
|
||||||
;######### CHANNEL 0 CONFIG ############
|
;######### CHANNEL 0 CONFIG ############
|
||||||
@ -354,7 +359,7 @@ Acquisition8.doppler_step=250
|
|||||||
|
|
||||||
;######### TRACKING GLOBAL CONFIG ############
|
;######### TRACKING GLOBAL CONFIG ############
|
||||||
|
|
||||||
;#implementatiion: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
|
;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
|
||||||
Tracking.implementation=GPS_L1_CA_DLL_FLL_PLL_Tracking
|
Tracking.implementation=GPS_L1_CA_DLL_FLL_PLL_Tracking
|
||||||
;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
|
;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
|
||||||
Tracking.item_type=gr_complex
|
Tracking.item_type=gr_complex
|
||||||
|
@ -13,17 +13,17 @@ GNSS-SDR.internal_fs_hz=4000000
|
|||||||
ControlThread.wait_for_flowgraph=false
|
ControlThread.wait_for_flowgraph=false
|
||||||
|
|
||||||
;######### SIGNAL_SOURCE CONFIG ############
|
;######### SIGNAL_SOURCE CONFIG ############
|
||||||
;#implementation: Use File_Signal_Source or UHD_Signal_Source or GN3S_Signal_Source (experimental)
|
;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental)
|
||||||
SignalSource.implementation=File_Signal_Source
|
SignalSource.implementation=File_Signal_Source
|
||||||
|
|
||||||
;#filename: path to file with the captured GNSS signal samples to be processed
|
;#filename: path to file with the captured GNSS signal samples to be processed
|
||||||
SignalSource.filename=../data/my_capture.dat
|
;SignalSource.filename=../data/my_capture.dat
|
||||||
|
|
||||||
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
||||||
SignalSource.item_type=gr_complex
|
SignalSource.item_type=gr_complex
|
||||||
|
|
||||||
;#sampling_frequency: Original Signal sampling frequency in [Hz]
|
;#sampling_frequency: Original Signal sampling frequency in [Hz]
|
||||||
SignalSource.sampling_frequency=8000000
|
SignalSource.sampling_frequency=4000000
|
||||||
|
|
||||||
;#freq: RF front-end center frequency in [Hz]
|
;#freq: RF front-end center frequency in [Hz]
|
||||||
SignalSource.freq=1575420000
|
SignalSource.freq=1575420000
|
||||||
@ -53,22 +53,25 @@ SignalSource.enable_throttle_control=false
|
|||||||
|
|
||||||
;######### SIGNAL_CONDITIONER CONFIG ############
|
;######### SIGNAL_CONDITIONER CONFIG ############
|
||||||
;## It holds blocks to change data type, filter and resample input data.
|
;## It holds blocks to change data type, filter and resample input data.
|
||||||
;#implementation: Pass_Through disables this block and the Data_Type_adapter, Input_Filter and Resampler blocks
|
|
||||||
;#implementation: Signal_Conditioner enables this block. Then you have to configure Data_Type_adapter, Input_Filter and Resampler blocks
|
;#implementation: Use [Pass_Through] or [Signal_Conditioner]
|
||||||
SignalConditioner.implementation=Signal_Conditioner
|
;#[Pass_Through] disables this block and the [DataTypeAdapter], [InputFilter] and [Resampler] blocks
|
||||||
;SignalConditioner.implementation=Pass_Through
|
;#[Signal_Conditioner] enables this block. Then you have to configure [DataTypeAdapter], [InputFilter] and [Resampler] blocks
|
||||||
|
;SignalConditioner.implementation=Signal_Conditioner
|
||||||
|
SignalConditioner.implementation=Pass_Through
|
||||||
|
|
||||||
;######### DATA_TYPE_ADAPTER CONFIG ############
|
;######### DATA_TYPE_ADAPTER CONFIG ############
|
||||||
;## Changes the type of input data. Please disable it in this version.
|
;## Changes the type of input data. Please disable it in this version.
|
||||||
;#implementation: Pass_Through disables this block
|
;#implementation: [Pass_Through] disables this block
|
||||||
DataTypeAdapter.implementation=Pass_Through
|
DataTypeAdapter.implementation=Pass_Through
|
||||||
|
|
||||||
;######### INPUT_FILTER CONFIG ############
|
;######### INPUT_FILTER CONFIG ############
|
||||||
;## Filter the input data. Can be combined with frequency translation for IF signals
|
;## Filter the input data. Can be combined with frequency translation for IF signals
|
||||||
|
|
||||||
;#implementation: Pass_Through disables this block
|
;#implementation: Use [Pass_Through] or [Fir_Filter] or [Freq_Xlating_Fir_Filter]
|
||||||
;#implementation: Fir_Filter enables a FIR Filter
|
;#[Pass_Through] disables this block
|
||||||
;#implementation: Freq_Xlating_Fir_Filter enables FIR filter and a composite frequency translation that shifts center_frequency down to zero Hz.
|
;#[Fir_Filter] enables a FIR Filter
|
||||||
|
;#[Freq_Xlating_Fir_Filter] enables FIR filter and a composite frequency translation that shifts IF down to zero Hz.
|
||||||
|
|
||||||
;InputFilter.implementation=Fir_Filter
|
;InputFilter.implementation=Fir_Filter
|
||||||
;InputFilter.implementation=Freq_Xlating_Fir_Filter
|
;InputFilter.implementation=Freq_Xlating_Fir_Filter
|
||||||
@ -129,25 +132,26 @@ InputFilter.filter_type=bandpass
|
|||||||
InputFilter.grid_density=16
|
InputFilter.grid_density=16
|
||||||
|
|
||||||
;#The following options are used only in Freq_Xlating_Fir_Filter implementation.
|
;#The following options are used only in Freq_Xlating_Fir_Filter implementation.
|
||||||
;#InputFilter.center_frequency is the frequency (in Hz) shifted down to zero Hz
|
;#InputFilter.IF is the intermediate frequency (in Hz) shifted down to zero Hz
|
||||||
|
|
||||||
InputFilter.sampling_frequency=8000000
|
InputFilter.sampling_frequency=4000000
|
||||||
InputFilter.center_frequency=0
|
InputFilter.IF=0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;######### RESAMPLER CONFIG ############
|
;######### RESAMPLER CONFIG ############
|
||||||
;## Resamples the input data.
|
;## Resamples the input data.
|
||||||
|
|
||||||
;#implementation: Pass_Through disables this block
|
;#implementation: Use [Pass_Through] or [Direct_Resampler]
|
||||||
;#implementation: Direct_Resampler enables a resampler that implements a nearest neigbourhood interpolation
|
;#[Pass_Through] disables this block
|
||||||
Resampler.implementation=Direct_Resampler
|
;#[Direct_Resampler] enables a resampler that implements a nearest neigbourhood interpolation
|
||||||
;Resampler.implementation=Pass_Through
|
;Resampler.implementation=Direct_Resampler
|
||||||
|
Resampler.implementation=Pass_Through
|
||||||
|
|
||||||
;#dump: Dump the filtered data to a file.
|
;#dump: Dump the resamplered data to a file.
|
||||||
InputFilter.dump=false
|
Resampler.dump=false
|
||||||
;#dump_filename: Log path and filename.
|
;#dump_filename: Log path and filename.
|
||||||
InputFilter.dump=../data/resampler.dat
|
Resampler.dump_filename=../data/resampler.dat
|
||||||
|
|
||||||
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
|
||||||
Resampler.item_type=gr_complex
|
Resampler.item_type=gr_complex
|
||||||
@ -162,6 +166,7 @@ Resampler.sample_freq_out=4000000
|
|||||||
;######### CHANNELS GLOBAL CONFIG ############
|
;######### CHANNELS GLOBAL CONFIG ############
|
||||||
;#count: Number of available satellite channels.
|
;#count: Number of available satellite channels.
|
||||||
Channels.count=5
|
Channels.count=5
|
||||||
|
;#in_acquisition: Number of channels simultaneously acquiring
|
||||||
Channels.in_acquisition=1
|
Channels.in_acquisition=1
|
||||||
|
|
||||||
;######### CHANNEL 0 CONFIG ############
|
;######### CHANNEL 0 CONFIG ############
|
||||||
@ -287,7 +292,7 @@ Acquisition.sampled_ms=1
|
|||||||
;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition]
|
;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition]
|
||||||
Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition
|
Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition
|
||||||
;#threshold: Acquisition threshold
|
;#threshold: Acquisition threshold
|
||||||
Acquisition0.threshold=60
|
Acquisition0.threshold=50
|
||||||
;#doppler_max: Maximum expected Doppler shift [Hz]
|
;#doppler_max: Maximum expected Doppler shift [Hz]
|
||||||
Acquisition0.doppler_max=10000
|
Acquisition0.doppler_max=10000
|
||||||
;#doppler_max: Doppler step in the grid search [Hz]
|
;#doppler_max: Doppler step in the grid search [Hz]
|
||||||
@ -297,35 +302,35 @@ Acquisition0.doppler_step=250
|
|||||||
|
|
||||||
;######### ACQUISITION CH 1 CONFIG ############
|
;######### ACQUISITION CH 1 CONFIG ############
|
||||||
Acquisition1.implementation=GPS_L1_CA_PCPS_Acquisition
|
Acquisition1.implementation=GPS_L1_CA_PCPS_Acquisition
|
||||||
Acquisition1.threshold=60
|
Acquisition1.threshold=50
|
||||||
Acquisition1.doppler_max=10000
|
Acquisition1.doppler_max=10000
|
||||||
Acquisition1.doppler_step=250
|
Acquisition1.doppler_step=250
|
||||||
|
|
||||||
|
|
||||||
;######### ACQUISITION CH 2 CONFIG ############
|
;######### ACQUISITION CH 2 CONFIG ############
|
||||||
Acquisition2.implementation=GPS_L1_CA_PCPS_Acquisition
|
Acquisition2.implementation=GPS_L1_CA_PCPS_Acquisition
|
||||||
Acquisition2.threshold=60
|
Acquisition2.threshold=50
|
||||||
Acquisition2.doppler_max=10000
|
Acquisition2.doppler_max=10000
|
||||||
Acquisition2.doppler_step=250
|
Acquisition2.doppler_step=250
|
||||||
|
|
||||||
|
|
||||||
;######### ACQUISITION CH 3 CONFIG ############
|
;######### ACQUISITION CH 3 CONFIG ############
|
||||||
Acquisition3.implementation=GPS_L1_CA_PCPS_Acquisition
|
Acquisition3.implementation=GPS_L1_CA_PCPS_Acquisition
|
||||||
Acquisition3.threshold=60
|
Acquisition3.threshold=50
|
||||||
Acquisition3.doppler_max=10000
|
Acquisition3.doppler_max=10000
|
||||||
Acquisition3.doppler_step=250
|
Acquisition3.doppler_step=250
|
||||||
|
|
||||||
|
|
||||||
;######### ACQUISITION CH 4 CONFIG ############
|
;######### ACQUISITION CH 4 CONFIG ############
|
||||||
Acquisition4.implementation=GPS_L1_CA_PCPS_Acquisition
|
Acquisition4.implementation=GPS_L1_CA_PCPS_Acquisition
|
||||||
Acquisition4.threshold=60
|
Acquisition4.threshold=50
|
||||||
Acquisition4.doppler_max=10000
|
Acquisition4.doppler_max=10000
|
||||||
Acquisition4.doppler_step=250
|
Acquisition4.doppler_step=250
|
||||||
|
|
||||||
|
|
||||||
;######### ACQUISITION CH 5 CONFIG ############
|
;######### ACQUISITION CH 5 CONFIG ############
|
||||||
Acquisition5.implementation=GPS_L1_CA_PCPS_Acquisition
|
Acquisition5.implementation=GPS_L1_CA_PCPS_Acquisition
|
||||||
Acquisition5.threshold=60
|
Acquisition5.threshold=50
|
||||||
Acquisition5.doppler_max=10000
|
Acquisition5.doppler_max=10000
|
||||||
Acquisition5.doppler_step=250
|
Acquisition5.doppler_step=250
|
||||||
|
|
||||||
@ -354,7 +359,7 @@ Acquisition8.doppler_step=250
|
|||||||
|
|
||||||
;######### TRACKING GLOBAL CONFIG ############
|
;######### TRACKING GLOBAL CONFIG ############
|
||||||
|
|
||||||
;#implementatiion: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
|
;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
|
||||||
Tracking.implementation=GPS_L1_CA_DLL_FLL_PLL_Tracking
|
Tracking.implementation=GPS_L1_CA_DLL_FLL_PLL_Tracking
|
||||||
;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
|
;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
|
||||||
Tracking.item_type=gr_complex
|
Tracking.item_type=gr_complex
|
||||||
|
@ -55,7 +55,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration
|
|||||||
== 0))
|
== 0))
|
||||||
{
|
{
|
||||||
item_size = sizeof(gr_complex);
|
item_size = sizeof(gr_complex);
|
||||||
freq_xlating_fir_filter_ccf_ = gr_make_freq_xlating_fir_filter_ccf(1, taps_, center_freq_, sampling_freq_);
|
freq_xlating_fir_filter_ccf_ = gr_make_freq_xlating_fir_filter_ccf(1, taps_, intermediate_freq_, sampling_freq_);
|
||||||
DLOG(INFO) << "input_filter(" << freq_xlating_fir_filter_ccf_->unique_id() << ")";
|
DLOG(INFO) << "input_filter(" << freq_xlating_fir_filter_ccf_->unique_id() << ")";
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -114,7 +114,7 @@ void FreqXlatingFirFilter::init()
|
|||||||
std::string default_output_item_type = "gr_complex";
|
std::string default_output_item_type = "gr_complex";
|
||||||
std::string default_taps_item_type = "float";
|
std::string default_taps_item_type = "float";
|
||||||
std::string default_dump_filename = "../data/input_filter.dat";
|
std::string default_dump_filename = "../data/input_filter.dat";
|
||||||
double default_center_freq = 0;
|
double default_intermediate_freq = 0;
|
||||||
double default_sampling_freq = 4000000;
|
double default_sampling_freq = 4000000;
|
||||||
int default_number_of_taps = 6;
|
int default_number_of_taps = 6;
|
||||||
unsigned int default_number_of_bands = 2;
|
unsigned int default_number_of_bands = 2;
|
||||||
@ -136,8 +136,8 @@ void FreqXlatingFirFilter::init()
|
|||||||
dump_ = config_->property(role_ + ".dump", false);
|
dump_ = config_->property(role_ + ".dump", false);
|
||||||
dump_filename_ = config_->property(role_ + ".dump_filename",
|
dump_filename_ = config_->property(role_ + ".dump_filename",
|
||||||
default_dump_filename);
|
default_dump_filename);
|
||||||
center_freq_ = config_->property(role_ + ".center_frequency",
|
intermediate_freq_ = config_->property(role_ + ".IF",
|
||||||
default_center_freq);
|
default_intermediate_freq);
|
||||||
sampling_freq_ = config_->property(role_ + ".sampling_frequency",
|
sampling_freq_ = config_->property(role_ + ".sampling_frequency",
|
||||||
default_sampling_freq);
|
default_sampling_freq);
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ class ConfigurationInterface;
|
|||||||
* \brief This class adapts a gnuradio gr_freq_xlating_fir_filter designed with gr_remez
|
* \brief This class adapts a gnuradio gr_freq_xlating_fir_filter designed with gr_remez
|
||||||
*
|
*
|
||||||
* Construct a FIR filter with the given taps and a composite frequency
|
* Construct a FIR filter with the given taps and a composite frequency
|
||||||
* translation that shifts center_freq down to zero Hz. The frequency
|
* translation that shifts intermediate_freq_ down to zero Hz. The frequency
|
||||||
* translation logically comes before the filtering operation.
|
* translation logically comes before the filtering operation.
|
||||||
*
|
*
|
||||||
* See Parks-McClellan FIR filter design, http://en.wikipedia.org/wiki/Parks-McClellan_filter_design_algorithm
|
* See Parks-McClellan FIR filter design, http://en.wikipedia.org/wiki/Parks-McClellan_filter_design_algorithm
|
||||||
@ -95,7 +95,7 @@ private:
|
|||||||
std::string output_item_type_;
|
std::string output_item_type_;
|
||||||
std::string taps_item_type_;
|
std::string taps_item_type_;
|
||||||
std::vector <float> taps_;
|
std::vector <float> taps_;
|
||||||
double center_freq_;
|
double intermediate_freq_;
|
||||||
double sampling_freq_;
|
double sampling_freq_;
|
||||||
std::string role_;
|
std::string role_;
|
||||||
unsigned int in_streams_;
|
unsigned int in_streams_;
|
||||||
|
@ -55,6 +55,7 @@ DirectResamplerConditioner::DirectResamplerConditioner(
|
|||||||
item_type_ = configuration->property(role + ".item_type",
|
item_type_ = configuration->property(role + ".item_type",
|
||||||
default_item_type);
|
default_item_type);
|
||||||
dump_ = configuration->property(role + ".dump", false);
|
dump_ = configuration->property(role + ".dump", false);
|
||||||
|
DLOG(INFO) << "dump_ is "<< dump_;
|
||||||
dump_filename_ = configuration->property(role + ".dump_filename",
|
dump_filename_ = configuration->property(role + ".dump_filename",
|
||||||
default_dump_file);
|
default_dump_file);
|
||||||
|
|
||||||
@ -86,13 +87,9 @@ DirectResamplerConditioner::DirectResamplerConditioner(
|
|||||||
{
|
{
|
||||||
DLOG(INFO) << "Dumping output into file " << dump_filename_;
|
DLOG(INFO) << "Dumping output into file " << dump_filename_;
|
||||||
file_sink_ = gr_make_file_sink(item_size_, dump_filename_.c_str());
|
file_sink_ = gr_make_file_sink(item_size_, dump_filename_.c_str());
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (dump_)
|
|
||||||
{
|
|
||||||
DLOG(INFO) << "file_sink(" << file_sink_->unique_id() << ")";
|
DLOG(INFO) << "file_sink(" << file_sink_->unique_id() << ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
DirectResamplerConditioner::~DirectResamplerConditioner() {}
|
DirectResamplerConditioner::~DirectResamplerConditioner() {}
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ TEST(GNSS_Block_Factory_Test, InstantiateFreqXlatingFIRFilter) {
|
|||||||
configuration->set_property("InputFilter.grid_density", "16");
|
configuration->set_property("InputFilter.grid_density", "16");
|
||||||
|
|
||||||
configuration->set_property("InputFilter.sampling_frequency","4000000");
|
configuration->set_property("InputFilter.sampling_frequency","4000000");
|
||||||
configuration->set_property("InputFilter.center_frequency","34000");
|
configuration->set_property("InputFilter.IF","34000");
|
||||||
|
|
||||||
GNSSBlockFactory *factory = new GNSSBlockFactory();
|
GNSSBlockFactory *factory = new GNSSBlockFactory();
|
||||||
GNSSBlockInterface *input_filter = factory->GetBlock(configuration, "InputFilter", "Freq_Xlating_Fir_Filter", 1,1, queue);
|
GNSSBlockInterface *input_filter = factory->GetBlock(configuration, "InputFilter", "Freq_Xlating_Fir_Filter", 1,1, queue);
|
||||||
|
Loading…
Reference in New Issue
Block a user