From 4c533708618fa66b075bd88c1fa8bd4db9938668 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Thu, 21 Oct 2021 16:03:52 +0200
Subject: [PATCH] Added support for the end of prohibitions and the prohibited
left and right signals.
---
include/generate_launch.h | 9 +++++++++
src/generate_launch.cpp | 15 +++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/generate_launch.h b/include/generate_launch.h
index 28c600a..6ee58ec 100644
--- a/include/generate_launch.h
+++ b/include/generate_launch.h
@@ -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"
diff --git a/src/generate_launch.cpp b/src/generate_launch.cpp
index 53fcbf0..809f6a6 100644
--- a/src/generate_launch.cpp
+++ b/src/generate_launch.cpp
@@ -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";
--
GitLab