Merge pull request #340 from ut-issl/feature/update_eh

EHにおいて，event groupで EH Rule を操作する関数，コマンドを追加
ut-issl · Jun 8, 2022 · d16250d · d16250d
2 parents 6d2e320 + a118ed2
commit d16250d
Show file tree

Hide file tree

Showing 6 changed files with 461 additions and 65 deletions.
diff --git a/...m_user_for_s2e/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv b/...m_user_for_s2e/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv
@@ -120,34 +120,40 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description,
 ,Cmd_EH_SET_PAGE_OF_LOG_TABLE_FOR_TLM,OBC,0x0066,1,uint8_t,page_no,,,,,,,,,,,,,EH���O�e�[�u���̃e�����y�[�W�̐ݒ�,
 ,Cmd_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM,OBC,0x0067,1,uint16_t,rule id,,,,,,,,,,,,,EH�e�����ɕ\�����郋�[����ID�ݒ�,
 ,Cmd_EH_MATCH_EVENT_COUNTER_TO_EL,OBC,0x0068,0,,,,,,,,,,,,,,,�C�x���g���������m���邽�߂�EH�J�E���^��EL�J�E���^�ɋ�������ɍ��킹��,
+,Cmd_EH_INIT_RULE_BY_EVENT_GROUP,OBC,0x0069,1,uint32_t,group,,,,,,,,,,,,,Cmd_EH_INIT_RULE �� by_event_group �R�}���h�D�z��O�̂��̂܂ő��삳��Ȃ������ӂ��邱��,
+,Cmd_EH_INIT_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL,OBC,0x006A,1,uint32_t,group,,,,,,,,,,,,,Cmd_EH_INIT_RULE_FOR_MULTI_LEVEL �� by_event_group �R�}���h�D�z��O�̂��̂܂ő��삳��Ȃ������ӂ��邱��,
+,Cmd_EH_ACTIVATE_RULE_BY_EVENT_GROUP,OBC,0x006B,1,uint32_t,group,,,,,,,,,,,,,Cmd_EH_ACTIVATE_RULE �� by_event_group �R�}���h�D�z��O�̂��̂܂ő��삳��Ȃ������ӂ��邱��,
+,Cmd_EH_INACTIVATE_RULE_BY_EVENT_GROUP,OBC,0x006C,1,uint32_t,group,,,,,,,,,,,,,Cmd_EH_INACTIVATE_RULE �� by_event_group �R�}���h�D�z��O�̂��̂܂ő��삳��Ȃ������ӂ��邱��,
+,Cmd_EH_ACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL,OBC,0x006D,1,uint32_t,group,,,,,,,,,,,,,Cmd_EH_ACTIVATE_RULE_FOR_MULTI_LEVEL �� by_event_group �R�}���h�D�z��O�̂��̂܂ő��삳��Ȃ������ӂ��邱��,
+,Cmd_EH_INACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL,OBC,0x006E,1,uint32_t,group,,,,,,,,,,,,,Cmd_EH_INACTIVATE_RULE_FOR_MULTI_LEVEL �� by_event_group �R�}���h�D�z��O�̂��̂܂ő��삳��Ȃ������ӂ��邱��,
 **,EventUtility,,,,,,,,,,,,,,,,,,,
-,Cmd_EVENT_UTIL_ENABLE_EH_EXEC,OBC,0x0069,0,,,,,,,,,,,,,,,EH�̎��s��L����,
-,Cmd_EVENT_UTIL_DISABLE_EH_EXEC,OBC,0x006A,0,,,,,,,,,,,,,,,EH�̎��s�𖳌���,
-,Cmd_EVENT_UTIL_EXEC_EH,OBC,0x006B,0,,,,,,,,,,,,,,,EH��P���Ŏ��s,
+,Cmd_EVENT_UTIL_ENABLE_EH_EXEC,OBC,0x006F,0,,,,,,,,,,,,,,,EH�̎��s��L����,
+,Cmd_EVENT_UTIL_DISABLE_EH_EXEC,OBC,0x0070,0,,,,,,,,,,,,,,,EH�̎��s�𖳌���,
+,Cmd_EVENT_UTIL_EXEC_EH,OBC,0x0071,0,,,,,,,,,,,,,,,EH��P���Ŏ��s,
 **,Telemetry Frame@@ Command Analyze,,,,,,,,,,,,,,,,,,,
