[hamradio-commits] [gnss-sdr] 224/251: Updating configuration files

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:55 UTC 2015


This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit f7d9438801b217ce496f58b422b8859930e265d1
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jul 21 19:14:17 2015 +0200

    Updating configuration files
---
 conf/gnss-sdr.conf                          |   2 +
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf | 121 ++++++----------------------
 conf/gnss-sdr_Galileo_E1_short.conf         |  76 +++++++----------
 3 files changed, 58 insertions(+), 141 deletions(-)

diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf
index 0faf38f..ddd6f4a 100644
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@ -13,6 +13,8 @@ GNSS-SDR.internal_fs_hz=4000000
 ControlThread.wait_for_flowgraph=false
 
 ;######### SUPL RRLP GPS assistance configuration #####
+; Check http://www.mcc-mnc.com/
+; On Android: https://play.google.com/store/apps/details?id=net.its_here.cellidinfo&hl=en
 GNSS-SDR.SUPL_gps_enabled=false
 GNSS-SDR.SUPL_read_gps_assistance_xml=true
 GNSS-SDR.SUPL_gps_ephemeris_server=supl.nokia.com
diff --git a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
index 26f0b22..73ce7d8 100644
--- a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
@@ -1,4 +1,3 @@
-; Default configuration file
 ; You can define your own receiver and invoke it by doing
 ; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf
 ;
@@ -17,7 +16,7 @@ ControlThread.wait_for_flowgraph=false
 SignalSource.implementation=File_Signal_Source
 
 ;#filename: path to file with the captured GNSS signal samples to be processed
-SignalSource.filename=../data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
+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. 
@@ -184,143 +183,75 @@ Resampler.sample_freq_out=4000000
 
 ;######### CHANNELS GLOBAL CONFIG ############
 ;#count: Number of available satellite channels.
-Channels_Galileo.count=4
-Channels_GPS.count=0
+Channels_1B.count=4
 ;#in_acquisition: Number of channels simultaneously acquiring
 Channels.in_acquisition=1
-
-;######### CHANNEL 0 CONFIG ############
-;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
-;#if the option is disabled by default is assigned GPS
-Channel.system=Galileo
-
-;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 Channel.signal=1B
 
-;#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
-
-
-
 
 ;######### ACQUISITION GLOBAL CONFIG ############
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] 
-Acquisition_Galileo.dump=false
+Acquisition_1B.dump=false
 ;#filename: Log path and filename
-Acquisition_Galileo.dump_filename=./acq_dump.dat
+Acquisition_1B.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition_Galileo.item_type=gr_complex
+Acquisition_1B.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz] 
-Acquisition_Galileo.if=0
+Acquisition_1B.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_Galileo.coherent_integration_time_ms=4
+Acquisition_1B.coherent_integration_time_ms=4
 
-Acquisition_Galileo.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
+Acquisition_1B.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
 
 ;#threshold: Acquisition threshold
-Acquisition_Galileo.threshold=0.05
+Acquisition_1B.threshold=0.05
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_Galileo.doppler_max=15000
+Acquisition_1B.doppler_max=15000
 ;#doppler_max: Doppler step in the grid search [Hz]
-Acquisition_Galileo.doppler_step=125
+Acquisition_1B.doppler_step=125
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms];
-Acquisition_Galileo.coherent_integration_time_ms=8
+Acquisition_1B.coherent_integration_time_ms=8
 
-Acquisition_Galileo.cboc=false
+Acquisition_1B.cboc=false
 
 ;######### 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]
-Tracking_Galileo.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
+Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
-Tracking_Galileo.item_type=gr_complex
+Tracking_1B.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz] 
-Tracking_Galileo.if=0
+Tracking_1B.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] 
-Tracking_Galileo.dump=true
+Tracking_1B.dump=true
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking_Galileo.dump_filename=../data/veml_tracking_ch_
+Tracking_1B.dump_filename=../data/veml_tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_Galileo.pll_bw_hz=20.0;
+Tracking_1B.pll_bw_hz=20.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking_Galileo.dll_bw_hz=2.0;
+Tracking_1B.dll_bw_hz=2.0;
 
 ;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_Galileo.fll_bw_hz=10.0;
+Tracking_1B.fll_bw_hz=10.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking_Galileo.order=3;
+Tracking_1B.order=3;
 
 ;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] for GPS and [0.15] for Galileo
-Tracking_Galileo.early_late_space_chips=0.15;
+Tracking_1B.early_late_space_chips=0.15;
 
 ;#very_early_late_space_chips: only for [Galileo_E1_DLL_PLL_VEML_Tracking], correlator very early-late space [chips]. Use [0.6]
-Tracking_Galileo.very_early_late_space_chips=0.6;
+Tracking_1B.very_early_late_space_chips=0.6;
 
 ;######### TELEMETRY DECODER CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A or [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
-TelemetryDecoder_Galileo.implementation=Galileo_E1B_Telemetry_Decoder
-TelemetryDecoder_Galileo.dump=false
+TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
+TelemetryDecoder_1B.dump=false
 
 ;######### OBSERVABLES CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
diff --git a/conf/gnss-sdr_Galileo_E1_short.conf b/conf/gnss-sdr_Galileo_E1_short.conf
index df1dabe..e7400c4 100644
--- a/conf/gnss-sdr_Galileo_E1_short.conf
+++ b/conf/gnss-sdr_Galileo_E1_short.conf
@@ -1,4 +1,3 @@
-; Default configuration file
 ; You can define your own receiver and invoke it by doing
 ; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf
 ;
