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

[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 ed06936992898ba9488b58e34d5bf8455f7aa89c
Merge: 7dcffd3 c23654f
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue May 19 07:58:23 2015 +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_Hybrid_short.conf                    |  16 +-
 .../adapters/gps_l2_m_telemetry_decoder.cc         |   9 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               | 688 ++++++++++++---------
 .../gps_l2_m_telemetry_decoder_cc.h                | 134 ++--
 .../sbas_l1_telemetry_decoder_cc.cc                |   2 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |   5 +-
 6 files changed, 498 insertions(+), 356 deletions(-)

diff --cc conf/gnss-sdr_Hybrid_short.conf
index cb50e95,cb50e95..cb954b1
--- a/conf/gnss-sdr_Hybrid_short.conf
+++ b/conf/gnss-sdr_Hybrid_short.conf
@@@ -12,12 -12,12 +12,26 @@@ GNSS-SDR.internal_fs_hz=400000
  ;######### CONTROL_THREAD CONFIG ############
  ControlThread.wait_for_flowgraph=false
  
++
++;######### SUPL RRLP GPS assistance configuration #####
++GNSS-SDR.SUPL_gps_enabled=false
++GNSS-SDR.SUPL_read_gps_assistance_xml=true
++GNSS-SDR.SUPL_gps_ephemeris_server=supl.nokia.com
++GNSS-SDR.SUPL_gps_ephemeris_port=7275
++GNSS-SDR.SUPL_gps_acquisition_server=supl.google.com
++GNSS-SDR.SUPL_gps_acquisition_port=7275
++GNSS-SDR.SUPL_MCC=244
++GNSS-SDR.SUPL_MNS=5
++GNSS-SDR.SUPL_LAC=0x59e2
++GNSS-SDR.SUPL_CI=0x31b0
++
++
  ;######### SIGNAL_SOURCE CONFIG ############
  ;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental)
  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/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
  
  ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
  SignalSource.item_type=short

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