CHANGELOG.md

@@ -37,6 +37,7 @@ will consitute of a breaking change warranting a new major release:
 
 - Set `OBSW_ADD_TCS_CTRL` to 1. Always add TCS controller now for both EM and FM.
 - generators module: Bump `fsfwgen` dependency to v0.3.1. The returnvalue CSV files are now sorted.
+- generators module: Always generate subsystem ID CSV files now.
 
 # [v1.37.0] 2023-03-11
 

bsp_hosted/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 277 translations.
  * @details
- * Generated on: 2023-03-14 15:27:13
+ * Generated on: 2023-03-14 17:08:41
  */
 #include "translateEvents.h"
 
@@ -35,11 +35,11 @@ const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
 const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
 const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
 const char *DEVICE_WANTS_HARD_REBOOT_STRING = "DEVICE_WANTS_HARD_REBOOT";
+const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
 const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
 const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
 const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *HEATER_ON_STRING = "HEATER_ON";
 const char *HEATER_OFF_STRING = "HEATER_OFF";
 const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
@@ -340,16 +340,16 @@ const char *translateEvents(Event event) {
       return MONITORING_AMBIGUOUS_STRING;
     case (2811):
       return DEVICE_WANTS_HARD_REBOOT_STRING;
-    case (4201):
-      return FUSE_CURRENT_HIGH_STRING;
-    case (4202):
-      return FUSE_WENT_OFF_STRING;
-    case (4204):
-      return POWER_ABOVE_HIGH_LIMIT_STRING;
-    case (4205):
-      return POWER_BELOW_LOW_LIMIT_STRING;
     case (4300):
       return SWITCH_WENT_OFF_STRING;
+    case (4301):
+      return FUSE_CURRENT_HIGH_STRING;
+    case (4302):
+      return FUSE_WENT_OFF_STRING;
+    case (4304):
+      return POWER_ABOVE_HIGH_LIMIT_STRING;
+    case (4305):
+      return POWER_BELOW_LOW_LIMIT_STRING;
     case (5000):
       return HEATER_ON_STRING;
     case (5001):

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 169 translations.
- * Generated on: 2023-03-14 15:27:13
+ * Generated on: 2023-03-14 17:08:41
  */
 #include "translateObjects.h"
 

generators/bsp_hosted_events.csv

@@ -29,11 +29,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-4201;0x1069;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4202;0x106a;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 4300;0x10cc;SWITCH_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/PowerSwitchIF.h
+4301;0x10cd;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4302;0x10ce;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4304;0x10d0;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4305;0x10d1;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 5000;0x1388;HEATER_ON;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5001;0x1389;HEATER_OFF;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5002;0x138a;HEATER_TIMEOUT;LOW;No description;fsfw/src/fsfw/thermal/Heater.h

generators/bsp_hosted_returnvalues.csv

@@ -59,6 +59,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0502;PS_SwitchTimeout;No description;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0503;PS_FuseOn;No description;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0504;PS_FuseOff;No description;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x0505;PS_SwitchUnknown;No description;5;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0601;PP_DoItMyself;No description;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
 0x0602;PP_PointsToVariable;No description;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
 0x0603;PP_PointsToMemory;No description;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h

generators/bsp_hosted_subsystems.csv

@@ -0,0 +1,61 @@
+22;MEMORY
+26;OBSW
+28;CDH
+59;TCS_1
+42;PCDU_1
+43;POWER_SWITCH_IF
+50;HEATER
+52;T_SENSORS
+70;FDIR
+71;FDIR_1
+72;FDIR_2
+73;HK
+74;SYSTEM_MANAGER
+75;SYSTEM_MANAGER_1
+76;TMTC_DISTRIBUTION
+79;SYSTEM_1
+80;PUS_SERVICE_1
+82;PUS_SERVICE_2
+83;PUS_SERVICE_3
+85;PUS_SERVICE_5
+86;PUS_SERVICE_6
+88;PUS_SERVICE_8
+89;PUS_SERVICE_9
+91;PUS_SERVICE_11
+97;PUS_SERVICE_17
+103;PUS_SERVICE_23
+106;MGM_LIS3MDL
+107;MGM_RM3100
+108;CFDP
+112;ACS_SUBSYSTEM
+113;PCDU_HANDLER
+114;HEATER_HANDLER
+115;SA_DEPL_HANDLER
+116;PLOC_MPSOC_HANDLER
+117;IMTQ_HANDLER
+118;RW_HANDLER
+119;STR_HANDLER
+120;PLOC_SUPERVISOR_HANDLER
+121;FILE_SYSTEM
+122;PLOC_UPDATER
+123;PLOC_MEMORY_DUMPER
+124;PDEC_HANDLER
+125;STR_HELPER
+126;PLOC_MPSOC_HELPER
+127;PL_PCDU_HANDLER
+128;ACS_BOARD_ASS
+129;SUS_BOARD_ASS
+130;TCS_BOARD_ASS
+131;GPS_HANDLER
+132;P60_DOCK_HANDLER
+133;PDU1_HANDLER
+134;PDU2_HANDLER
+135;ACU_HANDLER
+136;PLOC_SUPV_HELPER
+137;SYRLINKS
+138;SCEX_HANDLER
+139;CONFIGHANDLER
+140;CORE
+141;TCS_CONTROLLER
+142;COM_SUBSYSTEM
+143;PERSISTENT_TM_STORE

generators/bsp_q7s_events.csv

@@ -29,11 +29,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-4201;0x1069;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4202;0x106a;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
-4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 4300;0x10cc;SWITCH_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/PowerSwitchIF.h
+4301;0x10cd;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4302;0x10ce;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4304;0x10d0;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4305;0x10d1;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
 5000;0x1388;HEATER_ON;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5001;0x1389;HEATER_OFF;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
 5002;0x138a;HEATER_TIMEOUT;LOW;No description;fsfw/src/fsfw/thermal/Heater.h

generators/bsp_q7s_returnvalues.csv

@@ -59,6 +59,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0502;PS_SwitchTimeout;No description;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0503;PS_FuseOn;No description;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0504;PS_FuseOff;No description;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x0505;PS_SwitchUnknown;No description;5;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0601;PP_DoItMyself;No description;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
 0x0602;PP_PointsToVariable;No description;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
 0x0603;PP_PointsToMemory;No description;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h

generators/bsp_q7s_subsystems.csv

@@ -0,0 +1,61 @@
+22;MEMORY
+26;OBSW
+28;CDH
+59;TCS_1
+42;PCDU_1
+43;POWER_SWITCH_IF
+50;HEATER
+52;T_SENSORS
+70;FDIR
+71;FDIR_1
+72;FDIR_2
+73;HK
+74;SYSTEM_MANAGER
+75;SYSTEM_MANAGER_1
+76;TMTC_DISTRIBUTION
+79;SYSTEM_1
+80;PUS_SERVICE_1
+82;PUS_SERVICE_2
+83;PUS_SERVICE_3
+85;PUS_SERVICE_5
+86;PUS_SERVICE_6
+88;PUS_SERVICE_8
+89;PUS_SERVICE_9
+91;PUS_SERVICE_11
+97;PUS_SERVICE_17
+103;PUS_SERVICE_23
+106;MGM_LIS3MDL
+107;MGM_RM3100
+108;CFDP
+112;ACS_SUBSYSTEM
+113;PCDU_HANDLER
+114;HEATER_HANDLER
+115;SA_DEPL_HANDLER
+116;PLOC_MPSOC_HANDLER
+117;IMTQ_HANDLER
+118;RW_HANDLER
+119;STR_HANDLER
+120;PLOC_SUPERVISOR_HANDLER
+121;FILE_SYSTEM
+122;PLOC_UPDATER
+123;PLOC_MEMORY_DUMPER
+124;PDEC_HANDLER
+125;STR_HELPER
+126;PLOC_MPSOC_HELPER
+127;PL_PCDU_HANDLER
+128;ACS_BOARD_ASS
+129;SUS_BOARD_ASS
+130;TCS_BOARD_ASS
+131;GPS_HANDLER
+132;P60_DOCK_HANDLER
+133;PDU1_HANDLER
+134;PDU2_HANDLER
+135;ACU_HANDLER
+136;PLOC_SUPV_HELPER
+137;SYRLINKS
+138;SCEX_HANDLER
+139;CONFIGHANDLER
+140;CORE
+141;TCS_CONTROLLER
+142;COM_SUBSYSTEM
+143;PERSISTENT_TM_STORE

generators/events/event_parser.py

@@ -25,6 +25,7 @@ DATE_STRING_FULL = DATE_TODAY.strftime("%Y-%m-%d %H:%M:%S")
 
 PRINT_EVENTS = False
 PRINT_SUBSYSTEM_TABLE = False
+EXPORT_SUBSYSTEM_TABLE = True
 
 GENERATE_CPP = True
 GENERATE_CPP_H = True
@@ -53,7 +54,9 @@ class BspConfig:
 
         # Store this file in the root of the generators folder
         self.csv_filename = Path(f"{ROOT_DIR}/{self.bsp_dir_name}_events.csv")
+        self.subsystems_csv_filename = Path(f"{ROOT_DIR}/{self.bsp_dir_name}_subsystems.csv")
         self.csv_copy_dest = Path(f"{OBSW_ROOT_DIR}/tmtc/eive_tmtc/config/events.csv")
+        self.subsystem_csv_copy_dest = Path(f"{OBSW_ROOT_DIR}/tmtc/eive_tmtc/config/subsystems.csv")
 
         if (
             self.bsp_select == BspType.BSP_Q7S
@@ -100,7 +103,7 @@ def parse_events(
     _LOGGER.info(f"EventParser: Parsing events for {bsp_type.name}")
     # Small delay for clean printout
     time.sleep(0.01)
-    event_list = generate_event_list(bsp_cfg)
+    event_list = generate_event_list(bsp_cfg, copy_csv_to_eive_tmtc)
     if PRINT_EVENTS:
         PrettyPrinter.pprint(event_list)
         # Delay for clean printout
@@ -136,12 +139,26 @@ def parse_events(
     _LOGGER.info(f"Parsing done for {bsp_type.name}")
 
 
-def generate_event_list(cfg: BspConfig) -> EventDictT:
+def generate_event_list(cfg: BspConfig, copy_csv_to_eive_tmtc: bool) -> EventDictT:
     subsystem_parser = SubsystemDefinitionParser(cfg.subsystem_defs_as_paths())
     subsystem_table = subsystem_parser.parse_files()
     _LOGGER.info(f"Found {len(subsystem_table)} subsystem definitions.")
     if PRINT_SUBSYSTEM_TABLE:
         PrettyPrinter.pprint(subsystem_table)
+    if EXPORT_SUBSYSTEM_TABLE:
+        PrettyPrinter.pprint(subsystem_table)
+        with open(cfg.subsystems_csv_filename, "w") as file:
+            for name_str, table_entry in subsystem_table.items():
+                subsystem_id = int(table_entry[0])
+                file.write(f"{subsystem_id}{FILE_SEPARATOR}{name_str}\n")
+        if copy_csv_to_eive_tmtc:
+            _LOGGER.info(f"Copying CSV file to {cfg.cpp_copy_dest}")
+            copy_file(
+                filename=cfg.subsystems_csv_filename,
+                destination=cfg.subsystem_csv_copy_dest,
+                delete_existing_file=True,
+            )
+
     event_header_parser = FileListParser(cfg.header_defs_as_paths())
     event_headers = event_header_parser.parse_header_files(
         True, "Parsing event header file list:\n", True

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 277 translations.
  * @details
- * Generated on: 2023-03-14 15:27:13
+ * Generated on: 2023-03-14 17:08:41
  */
 #include "translateEvents.h"
 
@@ -35,11 +35,11 @@ const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
 const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
 const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
 const char *DEVICE_WANTS_HARD_REBOOT_STRING = "DEVICE_WANTS_HARD_REBOOT";
+const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
 const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
 const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
 const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *HEATER_ON_STRING = "HEATER_ON";
 const char *HEATER_OFF_STRING = "HEATER_OFF";
 const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
@@ -340,16 +340,16 @@ const char *translateEvents(Event event) {
       return MONITORING_AMBIGUOUS_STRING;
     case (2811):
       return DEVICE_WANTS_HARD_REBOOT_STRING;
-    case (4201):
-      return FUSE_CURRENT_HIGH_STRING;
-    case (4202):
-      return FUSE_WENT_OFF_STRING;
-    case (4204):
-      return POWER_ABOVE_HIGH_LIMIT_STRING;
-    case (4205):
-      return POWER_BELOW_LOW_LIMIT_STRING;
     case (4300):
       return SWITCH_WENT_OFF_STRING;
+    case (4301):
+      return FUSE_CURRENT_HIGH_STRING;
+    case (4302):
+      return FUSE_WENT_OFF_STRING;
+    case (4304):
+      return POWER_ABOVE_HIGH_LIMIT_STRING;
+    case (4305):
+      return POWER_BELOW_LOW_LIMIT_STRING;
     case (5000):
       return HEATER_ON_STRING;
     case (5001):

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-14 15:27:13
+ * Generated on: 2023-03-14 17:08:41
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 277 translations.
  * @details
- * Generated on: 2023-03-14 15:27:13
+ * Generated on: 2023-03-14 17:08:41
  */
 #include "translateEvents.h"
 
@@ -35,11 +35,11 @@ const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
 const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
 const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
 const char *DEVICE_WANTS_HARD_REBOOT_STRING = "DEVICE_WANTS_HARD_REBOOT";
+const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
 const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
 const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
 const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
 const char *HEATER_ON_STRING = "HEATER_ON";
 const char *HEATER_OFF_STRING = "HEATER_OFF";
 const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
@@ -340,16 +340,16 @@ const char *translateEvents(Event event) {
       return MONITORING_AMBIGUOUS_STRING;
     case (2811):
       return DEVICE_WANTS_HARD_REBOOT_STRING;
-    case (4201):
-      return FUSE_CURRENT_HIGH_STRING;
-    case (4202):
-      return FUSE_WENT_OFF_STRING;
-    case (4204):
-      return POWER_ABOVE_HIGH_LIMIT_STRING;
-    case (4205):
-      return POWER_BELOW_LOW_LIMIT_STRING;
     case (4300):
       return SWITCH_WENT_OFF_STRING;
+    case (4301):
+      return FUSE_CURRENT_HIGH_STRING;
+    case (4302):
+      return FUSE_WENT_OFF_STRING;
+    case (4304):
+      return POWER_ABOVE_HIGH_LIMIT_STRING;
+    case (4305):
+      return POWER_BELOW_LOW_LIMIT_STRING;
     case (5000):
       return HEATER_ON_STRING;
     case (5001):

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-14 15:27:13
+ * Generated on: 2023-03-14 17:08:41
  */
 #include "translateObjects.h"
 

tmtc

@@ -1 +1 @@
-Subproject commit e9bf90e36625fb00bfaffd7235ae50c1bbc1b710
+Subproject commit fe6390fab3638d46913134534905b1927513be8f