@@ -17,7 +16,7 @@ ControlThread.wait_for_flowgraph=false
 SignalSource.implementation=File_Signal_Source
 
 ;#filename: path to file with the captured GNSS signal samples to be processed
-SignalSource.filename=../../../Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
+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
@@ -28,12 +27,6 @@ SignalSource.sampling_frequency=4000000
 ;#freq: RF front-end center frequency in [Hz] 
 SignalSource.freq=1575420000
 
-;#gain: Front-end Gain in [dB] 
-SignalSource.gain=60
-
-;#subdevice: UHD subdevice specification (for USRP1 use A:0 or B:0)
-SignalSource.subdevice=B:0
-
 ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file.
 SignalSource.samples=0
 
@@ -163,99 +156,90 @@ Resampler.sample_freq_out=4000000
 
 
 ;######### CHANNELS GLOBAL CONFIG ############
-;#count: Number of available GPS satellite channels.
-Channels_GPS.count=0
 ;#count: Number of available Galileo satellite channels.
-Channels_Galileo.count=8
+Channels_1B.count=8
 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
 Channels.in_acquisition=1
-;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
-;#if the option is disabled by default is assigned GPS
-Channel.system=Galileo
-
-;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 Channel.signal=1B
 
 ;######### ACQUISITION GLOBAL CONFIG ############
 
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] 
-Acquisition_Galileo.dump=false
+Acquisition_1B.dump=false
 ;#filename: Log path and filename
-Acquisition_Galileo.dump_filename=./acq_dump.dat
+Acquisition_1B.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition_Galileo.item_type=gr_complex
+Acquisition_1B.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz] 
-Acquisition_Galileo.if=0
+Acquisition_1B.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_Galileo.sampled_ms=4
+Acquisition_1B.sampled_ms=4
 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_Galileo.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
+Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
 ;#threshold: Acquisition threshold
-;Acquisition_Galileo.threshold=0
+;Acquisition_1B.threshold=0
 ;#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_Galileo.pfa=0.000002
+Acquisition_1B.pfa=0.000002
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_Galileo.doppler_max=15000
+Acquisition_1B.doppler_max=15000
 ;#doppler_max: Doppler step in the grid search [Hz]
-Acquisition_Galileo.doppler_step=125
+Acquisition_1B.doppler_step=125
 
 ;######### ACQUISITION CHANNELS CONFIG ######
 
 ;######### ACQUISITION CH 0 CONFIG ############
 
 ;#repeat_satellite: Use only jointly with the satellite PRN ID option. The default value is false
-;Acquisition_Galileo0.repeat_satellite = true
-;Acquisition_Galileo1.repeat_satellite = true
-;Acquisition_Galileo2.repeat_satellite = true
-;Acquisition_Galileo3.repeat_satellite = true
+;Acquisition_1B0.repeat_satellite = true
+;Acquisition_1B1.repeat_satellite = true
+;Acquisition_1B2.repeat_satellite = true
+;Acquisition_1B3.repeat_satellite = true
 
 ;#cboc: Only for [Galileo_E1_PCPS_Ambiguous_Acquisition]. This option allows you to choose between acquiring with CBOC signal [true] or sinboc(1,1) signal [false]. 
 ;#Use only if GNSS-SDR.internal_fs_hz is greater than or equal to 6138000
-Acquisition_Galileo0.cboc=false
+Acquisition_1B.cboc=false
 
 
-;######### ACQUISITION CH 1 CONFIG ############
-Acquisition_Galileo1.cboc=false
 
 ;######### 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]
-Tracking_Galileo.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
+Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
-Tracking_Galileo.item_type=gr_complex
+Tracking_1B.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz] 
-Tracking_Galileo.if=0
+Tracking_1B.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] 
-Tracking_Galileo.dump=false
+Tracking_1B.dump=false
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking_Galileo.dump_filename=../data/veml_tracking_ch_
+Tracking_1B.dump_filename=../data/veml_tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_Galileo.pll_bw_hz=15.0;
+Tracking_1B.pll_bw_hz=15.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking_Galileo.dll_bw_hz=2.0;
+Tracking_1B.dll_bw_hz=2.0;
 
 ;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_Galileo.fll_bw_hz=10.0;
+Tracking_1B.fll_bw_hz=10.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking_Galileo.order=3;
+Tracking_1B.order=3;
 
 ;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] for GPS and [0.15] for Galileo
-Tracking_Galileo.early_late_space_chips=0.15;
+Tracking_1B.early_late_space_chips=0.15;
 
 ;#very_early_late_space_chips: only for [Galileo_E1_DLL_PLL_VEML_Tracking], correlator very early-late space [chips]. Use [0.6]
-Tracking_Galileo.very_early_late_space_chips=0.6;
+Tracking_1B.very_early_late_space_chips=0.6;
 
 
 ;######### TELEMETRY DECODER CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A or [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
-TelemetryDecoder_Galileo.implementation=Galileo_E1B_Telemetry_Decoder
-TelemetryDecoder_Galileo.dump=false
+TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
+TelemetryDecoder_1B.dump=false
 
 ;######### OBSERVABLES CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git



More information about the pkg-hamradio-commits mailing list