[jsk_topic_tools][lightweight_throttle] fix

jsk-ros-pkg · Apr 22, 2017 · 473a2bc · 473a2bc
1 parent 027dd9b
commit 473a2bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/jsk_topic_tools/CMakeLists.txt b/jsk_topic_tools/CMakeLists.txt
@@ -15,26 +15,24 @@ find_package(catkin REQUIRED COMPONENTS
   geometry_msgs
   image_transport
   message_generation
-  nodelet tf
+  nodelet
   roscpp
   rostime
   std_msgs
   std_srvs
-  topic_tools
+  tf
   topic_tools
 )
 catkin_python_setup()
 add_message_files(
   FILES TopicInfo.msg
 )
-
 add_service_files(
   FILES List.srv Update.srv ChangeTopic.srv PassthroughDuration.srv
 )
 generate_dynamic_reconfigure_options(
   cfg/LightweightThrottle.cfg
 )
-
 generate_messages()
 catkin_package(
     DEPENDS
@@ -106,7 +104,7 @@ add_library(jsk_topic_tools SHARED
   src/diagnostic_nodelet.cpp
   src/series_boolean.cpp
   src/counter.cpp)
-add_dependencies(jsk_topic_tools ${PROJECT_NAME}_gencpp)
+add_dependencies(jsk_topic_tools ${PROJECT_NAME}_gencpp ${PROJECT_NAME}_gencfg)
 target_link_libraries(jsk_topic_tools ${catkin_LIBRARIES})
 
 if (CATKIN_ENABLE_TESTING)

diff --git a/jsk_topic_tools/cfg/LightweightThrottle.cfg b/jsk_topic_tools/cfg/LightweightThrottle.cfg
@@ -6,6 +6,6 @@ PKG = "jsk_topic_tools"
 
 gen = ParameterGenerator()
 
-gen.add("update_rate", double_t, 0, "", 1.0, 0.0, 1000.0)
+gen.add("update_rate", double_t, 0, "Desired publish rate of throttled messages", 1.0, 0.0, 1000.0)
 
 exit(gen.generate(PKG, PKG, "LightweightThrottle"))
diff --git a/jsk_topic_tools/src/lightweight_throttle_nodelet.cpp b/jsk_topic_tools/src/lightweight_throttle_nodelet.cpp
@@ -44,7 +44,7 @@ namespace jsk_topic_tools
     subscribing_ = false;
 
     srv_ = boost::make_shared<dynamic_reconfigure::Server<Config> >(pnh_);
-    typename dynamic_reconfigure::Server<Config>::CallbackType f =
+    dynamic_reconfigure::Server<Config>::CallbackType f =
       boost::bind(&LightweightThrottle::configCallback, this, _1, _2);
     srv_->setCallback(f);