Skip to content

Commit ce9386a

Browse files
christophfroehlichchristophfroehlich
authored
Merge branch 'master' into jtc/controller_plugin
2 parents f0db289 + 6623cdd commit ce9386a

File tree

68 files changed

+243
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+243
-54
lines changed

‎ackermann_steering_controller/CHANGELOG.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog for package ackermann_steering_controller
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.4.0 (2024-01-11)
6+
------------------
7+
8+
4.3.0 (2024-01-08)
9+
------------------
10+
* Add few warning flags to error (`#961 <https://github.com/ros-controls/ros2_controllers/issues/961>`_)
11+
* Contributors: Sai Kishor Kothakota
12+
513
4.2.0 (2023-12-12)
614
------------------
715

‎ackermann_steering_controller/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(ackermann_steering_controller LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Wpedantic -Wconversion)
5+
add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable
6+
-Werror=return-type -Werror=shadow -Werror=format)
67
endif()
78

89
# find dependencies

‎ackermann_steering_controller/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>ackermann_steering_controller</name>
5-
<version>4.2.0</version>
5+
<version>4.4.0</version>
66
<description>Steering controller for Ackermann kinematics. Rear fixed wheels are powering the vehicle and front wheels are steering it.</description>
77
<license>Apache License 2.0</license>
88
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>

‎admittance_controller/CHANGELOG.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
Changelog for package admittance_controller
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.4.0 (2024-01-11)
6+
------------------
7+
8+
4.3.0 (2024-01-08)
9+
------------------
10+
* Remove robot description param from admittance YAML (`#963 <https://github.com/ros-controls/ros2_controllers/issues/963>`_)
11+
* Add few warning flags to error (`#961 <https://github.com/ros-controls/ros2_controllers/issues/961>`_)
12+
* Contributors: Abishalini Sivaraman, Sai Kishor Kothakota
13+
514
4.2.0 (2023-12-12)
615
------------------
716

‎admittance_controller/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(admittance_controller LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Wpedantic -Wconversion)
5+
add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable
6+
-Werror=return-type -Werror=shadow -Werror=format)
67
endif()
78

89
set(THIS_PACKAGE_INCLUDE_DEPENDS

‎admittance_controller/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>admittance_controller</name>
5-
<version>4.2.0</version>
5+
<version>4.4.0</version>
66
<description>Implementation of admittance controllers for different input and output interface.</description>
77
<maintainer email="denis@stogl.de">Denis Štogl</maintainer>
88
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>

‎admittance_controller/src/admittance_controller_parameters.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@ admittance_controller:
147147
}
148148

149149
# general settings
150-
robot_description: {
151-
type: string,
152-
description: "Contains robot description in URDF format. The description is used for forward and inverse kinematics.",
153-
read_only: true
154-
}
155150
enable_parameter_update_without_reactivation: {
156151
type: bool,
157152
default_value: true,

‎bicycle_steering_controller/CHANGELOG.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog for package bicycle_steering_controller
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.4.0 (2024-01-11)
6+
------------------
7+
8+
4.3.0 (2024-01-08)
9+
------------------
10+
* Add few warning flags to error (`#961 <https://github.com/ros-controls/ros2_controllers/issues/961>`_)
11+
* Contributors: Sai Kishor Kothakota
12+
513
4.2.0 (2023-12-12)
614
------------------
715

‎bicycle_steering_controller/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(bicycle_steering_controller LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Wpedantic -Wconversion)
5+
add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable
6+
-Werror=return-type -Werror=shadow -Werror=format)
67
endif()
78

89
# find dependencies

‎bicycle_steering_controller/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>bicycle_steering_controller</name>
5-
<version>4.2.0</version>
5+
<version>4.4.0</version>
66
<description>Steering controller with bicycle kinematics. Rear fixed wheel is powering the vehicle and front wheel is steering.</description>
77
<license>Apache License 2.0</license>
88
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>

0 commit comments

Comments
 (0)