Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed UI pane changing #14

Merged
merged 1 commit into from
Nov 25, 2024
Merged

removed UI pane changing #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions src/fanuc_sim/objectives/request_teleoperation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<!--Joint sliders interpolate to joint state-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 5">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -67,10 +63,6 @@
<!--Interactive markers move to pose-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 4">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -105,10 +97,6 @@
<!--Waypoint buttons move to joint state-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 3">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -142,20 +130,12 @@
</Decorator>
<!--Cartesian and joint jogging-->
<Control ID="Sequence" _while="teleop_mode == 2">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Action
ID="TeleoperateTwist"
controller_name="servo_controller"
/>
</Control>
<Control ID="Sequence" _while="teleop_mode == 1">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Action
ID="TeleoperateJointJog"
controller_name="servo_controller"
Expand Down
12 changes: 0 additions & 12 deletions src/moveit_pro_ur_configs/picknik_ur_base_config/objectives/request_teleoperation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@
<!--Interactive markers move to pose-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 4">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -102,10 +98,6 @@
<!--Waypoint buttons move to joint state-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 3">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -139,10 +131,6 @@
</Decorator>
<!--Cartesian and joint jogging-->
<Control ID="Sequence" _while="teleop_mode == 2">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Action
ID="TeleoperateTwist"
controller_name="servo_controller"
Expand Down
20 changes: 0 additions & 20 deletions src/moveit_pro_ur_configs/picknik_ur_multi_arm_config/objectives/request_teleoperation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<!--Joint sliders interpolate to joint state-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 5">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -67,10 +63,6 @@
<!--Interactive markers move to pose-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 4">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -105,10 +97,6 @@
<!--Waypoint buttons move to joint state-->
<Decorator ID="ForceSuccess" _while="teleop_mode == 3">
<Control ID="Sequence">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Control ID="Fallback" name="root">
<Control ID="Sequence">
<Action
Expand Down Expand Up @@ -142,21 +130,13 @@
</Decorator>
<!--Pose Jog-->
<Control ID="Sequence" _while="teleop_mode == 2">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Action
ID="TeleoperateTwist"
controller_name="servo_controller"
/>
</Control>
<!--Joint Jog-->
<Control ID="Sequence" _while="teleop_mode == 1">
<Action
ID="SwitchUIPrimaryView"
primary_view_name="Visualization"
/>
<Action
ID="TeleoperateJointJog"
controller_name="servo_controller"
Expand Down
Loading