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.

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

release: version 5.0.0-rc0001 #127

Merged
merged 19 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f08cb6f
refactor: rename function in modulo translators (#87)
domire8 May 6, 2024
502db63
Revert "Revert "feat: add mutex around step callback (#69)"" (#85)
domire8 May 6, 2024
94c4759
refactor: move utilities to modulo_utils package (#89)
domire8 May 13, 2024
401b218
refactor: move exceptions to modulo_utils (#90)
domire8 May 13, 2024
52c3dd9
refactor: remove modulo_component_interfaces (#88)
domire8 May 13, 2024
29a53ca
feat: add add_interfaces function for derived controllers (#107)
domire8 May 30, 2024
8f47982
refactor: remove period parameter and make rate double (#108)
domire8 May 31, 2024
3ea93b4
feat(modulo-controllers): use exceptions from modulo utils and update…
domire8 Jun 10, 2024
c7704a1
feat: define topic validation warning in utilities (#104)
domire8 Jun 10, 2024
7c6644e
fix(components): keep parameter values in sync with ros (#111)
domire8 Jun 11, 2024
f0232b7
feat: update to jazzy and CL v9.0.0 (#116)
domire8 Jun 12, 2024
a0e5ef3
refactor: move all exceptions into one place (#117)
domire8 Jun 12, 2024
f814f8b
feat: add flag for collision features to robot controller interface (…
domire8 Jun 27, 2024
6bfc04f
feat: try catch lifecycle transitions in components and controllers (…
domire8 Jul 3, 2024
25b6541
refactor: change predicate topic of controllers (#121)
domire8 Jul 3, 2024
9fe2c66
feat(components): only publish predicates on value change (#123)
domire8 Jul 4, 2024
b83d550
feat(controllers): only publish predicates on value change (#124)
domire8 Jul 4, 2024
6009b1f
fix(controllers): keep parameter values in sync with ros (#125)
domire8 Jul 8, 2024
4509f02
feat: use v2.0.0-rc1-jazzy image (#126)
domire8 Jul 8, 2024
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"."
],
"image": "modulo:development",
"postAttachCommand": "cd /home/ros2/ws && colcon build --packages-select modulo_component_interfaces modulo_interfaces",
"postAttachCommand": "cd /home/ros2/ws && colcon build --packages-select modulo_interfaces",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/ros2/.devcontainer,type=bind,consistency=cached",
"workspaceFolder": "/home/ros2/.devcontainer",
"mounts": [
Expand Down
23 changes: 8 additions & 15 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,13 @@ jobs:
name: Check if the version has been updated
outputs:
has_changed: ${{ steps.check.outputs.has_changed }}
version: ${{ steps.versions.outputs.new_version }}
version: ${{ steps.check.outputs.version }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- id: versions
run: |
PREV_VERSION=$(git show HEAD^:VERSION)
NEW_VERSION=$(git show HEAD:VERSION)
echo "prev_version=${PREV_VERSION}" >> $GITHUB_OUTPUT
echo "new_version=${NEW_VERSION}" >> $GITHUB_OUTPUT
shell: bash
- uses: aica-technology/.github/.github/actions/compare-versions@v0.11.0
- uses: aica-technology/.github/.github/actions/check-version-toml@v1.0.1
id: check
with:
previous_version: ${{ steps.versions.outputs.prev_version }}
new_version: ${{ steps.versions.outputs.new_version }}
package_path: .

metadata:
name: Get metadata
Expand All @@ -50,7 +39,11 @@ jobs:
if [ ${{ needs.check-version.outputs.has_changed }} = 'true' ]; then
CREATE_TAG=true
GIT_TAG="v${{ needs.check-version.outputs.version }}"
IMAGE_TAGS=latest,"${GIT_TAG}",rolling
if [[ "${GIT_TAG}" == *"-"* ]]; then
IMAGE_TAGS="{GIT_TAG},rolling"
else
IMAGE_TAGS=latest,"${GIT_TAG}",rolling
fi
else
IMAGE_TAGS=rolling
fi
Expand Down
2 changes: 1 addition & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "AMD",
"includePath": [
"/opt/ros/iron/include/**",
"/opt/ros/jazzy/include/**",
"/home/ros2/ros2_ws/install/**",
"/home/ros2/ws/install/**",
"/home/ros2/ws/src/modulo_utils/include",
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Release Versions:

- [4.2.2](#422)
- [4.2.1](#421)
- [4.2.0](#420)
- [4.1.0](#410)
Expand All @@ -14,6 +15,28 @@ Release Versions:
- [2.1.1](#211)
- [2.1.0](#210)

## Upcoming changes

- refactor: rename function in modulo translators (#77)
- feat(components): add mutex around step callback (#67)
- refactor: move utilities to modulo_utils package (#89)
- refactor: move exceptions to modulo_utils (#90)
- refactor: remove modulo_component_interfaces (#88)
- feat(controllers): add add_interfaces function for derived controllers (#102)
- refactor(components): remove period parameter and make rate double (#108)
- feat(controllers): use exceptions from modulo utils and update to CL v8.1.0 (#106)
- feat: define topic validation warning in utilities (#101)
- fix(components): keep parameter values in sync with ros (#111)
- feat: update to jazzy and CL v9.0.0 (#116)
- refactor: move all exceptions into one place (#117)
- feat(controllers): add flag for collision features to robot controller interface (#114)
- feat: try catch lifecycle transitions in components and controllers (#120)
- refactor: change predicate topic of controllers (#121)
- feat(components): only publish predicates on value change (#123)
- feat(controllers): only publish predicates on value change (#124)
- fix(controllers): keep parameter values in sync with ros (#125)
- feat: use v2.0.0-rc1-jazzy image (#126)

## 4.2.2

### June 14, 2024
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ As a general rule, a component interface methods do not throw an exception or ra
meaningful option. More precisely, only non-void public/protected methods throw, i.e. all setters and `add_xxx` methods
do not throw but catch all exceptions and log an error.

If an exception is thrown, it is either a `ComponentException` (in C++) or a `ComponentError` (in Python) or any
If an exception is thrown, it is either a `CoreException` (in C++) or a `CoreError` (in Python) or any
derived exception, such that all exceptions thrown by a component can be caught with those base exceptions (for example
in the periodic `step` function).

Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

11 changes: 4 additions & 7 deletions aica-package.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
#syntax=ghcr.io/aica-technology/package-builder:v1
#syntax=ghcr.io/aica-technology/package-builder:v1.0.1

[metadata]
version = "4.2.2"
version = "5.0.0-rc0001"
description = "Modular ROS 2 extension library for dynamic composition of components and controllers with the AICA robotics framework"

[metadata.collection]
name = "modulo"

[build]
type = "ros"
image = "v1.0.1-iron"
image = "v2.0.0-rc1-jazzy"

[build.dependencies]
"@aica/foss/control-libraries" = "v7.4.1"

[build.packages.modulo_component_interfaces]
source = "./source/modulo_component_interfaces"
"@aica/foss/control-libraries" = "v9.0.0"

[build.packages.modulo_components]
source = "./source/modulo_components"
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Options:

--cl-version <VERSION> Specify the version of the control libraries image to use.

--base-version <VERSION> Specify the version of base image to use.
--base-version <VERSION> Specify the version of the base image to use.

--tag <TAG> Specify the tag of the generated image.
(default: $IMAGE_TAG)
Expand Down
10 changes: 0 additions & 10 deletions source/modulo_component_interfaces/CMakeLists.txt

This file was deleted.

29 changes: 0 additions & 29 deletions source/modulo_component_interfaces/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions source/modulo_component_interfaces/msg/Predicate.msg

This file was deleted.

21 changes: 0 additions & 21 deletions source/modulo_component_interfaces/package.xml

This file was deleted.

3 changes: 0 additions & 3 deletions source/modulo_component_interfaces/srv/EmptyTrigger.srv

This file was deleted.

4 changes: 0 additions & 4 deletions source/modulo_component_interfaces/srv/StringTrigger.srv

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,8 @@
"display_name": "Rate",
"description": "The frequency in Hertz for all periodic callbacks",
"parameter_name": "rate",
"parameter_type": "int",
"default_value": "10"
},
{
"display_name": "Period",
"description": "The time interval in seconds for all periodic callbacks. This parameter is deprecated and will be removed in the next major release. The rate parameter takes precedence and overrides the component period.",
"parameter_name": "period",
"parameter_type": "double",
"default_value": "0.1",
"internal": true
"default_value": "10.0"
}
],
"predicates": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,8 @@
"display_name": "Rate",
"description": "The frequency in Hertz for all periodic callbacks",
"parameter_name": "rate",
"parameter_type": "int",
"default_value": "10"
},
{
"display_name": "Period",
"description": "The time interval in seconds for all periodic callbacks. This parameter is deprecated and will be removed in the next major release. The rate parameter takes precedence and overrides the component period.",
"parameter_name": "period",
"parameter_type": "double",
"default_value": "0.1",
"internal": true
"default_value": "10.0"
}
],
"predicates": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ class Component : public rclcpp::Node, public ComponentInterface {
using ComponentInterface::inputs_;
using ComponentInterface::outputs_;
using ComponentInterface::periodic_outputs_;
using ComponentInterface::publish_predicate;
using ComponentInterface::publish_predicates;
using ComponentInterface::publish_outputs;
using ComponentInterface::evaluate_periodic_callbacks;
Expand Down
Loading
Loading