-,Cmd_TF_INIT,OBC,0x006C,0,,,,,,,,,,,,,,,TF�̏�����,
-,Cmd_CA_INIT,OBC,0x006D,0,,,,,,,,,,,,,,,CA�̏�����,
-,Cmd_TF_REGISTER_TLM,OBC,0x006E,2,uint8_t,index,uint32_t,tlm_func,,,,,,,,,,,�e�����g���o�^�R�}���h,
-,Cmd_CA_REGISTER_CMD,OBC,0x006F,3,uint16_t,index,uint32_t,cmd_func,raw,param_info,,,,,,,,,�R�}���h�o�^�R�}���h,
-,Cmd_TF_SET_PAGE_FOR_TLM,OBC,0x0070,1,uint8_t,page_no,,,,,,,,,,,,,�e�����g����`�e�[�u���y�[�W�ԍ��ݒ�,
-,Cmd_CA_SET_PAGE_FOR_TLM,OBC,0x0071,1,uint8_t,page_no,,,,,,,,,,,,,�R�}���h��`�e�[�u���y�[�W�ԍ��ݒ�,
+,Cmd_TF_INIT,OBC,0x0072,0,,,,,,,,,,,,,,,TF�̏�����,
+,Cmd_CA_INIT,OBC,0x0073,0,,,,,,,,,,,,,,,CA�̏�����,
+,Cmd_TF_REGISTER_TLM,OBC,0x0074,2,uint8_t,index,uint32_t,tlm_func,,,,,,,,,,,�e�����g���o�^�R�}���h,
+,Cmd_CA_REGISTER_CMD,OBC,0x0075,3,uint16_t,index,uint32_t,cmd_func,raw,param_info,,,,,,,,,�R�}���h�o�^�R�}���h,
+,Cmd_TF_SET_PAGE_FOR_TLM,OBC,0x0076,1,uint8_t,page_no,,,,,,,,,,,,,�e�����g����`�e�[�u���y�[�W�ԍ��ݒ�,
+,Cmd_CA_SET_PAGE_FOR_TLM,OBC,0x0077,1,uint8_t,page_no,,,,,,,,,,,,,�R�}���h��`�e�[�u���y�[�W�ԍ��ݒ�,
 **,Tlm Manager �R�}���h,,,,,,,,,,,,,,,,,,,
-,Cmd_TLM_MGR_INIT,OBC,0x0072,0,,,,,,,,,,,,,,,������,
-,Cmd_TLM_MGR_INIT_MASTER_BC,OBC,0x0073,0,,,,,,,,,,,,,,,master bc �̏�����,
-,Cmd_TLM_MGR_CLEAR_HK_TLM,OBC,0x0074,0,,,,,,,,,,,,,,,HK�e������������,
-,Cmd_TLM_MGR_CLEAR_SYSTEM_TLM,OBC,0x0075,0,,,,,,,,,,,,,,,system�e������������,
-,Cmd_TLM_MGR_CLEAR_USER_TLM,OBC,0x0076,0,,,,,,,,,,,,,,,high_freq_tlm@@ low_freq_tlm ��������,
-,Cmd_TLM_MGR_START_TLM,OBC,0x0077,0,,,,,,,,,,,,,,,TLM���o�J�n,
-,Cmd_TLM_MGR_STOP_TLM,OBC,0x0078,0,,,,,,,,,,,,,,,TLM���o�ꎞ��~,
-,Cmd_TLM_MGR_CLEAR_TLM_TL,OBC,0x0079,0,,,,,,,,,,,,,,,TLM���o�pTL���N���A,
-,Cmd_TLM_MGR_REGISTER_HK_TLM,OBC,0x007A,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,HK�e������o�^,
-,Cmd_TLM_MGR_REGISTER_SYSTEM_TLM,OBC,0x007B,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,system�e������o�^,
-,Cmd_TLM_MGR_REGISTER_HIGH_FREQ_TLM,OBC,0x007C,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,high_freq_tlm ��o�^,
-,Cmd_TLM_MGR_REGISTER_LOW_FREQ_TLM,OBC,0x007D,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,low_freq_tlm ��o�^,
+,Cmd_TLM_MGR_INIT,OBC,0x0078,0,,,,,,,,,,,,,,,������,
+,Cmd_TLM_MGR_INIT_MASTER_BC,OBC,0x0079,0,,,,,,,,,,,,,,,master bc �̏�����,
+,Cmd_TLM_MGR_CLEAR_HK_TLM,OBC,0x007A,0,,,,,,,,,,,,,,,HK�e������������,
+,Cmd_TLM_MGR_CLEAR_SYSTEM_TLM,OBC,0x007B,0,,,,,,,,,,,,,,,system�e������������,
+,Cmd_TLM_MGR_CLEAR_USER_TLM,OBC,0x007C,0,,,,,,,,,,,,,,,high_freq_tlm@@ low_freq_tlm ��������,
+,Cmd_TLM_MGR_START_TLM,OBC,0x007D,0,,,,,,,,,,,,,,,TLM���o�J�n,
+,Cmd_TLM_MGR_STOP_TLM,OBC,0x007E,0,,,,,,,,,,,,,,,TLM���o�ꎞ��~,
+,Cmd_TLM_MGR_CLEAR_TLM_TL,OBC,0x007F,0,,,,,,,,,,,,,,,TLM���o�pTL���N���A,
+,Cmd_TLM_MGR_REGISTER_HK_TLM,OBC,0x0080,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,HK�e������o�^,
+,Cmd_TLM_MGR_REGISTER_SYSTEM_TLM,OBC,0x0081,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,system�e������o�^,
+,Cmd_TLM_MGR_REGISTER_HIGH_FREQ_TLM,OBC,0x0082,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,high_freq_tlm ��o�^,
+,Cmd_TLM_MGR_REGISTER_LOW_FREQ_TLM,OBC,0x0083,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,���o��,,,,,,,,,low_freq_tlm ��o�^,
 **,Divided Cmd Utility �R�}���h,,,,,,,,,,,,,,,,,,,
