[hamradio-commits] [gnss-sdr] 219/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 637c33a51fd995ec8c3a964450e53081fc6d5bf3
Merge: cbc51bc 3039af3
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jul 21 17:07:16 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_GPS_L1_USRP_X300_realtime.conf     |   6 +-
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf        | 219 +++--------------
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf           | 226 ++---------------
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf |  82 +++++++
 conf/gnss-sdr_Galileo_E1_nsr.conf                | 299 +++--------------------
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf         | 272 +--------------------
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc     |   3 +-
 7 files changed, 182 insertions(+), 925 deletions(-)

diff --cc src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc
index 9d1c527,9d1c527..cf36f38
--- a/src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc
+++ b/src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc
@@@ -353,7 -353,7 +353,8 @@@ bool galileo_e1_ls_pvt::get_PVT(std::ma
              mypos = leastSquarePos(satpos, obs, W);
  
              // Compute GST and Gregorian time
--            double GST = galileo_ephemeris_iter->second.Galileo_System_Time(Galileo_week_number, galileo_current_time);
++            //double GST = galileo_ephemeris_iter->second.Galileo_System_Time(Galileo_week_number, galileo_current_time);
++            double GST = galileo_ephemeris_map.find(gnss_pseudoranges_iter->first)->second.Galileo_System_Time(Galileo_week_number, galileo_current_time);
              utc = galileo_utc_model.GST_to_UTC_time(GST, Galileo_week_number);
              // get time string Gregorian calendar
              boost::posix_time::time_duration t = boost::posix_time::seconds(utc);

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