Skip to content

Commit 75e77f3

Browse files
meltingrabbitmeltingrabbit
authored
Merge pull request #421 from ut-issl/feature/fix_cmd_exec_ret
Cmd の返り値を CCP_EXEC_STS から CCP_CmdRet に（つづき）
2 parents cf6404d + 96102ea commit 75e77f3

26 files changed

+156
-129
lines changed

‎Examples/2nd_obc_user/src/src_user/Applications/UserDefined/debug_apps.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ void APP_DBG_print_time_stamp_(void)
8888
void APP_DBG_print_cmd_status_(void)
8989
{
9090
VT100_erase_line();
91-
Printf("CMD: GS %3d, RT %3d, Ack %3d, Code 0x%02x, Sts %3d\n",
91+
Printf("CMD: GS %3d, RT %3d, Ack %2d, ID 0x%02x, Sts %1d, EC %d\n",
9292
(PL_count_executed_nodes(&PH_gs_cmd_list) & 0xff),
9393
(PL_count_executed_nodes(&PH_rt_cmd_list) & 0xff),
9494
mobc_driver->info.c2a.ph_ack,
9595
gs_command_dispatcher->prev.code,
96-
gs_command_dispatcher->prev.sts);
96+
gs_command_dispatcher->prev.cmd_ret.exec_sts,
97+
gs_command_dispatcher->prev.cmd_ret.err_code);
9798
}
9899

99100
void APP_DBG_print_event_logger0_(void)

