Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update NokovSDK #17

Merged
merged 2 commits into from
Jun 14, 2024
Merged

update NokovSDK #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4036907
update NokovSDK
duguguang Jun 14, 2024
3021dda
Update README.md
duguguang Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ endif()
if (LIBMOTIONCAPTURE_ENABLE_NOKOV)
message("including nokov")

EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
message( STATUS "Architecture: ${ARCHITECTURE}" )

add_definitions(-DENABLE_NOKOV)
set(my_include_directories
${my_include_directories}
Expand All @@ -143,13 +146,20 @@ if (LIBMOTIONCAPTURE_ENABLE_NOKOV)
${my_files}
src/nokov.cpp
)
set(my_link_directories
${my_link_directories}
${NOKOV_SDK_DIR}/lib
)

if (${ARCHITECTURE} MATCHES "arm")
set(my_link_directories ${my_link_directories} ${NOKOV_SDK_DIR}/lib/armhf)
elseif (${ARCHITECTURE} MATCHES "aarch")
set(my_link_directories ${my_link_directories} ${NOKOV_SDK_DIR}/lib/aarch64)
else()
set(my_link_directories ${my_link_directories} ${NOKOV_SDK_DIR}/lib/x64)
endif()

message(STATUS "Link to nokov library directory:${my_link_directories}")

set(my_libraries
${my_libraries}
SeekerSDKClient
nokov_sdk
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ By default, `libmotioncapture` supports the following hardware:
- Qualisys - SDK git submodule
- OptiTrack - binary parsing over network (no dependency)
- VRPN - SDK git submodule
- NOKOV - manually obtain SDK and copy to deps/nokov_sdk/ and copy the .so file to the /lib or /usr/lib.
- NOKOV - manually obtain SDK and copy to deps/nokov_sdk/
- FZMotion - no dependency
- Motion Analysis - manually obtain SDK and copy to deps/cortex_sdk_linux/

Expand Down
10 changes: 5 additions & 5 deletions src/nokov.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#include <unordered_map>
#include <Eigen/Geometry>
//#include <ros/ros.h>
#include "SeekerSDKCAPI.h"
#include "NokovSDKCAPI.h"
// NOKOV
#include "SeekerSDKClient.h"
#include "NokovSDKClient.h"

namespace libmotioncapture {

Expand Down Expand Up @@ -94,7 +94,7 @@ namespace libmotioncapture {
int updateFrequency = 100;
bool enableFixedUpdate = false;
sDataDescriptions* pBodyDefs = nullptr;
SeekerSDKClient* pClient = nullptr;
NokovSDKClient* pClient = nullptr;
int lastFrame = 0;
std::unordered_map<std::string, size_t> bodyMap;

Expand Down Expand Up @@ -143,9 +143,9 @@ namespace libmotioncapture {
{
pImpl = new MotionCaptureNokovImpl;

SeekerSDKClient* theClient = new SeekerSDKClient();
NokovSDKClient* theClient = new NokovSDKClient();
unsigned char version[4] = {0};
theClient->SeekerSDKVersion(version);
theClient->NokovSDKVersion(version);
{
std::stringstream sstr;
sstr << (int)version[0] << "." << (int)version[1] << "." << (int)version[2] << "." << (int)version[3];
Expand Down
Loading