[hamradio-commits] [gnss-sdr] 10/236: 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 next
in repository gnss-sdr.

commit 7d0e3126aac9d16c5748bf5e60b833a8f887e576
Merge: 794d141 9bf4710
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Feb 9 19:43:07 2016 +0100

    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.

 build/.gitignore                                   |  16 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |  17 +-
 src/algorithms/PVT/libs/rtcm_printer.cc            |   6 +
 src/algorithms/PVT/libs/rtcm_printer.h             |   1 +
 ...volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h | 398 +++++++++++++++++++++
 ..._gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h | 134 +++++++
 .../volk_gnsssdr/lib/kernel_tests.h                |   1 +
 .../tracking/libs/cpu_multicorrelator_16sc.cc      |  41 ++-
 .../tracking/libs/cpu_multicorrelator_16sc.h       |   5 +-
 9 files changed, 587 insertions(+), 32 deletions(-)

diff --cc build/.gitignore
index 86d0cb2,86d0cb2..8c58952
--- a/build/.gitignore
+++ b/build/.gitignore
@@@ -1,4 -1,4 +1,12 @@@
--# Ignore everything in this directory
--*
--# Except this file
--!.gitignore
++*~
++.*.swp
++docs/doxygen/Doxyfile
++docs/html
++docs/latex
++docs/GNSS-SDR_manual.pdf
++src/tests/data/output.dat
++thirdparty/
++.project
++.cproject
++/install
++/.DS_Store
diff --cc src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
index 834da42,834da42..194a02d
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
@@@ -163,19 -163,19 +163,26 @@@ int gps_l1_ca_pvt_cc::general_work (in
      Gnss_Synchro **in = (Gnss_Synchro **)  &input_items[0]; //Get the input pointer
      //Gnss_Synchro **out = (Gnss_Synchro **)  &output_items[0]; //Get the output pointer
  
++    // ############ 1. READ EPHEMERIS FROM GLOBAL MAP ####
++    d_ls_pvt->gps_ephemeris_map = global_gps_ephemeris_map.get_map_copy();
++
      for (unsigned int i = 0; i < d_nchannels; i++)
          {
++            std::map<int,Gps_Ephemeris>::iterator gps_ephemeris_iter;
++            gps_ephemeris_iter = d_ls_pvt->gps_ephemeris_map.begin();
              if (in[i][0].Flag_valid_pseudorange == true)
                  {
                      gnss_pseudoranges_map.insert(std::pair<int,Gnss_Synchro>(in[i][0].PRN, in[i][0])); // store valid pseudoranges in a map
                      d_rx_time = in[i][0].d_TOW_at_current_symbol; // all the channels have the same RX timestamp (common RX time pseudoranges)
++                    d_rtcm_printer->lock_time(gps_ephemeris_iter->second, d_rx_time, in[i][0]); // keep track of locking time
++                }
++            else
++                {
++                    d_rtcm_printer->lock_time(gps_ephemeris_iter->second, 0.0, in[i][0]);
                  }
          }
  
--    // ############ 1. READ EPHEMERIS/UTC_MODE/IONO FROM GLOBAL MAPS ####
--
--    d_ls_pvt->gps_ephemeris_map = global_gps_ephemeris_map.get_map_copy();
--
++    // ############ READ UTC_MODEL/IONO FROM GLOBAL MAPS ####
      if (global_gps_utc_model_map.size() > 0)
          {
              // UTC MODEL data is shared for all the GPS satellites. Read always at a locked channel
@@@ -337,7 -337,7 +344,7 @@@
                                      if (gps_ephemeris_iter != d_ls_pvt->gps_ephemeris_map.end())
                                          {
                                              d_rtcm_printer->Print_Rtcm_MT1019(gps_ephemeris_iter->second);
--                                            d_rtcm_printer->Print_Rtcm_MT1002(gps_ephemeris_iter->second, d_rx_time, gnss_pseudoranges_map);
++                                            d_rtcm_printer->Print_Rtcm_MSM(1, gps_ephemeris_iter->second, {}, {}, d_rx_time, gnss_pseudoranges_map, 1234, 0, 0, 0, 0, 0);
                                          }
                                      b_rtcm_writing_started = true;
                                  }
diff --cc src/algorithms/PVT/libs/rtcm_printer.cc
index 44ed4e3,44ed4e3..b8b15e0
--- a/src/algorithms/PVT/libs/rtcm_printer.cc
+++ b/src/algorithms/PVT/libs/rtcm_printer.cc
@@@ -304,3 -304,3 +304,9 @@@ std::string Rtcm_Printer::print_MT1005_
      std::string test = rtcm->print_MT1005_test();
      return test;
  }
++
++
++unsigned int Rtcm_Printer::lock_time(const Gps_Ephemeris& gps_eph, double obs_time, const Gnss_Synchro & gnss_synchro)
++{
++    return rtcm->lock_time(gps_eph, obs_time, gnss_synchro);
++}
diff --cc src/algorithms/PVT/libs/rtcm_printer.h
index 004e2f3,004e2f3..e925de3
--- a/src/algorithms/PVT/libs/rtcm_printer.h
+++ b/src/algorithms/PVT/libs/rtcm_printer.h
@@@ -73,6 -73,6 +73,7 @@@ public
              bool more_messages);
  
      std::string print_MT1005_test(); //<!  For testing purposes
++    unsigned int lock_time(const Gps_Ephemeris& gps_eph, double obs_time, const Gnss_Synchro & gnss_synchro);
  
  private:
      std::string rtcm_filename; // String with the RTCM log filename

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