Skip to content
Snippets Groups Projects
Commit 32138d9b authored by Christian Dreher's avatar Christian Dreher
Browse files

fix: Make server::Navigator compile.

parent 337824ca
No related branches found
No related tags found
No related merge requests found
......@@ -8,8 +8,8 @@
namespace armarx::nav::server
{
Navigator::Navigator(const server::NavigationStack& navigationStack, const core::Scene& ctx) :
stack(navigationStack), scene(ctx)
Navigator::Navigator(const server::NavigationStack& navigationStack, const core::Scene& scene, ExecutorInterface& executor) :
stack(navigationStack), scene(scene), executor{executor}
{
setTag("Navigator");
}
......@@ -56,10 +56,10 @@ namespace armarx::nav::server
if (stack.safetyControl)
{
ARMARX_INFO << "Safety control";
res.safeVelocity = stack.safetyControl->control(res.controlVelocity);
res.safeVelocity = stack.safetyControl->control(res.controlVelocity.value());
}
executor.move(res.velocity());
}
}
} // namespace armarx::nav::server
\ No newline at end of file
} // namespace armarx::nav::server
......@@ -23,11 +23,14 @@
#include <Eigen/Core>
// ArmarX
#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
#include "ArmarXCore/core/logging/Logging.h"
// Navigation
#include "Navigation/libraries/core/types.h"
#include "NavigationStack.h"
#include <Navigation/libraries/server/execution/ExecutorInterface.h>
namespace armarx::nav::server
{
......@@ -64,7 +67,7 @@ namespace armarx::nav::server
class Navigator : public armarx::Logging
{
public:
Navigator(const server::NavigationStack& navigationStack, const core::Scene& scene);
Navigator(const server::NavigationStack& navigationStack, const core::Scene& scene, ExecutorInterface& executor);
void moveTo(const core::Pose& goal, const core::NavigationFrames& navigationFrame);
void moveToAbsolute(const core::Pose& goal);
......@@ -74,6 +77,6 @@ namespace armarx::nav::server
server::NavigationStack stack;
const core::Scene& scene;
ExecutorInterface& executor;
ExecutorInterface& executor;
};
} // namespace armarx::nav::server
\ No newline at end of file
} // namespace armarx::nav::server
......@@ -61,6 +61,9 @@ BOOST_AUTO_TEST_CASE(testNavigator)
.trajectoryControl = std::make_shared<traj_ctrl::TrajectoryFollowingController>(
traj_ctrl::TrajectoryFollowingControllerParams(), scene)};
// Executor.
server::DummyExecturo executor{scene.robot};
server::Navigator navigator(stack, scene, executor);
navigator.moveTo(goal, core::NavigationFrames::Absolute);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment