Skip to content

Commit b2ab7e1

Browse files
pumablattlauspumablattlaus
committed
Merge branch 'noetic-devel' of https://github.com/match-ROS/match_mobile_robotics into noetic-devel
2 parents 467c217 + ee45873 commit b2ab7e1

File tree

10 files changed

+955
-30
lines changed

10 files changed

+955
-30
lines changed

‎mur/mur_control/scripts/__pycache__/ur_dual_arm_collision_dist.cpython-38.pyc‎

0 Bytes
Binary file not shown.

‎mur/mur_description/urdf/mur_620.gazebo.xacro‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<!-- include gripper -->
3232
<xacro:if value="${sim}">
3333
<xacro:include filename="$(find schunk_emh_rp_45)/urdf/schunk_emh_rp_045.urdf.xacro"/>
34+
<xacro:include filename="$(find keyence_lj_x)/urdf/keyence_lj_x.urdf.xacro"/>
3435
</xacro:if>
3536
<!-- Init the MiR200 marco that is also used for the hardware -->
3637
<xacro:mir_600 />
@@ -95,36 +96,14 @@
9596
</joint>
9697

9798
<xacro:if value="${sim}">
98-
<xacro:schunk_emh_rp_045 tf_prefix="UR10_r" tool_link="UR10_r/flange"/>
99-
<xacro:schunk_emh_rp_045 tf_prefix="UR10_l" tool_link="UR10_l/flange"/>
99+
<!-- <xacro:schunk_emh_rp_045 tf_prefix="UR10_r" tool_link="UR10_r/flange"/>
100+
<xacro:schunk_emh_rp_045 tf_prefix="UR10_l" tool_link="UR10_l/flange"/> -->
101+
<xacro:keyence_lj_x tf_prefix="UR10_r" tool_link="UR10_r/flange"/>
102+
<xacro:keyence_lj_x tf_prefix="UR10_l" tool_link="UR10_l/flange"/>
100103
</xacro:if>
101-
<!-- <gazebo>
102-
<plugin name="gazebo_ros_control" filename="libgazebo_ros_control.so">
103-
<robotNamespace>mir</robotNamespace>
104-
<robotParam>mir/robot_description</robotParam>
105-
<controlPeriod>0.001</controlPeriod>
106-
<legacyModeNS>true</legacyModeNS>
107-
</plugin>
108-
</gazebo>
109-
-->
110-
<!-- <joint name="plattform_manipulator_joint" type="fixed">
111-
<parent link="mir/base_link" />
112-
<child link="ur/base_link" />
113-
<origin xyz="0.215 0.1 0.35" rpy="0 0 0" />
114-
</joint> -->
115-
116-
<!-- UR5 -->
117-
<!-- <xacro:arg name="transmission_hw_interface" default="hardware_interface/PositionJointInterface"/> -->
118-
119-
<!-- ur5 -->
120-
<!-- <xacro:include filename="$(find ur_description)/urdf/ur5.urdf.xacro" /> -->
121-
122-
<!-- arm -->
123-
<!--xacro:arg name="kinematics_config" default="$(find ur_description)/config/ur5_default.yaml"/>
124-
<xacro:ur5_robot prefix="ur/" joint_limited="false"
125-
transmission_hw_interface="$(arg transmission_hw_interface)"
126-
kinematics_file="${load_yaml('$(arg kinematics_config)')}"
127-
/> -->
104+
105+
<!-- <xacro:include filename="$(find print_sim)/urdf/keyence_line_laser.gazebo.xacro" />
106+
<xacro:keyence_line_laser parent_link="UR10_r/tcp" /> -->
128107

129108

130109
<!-- <gazebo>

‎submodules/match_robot_controllers‎

Submodule match_robot_controllers updated 30 files

‎tools/keyence_lj_x/CMakeLists.txt‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
cmake_minimum_required(VERSION 3.0.2)
2+
project(keyence_lj_x)
3+
4+
## Compile as C++11, supported in ROS Kinetic and newer
5+
# add_compile_options(-std=c++11)
6+
7+
## Find catkin macros and libraries
8+
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
9+
## is used, also find other catkin packages
10+
find_package(catkin REQUIRED)
11+
12+
## System dependencies are found with CMake's conventions
13+
# find_package(Boost REQUIRED COMPONENTS system)
14+
15+
16+
## Uncomment this if the package has a setup.py. This macro ensures
17+
## modules and global scripts declared therein get installed
18+
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
19+
# catkin_python_setup()
20+
21+
################################################
22+
## Declare ROS messages, services and actions ##
23+
################################################
24+
25+
## To declare and build messages, services or actions from within this
26+
## package, follow these steps:
27+
## * Let MSG_DEP_SET be the set of packages whose message types you use in
28+
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
29+
## * In the file package.xml:
30+
## * add a build_depend tag for "message_generation"
31+
## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
32+
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
33+
## but can be declared for certainty nonetheless:
34+
## * add a exec_depend tag for "message_runtime"
35+
## * In this file (CMakeLists.txt):
36+
## * add "message_generation" and every package in MSG_DEP_SET to
37+
## find_package(catkin REQUIRED COMPONENTS ...)
38+
## * add "message_runtime" and every package in MSG_DEP_SET to
39+
## catkin_package(CATKIN_DEPENDS ...)
40+
## * uncomment the add_*_files sections below as needed
41+
## and list every .msg/.srv/.action file to be processed
42+
## * uncomment the generate_messages entry below
43+
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
44+
45+
## Generate messages in the 'msg' folder
46+
# add_message_files(
47+
# FILES
48+
# Message1.msg
49+
# Message2.msg
50+
# )
51+
52+
## Generate services in the 'srv' folder
53+
# add_service_files(
54+
# FILES
55+
# Service1.srv
56+
# Service2.srv
57+
# )
58+
59+
## Generate actions in the 'action' folder
60+
# add_action_files(
61+
# FILES
62+
# Action1.action
63+
# Action2.action
64+
# )
65+
66+
## Generate added messages and services with any dependencies listed here
67+
# generate_messages(
68+
# DEPENDENCIES
69+
# std_msgs # Or other packages containing msgs
70+
# )
71+
72+
################################################
73+
## Declare ROS dynamic reconfigure parameters ##
74+
################################################
75+
76+
## To declare and build dynamic reconfigure parameters within this
77+
## package, follow these steps:
78+
## * In the file package.xml:
79+
## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
80+
## * In this file (CMakeLists.txt):
81+
## * add "dynamic_reconfigure" to
82+
## find_package(catkin REQUIRED COMPONENTS ...)
83+
## * uncomment the "generate_dynamic_reconfigure_options" section below
84+
## and list every .cfg file to be processed
85+
86+
## Generate dynamic reconfigure parameters in the 'cfg' folder
87+
# generate_dynamic_reconfigure_options(
88+
# cfg/DynReconf1.cfg
89+
# cfg/DynReconf2.cfg
90+
# )
91+
92+
###################################
93+
## catkin specific configuration ##
94+
###################################
95+
## The catkin_package macro generates cmake config files for your package
96+
## Declare things to be passed to dependent projects
97+
## INCLUDE_DIRS: uncomment this if your package contains header files
98+
## LIBRARIES: libraries you create in this project that dependent projects also need
99+
## CATKIN_DEPENDS: catkin_packages dependent projects also need
100+
## DEPENDS: system dependencies of this project that dependent projects also need
101+
catkin_package(
102+
# INCLUDE_DIRS include
103+
# LIBRARIES keyence_lj_x
104+
# CATKIN_DEPENDS other_catkin_pkg
105+
# DEPENDS system_lib
106+
)
107+
108+
###########
109+
## Build ##
110+
###########
111+
112+
## Specify additional locations of header files
113+
## Your package locations should be listed before other locations
114+
include_directories(
115+
# include
116+
# ${catkin_INCLUDE_DIRS}
117+
)
118+
119+
## Declare a C++ library
120+
# add_library(${PROJECT_NAME}
121+
# src/${PROJECT_NAME}/keyence_lj_x.cpp
122+
# )
123+
124+
## Add cmake target dependencies of the library
125+
## as an example, code may need to be generated before libraries
126+
## either from message generation or dynamic reconfigure
127+
# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
128+
129+
## Declare a C++ executable
130+
## With catkin_make all packages are built within a single CMake context
131+
## The recommended prefix ensures that target names across packages don't collide
132+
# add_executable(${PROJECT_NAME}_node src/keyence_lj_x_node.cpp)
133+
134+
## Rename C++ executable without prefix
135+
## The above recommended prefix causes long target names, the following renames the
136+
## target back to the shorter version for ease of user use
137+
## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
138+
# set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "")
139+
140+
## Add cmake target dependencies of the executable
141+
## same as for the library above
142+
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
143+
144+
## Specify libraries to link a library or executable target against
145+
# target_link_libraries(${PROJECT_NAME}_node
146+
# ${catkin_LIBRARIES}
147+
# )
148+
149+
#############
150+
## Install ##
151+
#############
152+
153+
# all install targets should use catkin DESTINATION variables
154+
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
155+
156+
## Mark executable scripts (Python etc.) for installation
157+
## in contrast to setup.py, you can choose the destination
158+
# catkin_install_python(PROGRAMS
159+
# scripts/my_python_script
160+
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
161+
# )
162+
163+
## Mark executables for installation
164+
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
165+
# install(TARGETS ${PROJECT_NAME}_node
166+
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
167+
# )
168+
169+
## Mark libraries for installation
170+
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
171+
# install(TARGETS ${PROJECT_NAME}
172+
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
173+
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
174+
# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
175+
# )
176+
177+
## Mark cpp header files for installation
178+
# install(DIRECTORY include/${PROJECT_NAME}/
179+
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
180+
# FILES_MATCHING PATTERN "*.h"
181+
# PATTERN ".svn" EXCLUDE
182+
# )
183+
184+
## Mark other files for installation (e.g. launch and bag files, etc.)
185+
# install(FILES
186+
# # myfile1
187+
# # myfile2
188+
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
189+
# )
190+
191+
#############
192+
## Testing ##
193+
#############
194+
195+
## Add gtest based cpp test target and link libraries
196+
# catkin_add_gtest(${PROJECT_NAME}-test test/test_keyence_lj_x.cpp)
197+
# if(TARGET ${PROJECT_NAME}-test)
198+
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
199+
# endif()
200+
201+
## Add folders to be run by python nosetests
202+
# catkin_add_nosetests(test)

‎tools/keyence_lj_x/meshes/collision/lj_v7080.stl‎

2.23 KB
Binary file not shown.

‎tools/keyence_lj_x/meshes/collision/lj_v7200.stl‎

2.23 KB
Binary file not shown.

0 commit comments

Comments
 (0)