‎Examples/2nd_obc_user/src/src_user/TlmCmd/telemetry_definitions.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_AOBC_(uint8_t* packet, uint16_t* len, uint16_t m
3232
TF_copy_u32(&packet[50], (uint32_t)(TDSP_info->tskd.prev_err.time.total_cycle));
3333
TF_copy_u8(&packet[54], (uint8_t)(TDSP_info->tskd.prev_err.time.step));
3434
TF_copy_u16(&packet[55], (uint16_t)(TDSP_info->tskd.prev_err.code));
35-
TF_copy_i32(&packet[57], (int32_t)(TDSP_info->tskd.prev_err.sts));
35+
// TF_copy_i32(&packet[57], (int32_t)(TDSP_info->tskd.prev_err.sts));
3636
TF_copy_u32(&packet[61], PL_count_executed_nodes(&PH_gs_cmd_list));
3737
TF_copy_u32(&packet[65], (uint32_t)(gs_command_dispatcher->prev.time.total_cycle));
3838
TF_copy_u16(&packet[69], (uint16_t)(gs_command_dispatcher->prev.code));
39-
TF_copy_i32(&packet[71], (int32_t)(gs_command_dispatcher->prev.sts));
39+
// TF_copy_i32(&packet[71], (int32_t)(gs_command_dispatcher->prev.sts));
4040
TF_copy_u32(&packet[75], (uint32_t)(gs_command_dispatcher->prev_err.time.total_cycle));
4141
TF_copy_u16(&packet[79], (uint16_t)(gs_command_dispatcher->prev_err.code));
42-
TF_copy_i32(&packet[81], (int32_t)(gs_command_dispatcher->prev_err.sts));
42+
// TF_copy_i32(&packet[81], (int32_t)(gs_command_dispatcher->prev_err.sts));
4343
TF_copy_u32(&packet[85], (uint32_t)(gs_command_dispatcher->error_counter));
4444
TF_copy_u32(&packet[89], PL_count_executed_nodes(&PH_rt_cmd_list));
4545
TF_copy_u32(&packet[93], (uint32_t)(realtime_command_dispatcher->prev.time.total_cycle));
4646
TF_copy_u16(&packet[97], (uint16_t)(realtime_command_dispatcher->prev.code));
47-
TF_copy_i32(&packet[99], (int32_t)(realtime_command_dispatcher->prev.sts));
47+
// TF_copy_i32(&packet[99], (int32_t)(realtime_command_dispatcher->prev.sts));
4848
TF_copy_u32(&packet[103], (uint32_t)(realtime_command_dispatcher->prev_err.time.total_cycle));
4949
TF_copy_u16(&packet[107], (uint16_t)(realtime_command_dispatcher->prev_err.code));
50-
TF_copy_i32(&packet[109], (int32_t)(realtime_command_dispatcher->prev_err.sts));
50+
// TF_copy_i32(&packet[109], (int32_t)(realtime_command_dispatcher->prev_err.sts));
5151
TF_copy_u32(&packet[113], (uint32_t)(realtime_command_dispatcher->error_counter));
5252
TF_copy_u32(&packet[117], PL_count_executed_nodes(&PH_tl_cmd_list[TLCD_ID_FROM_GS]));
5353
TF_copy_u8(&packet[121], (uint8_t)(PL_count_active_nodes(&PH_tl_cmd_list[TLCD_ID_FROM_GS])));
5454
TF_copy_u32(&packet[122], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.time.total_cycle));
5555
TF_copy_u16(&packet[126], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.code));
56-
TF_copy_i32(&packet[128], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.sts));
56+
// TF_copy_i32(&packet[128], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.sts));
5757
TF_copy_u32(&packet[132], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.time.total_cycle));
5858
TF_copy_u16(&packet[136], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.code));
59-
TF_copy_i32(&packet[138], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.sts));
59+
// TF_copy_i32(&packet[138], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.sts));
6060
TF_copy_u32(&packet[142], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].error_counter));
6161
TF_copy_u8(&packet[146], (uint8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].stop_on_error));
6262
TF_copy_u8(&packet[147], (uint8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].lockout));
@@ -66,10 +66,10 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_AOBC_(uint8_t* packet, uint16_t* len, uint16_t m
6666
TF_copy_u8(&packet[158], (uint8_t)(PL_count_active_nodes(&PH_tl_cmd_list[TLCD_ID_DEPLOY_BC])));
6767
TF_copy_u32(&packet[159], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev.time.total_cycle));
6868
TF_copy_u16(&packet[163], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev.code));
69-
TF_copy_i32(&packet[165], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev.sts));
69+
// TF_copy_i32(&packet[165], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev.sts));
7070
TF_copy_u32(&packet[169], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev_err.time.total_cycle));
7171
TF_copy_u16(&packet[173], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev_err.code));
72-
TF_copy_i32(&packet[175], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev_err.sts));
72+
// TF_copy_i32(&packet[175], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].prev_err.sts));
7373
TF_copy_u32(&packet[179], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].error_counter));
7474
TF_copy_u8(&packet[183], (uint8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].stop_on_error));
7575
TF_copy_u8(&packet[184], (uint8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].lockout));
@@ -79,10 +79,10 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_AOBC_(uint8_t* packet, uint16_t* len, uint16_t m
7979
TF_copy_u8(&packet[195], (uint8_t)(PL_count_active_nodes(&PH_tl_cmd_list[TLCD_ID_DEPLOY_TLM])));
8080
TF_copy_u32(&packet[196], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev.time.total_cycle));
8181
TF_copy_u16(&packet[200], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev.code));
82-
TF_copy_i32(&packet[202], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev.sts));
82+
// TF_copy_i32(&packet[202], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev.sts));
8383
TF_copy_u32(&packet[206], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev_err.time.total_cycle));
8484
TF_copy_u16(&packet[210], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev_err.code));
85-
TF_copy_i32(&packet[212], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev_err.sts));
85+
// TF_copy_i32(&packet[212], (int32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].prev_err.sts));
8686
TF_copy_u32(&packet[216], (uint32_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].error_counter));
8787
TF_copy_u8(&packet[220], (uint8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].stop_on_error));
8888
TF_copy_u8(&packet[221], (uint8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].lockout));
@@ -113,25 +113,25 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max
113113
TF_copy_u32(&packet[42], PL_count_executed_nodes(&PH_gs_cmd_list));
114114
TF_copy_u32(&packet[46], gs_command_dispatcher->prev.time.total_cycle);
115115
TF_copy_u16(&packet[50], (uint16_t)(gs_command_dispatcher->prev.code));
116-
TF_copy_i8(&packet[52], (int8_t)(gs_command_dispatcher->prev.sts));
116+
// TF_copy_i8(&packet[52], (int8_t)(gs_command_dispatcher->prev.sts));
117117
TF_copy_u32(&packet[53], gs_command_dispatcher->prev_err.time.total_cycle);
118118
TF_copy_u16(&packet[57], (uint16_t)(gs_command_dispatcher->prev_err.code));
119-
TF_copy_i8(&packet[59], (int8_t)(gs_command_dispatcher->prev_err.sts));
119+
// TF_copy_i8(&packet[59], (int8_t)(gs_command_dispatcher->prev_err.sts));
120120
TF_copy_u32(&packet[60], PL_count_executed_nodes(&PH_rt_cmd_list));
121121
TF_copy_u32(&packet[64], (uint32_t)(realtime_command_dispatcher->prev.time.total_cycle));
122122
TF_copy_u16(&packet[68], (uint16_t)(realtime_command_dispatcher->prev.code));
123-
TF_copy_i32(&packet[70], (int32_t)(realtime_command_dispatcher->prev.sts));
123+
// TF_copy_i32(&packet[70], (int32_t)(realtime_command_dispatcher->prev.sts));
124124
TF_copy_u32(&packet[74], (uint32_t)(realtime_command_dispatcher->prev_err.time.total_cycle));
125125
TF_copy_u16(&packet[78], (uint16_t)(realtime_command_dispatcher->prev_err.code));
126-
TF_copy_i32(&packet[80], (int32_t)(realtime_command_dispatcher->prev_err.sts));
126+
// TF_copy_i32(&packet[80], (int32_t)(realtime_command_dispatcher->prev_err.sts));
127127
TF_copy_u32(&packet[84], PL_count_executed_nodes(&PH_tl_cmd_list[TLCD_ID_FROM_GS]));
128128
TF_copy_u8(&packet[88], (uint8_t)(PL_count_active_nodes(&PH_tl_cmd_list[TLCD_ID_FROM_GS])));
129129
TF_copy_u32(&packet[89], timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.time.total_cycle);
130130
TF_copy_u16(&packet[93], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.code));
131-
TF_copy_i8(&packet[95], (int8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.sts));
131+
// TF_copy_i8(&packet[95], (int8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev.sts));
132132
TF_copy_u32(&packet[96], timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.time.total_cycle);
133133
TF_copy_u16(&packet[100], (uint16_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.code));
134-
TF_copy_i8(&packet[102], (int8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.sts));
134+
// TF_copy_i8(&packet[102], (int8_t)(timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].prev_err.sts));
135135
TF_copy_u32(&packet[103], (PL_is_empty(&(PH_tl_cmd_list[TLCD_ID_FROM_GS])) ? 0 : (uint32_t)CCP_get_ti((const CommonCmdPacket*)(PL_get_head(&(PH_tl_cmd_list[TLCD_ID_FROM_GS]))->packet))));
136136
TF_copy_u16(&packet[107], (uint16_t)(PL_is_empty(&(PH_tl_cmd_list[TLCD_ID_FROM_GS])) ? 0 : CCP_get_id((const CommonCmdPacket*)(PL_get_head(&(PH_tl_cmd_list[TLCD_ID_FROM_GS]))->packet))));
137137
TF_copy_u32(&packet[109], PL_count_executed_nodes(&PH_tl_cmd_list[TLCD_ID_DEPLOY_BC]));

