Skip to content

Commit c80ef1a

Browse files
wkentarowkentaro
committed
Copy deprecated srv files to jsk_recognition_msgs
- jsk_pcl_ros/srv -> jsk_recognition_msgs/srv - jsk_perception/srv -> jsk_recognition_msgs/srv TODO - 1. Migrate current code for srv files in jsk_recognition_msgs - 2. Remove srv files in jsk_pcl_ros and jsk_perception
1 parent c62a7b6 commit c80ef1a

25 files changed

+143
-4
lines changed

‎jsk_pcl_ros/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ IF(${yaml_cpp_VERSION} VERSION_LESS "0.5.0")
4949
add_definitions("-DUSE_OLD_YAML")
5050
ENDIF()
5151

52+
message(WARNING "DEPRECATION WARNING: srv files in jsk_pcl_ros are deprecated."
53+
" Please use those in jsk_recognition_msgs.")
54+
# TODO(wkentaro): Remove deprecated srv files.
5255
add_service_files(FILES SwitchTopic.srv
5356
UpdateOffset.srv
5457
SnapFootstep.srv

‎jsk_perception/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ generate_dynamic_reconfigure_options(
113113
cfg/LabelToMaskImage.cfg
114114
)
115115

116+
message(WARNING "DEPRECATION WARNING: srv files in jsk_pcl_ros are deprecated."
117+
" Please use those in jsk_recognition_msgs.")
118+
# TODO(wkentaro): Remove deprecated srv files.
116119
add_service_files(FILES
117120
EuclideanSegment.srv
118121
NonMaximumSuppression.srv

‎jsk_recognition_msgs/CMakeLists.txt

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(jsk_recognition_msgs)
33
find_package(catkin REQUIRED
4-
std_msgs sensor_msgs geometry_msgs message_generation pcl_msgs)
4+
std_msgs sensor_msgs geometry_msgs message_generation pcl_msgs jsk_footstep_msgs)
55
add_message_files(
66
FILES
77
BoundingBoxArray.msg
@@ -59,17 +59,40 @@ add_message_files(
5959
PlotDataArray.msg
6060
)
6161

62+
# TODO(wkentaro): Most of srv files are duplicated in jsk_pcl_ros,
63+
# and jsk_perception, so those in the packages should be removed.
6264
add_service_files(FILES
63-
SetPointCloud2.srv
65+
CallPolygon.srv
66+
CallSnapIt.srv
67+
CheckCircle.srv
68+
CheckCollision.srv
69+
EnvironmentLock.srv
70+
EuclideanSegment.srv
71+
ICPAlign.srv
72+
ICPAlignWithBox.srv
73+
NonMaximumSuppression.srv
74+
PolygonOnEnvironment.srv
75+
RobotPickupReleasePoint.srv
76+
SetDepthCalibrationParameter.srv
6477
SetLabels.srv
78+
SetPointCloud2.srv
79+
SetTemplate.srv
80+
SnapFootstep.srv
81+
SwitchTopic.srv
82+
TowerPickUp.srv
83+
TowerRobotMoveCommand.srv
84+
TransformScreenpoint.srv
85+
UpdateOffset.srv
86+
WhiteBalancePoints.srv
87+
WhiteBalance.srv
6588
)
6689

6790
generate_messages(
6891
DEPENDENCIES
69-
std_msgs sensor_msgs geometry_msgs pcl_msgs
92+
std_msgs sensor_msgs geometry_msgs pcl_msgs jsk_footstep_msgs
7093
)
7194
catkin_package(
72-
CATKIN_DEPENDS std_msgs sensor_msgs geometry_msgs pcl_msgs
95+
CATKIN_DEPENDS std_msgs sensor_msgs geometry_msgs pcl_msgs jsk_footstep_msgs
7396
)
7497

7598
install(DIRECTORY scripts

‎jsk_recognition_msgs/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<run_depend>sensor_msgs</run_depend>
1717
<build_depend>message_generation</build_depend>
1818
<run_depend>message_generation</run_depend>
19+
<build_depend>jsk_footstep_msgs</build_depend>
20+
<run_depend>jsk_footstep_msgs</run_depend>
1921
<export>
2022
</export>
2123
</package>

‎jsk_recognition_msgs/srv/CallPolygon.srv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
string filename
2+
---
3+
geometry_msgs/PolygonStamped points

‎jsk_recognition_msgs/srv/CallSnapIt.srv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jsk_recognition_msgs/SnapItRequest request
2+
---
3+
geometry_msgs/Pose transformation

‎jsk_recognition_msgs/srv/CheckCircle.srv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
geometry_msgs/Point point
2+
---
3+
bool clicked
4+
int32 index
5+
string msg

‎jsk_recognition_msgs/srv/CheckCollision.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sensor_msgs/JointState joint
2+
geometry_msgs/PoseStamped pose
3+
---
4+
bool result

‎jsk_recognition_msgs/srv/EnvironmentLock.srv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
uint32 environment_id

‎jsk_recognition_msgs/srv/EuclideanSegment.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sensor_msgs/PointCloud2 input
2+
float32 tolerance
3+
---
4+
sensor_msgs/PointCloud2[] output

‎jsk_recognition_msgs/srv/ICPAlign.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sensor_msgs/PointCloud2 reference_cloud
2+
sensor_msgs/PointCloud2 target_cloud
3+
---
4+
jsk_recognition_msgs/ICPResult result

‎jsk_recognition_msgs/srv/ICPAlignWithBox.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sensor_msgs/PointCloud2 target_cloud
2+
jsk_recognition_msgs/BoundingBox target_box
3+
---
4+
jsk_recognition_msgs/ICPResult result

‎jsk_recognition_msgs/srv/NonMaximumSuppression.srv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
jsk_recognition_msgs/Rect[] rect
2+
float32 threshold
3+
---
4+
jsk_recognition_msgs/Rect[] bbox
5+
int64 bbox_count

‎jsk_recognition_msgs/srv/PolygonOnEnvironment.srv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
uint32 environment_id
2+
uint32 plane_index
3+
geometry_msgs/PolygonStamped polygon
4+
---
5+
bool result
6+
string reason

‎jsk_recognition_msgs/srv/RobotPickupReleasePoint.srv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Header header
2+
geometry_msgs/Point target_point
3+
byte pick_or_release # 0 -> pick, 1 -> release
4+
---
5+
bool success

‎jsk_recognition_msgs/srv/SetDepthCalibrationParameter.srv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jsk_recognition_msgs/DepthCalibrationParameter parameter
2+
---

‎jsk_recognition_msgs/srv/SetTemplate.srv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
string type
2+
sensor_msgs/Image image
3+
# dimensions of the texture in the real world (in meters)
4+
float32 dimx
5+
float32 dimy
6+
geometry_msgs/Pose relativepose # used to set the coordinate system of the object relative to the texture
7+
string savefilename # if not empty, will save the resulting pp file to here
8+
---

‎jsk_recognition_msgs/srv/SnapFootstep.srv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jsk_footstep_msgs/FootstepArray input
2+
---
3+
jsk_footstep_msgs/FootstepArray output

‎jsk_recognition_msgs/srv/SwitchTopic.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# new topics
2+
string camera_info
3+
string points
4+
---

‎jsk_recognition_msgs/srv/TowerPickUp.srv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
int32 tower_index
2+
---

‎jsk_recognition_msgs/srv/TowerRobotMoveCommand.srv

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# a service to move robot with tower index
2+
byte ROBOT1=1
3+
byte ROBOT2=2
4+
byte ROBOT3=3
5+
6+
byte PLATE_SMALL=1
7+
byte PLATE_MIDDLE=2
8+
byte PLATE_LARGE=3
9+
10+
byte TOWER_LOWEST=1
11+
byte TOWER_MIDDLE=2
12+
byte TOWER_HIGHEST=3
13+
byte TOWER_LOWEST2=1
14+
15+
byte OPTION_NONE=0
16+
byte OPTION_MOVE_INITIAL=1
17+
18+
int32 robot_index
19+
int32 plate_index
20+
int32 from_tower
21+
int32 to_tower
22+
int32 option_command
23+
---

‎jsk_recognition_msgs/srv/TransformScreenpoint.srv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# screen point
2+
float32 x
3+
float32 y
4+
---
5+
# position in actual world
6+
std_msgs/Header header
7+
geometry_msgs/Point point
8+
geometry_msgs/Vector3 vector

‎jsk_recognition_msgs/srv/UpdateOffset.srv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# UpdatePose.srv
2+
# This service is designed to specify localization
3+
# transformation manually
4+
geometry_msgs/TransformStamped transformation
5+
---

‎jsk_recognition_msgs/srv/WhiteBalance.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
float32[3] reference_color
2+
sensor_msgs/Image input
3+
---
4+
sensor_msgs/Image output

‎jsk_recognition_msgs/srv/WhiteBalancePoints.srv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
float32[3] reference_color
2+
sensor_msgs/PointCloud2 input
3+
---
4+
sensor_msgs/PointCloud2 output

0 commit comments

Comments
 (0)