Skip to content

Commit 4582740

Browse files
committed
Merge branch 'master' of https://github.com/ros-controls/control_toolbox into ros2-master
2 parents 41c6529 + f2eb331 commit 4582740

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ repos:
6262

6363
# CPP hooks
6464
- repo: https://github.com/pre-commit/mirrors-clang-format
65-
rev: v21.1.8
65+
rev: v22.1.0
6666
hooks:
6767
- id: clang-format
6868
args: ['-fallback-style=none', '-i']
@@ -136,7 +136,7 @@ repos:
136136
exclude: CHANGELOG\.rst|\.(svg|pyc)$
137137

138138
- repo: https://github.com/python-jsonschema/check-jsonschema
139-
rev: 0.36.1
139+
rev: 0.37.0
140140
hooks:
141141
- id: check-github-workflows
142142
args: ["--verbose"]

control_toolbox/test/pid_ros_parameters_tests.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,9 @@ TEST(PidParametersTest, PrintValuesLogsExpectedContent)
869869
anti.tracking_time_constant = 0.3;
870870

871871
const double U_MAX = 1e9, U_MIN = -1e9; // avoid clamping
872-
ASSERT_TRUE(pid.initialize_from_args(/*p=*/1.0, /*i=*/1.0, /*d=*/0.0, U_MAX, U_MIN, anti,
873-
/*save_i_term=*/false));
872+
ASSERT_TRUE(pid.initialize_from_args(
873+
/*p=*/1.0, /*i=*/1.0, /*d=*/0.0, U_MAX, U_MIN, anti,
874+
/*save_i_term=*/false));
874875

875876
// Make the internal errors non-trivial
876877
const auto dt = rclcpp::Duration::from_seconds(0.2);

0 commit comments

Comments
 (0)