‎Examples/2nd_obc_user/src/src_user/TlmCmd/user_packet_handler.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ PH_ACK PH_user_analyze_cmd(const CommonCmdPacket* packet)
2626
}
2727

2828

29-
CCP_EXEC_STS PH_user_cmd_router(const CommonCmdPacket* packet)
29+
CCP_CmdRet PH_user_cmd_router(const CommonCmdPacket* packet)
3030
{
31-
switch (CCP_get_apid(packet))
31+
APID apid = CCP_get_apid(packet);
32+
switch (apid)
3233
{
3334
default:
34-
// 該当する配送先が定義されていない場合。
35-
return CCP_EXEC_ROUTING_FAILED;
35+
// 該当する配送先が定義されていない場合
36+
return CCP_make_cmd_ret(CCP_EXEC_ROUTING_FAILED, apid);
3637
}
3738
}
3839

‎Examples/2nd_obc_user/src/src_user/TlmCmd/user_packet_handler.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <src_core/TlmCmd/packet_list.h>
99
#include <src_core/TlmCmd/common_tlm_cmd_packet.h>
10+
#include <src_core/TlmCmd/common_cmd_packet_util.h>
1011
#include <src_core/TlmCmd/packet_handler.h>
1112

1213
/**
@@ -33,15 +34,15 @@ void PH_user_init(void);
3334
PH_ACK PH_user_analyze_cmd(const CommonCmdPacket* packet);
3435

3536
/**
36-
* @brief PH の cmd_router_ のユーザー処理関数
37+
* @brief PH の PH_dispatch_command のユーザー処理関数
3738
*
3839
* C2A を搭載したコンポに Cmd が転送される．
3940
* つまり，転送対象 OBC にとっては RTC 扱いになる
40-
* ここから Driver を叩いて送信まで行うことになる（実行時間は cmdExec と同じだけ許容されているので OK）
41+
* ここから Driver を叩いて送信まで行うことになる（実行時間は CA_execute_cmd と同じだけ許容されているので OK）
4142
* @param packet: CCP
42-
* @retval CCP_EXEC_SUCCESS など: 無事に転送された．転送先の結果を返す
43-
* @retval CCP_EXEC_ROUTING_FAILED: 転送失敗（詳細エラーは DriverSuper を参照）
43+
* @retval CCP_CmdRet{CCP_EXEC_SUCCESS, *} など: 無事に転送された．転送先の結果を返す
44+
* @retval CCP_CmdRet{CCP_EXEC_ROUTING_FAILED, *}: 転送失敗（詳細エラーは DriverSuper を参照）
4445
*/
45-
CCP_EXEC_STS PH_user_cmd_router(const CommonCmdPacket* packet);
46+
CCP_CmdRet PH_user_cmd_router(const CommonCmdPacket* packet);
4647

