Skip to content

Commit 7bfcd08

Browse files
Merge branch 'main' into add-rtest-package
2 parents e32dede + 54894d8 commit 7bfcd08

41 files changed

Lines changed: 1931 additions & 1833 deletions

Some content is hidden

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

.github/workflows/testpr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: Delete specific outdated cache entries
102102
shell: bash -l {0}
103103
run: |
104-
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-autoware-trajectory* 2>/dev/null || true
104+
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-rosx* 2>/dev/null || true
105105
mkdir -p ${{ matrix.folder_cache }}
106106
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force
107107

AGENTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Working notes for future coding agents in a RoboStack repo. Replace $DISTRO with
1717

1818
```bash
1919
# single package (preferred for debugging)
20-
pixi run build-one --package ros-$DISTRO-<pkg>
20+
pixi run build-one ros-$DISTRO-<pkg>
2121

2222
# broad pass when needed
2323
pixi run build_continue_on_failure
@@ -91,7 +91,7 @@ bash -x conda_build.sh 2>&1 | less
9191
### 7. Rebuild package
9292

9393
```bash
94-
pixi run build-one --package ros-$DISTRO-<pkg>
94+
pixi run build-one ros-$DISTRO-<pkg>
9595
```
9696

9797
## Create a patch from build-directory edits

conda_build_config.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ numpy:
33
assimp:
44
- 5
55
libprotobuf:
6-
- 6.31.1
6+
- 6.33.5
77
protobuf:
8-
- 6.31.1
8+
- 6.33.5
99
spdlog:
1010
- 1.17
1111
pugixml:
1212
- '1.15'
1313
libopencv:
14-
- 4.12.0
14+
- 4.13.0
1515
libxml2:
1616
- 2.14.*
1717
graphviz:
@@ -33,6 +33,12 @@ tbb_devel:
3333
cmake:
3434
- 3.*
3535

36+
# as of early April 2026 key robotics packages like pinocchio still required eigen 3.4.0.*,
37+
# see https://github.com/conda-forge/eigenpy-feedstock/pull/184
38+
eigen_abi_devel:
39+
- 3.4.0
40+
41+
3642
cdt_name: # [linux]
3743
- conda # [linux]
3844

@@ -71,3 +77,8 @@ libzenohcxx:
7177

7278
libhwloc:
7379
- 2.12.2
80+
81+
urdfdom:
82+
- 4.0.1
83+
urdfdom-headers:
84+
- 1.1.2

patch/dependencies.yaml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ foxglove_bridge:
55
ros_ign_interfaces:
66
add_host: ["ros-kilted-rcl-interfaces"]
77
cartographer_ros:
8-
add_host: ["cartographer 2.*", "libboost-devel"]
8+
add_host: ["cartographer 2.*", "libboost-devel", "ceres-solver * cpu*"]
99
libyaml_vendor:
1010
add_host: ["yaml-cpp", "yaml"]
1111
add_run: ["yaml-cpp", "yaml"]
@@ -39,7 +39,7 @@ rviz_ogre_vendor:
3939
add_build: ["vcstool"]
4040
add_run: ["assimp"]
4141
pcl_conversions:
42-
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel"]
42+
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel", "eigen-abi-devel"]
4343
pcl_ros:
4444
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel"]
4545
rviz_rendering:
@@ -96,7 +96,7 @@ nav2_smac_planner:
9696
nav2_util:
9797
add_host: ["libboost-devel"]
9898
nav2_constrained_smoother:
99-
add_host: ["${{ 'openblas' if win }}"]
99+
add_host: ["${{ 'openblas' if win }}", "ceres-solver * cpu*"]
100100
nav2_mppi_controller:
101101
add_build: ["${{ 'clang <19' if osx }}"]
102102
ompl:
@@ -133,6 +133,8 @@ rviz2:
133133
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
134134
plotjuggler_ros:
135135
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
136+
moveit_core:
137+
add_host: ["eigen-abi-devel"]
136138
moveit_setup_framework:
137139
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
138140
moveit_setup_core_plugins:
@@ -161,7 +163,7 @@ rqt_image_overlay:
161163
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
162164
slam_toolbox:
163165
add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"]
164-
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "blas-devel"]
166+
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "blas-devel", "ceres-solver * cpu*"]
165167
vision_msgs_rviz_plugins:
166168
add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"]
167169
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
@@ -220,11 +222,14 @@ gz_transport_vendor:
220222
gz_utils_vendor:
221223
add_host: ["gz-utils3"]
222224
add_run: ["gz-utils3"]
225+
sdformat_urdf:
226+
add_host: ["sdformat15"]
227+
add_run: ["sdformat15"]
223228
sdformat_vendor:
224229
add_host: ["sdformat15"]
225230
add_run: ["sdformat15"]
226231
gz_dartsim_vendor:
227-
add_host: ["dartsim-cpp"]
232+
add_host: ["dartsim-cpp", "eigen-abi-devel"]
228233
add_run: ["dartsim-cpp"]
229234
gz_ogre_next_vendor:
230235
add_host: ["ogre-next"]
@@ -247,6 +252,8 @@ autoware_utils_pcl:
247252
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
248253
autoware_utils_debug:
249254
add_host: ["fmt"]
255+
autoware_trajectory:
256+
add_host: ["fmt"]
250257
rclpy:
251258
add_host: ["typing_extensions"]
252259
add_run: ["typing_extensions"]
@@ -267,3 +274,17 @@ console_bridge_vendor:
267274
grid_map_octomap:
268275
add_host: ["octomap"]
269276
add_run: ["octomap"]
277+
py_trees:
278+
add_host: ["poetry-core"]
279+
py_trees_js:
280+
add_host: ["poetry-core"]
281+
py_trees_ros:
282+
add_host: ["poetry-core"]
283+
py_trees_ros_viewer:
284+
add_host: ["poetry-core"]
285+
tf2_eigen_kdl:
286+
add_host: ["eigen-abi-devel"]
287+
pinocchio:
288+
add_host: ["eigen-abi-devel"]
289+
eigenpy:
290+
add_host: ["eigen-abi-devel"]

patch/ros-kilted-apriltag-ros.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,15 @@ index c906851..b48600f 100644
1515
endif()
1616

1717
option(ASAN "use AddressSanitizer to detect memory issues" OFF)
18+
diff --git a/src/conversion.cpp b/src/conversion.cpp
19+
--- a/src/conversion.cpp
20+
+++ b/src/conversion.cpp
21+
@@ -56,7 +56,7 @@ tf2::toMsg(const std::pair<cv::Mat_<double>, cv::Mat_<double>>& pose)
22+
23+
// convert compact rotation vector to angle-axis to quaternion
24+
const Eigen::Map<const Eigen::Vector3d> rvec(reinterpret_cast<double*>(pose.second.data));
25+
- const Eigen::Quaterniond q({rvec.norm(), rvec.normalized()});
26+
+ const Eigen::Quaterniond q(Eigen::AngleAxisd(rvec.norm(), rvec.normalized()));
27+
28+
geometry_msgs::msg::Transform t;
29+
tf2::convert(pose.first, t.translation);

patch/ros-kilted-autoware-adapi-adaptors.patch

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

patch/ros-kilted-autoware-default-adapi.patch

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 0bf9d1d..3333333 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,11 +1,12 @@
6+
cmake_minimum_required(VERSION 3.14)
7+
project(autoware_kalman_filter)
8+
9+
+find_package(eigen3_cmake_module REQUIRED)
10+
+find_package(Eigen3 REQUIRED)
11+
+get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
12+
find_package(autoware_cmake REQUIRED)
13+
autoware_package()
14+
15+
-find_package(eigen3_cmake_module REQUIRED)
16+
-find_package(Eigen3 REQUIRED)
17+
18+
include_directories(
19+
SYSTEM

patch/ros-kilted-autoware-map-height-fitter.patch

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

patch/ros-kilted-autoware-ndt-scan-matcher.patch

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,3 @@ index 57c25aa..01eb4e7 100644
2222

2323
#include <limits>
2424
#include <map>
25-
diff --git a/src/ndt_scan_matcher_core.cpp b/src/ndt_scan_matcher_core.cpp
26-
index 24d3c6b..bedde26 100644
27-
--- a/src/ndt_scan_matcher_core.cpp
28-
+++ b/src/ndt_scan_matcher_core.cpp
29-
@@ -195,12 +195,12 @@ NDTScanMatcher::NDTScanMatcher(const rclcpp::NodeOptions & options)
30-
"ndt_align_srv",
31-
std::bind(
32-
&NDTScanMatcher::service_ndt_align, this, std::placeholders::_1, std::placeholders::_2),
33-
- rclcpp::ServicesQoS().get_rmw_qos_profile(), sensor_callback_group);
34-
+ rclcpp::ServicesQoS(), sensor_callback_group);
35-
service_trigger_node_ = this->create_service<std_srvs::srv::SetBool>(
36-
"trigger_node_srv",
37-
std::bind(
38-
&NDTScanMatcher::service_trigger_node, this, std::placeholders::_1, std::placeholders::_2),
39-
- rclcpp::ServicesQoS().get_rmw_qos_profile(), sensor_callback_group);
40-
+ rclcpp::ServicesQoS(), sensor_callback_group);
41-
42-
ndt_ptr_->setParams(param_.ndt);
43-

0 commit comments

Comments
 (0)