[hamradio-commits] [gnss-sdr] 222/251: updating conf notation

[Carles Fernandez]

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 1de57855ef3f8a3a4d5fbd7b5671c1e1fef6f255
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jul 21 18:13:06 2015 +0200

    updating conf notation
---
 conf/gnss-sdr.conf | 69 ++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf
index 8fb0a37..0faf38f 100644
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@ -29,12 +29,10 @@ GNSS-SDR.SUPL_CI=0x31b0
 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=../../../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
-;SignalSource.item_type=byte
 
 ;#sampling_frequency: Original Signal sampling frequency in [Hz]
 SignalSource.sampling_frequency=4000000
@@ -182,15 +180,13 @@ Resampler.sample_freq_out=4000000
 
 
 ;######### CHANNELS GLOBAL CONFIG ############
-;#count: Number of available GPS satellite channels.
-Channels_GPS.count=6
-;#count: Number of available Galileo satellite channels.
-Channels_Galileo.count=0
+;#count: Number of available GPS L1 C/A satellite channels.
+Channels_1C.count=6
+;#count: Number of available Galileo E1B satellite channels.
+Channels_1B.count=0
 ;#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=GPS
+
 
 ;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 Channel.signal=1C
@@ -200,80 +196,75 @@ Channel.signal=1C
 ;#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 ############
 
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] 
-Acquisition_GPS.dump=false
+Acquisition_1C.dump=false
 ;#filename: Log path and filename
-Acquisition_GPS.dump_filename=./acq_dump.dat
+Acquisition_1C.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition_GPS.item_type=gr_complex
+Acquisition_1C.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz] 
-Acquisition_GPS.if=0
+Acquisition_1C.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_GPS.sampled_ms=1
+Acquisition_1C.sampled_ms=1
 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_GPS.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
+Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
 ;#threshold: Acquisition threshold
-Acquisition_GPS.threshold=0.005
+Acquisition_1C.threshold=0.005
 ;#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_GPS.pfa=0.0001
+;Acquisition_1C.pfa=0.0001
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_GPS.doppler_max=10000
+Acquisition_1C.doppler_max=10000
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_GPS.doppler_min=-10000
+Acquisition_1C.doppler_min=-10000
 ;#doppler_step Doppler step in the grid search [Hz]
-Acquisition_GPS.doppler_step=500
+Acquisition_1C.doppler_step=500
 ;#maximum dwells
-Acquisition_GPS.max_dwells=5
+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]
-Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
+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_GPS.item_type=gr_complex
+Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz] 
-Tracking_GPS.if=0
+Tracking_1C.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] 
-Tracking_GPS.dump=false
+Tracking_1C.dump=false
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking_GPS.dump_filename=../data/epl_tracking_ch_
+Tracking_1C.dump_filename=../data/epl_tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_GPS.pll_bw_hz=45.0;
+Tracking_1C.pll_bw_hz=45.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking_GPS.dll_bw_hz=3.0;
+Tracking_1C.dll_bw_hz=3.0;
 
 ;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=10.0;
+Tracking_1C.fll_bw_hz=10.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking_GPS.order=3;
+Tracking_1C.order=3;
 
 ;######### 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
+TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
+TelemetryDecoder_1C.dump=false
 ;#decimation factor
-TelemetryDecoder_GPS.decimation_factor=1;
+TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### 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