Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
3956a2c8
Commit
3956a2c8
authored
10 years ago
by
Lorenz Meier
Browse files
Options
Downloads
Patches
Plain Diff
Baby steps towards PX4 ROS nodes
parent
3b2b280a
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
+2
-2
2 additions, 2 deletions
CMakeLists.txt
include/px4.h
+47
-0
47 additions, 0 deletions
include/px4.h
src/examples/publisher/publisher.cpp
+5
-5
5 additions, 5 deletions
src/examples/publisher/publisher.cpp
with
54 additions
and
7 deletions
CMakeLists.txt
+
2
−
2
View file @
3956a2c8
...
...
@@ -80,7 +80,7 @@ generate_messages(
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package
(
#
INCLUDE_DIRS include
INCLUDE_DIRS include
# LIBRARIES px4
# CATKIN_DEPENDS roscpp rospy std_msgs
# DEPENDS system_lib
...
...
@@ -92,7 +92,7 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
#
include_directories(include)
include_directories
(
include
)
include_directories
(
${
catkin_INCLUDE_DIRS
}
)
...
...
This diff is collapsed.
Click to expand it.
include/px4.h
0 → 100644
+
47
−
0
View file @
3956a2c8
/****************************************************************************
*
* Copyright (c) 2014 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/**
* @file px4.h
*
* Main system header with common convenience functions
*/
#ifdef __linux
#include
"ros/ros.h"
#define px4_warnx ROS_WARN
#define px4_infox ROS_INFO
#else
#define px4_warnx warnx
#define px4_infox warnx
#endif
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/examples/publisher/publisher.cpp
+
5
−
5
View file @
3956a2c8
...
...
@@ -24,9 +24,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
// %Tag(FULLTEXT)%
// %Tag(ROS_HEADER)%
#include
"ros/ros.h"
#include
<px4.h>
// %EndTag(ROS_HEADER)%
// %Tag(MSG_HEADER)%
#include
"std_msgs/String.h"
...
...
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
* part of the ROS system.
*/
// %Tag(INIT)%
ros
::
init
(
argc
,
argv
,
"
talk
er"
);
ros
::
init
(
argc
,
argv
,
"
px4_publish
er"
);
// %EndTag(INIT)%
/**
...
...
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
// %EndTag(FILL_MESSAGE)%
// %Tag(ROSCONSOLE)%
ROS_INFO
(
"%s"
,
msg
.
data
.
c_str
());
px4_warnx
(
"%s"
,
msg
.
data
.
c_str
());
// %EndTag(ROSCONSOLE)%
/**
...
...
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