Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
opendrive_to_gazebo
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
mobile_robotics
ADC
libraries
opendrive_to_gazebo
Commits
4c533708
Commit
4c533708
authored
3 years ago
by
Sergi Hernandez
Browse files
Options
Downloads
Patches
Plain Diff
Added support for the end of prohibitions and the prohibited left and right signals.
parent
f558c31f
No related branches found
No related tags found
1 merge request
!3
Added support for the end of prohibitions and the prohibited left and right signals.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/generate_launch.h
+9
-0
9 additions, 0 deletions
include/generate_launch.h
src/generate_launch.cpp
+15
-0
15 additions, 0 deletions
src/generate_launch.cpp
with
24 additions
and
0 deletions
include/generate_launch.h
+
9
−
0
View file @
4c533708
...
...
@@ -55,6 +55,15 @@ void generate_parkings_yaml(std::string &path,std::string &parkings_file,COpendr
#define MAX_VEL_TYPE "274"
#define MAX_VEL_MARKER "alvar0"
// #define MAX_VEL_MARKER "alvar13"
#define END_PROHIBITIONS_TYPE "282"
#define END_PROHIBITIONS_MARKER "alvar0"
// #define END_PROHIBITIONS_MARKER "alvar13"
#define PROHIBITED_LEFT_TYPE "214_10"
#define PROHIBITED_LEFT_MARKER "alvar0"
// #define PROHIBITED_LEFT_MARKER "alvar13"
#define PROHIBITED_RIGHT_TYPE "214"
#define PROHIBITED_RIGHT_MARKER "alvar0"
// #define PROHIBITED_RIGHT_MARKER "alvar13"
#define SEMAPHORE_TYPE "1000001"
#define SEMAPHORE_MARKER "alvar1"
// #define SEMAPHORE_MARKER "alvar15"
...
...
This diff is collapsed.
Click to expand it.
src/generate_launch.cpp
+
15
−
0
View file @
4c533708
...
...
@@ -102,6 +102,21 @@ void get_signal_type_info(std::string &type,std::string &subtype,int value,std::
name
=
txt
.
str
();
marker
=
MAX_VEL_MARKER
;
}
else
if
(
type
==
END_PROHIBITIONS_TYPE
)
{
name
=
"end_prohibitions"
;
marker
=
END_PROHIBITIONS_MARKER
;
}
else
if
(
type
==
PROHIBITED_LEFT_TYPE
)
{
name
=
"prohibited_left"
;
marker
=
PROHIBITED_LEFT_MARKER
;
}
else
if
(
type
==
PROHIBITED_RIGHT_TYPE
)
{
name
=
"prohibited_right"
;
marker
=
PROHIBITED_RIGHT_MARKER
;
}
else
if
(
type
==
SEMAPHORE_TYPE
)
{
name
=
"semaphore"
;
...
...
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