mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-08-09 23:43:54 +00:00
Code Issues Releases Wiki Activity

Change name of L2C observables block

Browse Source
This commit is contained in:
Carles Fernandez 2016-11-03 19:03:17 +01:00
parent 6ed6234170
commit e918da7785
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/observables/adapters/CMakeLists.txt
View File

@ -18,9 +18,9 @@
set(OBS_ADAPTER_SOURCES set(OBS_ADAPTER_SOURCES
gps_l1_ca_observables.cc gps_l1_ca_observables.cc
gps_l2_m_observables.cc gps_l2c_observables.cc
galileo_e1_observables.cc galileo_e1_observables.cc
galileo_e5a_observables.cc galileo_e5a_observables.cc
hybrid_observables.cc hybrid_observables.cc
) )

16
src/algorithms/observables/adapters/gps_l2_m_observables.cc → src/algorithms/observables/adapters/gps_l2c_observables.cc
View File

@ -1,5 +1,5 @@
/*! /*!
* \file gps_l2_m_observables.cc * \file gps_l2c_observables.cc
* \brief Implementation of an adapter of a GPS L2 C(M) observables block * \brief Implementation of an adapter of a GPS L2 C(M) observables block
* to a ObservablesInterface * to a ObservablesInterface
* \author Carles Fernandez 2016. carles.fernandez(at)cttc.es * \author Carles Fernandez 2016. carles.fernandez(at)cttc.es
@ -30,14 +30,14 @@
*/ */
#include "gps_l2_m_observables.h" #include "gps_l2c_observables.h"
#include "configuration_interface.h" #include "configuration_interface.h"
#include <glog/logging.h> #include <glog/logging.h>
#include "GPS_L2C.h" #include "GPS_L2C.h"
using google::LogMessage; using google::LogMessage;
GpsL2MObservables::GpsL2MObservables(ConfigurationInterface* configuration, GpsL2CObservables::GpsL2CObservables(ConfigurationInterface* configuration,
std::string role, std::string role,
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams) : unsigned int out_streams) :
@ -56,11 +56,11 @@ GpsL2MObservables::GpsL2MObservables(ConfigurationInterface* configuration,
} }
GpsL2MObservables::~GpsL2MObservables() GpsL2CObservables::~GpsL2CObservables()
{} {}
void GpsL2MObservables::connect(gr::top_block_sptr top_block) void GpsL2CObservables::connect(gr::top_block_sptr top_block)
{ {
if(top_block) { /* top_block is not null */}; if(top_block) { /* top_block is not null */};
// Nothing to connect internally // Nothing to connect internally
@ -68,20 +68,20 @@ void GpsL2MObservables::connect(gr::top_block_sptr top_block)
} }
void GpsL2MObservables::disconnect(gr::top_block_sptr top_block) void GpsL2CObservables::disconnect(gr::top_block_sptr top_block)
{ {
if(top_block) { /* top_block is not null */}; if(top_block) { /* top_block is not null */};
// Nothing to disconnect // Nothing to disconnect
} }
gr::basic_block_sptr GpsL2MObservables::get_left_block() gr::basic_block_sptr GpsL2CObservables::get_left_block()
{ {
return observables_; return observables_;
} }
gr::basic_block_sptr GpsL2MObservables::get_right_block() gr::basic_block_sptr GpsL2CObservables::get_right_block()
{ {
return observables_; return observables_;
} }

18
src/algorithms/observables/adapters/gps_l2_m_observables.h → src/algorithms/observables/adapters/gps_l2c_observables.h
View File

@ -1,5 +1,5 @@
/*! /*!
* \file gps_l2_m_observables.h * \file gps_l2c_observables.h
* \brief Implementation of an adapter of a GPS L2C(M) observables block * \brief Implementation of an adapter of a GPS L2C(M) observables block
* to a ObservablesInterface * to a ObservablesInterface
* \author Carles Fernandez 2016. carles.fernandez(at)cttc.es * \author Carles Fernandez 2016. carles.fernandez(at)cttc.es
@ -30,8 +30,8 @@
*/ */
#ifndef GNSS_SDR_GPS_L2_M_OBSERVABLES_H_ #ifndef GNSS_SDR_GPS_L2C_OBSERVABLES_H_
#define GNSS_SDR_GPS_L2_M_OBSERVABLES_H_ #define GNSS_SDR_GPS_L2C_OBSERVABLES_H_
#include <string> #include <string>
#include "observables_interface.h" #include "observables_interface.h"
@ -41,25 +41,25 @@
class ConfigurationInterface; class ConfigurationInterface;
/*! /*!
* \brief This class implements an ObservablesInterface for Galileo E1B * \brief This class implements an ObservablesInterface for GPS L2C
*/ */
class GpsL2MObservables : public ObservablesInterface class GpsL2CObservables : public ObservablesInterface
{ {
public: public:
GpsL2MObservables(ConfigurationInterface* configuration, GpsL2CObservables(ConfigurationInterface* configuration,
std::string role, std::string role,
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL2MObservables(); virtual ~GpsL2CObservables();
std::string role() std::string role()
{ {
return role_; return role_;
} }
//! Returns "GPS_L2_M_Observables" //! Returns "GPS_L2C_Observables"
std::string implementation() std::string implementation()
{ {
return "GPS_L2_M_Observables"; return "GPS_L2C_Observables";
} }
void connect(gr::top_block_sptr top_block); void connect(gr::top_block_sptr top_block);
void disconnect(gr::top_block_sptr top_block); void disconnect(gr::top_block_sptr top_block);

6
src/core/receiver/gnss_block_factory.cc
View File

@ -90,7 +90,7 @@
#include "galileo_e5a_telemetry_decoder.h" #include "galileo_e5a_telemetry_decoder.h"
#include "sbas_l1_telemetry_decoder.h" #include "sbas_l1_telemetry_decoder.h"
#include "gps_l1_ca_observables.h" #include "gps_l1_ca_observables.h"
#include "gps_l2_m_observables.h" #include "gps_l2c_observables.h"
#include "galileo_e1_observables.h" #include "galileo_e1_observables.h"
#include "galileo_e5a_observables.h" #include "galileo_e5a_observables.h"
#include "hybrid_observables.h" #include "hybrid_observables.h"
@ -1057,9 +1057,9 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
else if (implementation.compare("GPS_L2_M_Observables") == 0) else if (implementation.compare("GPS_L2C_Observables") == 0)
{ {
std::unique_ptr<GNSSBlockInterface> block_(new GpsL2MObservables(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new GpsL2CObservables(configuration.get(), role, in_streams,
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }