From ad738d54617f8bbe34b531c97ee88264e1965aa2 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Tue, 7 Apr 2020 16:17:45 +0200
Subject: [PATCH] adapted after gnss_utils renamings
---
include/subscriber_gnss.h | 13 +++++++------
include/subscriber_gnss_tdcp.h | 4 ++--
include/subscriber_gnss_ublox.h | 5 +++--
src/subscriber_gnss.cpp | 10 +++++-----
src/subscriber_gnss_tdcp.cpp | 8 ++++----
src/subscriber_gnss_ublox.cpp | 8 ++++----
6 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/include/subscriber_gnss.h b/include/subscriber_gnss.h
index 5acba76..f51518f 100644
--- a/include/subscriber_gnss.h
+++ b/include/subscriber_gnss.h
@@ -14,7 +14,7 @@
#include <ros/ros.h>
#include <iri_gnss_msgs/Observation.h>
#include <iri_gnss_msgs/Navigation.h>
-#include <iri_gnss_msgs/iri_gnss_msgs_to_gnssutils.h>
+#include <iri_gnss_msgs/iri_gnss_msgs_to_gnss_utils.h>
/**************************
* STD includes *
@@ -28,7 +28,8 @@
**************************/
#include "subscriber.h"
#include "subscriber_factory.h"
-#include "gnss_utils/gnss_utils.h"
+#include "gnss_utils/navigation.h"
+#include "gnss_utils/observations.h"
using namespace wolf;
@@ -37,10 +38,10 @@ class SubscriberGnss : public Subscriber
protected:
ros::Subscriber sub_nav_;
- std::shared_ptr<GNSSUtils::Navigation> last_nav_ptr_;
- //GNSSUtils::Navigation last_nav_;
- //GNSSUtils::Observations obs_;
- //GNSSUtils::ComputePosOutput get_pos_res_;
+ std::shared_ptr<GnssUtils::Navigation> last_nav_ptr_;
+ //GnssUtils::Navigation last_nav_;
+ //GnssUtils::Observations obs_;
+ //GnssUtils::ComputePosOutput get_pos_res_;
//prcopt_t prcopt_;
//bool new_obs_;
diff --git a/include/subscriber_gnss_tdcp.h b/include/subscriber_gnss_tdcp.h
index 91bf5c4..d5214c6 100644
--- a/include/subscriber_gnss_tdcp.h
+++ b/include/subscriber_gnss_tdcp.h
@@ -14,7 +14,7 @@
#include <ros/ros.h>
#include <iri_gnss_msgs/Observation.h>
#include <iri_gnss_msgs/Navigation.h>
-#include <iri_gnss_msgs/iri_gnss_msgs_to_gnssutils.h>
+#include <iri_gnss_msgs/iri_gnss_msgs_to_gnss_utils.h>
/**************************
* STD includes *
@@ -37,7 +37,7 @@ class SubscriberGnssTdcp : public Subscriber
protected:
ros::Subscriber sub_nav_;
- std::shared_ptr<GNSSUtils::Navigation> last_nav_ptr_;
+ std::shared_ptr<GnssUtils::Navigation> last_nav_ptr_;
//prcopt_t prcopt_;
//bool new_obs_;
diff --git a/include/subscriber_gnss_ublox.h b/include/subscriber_gnss_ublox.h
index c148ee0..decf5ce 100644
--- a/include/subscriber_gnss_ublox.h
+++ b/include/subscriber_gnss_ublox.h
@@ -19,7 +19,8 @@
**************************/
#include "subscriber.h"
#include "subscriber_factory.h"
-#include "gnss_utils/gnss_utils.h"
+#include "gnss_utils/navigation.h"
+#include "gnss_utils/observations.h"
#include "gnss_utils/ublox_raw.h"
using namespace wolf;
@@ -38,6 +39,6 @@ class SubscriberGnssUblox : public Subscriber
protected:
- GNSSUtils::UBloxRaw ublox_raw_;
+ GnssUtils::UBloxRaw ublox_raw_;
};
WOLF_REGISTER_SUBSCRIBER(SubscriberGnssUblox)
diff --git a/src/subscriber_gnss.cpp b/src/subscriber_gnss.cpp
index f80d76c..f6a81d3 100644
--- a/src/subscriber_gnss.cpp
+++ b/src/subscriber_gnss.cpp
@@ -35,8 +35,8 @@ void SubscriberGnss::callbackObservation(const iri_gnss_msgs::Observation::Const
if (last_nav_ptr_==nullptr)
return;
- GNSSUtils::ObservationsPtr obs_ptr = std::make_shared<GNSSUtils::Observations>();
- GNSSUtils::fillObservation(*obs_ptr, msg);
+ GnssUtils::ObservationsPtr obs_ptr = std::make_shared<GnssUtils::Observations>();
+ GnssUtils::fillObservation(*obs_ptr, msg);
CaptureGnssPtr new_capture = std::make_shared<CaptureGnss>(TimeStamp(msg->header.stamp.sec, msg->header.stamp.nsec),
sensor_ptr_,
obs_ptr,
@@ -49,14 +49,14 @@ void SubscriberGnss::callbackNavigation(const iri_gnss_msgs::Navigation::ConstPt
ROS_INFO("callbackNav!");
std::cout << "Ephemeris size: " << msg->eph.size() << "\n";
- last_nav_ptr_ = std::make_shared<GNSSUtils::Navigation>();
- GNSSUtils::fillNavigation(*last_nav_ptr_, msg);
+ last_nav_ptr_ = std::make_shared<GnssUtils::Navigation>();
+ GnssUtils::fillNavigation(*last_nav_ptr_, msg);
last_nav_ptr_->print();
// if (this->new_obs_)
// {
// std::cout << "Before computed!!! \n";
-// this->get_pos_res_ = GNSSUtils::computePos(this->obs_, *last_nav_ptr_, this->prcopt_);
+// this->get_pos_res_ = GnssUtils::computePos(this->obs_, *last_nav_ptr_, this->prcopt_);
// std::cout << "Computed!!! \n";
// }
}
diff --git a/src/subscriber_gnss_tdcp.cpp b/src/subscriber_gnss_tdcp.cpp
index 375d3c5..ef09f47 100644
--- a/src/subscriber_gnss_tdcp.cpp
+++ b/src/subscriber_gnss_tdcp.cpp
@@ -23,8 +23,8 @@ void SubscriberGnssTdcp::callbackObservation(const iri_gnss_msgs::Observation::C
// TODO copied from Tdcp_ros
-// GNSSUtils::ObservationsPtr obs_ptr = std::make_shared<GNSSUtils::Observations>();
-// GNSSUtils::fillObservation(*obs_ptr, msg);
+// GnssUtils::ObservationsPtr obs_ptr = std::make_shared<GnssUtils::Observations>();
+// GnssUtils::fillObservation(*obs_ptr, msg);
// CaptureGnssPtr new_capture = std::make_shared<CaptureGnss>(TimeStamp(msg->header.stamp.sec, msg->header.stamp.nsec),
// sensor_ptr_,
// obs_ptr,
@@ -37,8 +37,8 @@ void SubscriberGnssTdcp::callbackNavigation(const iri_gnss_msgs::Navigation::Con
{
ROS_INFO("callbackNav!");
- last_nav_ptr_ = std::make_shared<GNSSUtils::Navigation>();
- GNSSUtils::fillNavigation(*last_nav_ptr_, msg);
+ last_nav_ptr_ = std::make_shared<GnssUtils::Navigation>();
+ GnssUtils::fillNavigation(*last_nav_ptr_, msg);
last_nav_ptr_->print();
// TODO copied from Tdcp_ros
diff --git a/src/subscriber_gnss_ublox.cpp b/src/subscriber_gnss_ublox.cpp
index f24b5ef..3e59af9 100644
--- a/src/subscriber_gnss_ublox.cpp
+++ b/src/subscriber_gnss_ublox.cpp
@@ -17,17 +17,17 @@ void SubscriberGnssUblox::initSubscriber(ros::NodeHandle& nh, const std::string&
void SubscriberGnssUblox::callback(const std_msgs::UInt8MultiArray& msg)
{
- GNSSUtils::RawDataType res = ublox_raw_.addDataStream(msg.data);
+ GnssUtils::RawDataType res = ublox_raw_.addDataStream(msg.data);
//std::cout << "res = " << (int) res << std::endl;
// only create capture if observation is received
- if (res == GNSSUtils::OBS)
+ if (res == GnssUtils::OBS)
{
//ROS_INFO("Observation received!");
- GNSSUtils::ObservationsPtr obs_ptr = std::make_shared<GNSSUtils::Observations>(ublox_raw_.getObservations());
+ GnssUtils::ObservationsPtr obs_ptr = std::make_shared<GnssUtils::Observations>(ublox_raw_.getObservations());
//ROS_INFO("Observations copied!");
- GNSSUtils::NavigationPtr nav_ptr = std::make_shared<GNSSUtils::Navigation>(ublox_raw_.getNavigation());
+ GnssUtils::NavigationPtr nav_ptr = std::make_shared<GnssUtils::Navigation>(ublox_raw_.getNavigation());
//ROS_INFO("Navigation copied!");
ros::Time now = ros::Time::now();
--
GitLab