generators/fsfwgen

@@ -1 +1 @@
-Subproject commit 330db882497af87b0a0733f6515847880bac0dbe
+Subproject commit 5c8895b631cb5604da0d3d4013a27d50b2477b3f

generators/objects/objects.py

@@ -42,7 +42,7 @@ CPP_COPY_DESTINATION = f"{FSFW_CONFIG_ROOT}/objects/"
 CPP_FILENAME = f"{os.path.dirname(os.path.realpath(__file__))}//translateObjects.cpp"
 CPP_H_FILENAME = f"{os.path.dirname(os.path.realpath(__file__))}//translateObjects.h"
 CSV_OBJECT_FILENAME = f"{ROOT_DIR}/{BSP_SELECT.value}_objects.csv"
-CSV_COPY_DEST = f"{OBSW_ROOT_DIR}/tmtc/config/returnvalues.csv"
+CSV_COPY_DEST = f"{OBSW_ROOT_DIR}/tmtc/config/objects.csv"
 FILE_SEPARATOR = ";"
 
 

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 112 translations.
- * Generated on: 2022-03-04 10:29:16
+ * Generated on: 2022-03-04 10:30:45
  */
 #include "translateObjects.h"
 

generators/returnvalues/returnvalues_parser.py

@@ -10,6 +10,7 @@ To use MySQLdb, run pip install mysqlclient or install in IDE. On Windows, Build
 :data:      21.11.2019
 """
 from fsfwgen.core import get_console_logger
+from fsfwgen.utility.file_management import copy_file
 from fsfwgen.parserbase.file_list_parser import FileListParser
 from fsfwgen.returnvalues.returnvalues_parser import InterfaceParser, ReturnValueParser
 from fsfwgen.utility.sql_writer import SqlWriter
@@ -19,7 +20,7 @@ from definitions import BspType, DATABASE_NAME, ROOT_DIR, OBSW_ROOT_DIR
 
 LOGGER = get_console_logger()
 EXPORT_TO_FILE = True
-MOVE_CSV_FILE = True
+COPY_CSV_FILE = True
 EXPORT_TO_SQL = True
 PRINT_TABLES = True
 
@@ -30,6 +31,7 @@ MAX_STRING_LENGTH = 32
 BSP_SELECT = BspType.BSP_Q7S
 BSP_DIR_NAME = BSP_SELECT.value
 CSV_RETVAL_FILENAME = f"{ROOT_DIR}/{BSP_SELECT.value}_returnvalues.csv"
+CSV_COPY_DEST = f"{OBSW_ROOT_DIR}/tmtc/config/returnvalues.csv"
 ADD_LINUX_FOLDER = False
 
 if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD:
@@ -80,8 +82,12 @@ def parse_returnvalues():
         ReturnValueParser.export_to_file(
             CSV_RETVAL_FILENAME, returnvalue_table, FILE_SEPARATOR
         )
-        # if MOVE_CSV_FILE:
-        #    move_file(file_name=CSV_RETVAL_FILENAME, destination=CSV_MOVE_DESTINATION)
+        if COPY_CSV_FILE:
+            copy_file(
+                filename=CSV_RETVAL_FILENAME,
+                destination=CSV_COPY_DEST,
+                delete_existing_file=True
+            )
     if EXPORT_TO_SQL:
         LOGGER.info("ReturnvalueParser: Exporting to SQL")
         sql_retval_exporter(
@@ -98,6 +104,7 @@ def generate_returnvalue_table():
     header_parser = FileListParser(RETURNVALUE_SOURCES)
     header_list = header_parser.parse_header_files(True, "Parsing header file list: ")
     returnvalue_parser = ReturnValueParser(interfaces, header_list, PRINT_TABLES)
+    returnvalue_parser.obsw_root_path = OBSW_ROOT_DIR
     returnvalue_parser.set_moving_window_mode(moving_window_size=7)
     returnvalue_table = returnvalue_parser.parse_files(True)
     LOGGER.info(f"ReturnvalueParser: Found {len(returnvalue_table)} returnvalues")

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 112 translations.
- * Generated on: 2022-03-04 10:29:16
+ * Generated on: 2022-03-04 10:30:45
  */
 #include "translateObjects.h"
 

tmtc

@@ -1 +1 @@
-Subproject commit c37ea34290762a72ea6bb5dacfe155e7355e5b18
+Subproject commit 5f3a50a82ac2fccfae0139e146c8da6850ec074c