Skip to content
Snippets Groups Projects
Commit 63e52fee authored by Fabian Reister's avatar Fabian Reister
Browse files

fixing build

parent 6b6f1ccc
No related branches found
No related tags found
No related merge requests found
set(LIB_NAME algorithms) set(LIB_NAME ${PROJECT_NAME}Algorithms)
armarx_component_set_name("${LIB_NAME}") armarx_component_set_name("${LIB_NAME}")
armarx_set_target("Library: ${LIB_NAME}") armarx_set_target("Library: ${LIB_NAME}")
armarx_add_library( armarx_add_library(
LIBS LIBS
ArmarXCoreInterfaces ArmarXCoreInterfaces
ArmarXCore ArmarXCore
Navigation::core Navigation::core
SOURCES
SOURCES
./algorithms.cpp ./algorithms.cpp
HEADERS HEADERS
./algorithms.h ./algorithms.h
) )
add_library(Navigation::algorithms ALIAS algorithms) add_library(
Navigation::algorithms
ALIAS
${PROJECT_NAME}Algorithms
)
#find_package(MyLib QUIET) # find_package(MyLib QUIET) armarx_build_if(MyLib_FOUND "MyLib not available")
#armarx_build_if(MyLib_FOUND "MyLib not available") # all target_include_directories must be guarded by if(Xyz_FOUND) for multiple
# all target_include_directories must be guarded by if(Xyz_FOUND) # libraries write: if(X_FOUND AND Y_FOUND).... if(MyLib_FOUND)
# for multiple libraries write: if(X_FOUND AND Y_FOUND).... # target_include_directories(algorithms PUBLIC ${MyLib_INCLUDE_DIRS}) endif()
#if(MyLib_FOUND)
# target_include_directories(algorithms PUBLIC ${MyLib_INCLUDE_DIRS})
#endif()
# add unit tests # add unit tests add_subdirectory(test)
# add_subdirectory(test)
#include <Navigation/libraries/server/execution/PlatformUnitExecutor.h> #include <Navigation/libraries/server/execution/PlatformUnitExecutor.h>
namespace armarx::nav::server namespace armarx::nav::server
{ {
...@@ -17,7 +16,7 @@ namespace armarx::nav::server ...@@ -17,7 +16,7 @@ namespace armarx::nav::server
void PlatformUnitExecutor::move(const core::Twist& twist) void PlatformUnitExecutor::move(const core::Twist& twist)
{ {
if (enabled.get()) if (enabled)
{ {
platformUnit->move(twist.linear.x(), twist.linear.y(), twist.angular.z()); platformUnit->move(twist.linear.x(), twist.linear.y(), twist.angular.z());
} }
...@@ -25,13 +24,13 @@ namespace armarx::nav::server ...@@ -25,13 +24,13 @@ namespace armarx::nav::server
void PlatformUnitExecutor::disableAndStop() void PlatformUnitExecutor::disableAndStop()
{ {
enabled.set(false); enabled = false;
platformUnit->move(0, 0, 0); platformUnit->stopPlatform();
} }
void PlatformUnitExecutor::enable() void PlatformUnitExecutor::enable()
{ {
enabled.set(true); enabled = true;
} }
} } // namespace armarx::nav::server
...@@ -20,7 +20,7 @@ namespace armarx::nav::server ...@@ -20,7 +20,7 @@ namespace armarx::nav::server
PlatformUnitExecutor(PlatformUnitInterfacePrx platformUnit); PlatformUnitExecutor(PlatformUnitInterfacePrx platformUnit);
~PlatformUnitExecutor() override; ~PlatformUnitExecutor() override;
void move(const core::Twist &twist); void move(const core::Twist& twist) override;
void disableAndStop(); void disableAndStop();
void enable(); void enable();
...@@ -33,4 +33,4 @@ namespace armarx::nav::server ...@@ -33,4 +33,4 @@ namespace armarx::nav::server
}; };
} } // namespace armarx::nav::server
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