[hamradio-commits] [gnss-sdr] 146/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 8d1879d2e827af0076ad063fc922f2397c2c7cd1
Merge: 857e68c 9847a45
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon May 25 18:46:55 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.

 .../gps_l1_ca_pcps_quicksync_acquisition.cc        |  18 +-
 .../libs/galileo_e5_signal_processing.cc           |  25 +-
 src/core/system_parameters/CMakeLists.txt          |   3 +
 src/core/system_parameters/GPS_L2C.h               |   4 +-
 src/core/system_parameters/gps_cnav_ephemeris.cc   |   3 +-
 src/core/system_parameters/gps_cnav_ephemeris.h    |   9 +-
 src/core/system_parameters/gps_cnav_iono.cc        |  47 +++
 src/core/system_parameters/gps_cnav_iono.h         |  81 +++++
 .../gps_cnav_navigation_message.cc                 | 382 +++++++++++++++++++++
 .../gps_cnav_navigation_message.h                  | 121 +++++++
 src/core/system_parameters/gps_cnav_utc_model.cc   |  45 +++
 src/core/system_parameters/gps_cnav_utc_model.h    |  85 +++++
 12 files changed, 799 insertions(+), 24 deletions(-)

diff --cc src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
index 04c395d,04c395d..dbae797
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
@@@ -107,14 -107,14 +107,14 @@@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1C
      dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
  
      int samples_per_ms = round(code_length_);
--    code_= new gr_complex[code_length_];
++    code_ = new gr_complex[code_length_]();
      /*Object relevant information for debugging*/
--    LOG(INFO) <<"Implementation: "<<this->implementation()
--                         <<", Vector Length: "<<vector_length_
--                         <<", Samples per ms: "<<samples_per_ms
--                         <<", Folding factor: "<<folding_factor_
--                         <<", Sampled  ms: "<<sampled_ms_
--                         <<", Code Length: "<<code_length_;
++    LOG(INFO) << "Implementation: " << this->implementation()
++                         << ", Vector Length: " << vector_length_
++                         << ", Samples per ms: " << samples_per_ms
++                         << ", Folding factor: " << folding_factor_
++                         << ", Sampled  ms: " << sampled_ms_
++                         << ", Code Length: " << code_length_;
  
      if (item_type_.compare("gr_complex") == 0)
          {
@@@ -168,7 -168,7 +168,7 @@@ void GpsL1CaPcpsQuickSyncAcquisition::s
  
      if(pfa == 0.0)
          {
--            pfa = configuration_->property(role_+".pfa", 0.0);
++            pfa = configuration_->property(role_ + ".pfa", 0.0);
          }
      if(pfa == 0.0)
          {
@@@ -255,7 -255,7 +255,7 @@@ void GpsL1CaPcpsQuickSyncAcquisition::s
  {
      if (item_type_.compare("gr_complex") == 0)
          {
--            std::complex<float>* code = new std::complex<float>[code_length_];
++            std::complex<float>* code = new std::complex<float>[code_length_]();
  
              gps_l1_ca_code_gen_complex_sampled(code, gnss_synchro_->PRN, fs_in_, 0);
  
diff --cc src/algorithms/libs/galileo_e5_signal_processing.cc
index 2096f68,2096f68..a76f2f1
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@@ -98,11 -98,11 +98,10 @@@ void galileo_e5_a_code_gen_complex_prim
  void galileo_e5_a_code_gen_complex_sampled(std::complex<float>* _dest, char _Signal[3],
  		unsigned int _prn, signed int _fs, unsigned int _chip_shift)
  {
--    // This function is based on the GNU software GPS for MATLAB in the Kay Borre book
      unsigned int _samplesPerCode;
      unsigned int delay;
--    unsigned int _codeLength = Galileo_E5a_CODE_LENGTH_CHIPS;
--    const int _codeFreqBasis = Galileo_E5a_CODE_CHIP_RATE_HZ; //Hz
++    const unsigned int _codeLength = Galileo_E5a_CODE_LENGTH_CHIPS;
++    const int _codeFreqBasis = Galileo_E5a_CODE_CHIP_RATE_HZ;
  
      std::complex<float>* _code = new std::complex<float>[_codeLength]();
  
@@@ -114,17 -114,17 +113,23 @@@
  
      if (_fs != _codeFreqBasis)
          {
--        	std::complex<float>* _resampled_signal;
--        	if (posix_memalign((void**)&_resampled_signal, 16, _samplesPerCode * sizeof(gr_complex)) == 0){};
--        	resampler(_code, _resampled_signal, _codeFreqBasis, _fs, _codeLength, _samplesPerCode); //resamples code to fs
--        	delete[] _code;
--        	_code = _resampled_signal;
++            std::complex<float>* _resampled_signal;
++            if (posix_memalign((void**)&_resampled_signal, 16, _samplesPerCode * sizeof(gr_complex)) == 0){};
++            resampler(_code, _resampled_signal, _codeFreqBasis, _fs, _codeLength, _samplesPerCode); //resamples code to fs
++            delete[] _code;
++            _code = _resampled_signal;
          }
  
      for (unsigned int i = 0; i < _samplesPerCode; i++)
          {
              _dest[(i + delay) % _samplesPerCode] = _code[i];
          }
--
--    delete[] _code;
++    if (_fs != _codeFreqBasis)
++        {
++            free(_code);
++        }
++    else
++        {
++            delete[] _code;
++        }
  }

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