Fixed restrictions import in master plugin. Also adjusted names in roslaunches to be generated anonymously
This commit is contained in:
parent
4d8b68cd7d
commit
c736362efb
@ -1,7 +1,7 @@
|
|||||||
<launch>
|
<launch>
|
||||||
<node pkg="rqt_gui"
|
<node pkg="rqt_gui"
|
||||||
type="rqt_gui"
|
type="rqt_gui"
|
||||||
name="master_rqt_gui"
|
name="$(anon master_plugin)"
|
||||||
args="--standalone safety_master_plugin"
|
args="--standalone safety_master_plugin"
|
||||||
/>
|
/>
|
||||||
</launch>
|
</launch>
|
@ -1,6 +1,6 @@
|
|||||||
from ros_master_wrapper import ROSWrapper
|
from ros_master_wrapper import ROSWrapper
|
||||||
from qt_master_wrapper import QtWrapper
|
from qt_master_wrapper import QtWrapper
|
||||||
from restrictions import Restrictions
|
from master_restrictions import Restrictions
|
||||||
|
|
||||||
from master_info import MasterInfo
|
from master_info import MasterInfo
|
||||||
from master_widget import MasterWidget
|
from master_widget import MasterWidget
|
||||||
|
@ -7,7 +7,7 @@ from safety_user_plugin.msg import RobotInfoMsg
|
|||||||
from safety_user_plugin.msg import RestrictionsMsg
|
from safety_user_plugin.msg import RestrictionsMsg
|
||||||
|
|
||||||
from robot_info import RobotInfo
|
from robot_info import RobotInfo
|
||||||
from restrictions import Restrictions
|
from master_restrictions import Restrictions
|
||||||
|
|
||||||
from enums.stop_state import StopState as SS
|
from enums.stop_state import StopState as SS
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<launch>
|
<launch>
|
||||||
<node pkg="rqt_gui"
|
<node pkg="rqt_gui"
|
||||||
type="rqt_gui"
|
type="rqt_gui"
|
||||||
name="rqt_gui"
|
name="$(anon user_plugin)"
|
||||||
args="--standalone safety_user_plugin"
|
args="--standalone safety_user_plugin"
|
||||||
/>
|
/>
|
||||||
</launch>
|
</launch>
|
Loading…
Reference in New Issue
Block a user