From f4a7949f1608a489d854ade4a0437c5d3a070455 Mon Sep 17 00:00:00 2001 From: Pascal Gohl Date: Fri, 24 Apr 2015 10:04:22 +0200 Subject: [PATCH] use same name for cfg header as cfg file to prevent rebuilding every time --- cfg/visensor_node.cfg | 2 +- include/visensor.hpp | 8 ++++---- src/visensor.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cfg/visensor_node.cfg b/cfg/visensor_node.cfg index d1c4743..b15768e 100755 --- a/cfg/visensor_node.cfg +++ b/cfg/visensor_node.cfg @@ -78,5 +78,5 @@ gen.add("cam3_coarse_shutter_width", int_t, 0, "shutter", 100, 2 gen.add("cam3_adc_mode", int_t, 0, "ADC Mode", 2,2,3) gen.add("cam3_vref_adc_voltage_level", int_t, 0, "Vref ADC Voltage level", 4,0,7) -exit(gen.generate(PACKAGE, "visensor_node", "Driver")) +exit(gen.generate(PACKAGE, "visensor_node", "visensor_node")) diff --git a/include/visensor.hpp b/include/visensor.hpp index e624ed9..84580af 100644 --- a/include/visensor.hpp +++ b/include/visensor.hpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include "visensor_node/visensor_imu.h" #include "visensor_node/visensor_time_host.h" #include "visensor_node/visensor_calibration_service.h" @@ -103,7 +103,7 @@ class ViSensor { bool calibrationServiceCallback(visensor_node::visensor_calibration_service::Request &req, visensor_node::visensor_calibration_service::Response &res); //dynamic reconfigure callback - void configCallback(visensor_node::DriverConfig &config, uint32_t level); + void configCallback(visensor_node::visensor_nodeConfig &config, uint32_t level); private: void init(); @@ -135,9 +135,9 @@ class ViSensor { std::map camera_imu_calibrations_; - dynamic_reconfigure::Server dr_srv_; + dynamic_reconfigure::Server dr_srv_; - visensor_node::DriverConfig config_; + visensor_node::visensor_nodeConfig config_; }; } //namespace visensor diff --git a/src/visensor.cpp b/src/visensor.cpp index 837bc9e..73d12f9 100644 --- a/src/visensor.cpp +++ b/src/visensor.cpp @@ -287,7 +287,7 @@ void ViSensor::frameCallback(ViFrame::Ptr frame_ptr, ViErrorCode error) { camera_imu_calibrations_[ROS_CAMERA_NAMES.at(static_cast(frame_ptr->camera_id))]); } -void ViSensor::configCallback(visensor_node::DriverConfig &config, uint32_t level) { +void ViSensor::configCallback(visensor_node::visensor_nodeConfig &config, uint32_t level) { std::vector all_available_sensor_ids = drv_.getListOfSensorIDs();