run generators

generators/events/event_parser.py

@@ -4,17 +4,19 @@ Event exporter.
 import datetime
 import time
 import os
+from pathlib import Path
 
 from fsfwgen.events.event_parser import (
     handle_csv_export,
     handle_cpp_export,
     SubsystemDefinitionParser,
     EventParser,
+    EventDictT,
 )
 from fsfwgen.parserbase.file_list_parser import FileListParser
 from fsfwgen.utility.printer import PrettyPrinter
 from fsfwgen.utility.file_management import copy_file
-from fsfwgen.core import get_console_logger
+from fsfwgen.logging import get_console_logger
 from definitions import BspType, ROOT_DIR, OBSW_ROOT_DIR
 
 LOGGER = get_console_logger()
@@ -31,24 +33,28 @@ MOVE_CSV_FILE = True
 PARSE_HOST_BSP = True
 
 # Store these files relative to the events folder
-CPP_FILENAME = f"{os.path.dirname(os.path.realpath(__file__))}/translateEvents.cpp"
-CPP_H_FILENAME = f"{os.path.dirname(os.path.realpath(__file__))}/translateEvents.h"
+CPP_FILENAME = Path(
+    f"{os.path.dirname(os.path.realpath(__file__))}/translateEvents.cpp"
+)
+CPP_H_FILENAME = Path(
+    f"{os.path.dirname(os.path.realpath(__file__))}/translateEvents.h"
+)
 
 BSP_SELECT = BspType.BSP_Q7S
 
 BSP_DIR_NAME = BSP_SELECT.value
 
 # Store this file in the root of the generators folder
-CSV_FILENAME = f"{ROOT_DIR}/{BSP_SELECT.value}_events.csv"
-CSV_COPY_DEST = f"{OBSW_ROOT_DIR}/tmtc/config/events.csv"
+CSV_FILENAME = Path(f"{ROOT_DIR}/{BSP_SELECT.value}_events.csv")
+CSV_COPY_DEST = Path(f"{OBSW_ROOT_DIR}/tmtc/config/events.csv")
 
 if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD:
-    FSFW_CONFIG_ROOT = f"{OBSW_ROOT_DIR}/linux/fsfwconfig"
+    FSFW_CONFIG_ROOT = Path(f"{OBSW_ROOT_DIR}/linux/fsfwconfig")
 
 else:
-    FSFW_CONFIG_ROOT = f"{OBSW_ROOT_DIR}/{BSP_DIR_NAME}/fsfwconfig"
+    FSFW_CONFIG_ROOT = Path(f"{OBSW_ROOT_DIR}/{BSP_DIR_NAME}/fsfwconfig")
 
