Commit cc06d941 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Merge branch 'sign_localization' into 'master'

Added support for the end of prohibitions and the prohibited left and right signals.

See merge request !3
parents f558c31f 4c533708
Pipeline #6821 passed with stages
......@@ -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"
......
......@@ -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";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment