From cc3de3132d082f2edac96beb5307c26b3a7b0eee Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 26 Dec 2015 13:08:12 +0100 Subject: [PATCH] change input signal type from short to ishort So the file length in seconds is correctly displayed --- conf/gnss-sdr.conf | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index 1664c8b03..ac6a20cb7 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -33,8 +33,8 @@ SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat -;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. -SignalSource.item_type=short +;#item_type: Type and resolution for each of the signal samples. +SignalSource.item_type=ishort ;#sampling_frequency: Original Signal sampling frequency in [Hz] SignalSource.sampling_frequency=4000000 @@ -45,7 +45,7 @@ SignalSource.freq=1575420000 ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 -;#repeat: Repeat the processing file. Disable this option in this version +;#repeat: Repeat the processing file. SignalSource.repeat=false ;#dump: Dump the Signal source data to a file. Disable this option in this version @@ -69,7 +69,7 @@ SignalConditioner.implementation=Signal_Conditioner ;SignalConditioner.implementation=Pass_Through ;######### DATA_TYPE_ADAPTER CONFIG ############ -;## Changes the type of input data. Please disable it in this version. +;## Changes the type of input data. ;#implementation: [Pass_Through] disables this block DataTypeAdapter.implementation=Ishort_To_Complex ;DataTypeAdapter.implementation=Ibyte_To_Cbyte @@ -95,13 +95,13 @@ InputFilter.dump=false InputFilter.dump_filename=../data/input_filter.dat ;#The following options are used in the filter design of Fir_Filter and Freq_Xlating_Fir_Filter implementation. -;#These options are based on parameters of gnuradio's function: gr_remez. -;#These function calculates the optimal (in the Chebyshev/minimax sense) FIR filter inpulse reponse given a set of band edges, the desired reponse on those bands, and the weight given to the error in those bands. +;#These options are based on parameters of GNU Radio's function: gr_remez. +;#These function calculates the optimal (in the Chebyshev/minimax sense) FIR filter impulse response given a set of band edges, the desired response on those bands, and the weight given to the error in those bands. -;#input_item_type: Type and resolution for input signal samples. Use only gr_complex in this version. +;#input_item_type: Type and resolution for input signal samples. InputFilter.input_item_type=gr_complex -;#outut_item_type: Type and resolution for output filtered signal samples. Use only gr_complex in this version. +;#outut_item_type: Type and resolution for output filtered signal samples. InputFilter.output_item_type=gr_complex ;#taps_item_type: Type and resolution for the taps of the filter. Use only float in this version. @@ -155,12 +155,12 @@ InputFilter.IF=0 ;#implementation: Use [Pass_Through] or [Direct_Resampler] ;#[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 neighborhood interpolation ;Resampler.implementation=Direct_Resampler Resampler.implementation=Pass_Through -;#dump: Dump the resamplered data to a file. +;#dump: Dump the resampled data to a file. Resampler.dump=false ;#dump_filename: Log path and filename. Resampler.dump_filename=../data/resampler.dat @@ -194,7 +194,7 @@ Channel.signal=1C ;######### CHANNEL 0 CONFIG ############ ;Channel0.signal=1C -;#satellite: Satellite PRN ID for this channel. Disable this option to random search +;#satellite: Satellite PRN ID for this channel. Disable this option for random search ;Channel0.satellite=11 ;######### CHANNEL 1 CONFIG ############ @@ -213,7 +213,7 @@ Acquisition_1C.item_type=gr_complex Acquisition_1C.if=0 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms] Acquisition_1C.sampled_ms=1 -;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] +;#implementation: Acquisition algorithm selection for this channel Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler ;#threshold: Acquisition threshold Acquisition_1C.threshold=0.005 @@ -230,7 +230,7 @@ Acquisition_1C.max_dwells=5 ;######### TRACKING GLOBAL CONFIG ############ -;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking] +;#implementation: Selected tracking algorithm: Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version. Tracking_1C.item_type=gr_complex @@ -250,9 +250,6 @@ Tracking_1C.pll_bw_hz=45.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] Tracking_1C.dll_bw_hz=3.0; -;#fll_bw_hz: FLL loop filter bandwidth [Hz] -Tracking_1C.fll_bw_hz=10.0; - ;#order: PLL/DLL loop filter order [2] or [3] Tracking_1C.order=3; @@ -275,7 +272,7 @@ Observables.dump_filename=./observables.dat ;######### PVT CONFIG ############ -;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version. +;#implementation: Position Velocity and Time (PVT) implementation algorithm: PVT.implementation=GPS_L1_CA_PVT ;#averaging_depth: Number of PVT observations in the moving average algorithm @@ -287,7 +284,7 @@ PVT.flag_averaging=true ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms] PVT.output_rate_ms=10 -;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms<=display_rate_ms. +;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms <= display_rate_ms. PVT.display_rate_ms=500 ;# KML, GeoJSON, NMEA and RTCM output configuration @@ -296,19 +293,19 @@ PVT.display_rate_ms=500 PVT.dump_filename=./PVT ;#nmea_dump_filename: NMEA log path and filename -PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea; +PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea ;#flag_nmea_tty_port: Enables or disables the NMEA log to a serial TTY port (Can be used with real hardware or virtual one) -PVT.flag_nmea_tty_port=true; +PVT.flag_nmea_tty_port=true ;#nmea_dump_devname: serial device descriptor for NMEA logging PVT.nmea_dump_devname=/dev/pts/4 ;#flag_rtcm_server: Enables or disables a TCP/IP server transmitting RTCM 3.2 messages (accepts multiple clients, port 2101 by default) -PVT.flag_rtcm_server=false; +PVT.flag_rtcm_server=false ;#flag_rtcm_tty_port: Enables or disables the RTCM log to a serial TTY port (Can be used with real hardware or virtual one) -PVT.flag_rtcm_tty_port=false; +PVT.flag_rtcm_tty_port=false ;#rtcm_dump_devname: serial device descriptor for RTCM logging PVT.rtcm_dump_devname=/dev/pts/1