mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-12 02:10:34 +00:00
Code Issues Releases Wiki Activity

Freq_xlating_fir_filter decimation factor now can be configured using GNSS-SDR configuration file.

Browse Source 
gnss-sdr_gn3s_realtime.conf was updated to use this feature.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@237 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Javier Arribas 2012-08-30 15:50:10 +00:00
parent cee0dd320d
commit cc02888dad
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
conf/gnss-sdr_gn3s_realtime.conf
View File

@ -7,7 +7,7 @@
;######### GLOBAL OPTIONS ################## ;######### GLOBAL OPTIONS ##################
;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz]. ;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz].
GNSS-SDR.internal_fs_hz=2000000 GNSS-SDR.internal_fs_hz=2045950
;######### CONTROL_THREAD CONFIG ############ ;######### CONTROL_THREAD CONFIG ############
ControlThread.wait_for_flowgraph=false ControlThread.wait_for_flowgraph=false
@ -137,9 +137,13 @@ 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.IF is the intermediate frequency (in Hz) shifted down to zero Hz ;#InputFilter.IF is the intermediate frequency (in Hz) shifted down to zero Hz
; 8183800/5 = 1636760
; 8183800/4 = 2045950
InputFilter.sampling_frequency=8183800 InputFilter.sampling_frequency=8183800
InputFilter.IF=38400 InputFilter.IF=38400
InputFilter.decimation_factor=4
;######### RESAMPLER CONFIG ############ ;######### RESAMPLER CONFIG ############
@ -148,8 +152,8 @@ InputFilter.IF=38400
;#implementation: Use [Pass_Through] or [Direct_Resampler] ;#implementation: Use [Pass_Through] or [Direct_Resampler]
;#[Pass_Through] disables this block ;#[Pass_Through] disables this block
;#[Direct_Resampler] enables a resampler that implements a nearest neigbourhood interpolation ;#[Direct_Resampler] enables a resampler that implements a nearest neigbourhood interpolation
Resampler.implementation=Direct_Resampler ;Resampler.implementation=Direct_Resampler
;Resampler.implementation=Pass_Through Resampler.implementation=Pass_Through
;#dump: Dump the resamplered data to a file. ;#dump: Dump the resamplered data to a file.
Resampler.dump=false Resampler.dump=false
@ -163,12 +167,12 @@ Resampler.item_type=gr_complex
Resampler.sample_freq_in=8183800 Resampler.sample_freq_in=8183800
;#sample_freq_out: the desired sample frequency of the output signal ;#sample_freq_out: the desired sample frequency of the output signal
Resampler.sample_freq_out=2000000 Resampler.sample_freq_out=1636760
;######### CHANNELS GLOBAL CONFIG ############ ;######### CHANNELS GLOBAL CONFIG ############
;#count: Number of available satellite channels. ;#count: Number of available satellite channels.
Channels.count=4 Channels.count=7
;#in_acquisition: Number of channels simultaneously acquiring ;#in_acquisition: Number of channels simultaneously acquiring
Channels.in_acquisition=1 Channels.in_acquisition=1
@ -371,7 +375,7 @@ Tracking.item_type=gr_complex
Tracking.if=0 Tracking.if=0
;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
Tracking.dump=true Tracking.dump=false
;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number. ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
Tracking.dump_filename=./tracking_ch_ Tracking.dump_filename=./tracking_ch_
@ -429,6 +433,15 @@ PVT.dump=false
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump. ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT PVT.dump_filename=./PVT
;#nmea_dump_filename: NMEA log path and filename
PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
;#flag_nmea_tty_port: Enable or disable the NMEA log to a serial TTY port (Can be used with real hardware or virtual one)
PVT.flag_nmea_tty_port=true;
;#nmea_dump_devname: serial device descriptor for NMEA logging
PVT.nmea_dump_devname=/dev/pts/4
;######### OUTPUT_FILTER CONFIG ############ ;######### OUTPUT_FILTER CONFIG ############
;# Receiver output filter: Leave this block disabled in this version ;# Receiver output filter: Leave this block disabled in this version
OutputFilter.implementation=Null_Sink_Output_Filter OutputFilter.implementation=Null_Sink_Output_Filter

7
src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
View File

@ -50,12 +50,17 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration
size_t item_size; size_t item_size;
(*this).init(); (*this).init();
int decimation_factor;
int default_decimation_factor=1;
decimation_factor = config_->property(role_ + ".decimation_factor",
default_decimation_factor);
if ((taps_item_type_.compare("float") == 0) && (input_item_type_.compare( if ((taps_item_type_.compare("float") == 0) && (input_item_type_.compare(
"gr_complex") == 0) && (output_item_type_.compare("gr_complex") "gr_complex") == 0) && (output_item_type_.compare("gr_complex")
== 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_, intermediate_freq_, sampling_freq_); freq_xlating_fir_filter_ccf_ = gr_make_freq_xlating_fir_filter_ccf(decimation_factor, 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() << ")";
} }