Skip to content
Snippets Groups Projects
Commit dbe1af7c authored by Joaquim Casals Buñuel's avatar Joaquim Casals Buñuel
Browse files

Rename

parent c2c5187d
No related branches found
No related tags found
No related merge requests found
......@@ -139,7 +139,7 @@ include_directories(
# )
add_library(subscriber_gnss src/subscriber_gnss.cpp)
add_library(subscriber_gnss_fix src/subscriber_gnss_fix.cpp)
add_library(subscriber_gnss_TDCP src/subscriber_gnss_TDCP.cpp)
add_library(subscriber_gnss_Tdcp src/subscriber_gnss_Tdcp.cpp)
add_library(subscriber_gnss_ublox src/subscriber_gnss_ublox.cpp)
## Add cmake target dependencies of the library
......@@ -174,7 +174,7 @@ target_link_libraries(subscriber_gnss_fix
${wolfgnss_LIBRARIES}
${iri_gnss_msgs_LIBRARIES}
)
target_link_libraries(subscriber_gnss_TDCP
target_link_libraries(subscriber_gnss_Tdcp
${wolf_LIBRARIES}
${wolfgnss_LIBRARIES}
${iri_gnss_msgs_LIBRARIES}
......
......@@ -32,7 +32,7 @@
using namespace wolf;
class SubscriberGnssTDCP : public Subscriber
class SubscriberGnssTdcp : public Subscriber
{
protected:
......@@ -44,7 +44,7 @@ class SubscriberGnssTDCP : public Subscriber
public:
// Constructor
SubscriberGnssTDCP(const SensorBasePtr& sensor_ptr);
SubscriberGnssTdcp(const SensorBasePtr& sensor_ptr);
virtual void initSubscriber(ros::NodeHandle& nh, const std::string& topic);
......@@ -54,4 +54,4 @@ class SubscriberGnssTDCP : public Subscriber
static std::shared_ptr<Subscriber> create(const std::string& _unique_name, const ParamsServer& _params, const SensorBasePtr _sensor_ptr);
};
WOLF_REGISTER_SUBSCRIBER(SubscriberGnssTDCP)
WOLF_REGISTER_SUBSCRIBER(SubscriberGnssTdcp)
#include "../include/wolf_subscriber_gnss_TDCP.h"
#include "../include/wolf_subscriber_gnss_Tdcp.h"
using namespace wolf;
// Constructor
SubscriberGnssTDCP::SubscriberGnssTDCP(const SensorBasePtr& sensor_ptr) :
SubscriberGnssTdcp::SubscriberGnssTdcp(const SensorBasePtr& sensor_ptr) :
Subscriber(sensor_ptr)
{
// TODO copied from TDCP_ros
// TODO copied from Tdcp_ros
}
void SubscriberGnssTDCP::initSubscriber(ros::NodeHandle& nh, const std::string& topic)
void SubscriberGnssTdcp::initSubscriber(ros::NodeHandle& nh, const std::string& topic)
{
sub_ = nh.subscribe(topic+std::string("_obs"), 1, &SubscriberGnssTDCP::callbackObservation, this);
sub_nav_ = nh.subscribe(topic+std::string("_nav"), 1, &SubscriberGnssTDCP::callbackNavigation, this);
sub_ = nh.subscribe(topic+std::string("_obs"), 1, &SubscriberGnssTdcp::callbackObservation, this);
sub_nav_ = nh.subscribe(topic+std::string("_nav"), 1, &SubscriberGnssTdcp::callbackNavigation, this);
}
void SubscriberGnssTDCP::callbackObservation(const iri_gnss_msgs::Observation::ConstPtr& msg)
void SubscriberGnssTdcp::callbackObservation(const iri_gnss_msgs::Observation::ConstPtr& msg)
{
ROS_INFO("callbackObs!");
if (last_nav_ptr_==nullptr)
return;
// TODO copied from TDCP_ros
// TODO copied from Tdcp_ros
// GNSSUtils::ObservationsPtr obs_ptr = std::make_shared<GNSSUtils::Observations>();
// GNSSUtils::fillObservation(*obs_ptr, msg);
......@@ -33,7 +33,7 @@ void SubscriberGnssTDCP::callbackObservation(const iri_gnss_msgs::Observation::C
//
}
void SubscriberGnssTDCP::callbackNavigation(const iri_gnss_msgs::Navigation::ConstPtr& msg)
void SubscriberGnssTdcp::callbackNavigation(const iri_gnss_msgs::Navigation::ConstPtr& msg)
{
ROS_INFO("callbackNav!");
......@@ -41,10 +41,10 @@ void SubscriberGnssTDCP::callbackNavigation(const iri_gnss_msgs::Navigation::Con
GNSSUtils::fillNavigation(*last_nav_ptr_, msg);
last_nav_ptr_->print();
// TODO copied from TDCP_ros
// TODO copied from Tdcp_ros
}
std::shared_ptr<Subscriber> SubscriberGnssTDCP::create(const std::string& _unique_name, const ParamsServer& _params, const SensorBasePtr _sensor_ptr)
std::shared_ptr<Subscriber> SubscriberGnssTdcp::create(const std::string& _unique_name, const ParamsServer& _params, const SensorBasePtr _sensor_ptr)
{
return std::make_shared<SubscriberGnssTDCP>(_sensor_ptr);
return std::make_shared<SubscriberGnssTdcp>(_sensor_ptr);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment