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
2db15c60
Commit
2db15c60
authored
2 years ago
by
Cyrille Berger
Browse files
Options
Downloads
Patches
Plain Diff
clean up, don't link to sip module directly
parent
3426d599
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
python/CMakeLists.txt
+1
-1
1 addition, 1 deletion
python/CMakeLists.txt
src/python_interpreter.cpp
+2
-2
2 additions, 2 deletions
src/python_interpreter.cpp
with
4 additions
and
4 deletions
CMakeLists.txt
+
1
−
1
View file @
2db15c60
...
@@ -41,7 +41,7 @@ add_library(air_navigation SHARED
...
@@ -41,7 +41,7 @@ add_library(air_navigation SHARED
src/python_controller.cpp
src/python_controller.cpp
src/python_interpreter.cpp
)
src/python_interpreter.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
}
${
CMAKE_CURRENT_BINARY_DIR
}
/python/air_navigation_.so
)
target_link_libraries
(
air_navigation
${
PYTHON_LIBRARY
}
)
ament_target_dependencies
(
air_navigation
ament_target_dependencies
(
air_navigation
${
dependencies
}
${
dependencies
}
)
)
...
...
This diff is collapsed.
Click to expand it.
python/CMakeLists.txt
+
1
−
1
View file @
2db15c60
...
@@ -20,7 +20,7 @@ set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_
...
@@ -20,7 +20,7 @@ set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_
file
(
GLOB_RECURSE AIR_NAVIGATION_SIP_FILES *.sip
)
file
(
GLOB_RECURSE AIR_NAVIGATION_SIP_FILES *.sip
)
set
(
SIP_EXTRA_FILES_DEPEND
${
AIR_NAVIGATION_SIP_FILES
}
)
set
(
SIP_EXTRA_FILES_DEPEND
${
AIR_NAVIGATION_SIP_FILES
}
)
add_sip_python_module
(
air_navigation_ ./air_navigation/mod.sip
)
add_sip_python_module
(
air_navigation_ ./air_navigation/mod.sip
air_navigation
)
install
(
FILES
install
(
FILES
air_navigation/__init__.py
air_navigation/__init__.py
...
...
This diff is collapsed.
Click to expand it.
src/python_interpreter.cpp
+
2
−
2
View file @
2db15c60
#include
<air_navigation/python_interpreter.h>
#include
<air_navigation/python_interpreter.h>
#include
<Python.h>
#include
<Python.h>
#include
<
python/air_navigation/sipAPIair_navigation_
.h>
#include
<
sip
.h>
#include
<rclcpp/rclcpp.hpp>
#include
<rclcpp/rclcpp.hpp>
#include
<dlfcn.h>
#include
<dlfcn.h>
...
@@ -75,7 +75,7 @@ py_interface::Controller* python_interpreter::create_controller(const std::strin
...
@@ -75,7 +75,7 @@ py_interface::Controller* python_interpreter::create_controller(const std::strin
int
state
;
int
state
;
const
sipTypeDef
*
td
=
get_sip_api
()
->
api_find_type
(
"air_navigation::py_interface::Controller"
);
const
sipTypeDef
*
td
=
get_sip_api
()
->
api_find_type
(
"air_navigation::py_interface::Controller"
);
py_interface
::
Controller
*
controller
=
reinterpret_cast
<
py_interface
::
Controller
*>
(
get_sip_api
()
->
api_convert_to_type
(
pValue
,
td
,
NULL
,
SIP_NOT_NONE
,
&
state
,
&
isErr
));
py_interface
::
Controller
*
controller
=
reinterpret_cast
<
py_interface
::
Controller
*>
(
get_sip_api
()
->
api_convert_to_type
(
pValue
,
td
,
NULL
,
SIP_NOT_NONE
,
&
state
,
&
isErr
));
sipT
ransfer
T
o
(
pValue
,
Py_None
);
get_sip_api
()
->
api_t
ransfer
_t
o
(
pValue
,
Py_None
);
release_lock
();
release_lock
();
return
controller
;
return
controller
;
}
else
{
}
else
{
...
...
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