Skip to content

Commit 028b6fe

Browse files
authored
Merge pull request #642 from ut-issl/develop
2 parents 94699ae + e4bd719 commit 028b6fe

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

Applications/timeline_command_dispatcher.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,15 @@ CCP_CmdRet Cmd_TLCD_DEPLOY_BLOCK(const CommonCmdPacket* packet)
270270

271271
ack = PL_deploy_block_cmd(&(PH_tl_cmd_list[id]), block_no, TMGR_get_master_total_cycle());
272272

273-
if (ack != PL_SUCCESS)
273+
if (ack == PL_BC_LIST_CLEARED)
274+
{
275+
EL_record_event((EL_GROUP)EL_CORE_GROUP_TLCD_DEPLOY_BLOCK,
276+
(uint32_t)PL_BC_LIST_CLEARED,
277+
EL_ERROR_LEVEL_HIGH,
278+
(uint32_t)( ((0x000000ff & id) << 24) | (0x00ffffff & block_no) ));
279+
return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_CONTEXT, (uint32_t)ack);
280+
}
281+
else if (ack != PL_SUCCESS)
274282
{
275283
EL_record_event((EL_GROUP)EL_CORE_GROUP_TLCD_DEPLOY_BLOCK,
276284
(uint32_t)ack,

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "c2a-core"
3-
version = "3.10.0"
3+
version = "3.10.1"
44
edition = "2021"
55

66
links = "c2a-core"

c2a_core_main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void C2A_core_main(void);
99
// 詳細: Docs/General/release.md
1010
#define C2A_CORE_VER_MAJOR (3)
1111
#define C2A_CORE_VER_MINOR (10)
12-
#define C2A_CORE_VER_PATCH (0)
12+
#define C2A_CORE_VER_PATCH (1)
1313
#define C2A_CORE_VER_PRE ("")
1414

1515
#endif

0 commit comments

Comments
 (0)