-,Cmd_DCU_ABORT_CMD,OBC,0x007E,1,uint16_t,Cmd ID,,,,,,,,,,,,,���s���̕����R�}���h���~����,
-,Cmd_DCU_DOWN_ABORT_FLAG,OBC,0x007F,1,uint16_t,Cmd ID,,,,,,,,,,,,,�G���[�C�܂��̓R�}���h�ɂ���Ē��f�X�e�[�^�X�ƂȂ��Ă���R�}���h���C���s�\��Ԃɖ߂�,
-,Cmd_DCU_CLEAR_LOG,OBC,0x0080,0,,,,,,,,,,,,,,,���O���N���A����,
+,Cmd_DCU_ABORT_CMD,OBC,0x0084,1,uint16_t,Cmd ID,,,,,,,,,,,,,���s���̕����R�}���h���~����,
+,Cmd_DCU_DOWN_ABORT_FLAG,OBC,0x0085,1,uint16_t,Cmd ID,,,,,,,,,,,,,�G���[�C�܂��̓R�}���h�ɂ���Ē��f�X�e�[�^�X�ƂȂ��Ă���R�}���h���C���s�\��Ԃɖ߂�,
+,Cmd_DCU_CLEAR_LOG,OBC,0x0086,0,,,,,,,,,,,,,,,���O���N���A����,
 **,,,,,,,,,,,,,,,,,,,,
 * CDH,GS�p,,,,,,,,,,,,,,,,,,,
 ,Cmd_DI_GS_CCSDS_TX_START,OBC,0x0100,0,,,,,,,,,,,,,,,CCSDS �ʐM��L����,
