L1.5/l1.5-safety-system
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Removed message generation from user_plugin package

Browse Source
This commit is contained in:
Olek Bojda 2018-09-29 14:31:05 +02:00
parent bdf9d0f04c
commit 6cd0ce3934
4 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
safety_user_plugin/CMakeLists.txt
View File

@ -13,7 +13,6 @@ find_package(catkin REQUIRED COMPONENTS
rqt_gui_py rqt_gui_py
std_msgs std_msgs
geometry_msgs geometry_msgs
message_generation
) )
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
@ -50,11 +49,11 @@ catkin_python_setup()
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) ## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
## Generate messages in the 'msg' folder ## Generate messages in the 'msg' folder
add_message_files( # add_message_files(
FILES # FILES
RestrictionsMsg.msg # RestrictionsMsg.msg
RobotInfoMsg.msg # RobotInfoMsg.msg
) # )
## Generate services in the 'srv' folder ## Generate services in the 'srv' folder
# add_service_files( # add_service_files(
@ -71,11 +70,11 @@ catkin_python_setup()
# ) # )
## Generate added messages and services with any dependencies listed here ## Generate added messages and services with any dependencies listed here
generate_messages( # generate_messages(
DEPENDENCIES # DEPENDENCIES
std_msgs # std_msgs
geometry_msgs # geometry_msgs
) # )
################################################ ################################################
## Declare ROS dynamic reconfigure parameters ## ## Declare ROS dynamic reconfigure parameters ##

3
safety_user_plugin/msg/RestrictionsMsg.msg
View File

@ -1,3 +0,0 @@
std_msgs/Float64 distance
std_msgs/Float64 linear_velocity
std_msgs/Float64 angular_velocity

5
safety_user_plugin/msg/RobotInfoMsg.msg
View File

@ -1,5 +0,0 @@
std_msgs/UInt8 robot_id
std_msgs/Float64 battery_voltage
geometry_msgs/Twist twist
std_msgs/Bool state
std_msgs/Bool clutch

2
safety_user_plugin/package.xml
View File

@ -14,14 +14,12 @@
<build_depend>rqt_gui</build_depend> <build_depend>rqt_gui</build_depend>
<build_depend>rqt_gui_py</build_depend> <build_depend>rqt_gui_py</build_depend>
<build_depend>std_msgs</build_depend> <build_depend>std_msgs</build_depend>
<build_depend>message_generation</build_depend>
<build_depend>rosaria_msgs</build_depend> <build_depend>rosaria_msgs</build_depend>
<build_export_depend>rospy</build_export_depend> <build_export_depend>rospy</build_export_depend>
<build_export_depend>rqt_gui</build_export_depend> <build_export_depend>rqt_gui</build_export_depend>
<build_export_depend>rqt_gui_py</build_export_depend> <build_export_depend>rqt_gui_py</build_export_depend>
<build_export_depend>std_msgs</build_export_depend> <build_export_depend>std_msgs</build_export_depend>
<build_export_depend>message_generation</build_export_depend>
<build_export_depend>rosaria_msgs</build_export_depend> <build_export_depend>rosaria_msgs</build_export_depend>
<exec_depend>rospy</exec_depend> <exec_depend>rospy</exec_depend>