Major changes. Signal Conditioner holds now blocks to change data type, filter and resample input data.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@172 64b25241-fba3-4117-9849-534c7e92360d

src/algorithms/conditioner/adapters/jamfile.jam

@@ -1,3 +1,3 @@
 project : build-dir ../../../../build ;
 
-obj direct_resampler_conditioner : direct_resampler_conditioner.cc ;
+obj signal_conditioner : signal_conditioner.cc ;

src/algorithms/conditioner/adapters/signal_conditioner.cc

@@ -0,0 +1,121 @@
+/*!
+ * \file signal_conditioner.cc
+ * \brief It holds blocks to change data type, filter and resample input data.
+ * \author Luis Esteve, 2012. luis(at)epsilon-formacion.com
+ *
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#include "signal_conditioner.h"
+#include "gnss_flowgraph.h"
+#include <iostream>
+#include <sstream>
+#include <boost/lexical_cast.hpp>
+#include <boost/thread/thread.hpp>
+#include <gnuradio/gr_io_signature.h>
+#include <gnuradio/gr_message.h>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+
+using google::LogMessage;
+
+// Constructor
+SignalConditioner::SignalConditioner(ConfigurationInterface *configuration,
+        GNSSBlockInterface *data_type_adapt, GNSSBlockInterface *in_filt,
+        GNSSBlockInterface *res, std::string role, std::string implementation,
+        gr_msg_queue_sptr queue) : data_type_adapt_(data_type_adapt),
+        in_filt_(in_filt), res_(res), role_(role), implementation_(implementation),
+        queue_(queue)
+{
+//    stop_ = false;
+    connected_ = false;
+}
+
+// Destructor
+SignalConditioner::~SignalConditioner()
+{
+	delete data_type_adapt_;
+	delete in_filt_;
+	delete res_;
+}
+
+void SignalConditioner::connect(gr_top_block_sptr top_block)
+{
+
+    if (connected_)
+        {
+            LOG_AT_LEVEL(WARNING) << "Signal conditioner already connected internally";
+            return;
+        }
+
+    data_type_adapt_->connect(top_block);
+    in_filt_->connect(top_block);
+    res_->connect(top_block);
+
+    top_block->connect(data_type_adapt_->get_right_block(), 0,
+            in_filt_->get_left_block(), 0);
+    DLOG(INFO) << "data_type_adapter -> input_filter";
+
+    top_block->connect(in_filt_->get_right_block(), 0,
+            res_->get_left_block(), 0);
+    DLOG(INFO) << "input_filter -> resampler";
+
+    connected_ = true;
+}
+
+void SignalConditioner::disconnect(gr_top_block_sptr top_block)
+{
+
+    if (!connected_)
+        {
+            LOG_AT_LEVEL(WARNING) << "Signal conditioner already disconnected internally";
+            return;
+        }
+
+    top_block->disconnect(data_type_adapt_->get_right_block(), 0,
+            in_filt_->get_left_block(), 0);
+    top_block->disconnect(in_filt_->get_right_block(), 0,
+            res_->get_left_block(), 0);
+
+    data_type_adapt_->disconnect(top_block);
+    in_filt_->disconnect(top_block);
+    res_->disconnect(top_block);
+
+    connected_ = false;
+}
+
+gr_basic_block_sptr SignalConditioner::get_left_block()
+{
+    return data_type_adapt_->get_left_block();
+}
+
+
+
+gr_basic_block_sptr SignalConditioner::get_right_block()
+{
+    return res_->get_right_block();
+}
+

src/algorithms/conditioner/adapters/signal_conditioner.h

@@ -0,0 +1,97 @@
+/*!
+ * \file signal_conditioner.h
+ * \brief It holds blocks to change data type, filter and resample input data.
+ * \author Luis Esteve, 2012. luis(at)epsilon-formacion.com
+ *
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_SIGNAL_CONDITIONER_H_
+#define GNSS_SDR_SIGNAL_CONDITIONER_H_
+
+#include <gnuradio/gr_null_sink.h>
+#include <gnuradio/gr_msg_queue.h>
+#include "gnss_block_interface.h"
+#include "control_message_factory.h"
+//#include "gnss_signal.h"
+//#include "gnss_synchro.h"
+
+
+class ConfigurationInterface;
+class AcquisitionInterface;
+class TrackingInterface;
+class TelemetryDecoderInterface;
+
+class SignalConditioner: public GNSSBlockInterface
+{
+
+public:
+    //! Constructor
+	SignalConditioner(ConfigurationInterface *configuration,
+            GNSSBlockInterface *data_type_adapt, GNSSBlockInterface *in_filt,
+            GNSSBlockInterface *res, std::string role, std::string implementation,
+            gr_msg_queue_sptr queue);
+
+    //! Virtual destructor
+    virtual ~SignalConditioner();
+
+    void connect(gr_top_block_sptr top_block);
+    void disconnect(gr_top_block_sptr top_block);
+    gr_basic_block_sptr get_left_block();
+    gr_basic_block_sptr get_right_block();
+
+    std::string role(){ return role_; }
+
+    std::string implementation(){ return "Signal_Conditioner"; }
+
+    size_t item_size(){ return 0; }
+
+    GNSSBlockInterface *data_type_adapter(){ return data_type_adapt_; }
+
+    GNSSBlockInterface *input_filter(){ return in_filt_; }
+
+    GNSSBlockInterface *resampler(){ return res_; }
+
+
+
+
+private:
+
+    GNSSBlockInterface *data_type_adapt_;
+    GNSSBlockInterface *in_filt_;
+    GNSSBlockInterface *res_;
+
+    std::string role_;
+    std::string implementation_;
+
+    bool connected_;
+    //bool stop_;
+    gr_msg_queue_sptr queue_;
+
+
+};
+
+#endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/

src/algorithms/conditioner/jamfile.jam

@@ -1,2 +1,2 @@
-#build-project adapters ;
+build-project adapters ;
 #build-project gnuradio_blocks ;