[hamradio-commits] [gnss-sdr] 20/303: Add warning if sample rates are not consistent

[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 10cd79591b5f89ac1b8880284cbafb14bbee6aab
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Aug 13 17:25:07 2016 +0200

    Add warning if sample rates are not consistent
---
 .../resampler/adapters/direct_resampler_conditioner.cc     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
index e2a5628..1e08d02 100644
--- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
+++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
@@ -30,6 +30,8 @@
  */
 
 #include "direct_resampler_conditioner.h"
+#include <cmath>
+#include <limits>
 #include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <volk/volk.h>
@@ -38,7 +40,6 @@
 #include "direct_resampler_conditioner_cb.h"
 #include "configuration_interface.h"
 
-
 using google::LogMessage;
 
 DirectResamplerConditioner::DirectResamplerConditioner(
@@ -48,8 +49,17 @@ DirectResamplerConditioner::DirectResamplerConditioner(
 {
     std::string default_item_type = "short";
     std::string default_dump_file = "./data/signal_conditioner.dat";
+    double fs_in;
+    fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000.0);
     sample_freq_in_ = configuration->property(role_ + ".sample_freq_in", (double)4000000.0);
-    sample_freq_out_ = configuration->property(role_ + ".sample_freq_out", (double)2048000.0);
+    sample_freq_out_ = configuration->property(role_ + ".sample_freq_out", fs_in);
+    if(std::fabs(fs_in - sample_freq_out_) > std::numeric_limits<double>::epsilon())
+        {
+            std::string aux_warn = "CONFIGURATION WARNING: Parameters GNSS-SDR.internal_fs_hz and "
+                    + role_ + ".sample_freq_out are not set to the same value!" ;
+            LOG(WARNING) << aux_warn;
+            std::cout << aux_warn << std::endl;
+        }
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     dump_ = configuration->property(role + ".dump", false);
     DLOG(INFO) << "dump_ is " << dump_;

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