Skip to content

Commit 967f322

Browse files
Merge branch 'moveit:main' into main
2 parents 9fecf09 + 760277f commit 967f322

File tree

13 files changed

+25
-48
lines changed

13 files changed

+25
-48
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
# run: |
153153
# testspace "[ ${{ matrix.env.IMAGE }} ]${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml"
154154
- name: Upload test artifacts (on failure)
155-
uses: actions/upload-artifact@v4
155+
uses: actions/upload-artifact@v5
156156
if: failure() && (steps.ici.outputs.run_target_test || steps.ici.outputs.target_test_results)
157157
with:
158158
name: test-results-${{ matrix.env.IMAGE }}

.github/workflows/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
steps:
179179
- name: Delete Untagged Images
180180
if: (github.event_name != 'pull_request') && (github.repository == 'moveit/moveit2')
181-
uses: actions/github-script@v7
181+
uses: actions/github-script@v8
182182
with:
183183
github-token: ${{ secrets.DELETE_PACKAGES_TOKEN }}
184184
script: |

.github/workflows/stale.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/tutorial_docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
steps:
7676
- name: Delete Untagged Images
7777
if: (github.event_name != 'pull_request') && (github.repository == 'moveit/moveit2')
78-
uses: actions/github-script@v7
78+
uses: actions/github-script@v8
7979
with:
8080
github-token: ${{ secrets.DELETE_PACKAGES_TOKEN }}
8181
script: |

.pre-commit-config.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,12 @@ repos:
3737
hooks:
3838
- id: black
3939

40-
- repo: local
40+
- repo: https://github.com/pre-commit/mirrors-clang-format
41+
rev: v14.0.6
4142
hooks:
4243
- id: clang-format
43-
name: clang-format
44-
description: Format files with ClangFormat.
45-
entry: clang-format-14
46-
language: system
47-
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
48-
args: ['-fallback-style=none', '-i']
44+
types_or: [c++, c, cuda]
45+
args: ["-fallback-style=none"]
4946
- repo: https://github.com/codespell-project/codespell
5047
rev: v2.4.1
5148
hooks:

moveit_core/robot_state/test/test_aabb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ TEST_F(TestAABB, TestPR2)
160160
auto pub_aabb =
161161
node->create_publisher<visualization_msgs::msg::Marker>("/visualization_aabb", rmw_qos_profile_default);
162162
auto pub_obb = node->create_publisher<visualization_msgs::msg::Marker>("/visualization_obb", rmw_qos_profile_default);
163-
rclcpp::Rate loop_rate(10);
163+
rclcpp::WallRate loop_rate(10);
164164

165165
// Wait for the publishers to establish connections
166166
sleep(5);

moveit_ros/hybrid_planning/test/test_basic_integration.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ TEST_F(HybridPlanningFixture, ActionCompletion)
219219
auto goal_handle_future = hp_action_client_->async_send_goal(goal_action_request_, send_goal_options_);
220220
});
221221

222-
rclcpp::Rate rate(10);
222+
rclcpp::WallRate rate(10);
223223
while (!action_complete_)
224224
{
225225
executor_.spin_once();
@@ -241,7 +241,7 @@ TEST_F(HybridPlanningFixture, ActionCompletion)
241241
hp_action_client_->async_cancel_all_goals();
242242
});
243243
244-
rclcpp::Rate rate(10);
244+
rclcpp::WallRate rate(10);
245245
while (!action_complete_)
246246
{
247247
executor_.spin_once();

moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void TfPublisher::publishPlanningSceneFrames()
9494
tf2_ros::TransformBroadcaster broadcaster(context_->moveit_cpp_->getNode());
9595
#endif
9696
geometry_msgs::msg::TransformStamped transform;
97-
rclcpp::Rate rate(rate_);
97+
rclcpp::WallRate rate(rate_);
9898

9999
while (keep_running_)
100100
{

moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,17 @@ void updateSlidingWindow(KinematicState& next_joint_state, std::deque<KinematicS
135135
double max_expected_latency, const rclcpp::Time& cur_time);
136136

137137
/**
138-
* \brief Create a Float64MultiArray message from given joint state
139-
* @param servo_params The configuration used by servo, required for selecting position vs velocity.
140-
* @param joint_state The joint state to be added into the Float64MultiArray.
141-
* @return The Float64MultiArray message.
138+
* \brief Create a Float64MultiArray message from the given joint state.
139+
*
140+
* This function converts the joint state into a std_msgs::msg::Float64MultiArray message
141+
* based on the configuration in the Servo parameters. It supports both position and
142+
* velocity command modes, depending on the controller configuration.
143+
*
144+
* @param servo_params Configuration parameters used by Servo (e.g., command type: position or velocity).
145+
* @param joint_state The current joint state to be converted into a Float64MultiArray message.
146+
* @return The resulting Float64MultiArray message containing joint commands.
142147
*/
148+
143149
std_msgs::msg::Float64MultiArray composeMultiArrayMessage(const servo::Params& servo_params,
144150
const KinematicState& joint_state);
145151

moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/trajectory_monitor_middleware_handle.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ class TrajectoryMonitorMiddlewareHandle : public TrajectoryMonitor::MiddlewareHa
6666
void sleep() override;
6767

6868
private:
69-
std::unique_ptr<rclcpp::Rate> rate_;
69+
std::unique_ptr<rclcpp::WallRate> rate_;
7070
};
7171
} // namespace planning_scene_monitor

0 commit comments

Comments
 (0)