Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
air_navigation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tdde05_ros2
air_navigation
Commits
63b6dbf6
Commit
63b6dbf6
authored
1 month ago
by
Tommy Persson
Browse files
Options
Downloads
Patches
Plain Diff
Fixes for humble
parent
cf431c48
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+6
-0
6 additions, 0 deletions
CMakeLists.txt
include/air_navigation/python_controller.h
+2
-2
2 additions, 2 deletions
include/air_navigation/python_controller.h
package.xml
+1
-0
1 addition, 0 deletions
package.xml
src/python_controller.cpp
+2
-2
2 additions, 2 deletions
src/python_controller.cpp
with
11 additions
and
4 deletions
CMakeLists.txt
+
6
−
0
View file @
63b6dbf6
...
@@ -35,6 +35,7 @@ set(dependencies
...
@@ -35,6 +35,7 @@ set(dependencies
nav2_dwb_controller
nav2_dwb_controller
pluginlib
pluginlib
nav2_util
nav2_util
nav2_costmap_2d
)
)
add_library
(
air_navigation SHARED
add_library
(
air_navigation SHARED
...
@@ -44,6 +45,11 @@ add_library(air_navigation SHARED
...
@@ -44,6 +45,11 @@ add_library(air_navigation SHARED
src/python_trajectory_generator.cpp
)
src/python_trajectory_generator.cpp
)
target_compile_definitions
(
air_navigation PUBLIC
"PLUGINLIB__DISABLE_BOOST_FUNCTIONS"
)
target_compile_definitions
(
air_navigation PUBLIC
"PLUGINLIB__DISABLE_BOOST_FUNCTIONS"
)
target_link_libraries
(
air_navigation
${
PYTHON_LIBRARY
}
)
target_link_libraries
(
air_navigation
${
PYTHON_LIBRARY
}
)
target_include_directories
(
air_navigation
PUBLIC
/opt/ros/humble/include/nav_2d_msgs
/opt/ros/humble/include/dwb_msgs
)
ament_target_dependencies
(
air_navigation
ament_target_dependencies
(
air_navigation
${
dependencies
}
${
dependencies
}
)
)
...
...
This diff is collapsed.
Click to expand it.
include/air_navigation/python_controller.h
+
2
−
2
View file @
63b6dbf6
...
@@ -23,8 +23,8 @@ public:
...
@@ -23,8 +23,8 @@ public:
void
configure
(
void
configure
(
const
rclcpp_lifecycle
::
LifecycleNode
::
WeakPtr
&
parent
,
const
rclcpp_lifecycle
::
LifecycleNode
::
WeakPtr
&
parent
,
std
::
string
name
,
const
std
::
shared_ptr
<
tf2_ros
::
Buffer
>
&
tf
,
std
::
string
name
,
std
::
shared_ptr
<
tf2_ros
::
Buffer
>
tf
,
const
std
::
shared_ptr
<
nav2_costmap_2d
::
Costmap2DROS
>
&
costmap_ros
);
std
::
shared_ptr
<
nav2_costmap_2d
::
Costmap2DROS
>
costmap_ros
);
void
cleanup
()
override
;
void
cleanup
()
override
;
...
...
This diff is collapsed.
Click to expand it.
package.xml
+
1
−
0
View file @
63b6dbf6
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<buildtool_depend>
ament_cmake
</buildtool_depend>
<buildtool_depend>
ament_cmake
</buildtool_depend>
<depend>
nav2_dwb_controller
</depend>
<depend>
nav2_dwb_controller
</depend>
<depend>
nav2_costmap_2d
</depend>
<test_depend>
ament_lint_auto
</test_depend>
<test_depend>
ament_lint_auto
</test_depend>
<test_depend>
ament_lint_common
</test_depend>
<test_depend>
ament_lint_common
</test_depend>
...
...
This diff is collapsed.
Click to expand it.
src/python_controller.cpp
+
2
−
2
View file @
63b6dbf6
...
@@ -15,8 +15,8 @@ using namespace air_navigation;
...
@@ -15,8 +15,8 @@ using namespace air_navigation;
void
PythonController
::
configure
(
void
PythonController
::
configure
(
const
rclcpp_lifecycle
::
LifecycleNode
::
WeakPtr
&
parent
,
const
rclcpp_lifecycle
::
LifecycleNode
::
WeakPtr
&
parent
,
std
::
string
name
,
const
std
::
shared_ptr
<
tf2_ros
::
Buffer
>
&
,
std
::
string
name
,
std
::
shared_ptr
<
tf2_ros
::
Buffer
>
,
const
std
::
shared_ptr
<
nav2_costmap_2d
::
Costmap2DROS
>
&
)
std
::
shared_ptr
<
nav2_costmap_2d
::
Costmap2DROS
>
)
{
{
auto
node
=
parent
.
lock
();
auto
node
=
parent
.
lock
();
RCLCPP_ERROR_STREAM
(
node
->
get_logger
(),
"Configuring Python controller"
);
RCLCPP_ERROR_STREAM
(
node
->
get_logger
(),
"Configuring Python controller"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment