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.

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

Release/v1.6 #93

Merged
merged 55 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d82d5cf
Remove RobotStates::tcp_pose_des
pzhu-flexiv Dec 4, 2024
545930e
Add new struct JPos to describe data type "JPOS"
pzhu-flexiv Dec 4, 2024
a78419f
Update doc of rdk::Coord
pzhu-flexiv Dec 4, 2024
4af8e00
Add JPos and its vector to FlexivDataTypes variant
pzhu-flexiv Dec 4, 2024
058f939
Update Ubuntu x86_64 libs
pzhu-flexiv Dec 4, 2024
e31eb27
Replace GripperStates::max_width with is_moving
pzhu-flexiv Dec 12, 2024
ffc3e7d
Add Gripper::Enable and Disable
pzhu-flexiv Dec 12, 2024
09c0ef1
Remove Gripper::moving()
pzhu-flexiv Dec 12, 2024
c1b9241
Add Gripper::params()
pzhu-flexiv Dec 12, 2024
106db27
Add GripperParams struct
pzhu-flexiv Dec 12, 2024
9c7d2e1
Add Device::params()
pzhu-flexiv Dec 12, 2024
e446eb5
Remove deprecated functions from Robot
pzhu-flexiv Dec 12, 2024
c648f00
Update doc
pzhu-flexiv Dec 12, 2024
267769d
Merge branch 'main' of https://github.com/flexivrobotics/flexiv_rdk i…
pzhu-flexiv Dec 12, 2024
e7a57ec
Bump version number
pzhu-flexiv Dec 12, 2024
d01581a
Update Ubuntu x86_64 libs
pzhu-flexiv Dec 12, 2024
6147a18
Update gripper control examples
pzhu-flexiv Dec 12, 2024
720fcea
Fix example
pzhu-flexiv Dec 12, 2024
718ac70
Update robot sn input doc
pzhu-flexiv Dec 12, 2024
619aeb9
Update display robot states example
pzhu-flexiv Dec 12, 2024
055616c
Fix test
pzhu-flexiv Dec 12, 2024
603a3d6
Update issue templates
pzhu-flexiv Dec 13, 2024
258b103
Update Ubuntu x86_64 libs
pzhu-flexiv Dec 18, 2024
5572a52
Temporarily remove libs that are not yet updated
pzhu-flexiv Dec 18, 2024
31fbe7a
Add bool type to Device::Command variant
pzhu-flexiv Dec 24, 2024
5f861cb
Add new API rdk::Maintenance
pzhu-flexiv Dec 24, 2024
87ae933
Add new API rdk::Safety
pzhu-flexiv Dec 24, 2024
b12b94e
Add utility::Rad2Deg overload
pzhu-flexiv Dec 24, 2024
003695c
Update ubuntu x86_64 libs
pzhu-flexiv Dec 24, 2024
0a6bd70
Update README wording
pzhu-flexiv Dec 31, 2024
008d542
Add INSTALL_CPP_RDK option to CMakeLists.txt to allow skipping instal…
pzhu-flexiv Dec 31, 2024
20a37fd
Merge branch 'main' of https://github.com/flexivrobotics/flexiv_rdk i…
pzhu-flexiv Dec 31, 2024
91fb32d
Update README to allow configure only for Python without installing C…
pzhu-flexiv Dec 31, 2024
c4ba773
Disable force control axes in Cartesian pure motion control examples
pzhu-flexiv Jan 2, 2025
9d2fc2d
Use CMAKE_PREFIX_PATH to specify where to find flexiv_rdk from user p…
pzhu-flexiv Jan 3, 2025
5ba6185
Move ToolParams from data.hpp to tool.hpp
pzhu-flexiv Jan 3, 2025
7afa212
Move GripperParams and GripperStates from data.hpp to gripper.hpp
pzhu-flexiv Jan 3, 2025
d824c3d
Move SafetyLimits to outside class Safety
pzhu-flexiv Jan 3, 2025
5488a3f
Update build_and_install_dependencies.sh to install basic dependencie…
pzhu-flexiv Jan 3, 2025
2b9d069
Add string vector to the return variant of Device::params()
pzhu-flexiv Jan 3, 2025
47c8a25
Add missing header include
pzhu-flexiv Jan 3, 2025
6efabf1
Revert "Update build_and_install_dependencies.sh to install basic dep…
pzhu-flexiv Jan 3, 2025
c288ddc
Update Ubuntu x86_64 libs
pzhu-flexiv Jan 3, 2025
21e7ccf
Fix wording
pzhu-flexiv Jan 3, 2025
5f42b7b
Fix SafetyLimits doc
pzhu-flexiv Jan 7, 2025
f6c3e45
Update macOS arm64 lib
pzhu-flexiv Jan 7, 2025
d48aefe
Update macOS arm64 lib
pzhu-flexiv Jan 8, 2025
b54bd9a
Update windows amd64 lib
pzhu-flexiv Jan 8, 2025
0763e47
Update Ubuntu aarch64 lib
pzhu-flexiv Jan 8, 2025
c252911
Remove python libs, in PyPI now
pzhu-flexiv Jan 8, 2025
8d4d1ad
Remove Python contents from CMakeLists.txt
pzhu-flexiv Jan 8, 2025
3451e08
Re-write README
pzhu-flexiv Jan 9, 2025
b948aa2
Update compatibility overview
pzhu-flexiv Jan 9, 2025
172d418
Fix typo
pzhu-flexiv Jan 9, 2025
46992b7
Sync wording with manual
pzhu-flexiv Jan 9, 2025
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
31 changes: 0 additions & 31 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: bug
assignees: pzhu-flexiv

