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

Adjusted xml files and scripts to use messages from rosaria_msgs package

Browse Source
This commit is contained in:
Olek Bojda 2018-09-28 14:34:55 +02:00
parent be544b71e0
commit d2b0a3ad1a
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
safety_master_plugin/package.xml
View File

@ -14,20 +14,20 @@
<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>safety_user_plugin</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>safety_user_plugin</build_export_depend> <build_export_depend>rosaria_msgs</build_export_depend>
<exec_depend>rospy</exec_depend> <exec_depend>rospy</exec_depend>
<exec_depend>rqt_gui</exec_depend> <exec_depend>rqt_gui</exec_depend>
<exec_depend>rqt_gui_py</exec_depend> <exec_depend>rqt_gui_py</exec_depend>
<exec_depend>std_msgs</exec_depend> <exec_depend>std_msgs</exec_depend>
<exec_depend>message_runtime</exec_depend> <exec_depend>message_runtime</exec_depend>
<exec_depend>safety_user_plugin</exec_depend> <exec_depend>rosaria_msgs</exec_depend>
<export> <export>
<rqt_gui plugin="${prefix}/plugin.xml"/> <rqt_gui plugin="${prefix}/plugin.xml"/>

4
safety_master_plugin/scripts/ros_master_wrapper.py
View File

@ -3,8 +3,8 @@ import rospy
import rospkg import rospkg
from std_msgs.msg import Bool from std_msgs.msg import Bool
from safety_user_plugin.msg import RobotInfoMsg from rosaria_msgs.msg import RobotInfoMsg
from safety_user_plugin.msg import RestrictionsMsg from rosaria_msgs.msg import RestrictionsMsg
from robot_info import RobotInfo from robot_info import RobotInfo
from master_restrictions import Restrictions from master_restrictions import Restrictions

3
safety_user_plugin/package.xml
View File

@ -15,18 +15,21 @@
<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>message_generation</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>message_generation</build_export_depend>
<build_export_depend>rosaria_msgs</build_export_depend>
<exec_depend>rospy</exec_depend> <exec_depend>rospy</exec_depend>
<exec_depend>rqt_gui</exec_depend> <exec_depend>rqt_gui</exec_depend>
<exec_depend>rqt_gui_py</exec_depend> <exec_depend>rqt_gui_py</exec_depend>
<exec_depend>std_msgs</exec_depend> <exec_depend>std_msgs</exec_depend>
<exec_depend>message_runtime</exec_depend> <exec_depend>message_runtime</exec_depend>
<exec_depend>rosaria_msgs</exec_depend>
<export> <export>
<rqt_gui plugin="${prefix}/plugin.xml"/> <rqt_gui plugin="${prefix}/plugin.xml"/>

4
safety_user_plugin/scripts/ros_wrapper.py
View File

@ -3,8 +3,8 @@ import rospy
import rospkg import rospkg
from std_msgs.msg import Bool from std_msgs.msg import Bool
from safety_user_plugin.msg import RobotInfoMsg from rosaria_msgs.msg import RobotInfoMsg
from safety_user_plugin.msg import RestrictionsMsg from rosaria_msgs.msg import RestrictionsMsg
from robot_info import RobotInfo from robot_info import RobotInfo
from restrictions import Restrictions from restrictions import Restrictions