@@ -992,9 +998,3 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description,
 ,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
diff --git a/...um_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_handler.py b/...um_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_handler.py
@@ -1695,6 +1695,68 @@ def test_event_handler_responded_log():
     disable_eh_exec()
 
 
+@pytest.mark.real
+@pytest.mark.sils
+def test_event_handler_by_event_group_func():
+    print("")
+    print("test_event_handler_by_event_group_func")
+
+    # 初期化
+    init_el_and_eh()
+
+    # Cmd_EH_INIT_RULE_BY_EVENT_GROUP
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_INACTIVATE_RULE, (EH_RULE_TEST0,))
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_RULE_COUNTER, (EH_RULE_TEST2, 1))
+    assert "SUC" == wings.util.send_rt_cmd_and_confirm(
+        ope,
+        c2a_enum.Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP,
+        (EL_GROUP_TEST_EH,),
+        c2a_enum.Tlm_CODE_HK,
+    )
+
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM, (EH_RULE_TEST0,))
+    tlm_EH = download_eh_tlm()
+    assert tlm_EH["EH.TARTGET_RULE.COUNTER"] == 0
+    assert tlm_EH["EH.TARTGET_RULE.SETTINGS.IS_ACTIVE"] == "ACTIVE"
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM, (EH_RULE_TEST2,))
+    tlm_EH = download_eh_tlm()
+    assert tlm_EH["EH.TARTGET_RULE.COUNTER"] == 0
+    assert tlm_EH["EH.TARTGET_RULE.SETTINGS.IS_ACTIVE"] == "ACTIVE"
+
+    # Cmd_EH_INACTIVATE_RULE_BY_EVENT_GROUP
+    assert "SUC" == wings.util.send_rt_cmd_and_confirm(
+        ope,
+        c2a_enum.Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP,
+        (EL_GROUP_TEST_EH,),
+        c2a_enum.Tlm_CODE_HK,
+    )
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM, (EH_RULE_TEST0,))
+    tlm_EH = download_eh_tlm()
+    assert tlm_EH["EH.TARTGET_RULE.SETTINGS.IS_ACTIVE"] == "INACTIVE"
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM, (EH_RULE_TEST2,))
+    tlm_EH = download_eh_tlm()
+    assert tlm_EH["EH.TARTGET_RULE.SETTINGS.IS_ACTIVE"] == "INACTIVE"
+
+    # Cmd_EH_ACTIVATE_RULE_BY_EVENT_GROUP
+    assert "SUC" == wings.util.send_rt_cmd_and_confirm(
+        ope,
+        c2a_enum.Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP,
+        (EL_GROUP_TEST_EH,),
+        c2a_enum.Tlm_CODE_HK,
+    )
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM, (EH_RULE_TEST0,))
+    tlm_EH = download_eh_tlm()
+    assert tlm_EH["EH.TARTGET_RULE.SETTINGS.IS_ACTIVE"] == "ACTIVE"
+    ope.send_rt_cmd(c2a_enum.Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM, (EH_RULE_TEST2,))
+    tlm_EH = download_eh_tlm()
+    assert tlm_EH["EH.TARTGET_RULE.SETTINGS.IS_ACTIVE"] == "ACTIVE"
+
+    # Cmd_EH_INIT_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL
+    # Cmd_EH_INACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL
+    # Cmd_EH_ACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL
+    # この３つは結局 group が EL_CORE_GROUP_EH_MATCH_RULE になってしまい，意味がない？
+
+
 # 最後のお掃除
 @pytest.mark.real
 @pytest.mark.sils

