Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_safe_cmd
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
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
navigation
iri_safe_cmd
Commits
11e44095
Commit
11e44095
authored
2 years ago
by
Fernando Herrero
Browse files
Options
Downloads
Patches
Plain Diff
Added a bypass parameter to be able to disable its operation when necessary.
parent
6fdbadb1
No related branches found
No related tags found
1 merge request
!2
Adc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cfg/SafeCmd.cfg
+1
-0
1 addition, 0 deletions
cfg/SafeCmd.cfg
src/safe_cmd_alg_node.cpp
+16
-11
16 additions, 11 deletions
src/safe_cmd_alg_node.cpp
with
17 additions
and
11 deletions
cfg/SafeCmd.cfg
+
1
−
0
View file @
11e44095
...
@@ -40,6 +40,7 @@ ackermann = gen.add_group("ackermann")
...
@@ -40,6 +40,7 @@ ackermann = gen.add_group("ackermann")
# Name
Type Reconfiguration level Description Default Min Max
# Name
Type Reconfiguration level Description Default Min Max
gen.add("rate",
double_t, 0, "Main loop rate (Hz)", 10.0, 0.1, 1000.0)
gen.add("rate",
double_t, 0, "Main loop rate (Hz)", 10.0, 0.1, 1000.0)
gen.add("bypass",
bool_t, 0, "Whether or not to bypassa the safety fwature", False)
gen.add("safety_distance",
double_t, 0, "Safety distance to possible obstacles",0.5, 0.0, 10.0)
gen.add("safety_distance",
double_t, 0, "Safety distance to possible obstacles",0.5, 0.0, 10.0)
gen.add("traj_sim_distance",
double_t, 0, "Distance for the trajectory computation", 1.0, 0.1, 5.0)
gen.add("traj_sim_distance",
double_t, 0, "Distance for the trajectory computation", 1.0, 0.1, 5.0)
gen.add("traj_sim_time",
double_t, 0, "Time for the trajectory computation", 1.0, 0.1, 5.0)
gen.add("traj_sim_time",
double_t, 0, "Time for the trajectory computation", 1.0, 0.1, 5.0)
...
...
This diff is collapsed.
Click to expand it.
src/safe_cmd_alg_node.cpp
+
16
−
11
View file @
11e44095
...
@@ -171,20 +171,25 @@ void SafeCmdAlgNode::cmd_vel_callback(const geometry_msgs::Twist::ConstPtr& msg)
...
@@ -171,20 +171,25 @@ void SafeCmdAlgNode::cmd_vel_callback(const geometry_msgs::Twist::ConstPtr& msg)
this
->
alg_
.
lock
();
this
->
alg_
.
lock
();
//cmd_vel_mutex_.enter();
//cmd_vel_mutex_.enter();
this
->
Twist_msg_
=*
msg
;
if
(
this
->
config
.
bypass
)
// compute the robot trajectory depending on the architecture
cmd_vel_safe_publisher_
.
publish
(
msg
);
if
(
this
->
config
.
architecture
==
0
)
// ackermann using steering angle
this
->
alg_
.
compute_trajectory_ackermann_steer_angle
(
msg
->
linear
.
x
,
msg
->
angular
.
z
,
this
->
traj
);
else
if
(
this
->
config
.
architecture
==
1
)
// ackermann using angular velocity
this
->
alg_
.
compute_trajectory_ackermann_angular_speed
(
msg
->
linear
.
x
,
msg
->
angular
.
z
,
this
->
traj
);
else
if
(
this
->
config
.
architecture
==
2
)
// differential
this
->
alg_
.
compute_trajectory_differential
(
msg
->
linear
.
x
,
msg
->
angular
.
z
,
this
->
traj
);
else
else
{
{
ROS_ERROR
(
"SafeCmdAlgNode: unknown robot architecture"
);
this
->
Twist_msg_
=*
msg
;
return
;
// compute the robot trajectory depending on the architecture
if
(
this
->
config
.
architecture
==
0
)
// ackermann using steering angle
this
->
alg_
.
compute_trajectory_ackermann_steer_angle
(
msg
->
linear
.
x
,
msg
->
angular
.
z
,
this
->
traj
);
else
if
(
this
->
config
.
architecture
==
1
)
// ackermann using angular velocity
this
->
alg_
.
compute_trajectory_ackermann_angular_speed
(
msg
->
linear
.
x
,
msg
->
angular
.
z
,
this
->
traj
);
else
if
(
this
->
config
.
architecture
==
2
)
// differential
this
->
alg_
.
compute_trajectory_differential
(
msg
->
linear
.
x
,
msg
->
angular
.
z
,
this
->
traj
);
else
{
ROS_ERROR
(
"SafeCmdAlgNode: unknown robot architecture"
);
return
;
}
this
->
new_cmd_vel
=
true
;
}
}
this
->
new_cmd_vel
=
true
;
//cmd_vel_mutex_.exit();
//cmd_vel_mutex_.exit();
this
->
alg_
.
unlock
();
this
->
alg_
.
unlock
();
...
...
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