[hamradio-commits] [gnss-sdr] 70/80: Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next

Sun May 15 20:11:58 UTC 2016

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

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

commit 8d3a03a3705346c1f06545a83ddb92f896b32a2e
Merge: b2dfd34 7be4585
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu May 12 23:34:46 2016 +0200

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 conf/gnss-sdr_Galileo_E1_short.conf                |  5 ++--
 conf/gnss-sdr_Hybrid_short.conf                    | 30 +++++++++-------------
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |  2 +-
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --cc conf/gnss-sdr_Galileo_E1_short.conf
index 4b9d584,4b9d584..e84e218

--- a/conf/gnss-sdr_Galileo_E1_short.conf
+++ b/conf/gnss-sdr_Galileo_E1_short.conf
@@@ -16,7 -16,7 +16,7 @@@ ControlThread.wait_for_flowgraph=fals
  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
++SignalSource.filename=/Users/carlesfernandez/Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
  
  ;#item_type: Type and resolution for each of the signal samples.
  SignalSource.item_type=ishort
@@@ -287,10 -287,10 +287,9 @@@ PVT.nmea_dump_devname=/dev/pts/
  
  ;#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=true;
--
++PVT.rtcm_tcp_port=2100
  ;#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;
  
  ;#rtcm_dump_devname: serial device descriptor for RTCM logging
  PVT.rtcm_dump_devname=/dev/pts/1
--
diff --cc conf/gnss-sdr_Hybrid_short.conf
index cce28be,cce28be..3f96052
--- a/conf/gnss-sdr_Hybrid_short.conf
+++ b/conf/gnss-sdr_Hybrid_short.conf
@@@ -31,7 -31,7 +31,7 @@@ GNSS-SDR.SUPL_CI=0x31b
  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
++SignalSource.filename=/Users/carlesfernandez/Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
  
  ;#item_type: Type and resolution for each of the signal samples.
  SignalSource.item_type=ishort
@@@ -172,9 -172,9 +172,9 @@@ Resampler.sample_freq_out=400000
  
  ;######### CHANNELS GLOBAL CONFIG ############
  ;#count: Number of available GPS satellite channels.
--Channels_1C.count=5
++Channels_1C.count=0
  ;#count: Number of available Galileo satellite channels.
--Channels_1B.count=0
++Channels_1B.count=5
  ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
  Channels.in_acquisition=1
  
@@@ -183,11 -183,11 +183,11 @@@
  ;# "2S" GPS L2 L2C (M)
  ;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
  ;# "5X" GALILEO E5a I+Q
--Channel0.signal=1C
--Channel1.signal=1C
--Channel2.signal=1C
--Channel3.signal=1C
--Channel4.signal=1C
++Channel0.signal=1B
++Channel1.signal=1B
++Channel2.signal=1B
++Channel3.signal=1B
++Channel4.signal=1B
  Channel5.signal=1B
  Channel6.signal=1B
  Channel7.signal=1B
@@@ -235,11 -235,11 +235,12 @@@ Acquisition_1B.implementation=Galileo_E
  ;#threshold: Acquisition threshold
  ;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_1B.pfa=0.0000008
++Acquisition_1B.pfa=0.0000008; 0.0000008
  ;#doppler_max: Maximum expected Doppler shift [Hz]
  Acquisition_1B.doppler_max=15000
  ;#doppler_max: Doppler step in the grid search [Hz]
  Acquisition_1B.doppler_step=125
++Acquisition_1B.cboc=false;
  
  ;######### TRACKING GPS CONFIG ############
  
@@@ -263,9 -263,9 +264,6 @@@ Tracking_1C.pll_bw_hz=50.0
  ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
  Tracking_1C.dll_bw_hz=5.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;
  
@@@ -286,14 -286,14 +284,11 @@@ Tracking_1B.dump=fals
  Tracking_1B.dump_filename=../data/veml_tracking_ch_
  
  ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
--Tracking_1B.pll_bw_hz=15.0;
++Tracking_1B.pll_bw_hz=20.0;
  
  ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
  Tracking_1B.dll_bw_hz=2.0;
  
--;#fll_bw_hz: FLL loop filter bandwidth [Hz]
--Tracking_1B.fll_bw_hz=10.0;
--
  ;#order: PLL/DLL loop filter order [2] or [3]
  Tracking_1B.order=3;
  
@@@ -350,7 -350,7 +345,6 @@@ PVT.dump=fals
  PVT.flag_rtcm_server=true
  PVT.flag_rtcm_tty_port=false
  PVT.rtcm_dump_devname=/dev/pts/1
--
++PVT.rtcm_tcp_port=2100
  ;#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
--

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