diff --git a/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/command_definitions.c b/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/command_definitions.c
@@ -115,6 +115,12 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS])
   cmd_table[Cmd_CODE_EH_SET_PAGE_OF_LOG_TABLE_FOR_TLM].cmd_func = Cmd_EH_SET_PAGE_OF_LOG_TABLE_FOR_TLM;
   cmd_table[Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM].cmd_func = Cmd_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM;
   cmd_table[Cmd_CODE_EH_MATCH_EVENT_COUNTER_TO_EL].cmd_func = Cmd_EH_MATCH_EVENT_COUNTER_TO_EL;
+  cmd_table[Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP].cmd_func = Cmd_EH_INIT_RULE_BY_EVENT_GROUP;
+  cmd_table[Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL].cmd_func = Cmd_EH_INIT_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL;
+  cmd_table[Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP].cmd_func = Cmd_EH_ACTIVATE_RULE_BY_EVENT_GROUP;
+  cmd_table[Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP].cmd_func = Cmd_EH_INACTIVATE_RULE_BY_EVENT_GROUP;
+  cmd_table[Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL].cmd_func = Cmd_EH_ACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL;
+  cmd_table[Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL].cmd_func = Cmd_EH_INACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL;
   cmd_table[Cmd_CODE_EVENT_UTIL_ENABLE_EH_EXEC].cmd_func = Cmd_EVENT_UTIL_ENABLE_EH_EXEC;
   cmd_table[Cmd_CODE_EVENT_UTIL_DISABLE_EH_EXEC].cmd_func = Cmd_EVENT_UTIL_DISABLE_EH_EXEC;
   cmd_table[Cmd_CODE_EVENT_UTIL_EXEC_EH].cmd_func = Cmd_EVENT_UTIL_EXEC_EH;
