[hamradio-commits] [gnss-sdr] 40/80: Eliminate redundancy in doppler_max initialization

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sun May 15 20:11:55 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 7403fec396aefc5ef63759ac927ffd15d78a26f7
Author: Luis Esteve <luis.esteve.elfau at gmail.com>
Date:   Fri May 6 19:30:36 2016 +0200

    Eliminate redundancy in doppler_max initialization
    
    Eliminate the initialization of Acquisition variable "doppler_max" in
    Channel (acq_->set_doppler_max(doppler_max);) because this
    initialization is done now in Acquisition adpaters
---
 src/algorithms/channel/adapters/channel.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc
index 48f01dd..c60a23d 100644
--- a/src/algorithms/channel/adapters/channel.cc
+++ b/src/algorithms/channel/adapters/channel.cc
@@ -64,12 +64,7 @@ Channel::Channel(ConfigurationInterface *configuration, unsigned int channel,
     acq_->set_gnss_synchro(&gnss_synchro_);
     trk_->set_gnss_synchro(&gnss_synchro_);
 
-    // IMPORTANT: Do not change the order between set_doppler_max, set_doppler_step and set_threshold
-    unsigned int doppler_max = configuration->property("Acquisition_" + implementation_ + boost::lexical_cast<std::string>(channel_) + ".doppler_max", 0);
-    if(doppler_max == 0) doppler_max = configuration->property("Acquisition_" + implementation_+ ".doppler_max", 0);
-    DLOG(INFO) << "Channel "<< channel_ << " Doppler_max = " << doppler_max;
-
-    acq_->set_doppler_max(doppler_max);
+    // IMPORTANT: Do not change the order between set_doppler_step and set_threshold
 
     unsigned int doppler_step = configuration->property("Acquisition_" + implementation_ + boost::lexical_cast<std::string>(channel_) + ".doppler_step" ,0);
     if(doppler_step == 0) doppler_step = configuration->property("Acquisition_" + implementation_+".doppler_step", 500);

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



More information about the pkg-hamradio-commits mailing list