---

## Version info

- RDK: [e.g. v1.5]
- Robot software: [e.g. v3.7]
- OS: [e.g. Ubuntu 20.04, x86_64]

## How urgent is this bug? Have you found any workarounds?

On a scale of 1 to 10.

## Describe the issue and expected behavior

The issue is ...
The correct behavior you expect is ...

## Steps to reproduce

1. '....'
2. '....'
3. '....'
4. See error

## Screenshots

If applicable, add screenshots to help explain your issue.

## Additional context

Add any other context about the issue.
28 changes: 28 additions & 0 deletions .github/workflows/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Feature request
about: Suggest a new feature
title: "[FEATURE]"
labels: enhancement
assignees: pzhu-flexiv

---

## How urgent is this feature?

On a scale of 1 to 10.

## Is this feature request related to a problem?

This new feature is needed so that ... can be solved.

## Describe the solution you'd like

What you want to happen.

## Describe alternatives you've considered

Any alternative solutions or workarounds you've considered.

## Additional context

Add any other context or screenshots about this feature.
4 changes: 2 additions & 2 deletions .github/workflows/shared_steps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
pwd
cd example
mkdir -p build && cd build
cmake .. -DCMAKE_INSTALL_PREFIX=~/rdk_install
cmake .. -DCMAKE_PREFIX_PATH=~/rdk_install
cmake --build . --config Release -j 4

# Find and link to flexiv_rdk library, then build all test programs.
Expand All @@ -37,5 +37,5 @@ runs:
pwd
cd test
mkdir -p build && cd build
cmake .. -DCMAKE_INSTALL_PREFIX=~/rdk_install
cmake .. -DCMAKE_PREFIX_PATH=~/rdk_install
cmake --build . --config Release -j 4
53 changes: 10 additions & 43 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,34 @@ cmake_minimum_required(VERSION 3.16.3)
# ===================================================================
# PROJECT SETUP
# ===================================================================
project(flexiv_rdk VERSION 1.5.1)
project(flexiv_rdk VERSION 1.6.0)

# Configure build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "CMake build type" FORCE)
endif()
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Release" "Debug" "RelWithDebInfo")

