Merge remote-tracking branch 'origin/main' into thermal_controller

eive_tmtc/config/events.csv

@@ -91,6 +91,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;No description;mission/acsDefs.h
 11203;0x2bc3;MEKF_INVALID_INFO;INFO;No description;mission/acsDefs.h
 11204;0x2bc4;MEKF_INVALID_MODE_VIOLATION;HIGH;No description;mission/acsDefs.h
+11205;0x2bc5;SAFE_MODE_CONTROLLER_FAILURE;HIGH;No description;mission/acsDefs.h
 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/devices/devicedefinitions/powerDefinitions.h

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -64,6 +64,7 @@ class SetId(enum.IntEnum):
 class ActionId(enum.IntEnum):
     SOLAR_ARRAY_DEPLOYMENT_SUCCESSFUL = 0
     RESET_MEKF = 1
+    RESTORE_MEKF_NONFINITE_RECOVERY = 2
 
 
 class OpCodes:
@@ -77,6 +78,7 @@ class OpCodes:
     INERTIAL = ["ptg_inertial"]
     SAFE_PTG = ["confirm_deployment"]
     RESET_MEKF = ["reset_mekf"]
+    RESTORE_MEKF_NONFINITE_RECOVERY = ["restore_mekf_nonfinite_recovery"]
     SET_PARAMETER_SCALAR = ["set_scalar_param"]
     SET_PARAMETER_VECTOR = ["set_vector_param"]
     SET_PARAMETER_MATRIX = ["set_matrix_param"]
@@ -123,6 +125,7 @@ class Info:
     INERTIAL = "Switch ACS CTRL normal - pointing inertial"
     SAFE_PTG = "Confirm deployment of both solar arrays"
     RESET_MEKF = "Reset the MEKF"
+    RESTORE_MEKF_NONFINITE_RECOVERY = "Restore MEKF non-finite recovery"
     SET_PARAMETER_SCALAR = "Set Scalar Parameter"
     SET_PARAMETER_VECTOR = "Set Vector Parameter"
     SET_PARAMETER_MATRIX = "Set Matrix Parameter"
@@ -183,6 +186,7 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper):
     oce.add(keys=OpCodes.INERTIAL, info=Info.INERTIAL)
     oce.add(keys=OpCodes.SAFE_PTG, info=Info.SAFE_PTG)
     oce.add(keys=OpCodes.RESET_MEKF, info=Info.RESET_MEKF)
+    oce.add(keys=OpCodes.RESTORE_MEKF_NONFINITE_RECOVERY, info=Info.RESTORE_MEKF_NONFINITE_RECOVERY)
     oce.add(keys=OpCodes.SET_PARAMETER_SCALAR, info=Info.SET_PARAMETER_SCALAR)
     oce.add(keys=OpCodes.SET_PARAMETER_VECTOR, info=Info.SET_PARAMETER_VECTOR)
     oce.add(keys=OpCodes.SET_PARAMETER_MATRIX, info=Info.SET_PARAMETER_MATRIX)
@@ -263,6 +267,9 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
     elif op_code in OpCodes.RESET_MEKF:
         q.add_log_cmd(f"{Info.RESET_MEKF}")
         q.add_pus_tc(create_action_cmd(ACS_CONTROLLER, ActionId.RESET_MEKF))
+    elif op_code in OpCodes.RESTORE_MEKF_NONFINITE_RECOVERY:
+        q.add_log_cmd(f"{Info.RESTORE_MEKF_NONFINITE_RECOVERY}")
+        q.add_pus_tc(create_action_cmd(ACS_CONTROLLER, ActionId.RESTORE_MEKF_NONFINITE_RECOVERY))
     elif op_code in OpCodes.SET_PARAMETER_SCALAR:
         q.add_log_cmd(f"{Info.SET_PARAMETER_SCALAR}")
         set_acs_ctrl_param_scalar(q)

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -83,7 +83,7 @@ FACTORY_RESET_OPS = {
 }
 
 
-class SupvActionId:
+class SupvActionId(enum.IntEnum):
     HK_REPORT = 1
     START_MPSOC = 3
     SHUTWOWN_MPSOC = 4

eive_tmtc/tmtc/payload/rad_sensor.py

@@ -5,6 +5,7 @@
 @author J. Meier
 @date   01.07.2021
 """
+import enum
 import struct
 
 from eive_tmtc.config.definitions import CustomServiceList
@@ -20,7 +21,7 @@ from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
-class SetId:
+class SetId(enum.IntEnum):
     HK = 3
 
 

eive_tmtc/tmtc/tcs/tmp1075.py

@@ -39,7 +39,7 @@ class Tmp1075ActionId(enum.IntEnum):
     START_ADC_CONV = 2
 
 
-class SetId:
+class SetId(enum.IntEnum):
     TEMPERATURE = 1