@@ -283,6 +289,12 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS])
   cmd_table[Cmd_CODE_EH_SET_PAGE_OF_RULE_SORTED_IDX_FOR_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
   cmd_table[Cmd_CODE_EH_SET_PAGE_OF_LOG_TABLE_FOR_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
   cmd_table[Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_2BYTE;
+  cmd_table[Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE;
+  cmd_table[Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE;
+  cmd_table[Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE;
+  cmd_table[Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE;
+  cmd_table[Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE;
+  cmd_table[Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE;
   cmd_table[Cmd_CODE_TF_REGISTER_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
   cmd_table[Cmd_CODE_TF_REGISTER_TLM].param_size_infos[0].packed_info.bit.second = CA_PARAM_SIZE_TYPE_4BYTE;
   cmd_table[Cmd_CODE_CA_REGISTER_CMD].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_2BYTE;

diff --git a/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/command_definitions.h b/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/command_definitions.h
@@ -113,30 +113,36 @@ typedef enum
   Cmd_CODE_EH_SET_PAGE_OF_LOG_TABLE_FOR_TLM = 0x0066,
   Cmd_CODE_EH_SET_TARGET_ID_OF_RULE_TABLE_FOR_TLM = 0x0067,
   Cmd_CODE_EH_MATCH_EVENT_COUNTER_TO_EL = 0x0068,
-  Cmd_CODE_EVENT_UTIL_ENABLE_EH_EXEC = 0x0069,
-  Cmd_CODE_EVENT_UTIL_DISABLE_EH_EXEC = 0x006A,
-  Cmd_CODE_EVENT_UTIL_EXEC_EH = 0x006B,
-  Cmd_CODE_TF_INIT = 0x006C,
-  Cmd_CODE_CA_INIT = 0x006D,
-  Cmd_CODE_TF_REGISTER_TLM = 0x006E,
-  Cmd_CODE_CA_REGISTER_CMD = 0x006F,
-  Cmd_CODE_TF_SET_PAGE_FOR_TLM = 0x0070,
-  Cmd_CODE_CA_SET_PAGE_FOR_TLM = 0x0071,
-  Cmd_CODE_TLM_MGR_INIT = 0x0072,
-  Cmd_CODE_TLM_MGR_INIT_MASTER_BC = 0x0073,
-  Cmd_CODE_TLM_MGR_CLEAR_HK_TLM = 0x0074,
-  Cmd_CODE_TLM_MGR_CLEAR_SYSTEM_TLM = 0x0075,
-  Cmd_CODE_TLM_MGR_CLEAR_USER_TLM = 0x0076,
-  Cmd_CODE_TLM_MGR_START_TLM = 0x0077,
-  Cmd_CODE_TLM_MGR_STOP_TLM = 0x0078,
-  Cmd_CODE_TLM_MGR_CLEAR_TLM_TL = 0x0079,
-  Cmd_CODE_TLM_MGR_REGISTER_HK_TLM = 0x007A,
-  Cmd_CODE_TLM_MGR_REGISTER_SYSTEM_TLM = 0x007B,
-  Cmd_CODE_TLM_MGR_REGISTER_HIGH_FREQ_TLM = 0x007C,
-  Cmd_CODE_TLM_MGR_REGISTER_LOW_FREQ_TLM = 0x007D,
-  Cmd_CODE_DCU_ABORT_CMD = 0x007E,
-  Cmd_CODE_DCU_DOWN_ABORT_FLAG = 0x007F,
-  Cmd_CODE_DCU_CLEAR_LOG = 0x0080,
+  Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP = 0x0069,
+  Cmd_CODE_EH_INIT_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL = 0x006A,
+  Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP = 0x006B,
+  Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP = 0x006C,
+  Cmd_CODE_EH_ACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL = 0x006D,
+  Cmd_CODE_EH_INACTIVATE_RULE_BY_EVENT_GROUP_FOR_MULTI_LEVEL = 0x006E,
+  Cmd_CODE_EVENT_UTIL_ENABLE_EH_EXEC = 0x006F,
+  Cmd_CODE_EVENT_UTIL_DISABLE_EH_EXEC = 0x0070,
+  Cmd_CODE_EVENT_UTIL_EXEC_EH = 0x0071,
+  Cmd_CODE_TF_INIT = 0x0072,
+  Cmd_CODE_CA_INIT = 0x0073,
+  Cmd_CODE_TF_REGISTER_TLM = 0x0074,
+  Cmd_CODE_CA_REGISTER_CMD = 0x0075,
+  Cmd_CODE_TF_SET_PAGE_FOR_TLM = 0x0076,
+  Cmd_CODE_CA_SET_PAGE_FOR_TLM = 0x0077,
+  Cmd_CODE_TLM_MGR_INIT = 0x0078,
+  Cmd_CODE_TLM_MGR_INIT_MASTER_BC = 0x0079,
+  Cmd_CODE_TLM_MGR_CLEAR_HK_TLM = 0x007A,
+  Cmd_CODE_TLM_MGR_CLEAR_SYSTEM_TLM = 0x007B,
+  Cmd_CODE_TLM_MGR_CLEAR_USER_TLM = 0x007C,
+  Cmd_CODE_TLM_MGR_START_TLM = 0x007D,
+  Cmd_CODE_TLM_MGR_STOP_TLM = 0x007E,
+  Cmd_CODE_TLM_MGR_CLEAR_TLM_TL = 0x007F,
+  Cmd_CODE_TLM_MGR_REGISTER_HK_TLM = 0x0080,
+  Cmd_CODE_TLM_MGR_REGISTER_SYSTEM_TLM = 0x0081,
+  Cmd_CODE_TLM_MGR_REGISTER_HIGH_FREQ_TLM = 0x0082,
+  Cmd_CODE_TLM_MGR_REGISTER_LOW_FREQ_TLM = 0x0083,
+  Cmd_CODE_DCU_ABORT_CMD = 0x0084,
+  Cmd_CODE_DCU_DOWN_ABORT_FLAG = 0x0085,
+  Cmd_CODE_DCU_CLEAR_LOG = 0x0086,
   Cmd_CODE_DI_GS_CCSDS_TX_START = 0x0100,
   Cmd_CODE_DI_GS_CCSDS_TX_STOP = 0x0101,
   Cmd_CODE_DI_GS_DRIVER_RESET = 0x0102,