Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_base_driver
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
ros
iri_core
iri_base_driver
Commits
5da8340c
Commit
5da8340c
authored
7 years ago
by
Sergi Foix Salmerón
Browse files
Options
Downloads
Patches
Plain Diff
removing duplicated SensorLevels.msg
parent
c448f5ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+12
-11
12 additions, 11 deletions
CMakeLists.txt
msg/SensorLevels.msg
+0
-4
0 additions, 4 deletions
msg/SensorLevels.msg
package.xml
+2
-2
2 additions, 2 deletions
package.xml
with
14 additions
and
17 deletions
CMakeLists.txt
+
12
−
11
View file @
5da8340c
...
...
@@ -9,7 +9,7 @@ set(CMAKE_BUILD_TYPE "DEBUG")
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package
(
catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure
message_generation
)
find_package
(
catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure
)
## System dependencies are found with CMake's conventions
find_package
(
Boost REQUIRED COMPONENTS system thread
)
...
...
@@ -44,10 +44,11 @@ find_package(Boost REQUIRED COMPONENTS system thread)
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
## Generate messages in the 'msg' folder
add_message_files
(
FILES
SensorLevels.msg
)
# add_message_files(
# FILES
# Message1.msg
# Message2.msg
# )
## Generate services in the 'srv' folder
# add_service_files(
...
...
@@ -64,10 +65,10 @@ add_message_files(
# )
## Generate added messages and services with any dependencies listed here
generate_messages
(
DEPENDENCIES
std_msgs
# Or other packages containing msgs
)
#
generate_messages(
#
DEPENDENCIES
#
std_msgs # Or other packages containing msgs
#
)
###################################
## catkin specific configuration ##
...
...
@@ -81,7 +82,7 @@ generate_messages(
catkin_package
(
INCLUDE_DIRS include
LIBRARIES
${
PROJECT_NAME
}
CATKIN_DEPENDS roscpp dynamic_reconfigure
message_runtime
CATKIN_DEPENDS roscpp dynamic_reconfigure
DEPENDS Boost
)
...
...
@@ -110,7 +111,7 @@ target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes
# add_dependencies(foo_node foo_generate_messages_cpp)
add_dependencies
(
${
PROJECT_NAME
}
${${
PROJECT_NAME
}
_EXPORTED_TARGETS
}
)
#
add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS})
## Specify libraries to link a library or executable target against
# target_link_libraries(foo_node
...
...
This diff is collapsed.
Click to expand it.
msg/SensorLevels.msg
deleted
100644 → 0
+
0
−
4
View file @
c448f5ae
byte RECONFIGURE_CLOSE = 3 # Parameters that need a sensor to be stopped completely when changed
byte RECONFIGURE_STOP = 1 # Parameters that need a sensor to stop streaming when changed
byte RECONFIGURE_RUNNING = 0 # Parameters that can be changed while a sensor is streaming
This diff is collapsed.
Click to expand it.
package.xml
+
2
−
2
View file @
5da8340c
...
...
@@ -35,13 +35,13 @@
<!-- Use build_depend for packages you need at compile time: -->
<build_depend>
roscpp
</build_depend>
<build_depend>
dynamic_reconfigure
</build_depend>
<build_depend>
message_generation
</build_depend>
<!--
<build_depend>message_generation</build_depend>
-->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use run_depend for packages you need at runtime: -->
<run_depend>
roscpp
</run_depend>
<run_depend>
dynamic_reconfigure
</run_depend>
<run_depend>
message_runtime
</run_depend>
<!--
<run_depend>message_runtime</run_depend>
-->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>
catkin
</buildtool_depend>
...
...
This diff is collapsed.
Click to expand it.
Sergi Foix Salmerón
@sfoix
mentioned in commit
e901365e
·
7 years ago
mentioned in commit
e901365e
mentioned in commit e901365e5f4934f2bab6a1e862a71e6252aa41e7
Toggle commit list
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