Skip to content
Snippets Groups Projects

Resolve "Follow core 422"

Merged Joan Solà Ortega requested to merge 18-follow-core-422 into devel
2 files
+ 5
5
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -42,7 +42,7 @@ namespace wolf {
@@ -42,7 +42,7 @@ namespace wolf {
WOLF_PTR_TYPEDEFS(ProcessorOdomIcp);
WOLF_PTR_TYPEDEFS(ProcessorOdomIcp);
WOLF_STRUCT_PTR_TYPEDEFS(ParamsProcessorOdomIcp);
WOLF_STRUCT_PTR_TYPEDEFS(ParamsProcessorOdomIcp);
struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMotion
struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsMotionProvider
{
{
// ICP Params
// ICP Params
laserscanutils::icpParams icp_params;
laserscanutils::icpParams icp_params;
@@ -60,7 +60,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
@@ -60,7 +60,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
ParamsProcessorOdomIcp() = default;
ParamsProcessorOdomIcp() = default;
ParamsProcessorOdomIcp(std::string _unique_name, const ParamsServer &_server):
ParamsProcessorOdomIcp(std::string _unique_name, const ParamsServer &_server):
ParamsProcessorTracker(_unique_name, _server),
ParamsProcessorTracker(_unique_name, _server),
ParamsIsMotion(_unique_name, _server)
ParamsMotionProvider(_unique_name, _server)
{
{
// keyframe voting
// keyframe voting
vfk_min_dist = _server.getParam<double> (prefix + _unique_name + "/keyframe_vote/min_dist");
vfk_min_dist = _server.getParam<double> (prefix + _unique_name + "/keyframe_vote/min_dist");
@@ -127,7 +127,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
@@ -127,7 +127,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
}
}
};
};
class ProcessorOdomIcp : public ProcessorTracker, public IsMotion
class ProcessorOdomIcp : public ProcessorTracker, public MotionProvider
{
{
protected:
protected:
// Useful sensor stuff
// Useful sensor stuff
Loading