Skip to content

Commit 8f5dbce

Browse files
authored
Merge branch 'main' into feature/add-config-thumbnails
2 parents f8881d9 + 165c38e commit 8f5dbce

File tree

15 files changed

+20
-18
lines changed

15 files changed

+20
-18
lines changed

src/factory_sim/config/moveit/servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::ButterworthFilterPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::ButterworthFilterPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/grinding_sim/config/moveit/servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::ButterworthFilterPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::ButterworthFilterPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/hangar_sim/config/moveit/ur_servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::AccelerationLimitedPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::AccelerationLimitedPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/lab_sim/config/moveit/ur_servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::AccelerationLimitedPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::AccelerationLimitedPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/lab_sim/objectives/inspector.xml renamed to src/lab_sim/objectives/stitch_multiple_point_clouds_together.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<root BTCPP_format="4" main_tree_to_execute="Inspector">
2+
<root
3+
BTCPP_format="4"
4+
main_tree_to_execute="Stitch Multiple Point Clouds Together"
5+
>
36
<BehaviorTree
4-
ID="Inspector"
7+
ID="Stitch Multiple Point Clouds Together"
58
_description="Multi-view inspection routine: Captures images and point clouds from multiple viewpoints for 3D reconstruction or quality inspection"
6-
_favorite="true"
79
>
810
<Control ID="Sequence">
911
<!--Initialize visualization and point cloud vector-->
@@ -201,7 +203,7 @@
201203
</Control>
202204
</BehaviorTree>
203205
<TreeNodesModel>
204-
<SubTree ID="Inspector">
206+
<SubTree ID="Stitch Multiple Point Clouds Together">
205207
<MetadataFields>
206208
<Metadata subcategory="Application - Basic Examples" />
207209
<Metadata runnable="true" />

src/lab_sim/test/objectives_integration_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"Record Square Trajectory",
7474
"Stack Blocks with ICP", # Skipped because there is no primary ui to switch to in ci
7575
"Teleoperate",
76-
"Inspector",
76+
"Stitch Multiple Point Clouds Together",
7777
"Pick 1 Pill Bottle",
7878
"AddBottlesToPlanningScene",
7979
"Interactive Marker Visualization", # Server not available for GetTextFromUser

src/moveit_pro_franka_configs/dual_arm_sim/config/moveit/servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::AccelerationLimitedPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::AccelerationLimitedPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/moveit_pro_franka_configs/franka_base_config/config/moveit/servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::AccelerationLimitedPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::AccelerationLimitedPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/moveit_pro_franka_configs/franka_dual_arm_hw/config/moveit/servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ publish_joint_accelerations: false
3232

3333
## Plugins for smoothing outgoing commands
3434
use_smoothing: true
35-
smoothing_filter_plugin_name: "online_signal_smoothing::AccelerationLimitedPlugin"
35+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::AccelerationLimitedPlugin"
3636
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3737

3838
## MoveIt properties

src/moveit_pro_kinova_configs/kinova_gen3_base_config/config/moveit/kinova_gen3_servo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ publish_joint_accelerations: false
2929

3030
## Plugins for smoothing outgoing commands
3131
use_smoothing: true
32-
smoothing_filter_plugin_name: "online_signal_smoothing::AccelerationLimitedPlugin"
32+
smoothing_filter_plugin_name: "moveit_pro::base::online_signal_smoothing::AccelerationLimitedPlugin"
3333
acceleration_filter_update_period: 0.01 # [seconds] Must match the publish_period parameter
3434

3535
## MoveIt properties

0 commit comments

Comments
 (0)