4748
#endif

‎Examples/minimum_user/src/src_user/Applications/DriverInstances/di_aobc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void DI_AOBC_cmd_dispatcher_(void)
7474
}
7575

7676

77-
CCP_EXEC_STS DI_AOBC_dispatch_command(const CommonCmdPacket* packet)
77+
CCP_CmdRet DI_AOBC_dispatch_command(const CommonCmdPacket* packet)
7878
{
7979
DS_CMD_ERR_CODE ret;
8080
CommonCmdPacket* pckt = (CommonCmdPacket*)packet; // const_cast
@@ -97,7 +97,7 @@ CCP_EXEC_STS DI_AOBC_dispatch_command(const CommonCmdPacket* packet)
9797

9898
ret = AOBC_send_cmd(&aobc_driver_, pckt);
9999
// FIXME: ここも一旦握りつぶす（後で直す）
100-
return DS_conv_cmd_err_to_ccp_cmd_ret(ret).exec_sts;
100+
return DS_conv_cmd_err_to_ccp_cmd_ret(ret);
101101
}
102102

103103

‎Examples/minimum_user/src/src_user/Applications/DriverInstances/di_aobc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ AppInfo DI_AOBC_cmd_dispatcher(void);
3535
* @note AOBC が自身のコマンドと解釈できるよう，Execution Type を上書きするため， packet を const cast する．[TODO] const cast やめたい
3636
* @note この関数を呼んでも良いのは，user_packet_handler のみ！
3737
* @param packet: CommonCmdPacket packet
38-
* @retval CCP_EXEC_SUCCESS: 無事に転送された
38+
* @retval CCP_CmdRet{CCP_EXEC_SUCCESS, *}: 無事に転送された
3939
* @retval それ以外: 転送失敗（DS_CMD_ERR_CODE を CCP_EXEC_STS に変換して返す．詳細エラーは DriverSuper を参照）
4040
*/
41-
CCP_EXEC_STS DI_AOBC_dispatch_command(const CommonCmdPacket* packet);
41+
CCP_CmdRet DI_AOBC_dispatch_command(const CommonCmdPacket* packet);
4242

4343
CCP_CmdRet Cmd_DI_AOBC_CDIS_CLEAR_ALL_REALTIME(const CommonCmdPacket* packet);
4444

