From 68158097d9e7977527205a5aab9e834c0e7360c6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 18 May 2021 16:16:02 +0200 Subject: [PATCH] bsp name is gen csv --- generators/{mod_events.csv => bsp_q7s_events.csv} | 0 generators/{mod_objects.csv => bsp_q7s_objects.csv} | 0 .../{mod_returnvalues.csv => bsp_q7s_returnvalues.csv} | 0 generators/events/event_parser.py | 6 +++--- generators/events/translateEvents.cpp | 2 +- generators/objects/objects.py | 2 +- generators/objects/translateObjects.cpp | 2 +- generators/returnvalues/returnvalues_parser.py | 6 ++++-- linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) rename generators/{mod_events.csv => bsp_q7s_events.csv} (100%) rename generators/{mod_objects.csv => bsp_q7s_objects.csv} (100%) rename generators/{mod_returnvalues.csv => bsp_q7s_returnvalues.csv} (100%) diff --git a/generators/mod_events.csv b/generators/bsp_q7s_events.csv similarity index 100% rename from generators/mod_events.csv rename to generators/bsp_q7s_events.csv diff --git a/generators/mod_objects.csv b/generators/bsp_q7s_objects.csv similarity index 100% rename from generators/mod_objects.csv rename to generators/bsp_q7s_objects.csv diff --git a/generators/mod_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv similarity index 100% rename from generators/mod_returnvalues.csv rename to generators/bsp_q7s_returnvalues.csv diff --git a/generators/events/event_parser.py b/generators/events/event_parser.py index c337e778..fa52f938 100644 --- a/generators/events/event_parser.py +++ b/generators/events/event_parser.py @@ -30,9 +30,6 @@ MOVE_CSV_FILE = True PARSE_HOST_BSP = True -CSV_FILENAME = "mod_events.csv" -CSV_MOVE_DESTINATION = "../" - CPP_FILENAME = "translateEvents.cpp" CPP_H_FILENAME = "translateEvents.h" @@ -40,6 +37,9 @@ BSP_SELECT = BspType.BSP_Q7S BSP_DIR_NAME = BSP_SELECT.value +CSV_FILENAME = f"{BSP_SELECT.value}_events.csv" +CSV_MOVE_DESTINATION = "../" + if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD: FSFW_CONFIG_ROOT = f"../../linux/fsfwconfig" diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 85cbd5c0..8fb7d4e8 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 83 translations. * @details - * Generated on: 2021-05-18 16:13:40 + * Generated on: 2021-05-18 16:15:50 */ #include "translateEvents.h" diff --git a/generators/objects/objects.py b/generators/objects/objects.py index 9d1377dd..0e7c5509 100644 --- a/generators/objects/objects.py +++ b/generators/objects/objects.py @@ -41,7 +41,7 @@ CPP_COPY_DESTINATION = f"{FSFW_CONFIG_ROOT}/objects/" CSV_MOVE_DESTINATION = "../" CPP_FILENAME = "translateObjects.cpp" CPP_H_FILENAME = "translateObjects.h" -CSV_OBJECT_FILENAME = "mod_objects.csv" +CSV_OBJECT_FILENAME = f"{BSP_SELECT.value}_objects.csv" FILE_SEPARATOR = ";" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 7e5832ea..a3347a99 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 61 translations. - * Generated on: 2021-05-18 16:13:47 + * Generated on: 2021-05-18 16:15:47 */ #include "translateObjects.h" diff --git a/generators/returnvalues/returnvalues_parser.py b/generators/returnvalues/returnvalues_parser.py index e3679274..24bbd54b 100644 --- a/generators/returnvalues/returnvalues_parser.py +++ b/generators/returnvalues/returnvalues_parser.py @@ -21,14 +21,16 @@ MOVE_CSV_FILE = True EXPORT_TO_SQL = True PRINT_TABLES = True -CSV_RETVAL_FILENAME = "mod_returnvalues.csv" -CSV_MOVE_DESTINATION = "../" + FILE_SEPARATOR = ';' MAX_STRING_LENGTH = 32 BSP_SELECT = BspType.BSP_Q7S BSP_DIR_NAME = BSP_SELECT.value +CSV_RETVAL_FILENAME = f"{BSP_SELECT.value}_returnvalues.csv" +CSV_MOVE_DESTINATION = "../" ADD_LINUX_FOLDER = False + if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD: FSFW_CONFIG_ROOT = f"../../linux/fsfwconfig" ADD_LINUX_FOLDER = True diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 85cbd5c0..8fb7d4e8 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 83 translations. * @details - * Generated on: 2021-05-18 16:13:40 + * Generated on: 2021-05-18 16:15:50 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 7e5832ea..a3347a99 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 61 translations. - * Generated on: 2021-05-18 16:13:47 + * Generated on: 2021-05-18 16:15:47 */ #include "translateObjects.h"