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

sciurus17_moveit_configのROS 2対応 #141

Merged
merged 25 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a349405
不要なファイルを削除
Kuwamai Oct 17, 2023
4fc2fb0
CMakeLists.txt、package.xmlのROS 2対応
Kuwamai Oct 17, 2023
dad50b4
COLCON_IGNORE削除
Kuwamai Oct 17, 2023
bcbc8ab
.setup_assistant更新
Kuwamai Oct 17, 2023
27097a8
生成されたlaunchファイル追加
Kuwamai Oct 17, 2023
8e1647b
SRDFファイル更新
Kuwamai Oct 17, 2023
90bb11a
生成された設定ファイル追加
Kuwamai Oct 17, 2023
52523c0
CI用の依存パッケージ追加
Kuwamai Oct 17, 2023
c0919bd
不要なファイルを削除
Kuwamai Oct 24, 2023
0537a00
パッケージフォーマット更新
Kuwamai Oct 24, 2023
9a43d64
sciurus17_controllers.yaml追加
Kuwamai Oct 24, 2023
8fbd7b0
controllerのファイルパス設定
Kuwamai Oct 24, 2023
698f9de
move_groupのパタメータ設定
Kuwamai Oct 24, 2023
cd63d0d
move_groupとcontrollerを追加
Kuwamai Oct 24, 2023
ba5dcfd
不要なファイルを削除
Kuwamai Oct 24, 2023
77f1044
moveit_controllers.yaml追加
Kuwamai Oct 24, 2023
fb6790e
run_move_group.launch.pyを追加
Kuwamai Oct 24, 2023
cf34754
不要な設定を削除
Kuwamai Oct 24, 2023
fd36f8b
planning_pipelinesにOMPLを設定
Kuwamai Oct 25, 2023
3aac157
scaling factor変更
Kuwamai Oct 25, 2023
f3eea91
max_acceleration設定
Kuwamai Oct 25, 2023
c7d9fb3
不要なファイルを削除
Kuwamai Oct 25, 2023
6428948
RVizのconfig設定
Kuwamai Oct 25, 2023
4048cf9
Revert "不要なファイルを削除"
Kuwamai Oct 26, 2023
85f148b
不要なファイルを削除
Kuwamai Oct 26, 2023
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
2 changes: 1 addition & 1 deletion .ci.rosinstall
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- git:
uri: https://github.com/rt-net/sciurus17_description.git
local-name: sciurus17_description
version: main
version: ros2
3 changes: 3 additions & 0 deletions .github/workflows/industrial_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
- '**.md'
workflow_dispatch:

env:
UPSTREAM_WORKSPACE: .ci.rosinstall

jobs:
industrial_ci:
strategy:
Expand Down
54 changes: 6 additions & 48 deletions sciurus17_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,53 +1,11 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.5)
project(sciurus17_control)

add_compile_options(-std=c++11)
find_package(ament_cmake REQUIRED)

find_package(catkin REQUIRED COMPONENTS
controller_manager
dynamixel_sdk
roscpp
rospy
hardware_interface
transmission_interface
sciurus17_msgs
dynamic_reconfigure
install(DIRECTORY
config
DESTINATION share/${PROJECT_NAME}/
)

catkin_package(
INCLUDE_DIRS include
CATKIN_DEPENDS roscpp hardware_interface transmission_interface controller_manager dynamixel_sdk
)

include_directories(
include
${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIR})

find_library( dxl_x64_cpp NAME libdxl_x64_cpp.so PATHS src/dynamixel_sdk/build/linux64 )

add_executable(sciurus17_control src/hardware.cpp src/joint_control.cpp src/dxlport_control.cpp src/control_setting.cpp)

target_link_libraries( sciurus17_control
${catkin_LIBRARIES}
)
set(MESSAGE_DEPENDS sciurus17_msgs_generate_messages)

install(TARGETS sciurus17_control
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)

install(DIRECTORY config launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

file(GLOB python_scripts scripts/*.py)
catkin_install_python(
PROGRAMS ${python_scripts}
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
ament_package()
Empty file removed sciurus17_control/COLCON_IGNORE
Empty file.
143 changes: 0 additions & 143 deletions sciurus17_control/config/sciurus17_control1.yaml

This file was deleted.

132 changes: 0 additions & 132 deletions sciurus17_control/config/sciurus17_control2.yaml

This file was deleted.

Loading