Use DiagnosticNodelet instead of ConnectionBasedNodelet.#2712
Use DiagnosticNodelet instead of ConnectionBasedNodelet.#2712iory wants to merge 2 commits intojsk-ros-pkg:masterfrom
Conversation
70a1199 to
0f86538
Compare
|
|
||
| #include <pcl_ros/publisher.h> | ||
| #include <jsk_topic_tools/connection_based_nodelet.h> | ||
| #include <jsk_topic_tools/diagnostic_nodelet.h> |
There was a problem hiding this comment.
if this code depends on jsk_topic_tools >= x.x.x, I would recommend to write something like PR2/pr2_mechanism@c2d2d7e#diff-b32b543817fc81911592c454ab29c1d29f6ce7cd2ab6dcd3a374014568a2ee55R81-R85
instead of using -DJSK_TOPIC_TOOLS_X_X_XAPI , will we introduce jsk_topic_tools_version.h ???(https://github.com/jsk-ros-pkg/jsk_common/blob/714713378fb037c9670bf48118010f1899c10bd5/jsk_topic_tools/CMakeLists.txt#L30-L32)
| } | ||
|
|
||
|
|
||
| class BilateralFilter: public jsk_topic_tools::ConnectionBasedNodelet |
There was a problem hiding this comment.
how about
#if defined(JSK_TOPIC_TOOLS_VERSION) and JKS_NODELET_VERSION_MINIMUM(2,2,13))
#define jsk_topic_tools::NODLET jsk_topic_tools::ConnectionBasedNodelet
#else
#define jsk_topic_tools::NODLET jsk_topic_tools::DiagnosticNodelet
#endif
Along with that, poke is added to check node is running.
…nectionBasedNodelet
|
@k-okada I have changed to use The released Because |
Modified all
ConnectionBasedNodeletsin jsk_recognition toDiagnosticNodelet.Also, DiagnosticsNodelet requires poke.
There are many PRs out there that add
poke, and this PR also addedpokefor all nodelets that do not havepoke.#2690
#2710
#2203
The nodes of
resized_image_transportinherit fromimage_processing_nodelet, andpokeis called insideimage_processing_nodelet.jsk_recognition/resized_image_transport/src/image_processing_nodelet.cpp
Lines 141 to 157 in 09cbce5