‎Examples/minimum_user/src/src_user/Applications/UserDefined/debug_apps.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,13 @@ void APP_DBG_print_time_stamp_(void)
8989
void APP_DBG_print_cmd_status_(void)
9090
{
9191
VT100_erase_line();
92-
Printf("CMD: GS %3d, RT %3d, Ack %3d, Code 0x%02x, Sts %3d\n",
92+
Printf("CMD: GS %3d, RT %3d, Ack %2d, ID 0x%02x, Sts %1d, EC %d\n",
9393
(PL_count_executed_nodes(&PH_gs_cmd_list) & 0xff),
9494
(PL_count_executed_nodes(&PH_rt_cmd_list) & 0xff),
95-
gs_driver->info[gs_driver->tlm_tx_port_type].rx.cmd_ack, gs_command_dispatcher->prev.code, gs_command_dispatcher->prev.sts);
95+
gs_driver->info[gs_driver->tlm_tx_port_type].rx.cmd_ack,
96+
gs_command_dispatcher->prev.code,
97+
gs_command_dispatcher->prev.cmd_ret.exec_sts,
98+
gs_command_dispatcher->prev.cmd_ret.err_code);
9699
}
97100

98101
void APP_DBG_print_event_logger0_(void)

‎Examples/minimum_user/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ def initialize_el():
760760
ret = wings.util.send_rt_cmd_and_confirm(
761761
ope,
762762
c2a_enum.Cmd_CODE_EL_DISABLE_LOGGING,
763-
(c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR,),
763+
(c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR_STS,),
764764
c2a_enum.Tlm_CODE_HK,
765765
)
766766
assert ret == "SUC"

‎Examples/minimum_user/src/src_user/Test/test/src_core/TlmCmd/test_command_dispatcher.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ def test_cdis_exec_err():
5858
ope, c2a_enum.Cmd_CODE_GENERATE_TLM, c2a_enum.Tlm_CODE_EL
5959
)
6060
# GS_cmd_dispatcher
61-
assert tlm_EL["EL.TLOGS.LOW.EVENTS3.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR
62-
assert tlm_EL["EL.TLOGS.LOW.EVENTS2.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR
61+
assert tlm_EL["EL.TLOGS.LOW.EVENTS3.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR_STS
62+
assert tlm_EL["EL.TLOGS.LOW.EVENTS2.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR_STS
6363
assert tlm_EL["EL.TLOGS.LOW.EVENTS3.LOCAL"] == tlm_EL["EL.TLOGS.LOW.EVENTS2.LOCAL"]
6464
note = (c2a_enum.Cmd_CODE_TMGR_UPDATE_UNIXTIME << 16) | c2a_enum.CCP_EXEC_ILLEGAL_PARAMETER
6565
assert tlm_EL["EL.TLOGS.LOW.EVENTS3.NOTE"] == note
6666
note = (c2a_enum.Cmd_CODE_AM_SET_PAGE_FOR_TLM << 16) | c2a_enum.CCP_EXEC_ILLEGAL_PARAMETER
6767
assert tlm_EL["EL.TLOGS.LOW.EVENTS2.NOTE"] == note
6868
# TL_cmd_dispatcher
69-
assert tlm_EL["EL.TLOGS.LOW.EVENTS1.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR
70-
assert tlm_EL["EL.TLOGS.LOW.EVENTS0.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR
69+
assert tlm_EL["EL.TLOGS.LOW.EVENTS1.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR_STS
70+
assert tlm_EL["EL.TLOGS.LOW.EVENTS0.GROUP"] == c2a_enum.EL_CORE_GROUP_CDIS_EXEC_ERR_STS
7171
assert tlm_EL["EL.TLOGS.LOW.EVENTS1.LOCAL"] == tlm_EL["EL.TLOGS.LOW.EVENTS0.LOCAL"]
7272
note = (c2a_enum.Cmd_CODE_TMGR_UPDATE_UNIXTIME << 16) | c2a_enum.CCP_EXEC_ILLEGAL_PARAMETER
7373
assert tlm_EL["EL.TLOGS.LOW.EVENTS1.NOTE"] == note

0 commit comments

Comments
 (0)