From 3ec9b7841c039f9b4c4a774b0c8f05857220c8ff Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Thu, 28 Aug 2014 16:48:41 +0200 Subject: [PATCH] Config files updated --- conf/gnss-sdr_Galileo_E1_IFEN.conf | 8 +- conf/gnss-sdr_Hybrid_IFEN.conf | 6 +- conf/gnss-sdr_nsr_file.conf | 159 +++++++---------------------- 3 files changed, 44 insertions(+), 129 deletions(-) diff --git a/conf/gnss-sdr_Galileo_E1_IFEN.conf b/conf/gnss-sdr_Galileo_E1_IFEN.conf index cc2167c66..1c0cd0e26 100644 --- a/conf/gnss-sdr_Galileo_E1_IFEN.conf +++ b/conf/gnss-sdr_Galileo_E1_IFEN.conf @@ -152,7 +152,7 @@ Resampler.implementation=Pass_Through ;#count: Number of available GPS satellite channels. Channels_GPS.count=0 ;#count: Number of available Galileo satellite channels. -Channels_Galileo.count=6 +Channels_Galileo.count=8 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver Channels.in_acquisition=1 ;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS @@ -347,13 +347,13 @@ PVT.implementation=GALILEO_E1_PVT PVT.averaging_depth=100 ;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false] -PVT.flag_averaging=true +PVT.flag_averaging=false ;#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=100; +PVT.output_rate_ms=10 ;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms<=display_rate_ms. -PVT.display_rate_ms=500; +PVT.display_rate_ms=500 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false] PVT.dump=false diff --git a/conf/gnss-sdr_Hybrid_IFEN.conf b/conf/gnss-sdr_Hybrid_IFEN.conf index 63d59e987..3deefc489 100644 --- a/conf/gnss-sdr_Hybrid_IFEN.conf +++ b/conf/gnss-sdr_Hybrid_IFEN.conf @@ -151,9 +151,9 @@ Resampler.implementation=Pass_Through ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available GPS satellite channels. -Channels_GPS.count=4 +Channels_GPS.count=8 ;#count: Number of available Galileo satellite channels. -Channels_Galileo.count=4 +Channels_Galileo.count=0 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver Channels.in_acquisition=1 ;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS @@ -232,7 +232,7 @@ Tracking_GPS.dump_filename=../data/epl_tracking_ch_ Tracking_GPS.pll_bw_hz=45.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] -Tracking_GPS.dll_bw_hz=4.0; +Tracking_GPS.dll_bw_hz=2.0; ;#fll_bw_hz: FLL loop filter bandwidth [Hz] Tracking_GPS.fll_bw_hz=10.0; diff --git a/conf/gnss-sdr_nsr_file.conf b/conf/gnss-sdr_nsr_file.conf index 4ac49a185..14f72fd2e 100644 --- a/conf/gnss-sdr_nsr_file.conf +++ b/conf/gnss-sdr_nsr_file.conf @@ -31,7 +31,7 @@ GNSS-SDR.SUPL_CI=0x31b0 SignalSource.implementation=Nsr_File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed -SignalSource.filename=/media/DATALOGGER/ION GNSS 2013/E1L1_FE0_Band0.stream +SignalSource.filename=/Volumes/BOOTCAMP/signals/ifen/E1L1_FE0_Band0.stream ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=byte @@ -178,167 +178,82 @@ Resampler.sample_freq_out=2048000 ;######### CHANNELS GLOBAL CONFIG ############ -;#count: Number of available satellite channels. -Channels.count=8 -;#in_acquisition: Number of channels simultaneously acquiring +;#count: Number of available GPS satellite channels. +Channels_GPS.count=8 +;#count: Number of available Galileo satellite channels. +Channels_Galileo.count=0 +;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver Channels.in_acquisition=1 -;#system: GPS, GLONASS, Galileo, SBAS or Compass +;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS ;#if the option is disabled by default is assigned GPS Channel.system=GPS ;#signal: -;# "1C" GPS L1 C/A -;# "1P" GPS L1 P -;# "1W" GPS L1 Z-tracking and similar (AS on) -;# "1Y" GPS L1 Y -;# "1M" GPS L1 M -;# "1N" GPS L1 codeless -;# "2C" GPS L2 C/A -;# "2D" GPS L2 L1(C/A)+(P2-P1) semi-codeless -;# "2S" GPS L2 L2C (M) -;# "2L" GPS L2 L2C (L) -;# "2X" GPS L2 L2C (M+L) -;# "2P" GPS L2 P -;# "2W" GPS L2 Z-tracking and similar (AS on) -;# "2Y" GPS L2 Y -;# "2M" GPS GPS L2 M -;# "2N" GPS L2 codeless -;# "5I" GPS L5 I -;# "5Q" GPS L5 Q -;# "5X" GPS L5 I+Q -;# "1C" GLONASS G1 C/A -;# "1P" GLONASS G1 P -;# "2C" GLONASS G2 C/A (Glonass M) -;# "2P" GLONASS G2 P -;# "1A" GALILEO E1 A (PRS) -;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL) -;# "1C" GALILEO E1 C (no data) -;# "1X" GALILEO E1 B+C -;# "1Z" GALILEO E1 A+B+C -;# "5I" GALILEO E5a I (F/NAV OS) -;# "5Q" GALILEO E5a Q (no data) -;# "5X" GALILEO E5a I+Q -;# "7I" GALILEO E5b I -;# "7Q" GALILEO E5b Q -;# "7X" GALILEO E5b I+Q -;# "8I" GALILEO E5 I -;# "8Q" GALILEO E5 Q -;# "8X" GALILEO E5 I+Q -;# "6A" GALILEO E6 A -;# "6B" GALILEO E6 B -;# "6C" GALILEO E6 C -;# "6X" GALILEO E6 B+C -;# "6Z" GALILEO E6 A+B+C -;# "1C" SBAS L1 C/A -;# "5I" SBAS L5 I -;# "5Q" SBAS L5 Q -;# "5X" SBAS L5 I+Q -;# "2I" COMPASS E2 I -;# "2Q" COMPASS E2 Q -;# "2X" COMPASS E2 IQ -;# "7I" COMPASS E5b I -;# "7Q" COMPASS E5b Q -;# "7X" COMPASS E5b IQ -;# "6I" COMPASS E6 I -;# "6Q" COMPASS E6 Q -;# "6X" COMPASS E6 IQ ;#if the option is disabled by default is assigned "1C" GPS L1 C/A Channel.signal=1C -;######### SPECIFIC CHANNELS CONFIG ###### -;#The following options are specific to each channel and overwrite the generic options -;######### CHANNEL 0 CONFIG ############ - -Channel0.system=GPS -Channel0.signal=1C - -;#satellite: Satellite PRN ID for this channel. Disable this option to random search -Channel0.satellite=11 - -;######### CHANNEL 1 CONFIG ############ - -Channel1.system=GPS -Channel1.signal=1C -Channel1.satellite=18 - - -;######### ACQUISITION GLOBAL CONFIG ############ +;######### GPS ACQUISITION CONFIG ############ ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] -Acquisition.dump=false +Acquisition_GPS.dump=false ;#filename: Log path and filename -Acquisition.dump_filename=./acq_dump.dat +Acquisition_GPS.dump_filename=./acq_dump.dat ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. -Acquisition.item_type=gr_complex +Acquisition_GPS.item_type=gr_complex ;#if: Signal intermediate frequency in [Hz] -Acquisition.if=0 +Acquisition_GPS.if=0 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms] -Acquisition.sampled_ms=1 +Acquisition_GPS.sampled_ms=1 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -Acquisition.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler +Acquisition_GPS.implementation=GPS_L1_CA_PCPS_Acquisition ;#threshold: Acquisition threshold -Acquisition.threshold=0.010 +Acquisition_GPS.threshold=0.0075 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -;Acquisition.pfa=0.0001 +;Acquisition_GPS.pfa=0.01 ;#doppler_max: Maximum expected Doppler shift [Hz] -Acquisition.doppler_max=10000 -Acquisition.doppler_min=-10000 +Acquisition_GPS.doppler_max=10000 ;#doppler_max: Doppler step in the grid search [Hz] -Acquisition.doppler_step=500 -;#maximum dwells -Acquisition.max_dwells=15 +Acquisition_GPS.doppler_step=500 ;######### ACQUISITION CHANNELS CONFIG ###### ;#The following options are specific to each channel and overwrite the generic options -;######### ACQUISITION CH 0 CONFIG ############ -;Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition -;Acquisition0.threshold=0.005 -;Acquisition0.pfa=0.001 -;Acquisition0.doppler_max=10000 -;Acquisition0.doppler_step=250 +;######### TRACKING GPS CONFIG ############ -;#repeat_satellite: Use only jointly with the satellite PRN ID option. The default value is false -;Acquisition0.repeat_satellite = false - - -;######### TRACKING GLOBAL CONFIG ############ - -;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] [GPS_L1_CA_DLL_PLL_Optim_Tracking] -Tracking.implementation=GPS_L1_CA_DLL_PLL_Optim_Tracking +;#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] +Tracking_GPS.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.item_type=gr_complex +Tracking_GPS.item_type=gr_complex ;#sampling_frequency: Signal Intermediate Frequency in [Hz] -Tracking.if=0 +Tracking_GPS.if=0 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] -Tracking.dump=false +Tracking_GPS.dump=false ;#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_GPS.dump_filename=../data/epl_tracking_ch_ ;#pll_bw_hz: PLL loop filter bandwidth [Hz] -Tracking.pll_bw_hz=50.0; +Tracking_GPS.pll_bw_hz=45.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] -Tracking.dll_bw_hz=2.0; +Tracking_GPS.dll_bw_hz=2.0; ;#fll_bw_hz: FLL loop filter bandwidth [Hz] -Tracking.fll_bw_hz=10.0; +Tracking_GPS.fll_bw_hz=10.0; ;#order: PLL/DLL loop filter order [2] or [3] -Tracking.order=3; +Tracking_GPS.order=3; -;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] -Tracking.early_late_space_chips=0.5; - -;######### TELEMETRY DECODER CONFIG ############ -;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A. -TelemetryDecoder.implementation=GPS_L1_CA_Telemetry_Decoder -TelemetryDecoder.dump=false +;######### TELEMETRY DECODER GPS CONFIG ############ +;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A +TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder +TelemetryDecoder_GPS.dump=false +;#decimation factor +TelemetryDecoder_GPS.decimation_factor=1; ;######### OBSERVABLES CONFIG ############ ;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A. @@ -359,10 +274,10 @@ PVT.implementation=GPS_L1_CA_PVT PVT.averaging_depth=100 ;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false] -PVT.flag_averaging=true +PVT.flag_averaging=false ;#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=100 +PVT.output_rate_ms=10 ;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms<=display_rate_ms. PVT.display_rate_ms=500