Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
imu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CdF
modules
imu
Commits
d7277bcd
Commit
d7277bcd
authored
4 years ago
by
Paul D'Angio
Browse files
Options
Downloads
Patches
Plain Diff
switched to shared pointers for ros node components
parent
d562be22
No related branches found
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
driver_mpu9250/src/main_rpi.cpp
+1
-1
1 addition, 1 deletion
driver_mpu9250/src/main_rpi.cpp
driver_mpu9250/src/ros_node.cpp
+2
-8
2 additions, 8 deletions
driver_mpu9250/src/ros_node.cpp
driver_mpu9250/src/ros_node.h
+3
-4
3 additions, 4 deletions
driver_mpu9250/src/ros_node.h
with
6 additions
and
13 deletions
driver_mpu9250/src/main_rpi.cpp
+
1
−
1
View file @
d7277bcd
...
...
@@ -4,7 +4,7 @@
int
main
(
int
argc
,
char
**
argv
)
{
// Create the driver.
rpi_
driver
*
driver
=
new
rpi_driver
();
auto
driver
=
std
::
make_shared
<
rpi_driver
>
();
// Create the node.
ros_node
node
(
driver
,
argc
,
argv
);
...
...
This diff is collapsed.
Click to expand it.
driver_mpu9250/src/ros_node.cpp
+
2
−
8
View file @
d7277bcd
...
...
@@ -8,7 +8,7 @@
#include
<cmath>
// CONSTRUCTORS
ros_node
::
ros_node
(
driver
*
driver
,
int
argc
,
char
**
argv
)
ros_node
::
ros_node
(
std
::
shared_ptr
<
driver
>
driver
,
int
argc
,
char
**
argv
)
{
// Initialize flags.
ros_node
::
f_gyroscope_calibrating
=
false
;
...
...
@@ -20,7 +20,7 @@ ros_node::ros_node(driver *driver, int argc, char **argv)
ros
::
init
(
argc
,
argv
,
"driver_mpu9250"
);
// Get the node's handle.
ros_node
::
m_node
=
new
ros
::
NodeHandle
();
ros_node
::
m_node
=
std
::
make_shared
<
ros
::
NodeHandle
>
();
// Read parameters.
ros
::
NodeHandle
private_node
(
"~"
);
...
...
@@ -73,12 +73,6 @@ ros_node::ros_node(driver *driver, int argc, char **argv)
// Perform initial gyroscope calibration.
ros_node
::
calibrate_gyroscope
(
500
);
}
ros_node
::~
ros_node
()
{
// Clean up resources.
delete
ros_node
::
m_node
;
delete
ros_node
::
m_driver
;
}
// ROS
void
ros_node
::
spin
()
...
...
This diff is collapsed.
Click to expand it.
driver_mpu9250/src/ros_node.h
+
3
−
4
View file @
d7277bcd
...
...
@@ -21,8 +21,7 @@ public:
/// \param driver The MPU9250 driver instance.
/// \param argc Number of main() args.
/// \param argv The main() args.
ros_node
(
driver
*
driver
,
int
argc
,
char
**
argv
);
~
ros_node
();
ros_node
(
std
::
shared_ptr
<
driver
>
driver
,
int
argc
,
char
**
argv
);
// METHODS
/// \brief spin Runs the node.
...
...
@@ -31,7 +30,7 @@ public:
private:
// COMPONENTS
/// \brief m_driver The driver instance.
driver
*
m_driver
;
std
::
shared_ptr
<
driver
>
m_driver
;
// CALIBRATIONS
/// \brief The accelerometer's calibration.
...
...
@@ -53,7 +52,7 @@ private:
// ROS
/// \brief m_node The node's handle.
ros
::
NodeHandle
*
m_node
;
std
::
shared_ptr
<
ros
::
NodeHandle
>
m_node
;
// PUBLISHERS
/// \brief Publisher for accelerometer data.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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