-CPP_COPY_DESTINATION = f"{FSFW_CONFIG_ROOT}/events/"
+CPP_COPY_DESTINATION = Path(f"{FSFW_CONFIG_ROOT}/events/")
 
 FILE_SEPARATOR = ";"
 SUBSYSTEM_DEFINITION_DESTINATIONS = [
@@ -56,14 +62,21 @@ SUBSYSTEM_DEFINITION_DESTINATIONS = [
     f"{OBSW_ROOT_DIR}/fsfw/src/fsfw/events/fwSubsystemIdRanges.h",
     f"{OBSW_ROOT_DIR}/common/config/commonSubsystemIds.h",
 ]
+SUBSYSTEM_DEFS_DEST_AS_PATH = [Path(x) for x in SUBSYSTEM_DEFINITION_DESTINATIONS]
+
 HEADER_DEFINITION_DESTINATIONS = [
     f"{OBSW_ROOT_DIR}/mission/",
     f"{OBSW_ROOT_DIR}/fsfw/",
     f"{FSFW_CONFIG_ROOT}",
     f"{OBSW_ROOT_DIR}/test/",
-    f"{OBSW_ROOT_DIR}/bsp_q7s",
+    f"{OBSW_ROOT_DIR}/bsp_q7s/",
     f"{OBSW_ROOT_DIR}/linux/",
 ]
+HEADER_DEFINITION_DESTINATIONS_AS_PATH = [
+    Path(x) for x in HEADER_DEFINITION_DESTINATIONS
+]
+
+LOGGER = get_console_logger()
 
 
 def parse_events(
@@ -77,7 +90,6 @@ def parse_events(
         PrettyPrinter.pprint(event_list)
         # Delay for clean printout
         time.sleep(0.1)
-    # xml_test()
     if generate_csv:
         handle_csv_export(
             file_name=CSV_FILENAME, event_list=event_list, file_separator=FILE_SEPARATOR
@@ -96,17 +108,19 @@ def parse_events(
             header_file_name=CPP_H_FILENAME,
         )
         if COPY_CPP_FILE:
-            LOGGER.info(f"EventParser: Copying CPP translation file to {CPP_COPY_DESTINATION}")
+            LOGGER.info(
+                f"EventParser: Copying CPP translation file to {CPP_COPY_DESTINATION}"
+            )
             copy_file(CPP_FILENAME, CPP_COPY_DESTINATION)
             copy_file(CPP_H_FILENAME, CPP_COPY_DESTINATION)
 
 
-def generate_event_list() -> list:
-    subsystem_parser = SubsystemDefinitionParser(SUBSYSTEM_DEFINITION_DESTINATIONS)
+def generate_event_list() -> EventDictT:
+    subsystem_parser = SubsystemDefinitionParser(SUBSYSTEM_DEFS_DEST_AS_PATH)
     subsystem_table = subsystem_parser.parse_files()
     LOGGER.info(f"Found {len(subsystem_table)} subsystem definitions.")
     PrettyPrinter.pprint(subsystem_table)
-    event_header_parser = FileListParser(HEADER_DEFINITION_DESTINATIONS)
+    event_header_parser = FileListParser(HEADER_DEFINITION_DESTINATIONS_AS_PATH)
     event_headers = event_header_parser.parse_header_files(
         True, "Parsing event header file list:\n", True
     )
@@ -116,6 +130,6 @@ def generate_event_list() -> list:
     event_parser.obsw_root_path = OBSW_ROOT_DIR
     event_parser.set_moving_window_mode(moving_window_size=7)
     event_table = event_parser.parse_files()
-    event_list = sorted(event_table.items())
-    LOGGER.info(f"Found {len(event_list)} entries")
-    return event_list
+    events_sorted = dict(sorted(event_table.items()))
+    LOGGER.info(f"Found {len(events_sorted)} entries")
+    return events_sorted

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 207 translations.
+ * @brief    Auto-generated event translation file. Contains 209 translations.
  * @details
- * Generated on: 2022-06-04 11:59:52
+ * Generated on: 2022-06-27 09:14:37
  */
 #include "translateEvents.h"
 
@@ -134,6 +134,8 @@ const char *INVALID_TC_FRAME_STRING = "INVALID_TC_FRAME";
 const char *INVALID_FAR_STRING = "INVALID_FAR";
 const char *CARRIER_LOCK_STRING = "CARRIER_LOCK";
 const char *BIT_LOCK_PDEC_STRING = "BIT_LOCK_PDEC";
+const char *LOST_CARRIER_LOCK_PDEC_STRING = "LOST_CARRIER_LOCK_PDEC";
+const char *LOST_BIT_LOCK_PDEC_STRING = "LOST_BIT_LOCK_PDEC";
 const char *IMAGE_UPLOAD_FAILED_STRING = "IMAGE_UPLOAD_FAILED";
 const char *IMAGE_DOWNLOAD_FAILED_STRING = "IMAGE_DOWNLOAD_FAILED";
 const char *IMAGE_UPLOAD_SUCCESSFUL_STRING = "IMAGE_UPLOAD_SUCCESSFUL";
@@ -469,6 +471,10 @@ const char *translateEvents(Event event) {
       return CARRIER_LOCK_STRING;
     case (12404):
       return BIT_LOCK_PDEC_STRING;
+    case (12405):
+      return LOST_CARRIER_LOCK_PDEC_STRING;
+    case (12406):
+      return LOST_BIT_LOCK_PDEC_STRING;
     case (12500):
       return IMAGE_UPLOAD_FAILED_STRING;
     case (12501):