Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
looming_modbus
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
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
mobile_robotics
Looming_project
looming_modbus
Commits
db553be8
Commit
db553be8
authored
2 years ago
by
Fernando Herrero
Browse files
Options
Downloads
Patches
Plain Diff
Added support to change the navigation mode using dynamic reconfigure.
parent
8be83aef
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
cfg/LoomingModbus.cfg
+2
-0
2 additions, 0 deletions
cfg/LoomingModbus.cfg
include/looming_modbus_driver_node.h
+1
-0
1 addition, 0 deletions
include/looming_modbus_driver_node.h
src/looming_modbus_driver_node.cpp
+36
-0
36 additions, 0 deletions
src/looming_modbus_driver_node.cpp
with
39 additions
and
0 deletions
cfg/LoomingModbus.cfg
+
2
−
0
View file @
db553be8
...
@@ -43,5 +43,7 @@ gen.add("rate", double_t, SensorLevels.RECONFIGURE_STOP, "Main loop
...
@@ -43,5 +43,7 @@ gen.add("rate", double_t, SensorLevels.RECONFIGURE_STOP, "Main loop
gen.add("modbus_address",
str_t, SensorLevels.RECONFIGURE_STOP, "Modbus IP address", "")
gen.add("modbus_address",
str_t, SensorLevels.RECONFIGURE_STOP, "Modbus IP address", "")
gen.add("modbus_port",
int_t, SensorLevels.RECONFIGURE_STOP, "Modbus Port", 4444,1,65536)
gen.add("modbus_port",
int_t, SensorLevels.RECONFIGURE_STOP, "Modbus Port", 4444,1,65536)
gen.add("map_frame",
str_t, SensorLevels.RECONFIGURE_STOP, "Map frame", "")
gen.add("map_frame",
str_t, SensorLevels.RECONFIGURE_STOP, "Map frame", "")
gen.add("call_mode_change",
bool_t, SensorLevels.RECONFIGURE_STOP, "Call mode change service", False)
gen.add("mode",
int_t, SensorLevels.RECONFIGURE_STOP, "Mode to set on call mode change", 3,0,3)
exit(gen.generate(PACKAGE,
"LoomingModbusDriver", "LoomingModbus"))
exit(gen.generate(PACKAGE,
"LoomingModbusDriver", "LoomingModbus"))
This diff is collapsed.
Click to expand it.
include/looming_modbus_driver_node.h
+
1
−
0
View file @
db553be8
...
@@ -83,6 +83,7 @@ class LoomingModbusDriverNode : public iri_base_driver::IriBaseNodeDriver<Loomin
...
@@ -83,6 +83,7 @@ class LoomingModbusDriverNode : public iri_base_driver::IriBaseNodeDriver<Loomin
void
move_baseActive
();
void
move_baseActive
();
void
move_baseFeedback
(
const
move_base_msgs
::
MoveBaseFeedbackConstPtr
&
feedback
);
void
move_baseFeedback
(
const
move_base_msgs
::
MoveBaseFeedbackConstPtr
&
feedback
);
bool
change_mode_call
(
int
mode
);
/**
/**
* \brief post open hook
* \brief post open hook
...
...
This diff is collapsed.
Click to expand it.
src/looming_modbus_driver_node.cpp
+
36
−
0
View file @
db553be8
...
@@ -229,10 +229,46 @@ void LoomingModbusDriverNode::node_config_update(Config& new_cfg, uint32_t level
...
@@ -229,10 +229,46 @@ void LoomingModbusDriverNode::node_config_update(Config& new_cfg, uint32_t level
this
->
driver_
.
lock
();
this
->
driver_
.
lock
();
if
(
new_cfg
.
rate
!=
this
->
getRate
())
if
(
new_cfg
.
rate
!=
this
->
getRate
())
this
->
setRate
(
new_cfg
.
rate
);
this
->
setRate
(
new_cfg
.
rate
);
if
(
new_cfg
.
call_mode_change
)
{
if
(
this
->
change_mode_call
(
new_cfg
.
mode
))
ROS_INFO
(
"LoomingModbusDriverNode:node_config_update: success changing mode"
);
else
ROS_ERROR
(
"LoomingModbusDriverNode:node_config_update: error changing mode"
);
new_cfg
.
call_mode_change
=
false
;
}
this
->
config_
=
new_cfg
;
this
->
config_
=
new_cfg
;
this
->
driver_
.
unlock
();
this
->
driver_
.
unlock
();
}
}
bool
LoomingModbusDriverNode
::
change_mode_call
(
int
mode
)
{
bool
ok
=
false
;
this
->
mode_change_srv_
.
request
.
mode
.
mode
=
mode
;
if
(
this
->
mode_change_client_
.
call
(
this
->
mode_change_srv_
))
{
if
(
this
->
mode_change_srv_
.
response
.
accepted
)
{
ROS_INFO
(
"LoomingModbusDriverNode:: Navigation mode changed successfully"
);
ok
=
true
;
}
else
{
ROS_WARN
(
"LoomingModbusDriverNode:: Impossible to change navigation mode"
);
ok
=
false
;
}
}
else
{
ROS_WARN_STREAM
(
"LoomingModbusDriverNode:: Impossible to change navigation mode (no connection to "
<<
this
->
mode_change_client_
.
getService
()
<<
")"
);
ok
=
false
;
}
return
ok
;
}
LoomingModbusDriverNode
::~
LoomingModbusDriverNode
(
void
)
LoomingModbusDriverNode
::~
LoomingModbusDriverNode
(
void
)
{
{
// [free dynamic memory]
// [free dynamic memory]
...
...
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