# Configure Python RDK
option(INSTALL_PYTHON_RDK "Install Python RDK (to user site packages path)" OFF)
if(INSTALL_PYTHON_RDK)
if(NOT RDK_PYTHON_VERSION)
set(RDK_PYTHON_VERSION 3.10 CACHE STRING "Python version to install RDK for" FORCE)
endif()
set_property(CACHE RDK_PYTHON_VERSION PROPERTY STRINGS "3.10" "3.12")
find_package(Python3 ${RDK_PYTHON_VERSION} EXACT COMPONENTS Interpreter REQUIRED)
endif()

# Set C++ and Python library filename
message("OS: ${CMAKE_SYSTEM_NAME}")
message("Processor: ${CMAKE_SYSTEM_PROCESSOR}")
# Set static library according to platform
message(STATUS "OS: ${CMAKE_SYSTEM_NAME}")
message(STATUS "Processor: ${CMAKE_SYSTEM_PROCESSOR}")
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
set(RDK_CPP_LIB "libflexiv_rdk.x86_64-linux-gnu.a")
set(RDK_PY_LIB "flexivrdk.cpython-${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}-x86_64-linux-gnu.so")
set(RDK_STATIC_LIB "libflexiv_rdk.x86_64-linux-gnu.a")
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(RDK_CPP_LIB "libflexiv_rdk.aarch64-linux-gnu.a")
set(RDK_PY_LIB "flexivrdk.cpython-${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}-aarch64-linux-gnu.so")
set(RDK_STATIC_LIB "libflexiv_rdk.aarch64-linux-gnu.a")
else()
message(FATAL_ERROR "Linux with ${CMAKE_SYSTEM_PROCESSOR} processor is currently not supported.")
endif()
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
set(RDK_CPP_LIB "libflexiv_rdk.arm64-darwin.a")
set(RDK_PY_LIB "flexivrdk.cpython-${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}-darwin.so")
set(RDK_STATIC_LIB "libflexiv_rdk.arm64-darwin.a")
else()
message(FATAL_ERROR "Mac with ${CMAKE_SYSTEM_PROCESSOR} processor is currently not supported.")
endif()
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
set(RDK_CPP_LIB "flexiv_rdk.win_amd64.lib")
set(RDK_PY_LIB "flexivrdk.cp${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}-win_amd64.pyd")
set(RDK_STATIC_LIB "flexiv_rdk.win_amd64.lib")
else()
message(FATAL_ERROR "Windows with ${CMAKE_SYSTEM_PROCESSOR} processor is currently not supported.")
endif()
Expand Down Expand Up @@ -79,7 +65,7 @@ if(fastrtps_FOUND)
endif()

# ===================================================================
# INSTALL C++ LIBRARY
# CREATE LIBRARY
# ===================================================================
# Create an INTERFACE library with no source file to compile
add_library(${PROJECT_NAME} INTERFACE)
Expand All @@ -94,7 +80,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
)

target_link_libraries(${PROJECT_NAME} INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/lib/${RDK_CPP_LIB}
${CMAKE_CURRENT_SOURCE_DIR}/lib/${RDK_STATIC_LIB}
Threads::Threads
Eigen3::Eigen
spdlog::spdlog
Expand All @@ -109,24 +95,5 @@ else()
endif()

# Install the INTERFACE library
message(STATUS "C++ RDK library: ${RDK_CPP_LIB}")
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FlexivInstallLibrary.cmake)
FlexivInstallLibrary()

# ===================================================================
# INSTALL PYTHON LIBRARY
# ===================================================================
if(INSTALL_PYTHON_RDK)
# Get user site packages path
message(STATUS "Python executable: ${Python3_EXECUTABLE}")
execute_process(
COMMAND ${Python3_EXECUTABLE} -c "import site; print(site.getusersitepackages())"
OUTPUT_VARIABLE USER_SITE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
message(STATUS "Python site packages path: ${USER_SITE}")

# Install Python RDK to user site packages path
message(STATUS "Python RDK library: ${RDK_PY_LIB}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib_py/${RDK_PY_LIB}" DESTINATION ${USER_SITE})
endif()
Loading