Skip to content

Commit

Permalink
fixing build
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Nov 13, 2023
1 parent 18e36e5 commit fcb4be8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions mrs_tf_reconfigure/include/TfReconfigure.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

#include <mrs_lib/param_loader.h>

#include <tf_reconfigure/tfConfig.h>
#include <mrs_tf_reconfigure/tfConfig.h>

#include <mutex>

namespace tf_reconfigure
namespace mrs_tf_reconfigure
{

/* class TfReconfigure //{ */
Expand Down Expand Up @@ -52,19 +52,19 @@ class TfReconfigure : public nodelet::Nodelet {

boost::recursive_mutex mutex_reconfigure_;

boost::shared_ptr<dynamic_reconfigure::Server<tf_reconfigure::tfConfig>> reconfigure_server_;
boost::shared_ptr<dynamic_reconfigure::Server<mrs_tf_reconfigure::tfConfig>> reconfigure_server_;

ros::Timer timer_tf_;
ros::Timer timer_tf_;

double rate_timer_tf_ = 1.0;

void timerTf(const ros::TimerEvent& event);
void callbackReconfigure([[maybe_unused]] tf_reconfigure::tfConfig& config, [[maybe_unused]] uint32_t level);
void callbackReconfigure([[maybe_unused]] mrs_tf_reconfigure::tfConfig& config, [[maybe_unused]] uint32_t level);
void broadcastTransforms();

//}
};

} // namespace tf_reconfigure
} // namespace mrs_tf_reconfigure

#endif
14 changes: 7 additions & 7 deletions mrs_tf_reconfigure/src/TfReconfigure.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <TfReconfigure.h>

namespace tf_reconfigure
namespace mrs_tf_reconfigure
{

/* onInit() //{ */
Expand Down Expand Up @@ -35,11 +35,11 @@ void TfReconfigure::onInit() {
// | dynamic reconfigure |
// --------------------------------------------------------------

reconfigure_server_.reset(new dynamic_reconfigure::Server<tf_reconfigure::tfConfig>(mutex_reconfigure_, nh_));
dynamic_reconfigure::Server<tf_reconfigure::tfConfig>::CallbackType f = boost::bind(&TfReconfigure::callbackReconfigure, this, _1, _2);
reconfigure_server_.reset(new dynamic_reconfigure::Server<mrs_tf_reconfigure::tfConfig>(mutex_reconfigure_, nh_));
dynamic_reconfigure::Server<mrs_tf_reconfigure::tfConfig>::CallbackType f = boost::bind(&TfReconfigure::callbackReconfigure, this, _1, _2);
reconfigure_server_->setCallback(f);

transformer_ = std::make_unique<mrs_lib::Transformer>("tf_reconfigure");
transformer_ = std::make_unique<mrs_lib::Transformer>("mrs_tf_reconfigure");
transformer_->retryLookupNewest(true);

is_initialized_ = true;
Expand Down Expand Up @@ -106,7 +106,7 @@ void TfReconfigure::timerTf(const ros::TimerEvent& event) {
//}

/* //{ callbackReconfigure() */
void TfReconfigure::callbackReconfigure([[maybe_unused]] tf_reconfigure::tfConfig& config, [[maybe_unused]] uint32_t level) {
void TfReconfigure::callbackReconfigure([[maybe_unused]] mrs_tf_reconfigure::tfConfig& config, [[maybe_unused]] uint32_t level) {

if (!is_initialized_) {
return;
Expand Down Expand Up @@ -176,7 +176,7 @@ void TfReconfigure::callbackReconfigure([[maybe_unused]] tf_reconfigure::tfConfi
}
//}

} // namespace tf_reconfigure
} // namespace mrs_tf_reconfigure

#include <pluginlib/class_list_macros.h>
PLUGINLIB_EXPORT_CLASS(tf_reconfigure::TfReconfigure, nodelet::Nodelet)
PLUGINLIB_EXPORT_CLASS(mrs_tf_reconfigure::TfReconfigure, nodelet::Nodelet)

0 comments on commit fcb4be8

Please sign in to comment.