Merge pull request #642 from ut-issl/develop

ut-issl · Sep 26, 2023 · 028b6fe · 028b6fe
2 parents 94699ae + e4bd719
commit 028b6fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Applications/timeline_command_dispatcher.c b/Applications/timeline_command_dispatcher.c
@@ -270,7 +270,15 @@ CCP_CmdRet Cmd_TLCD_DEPLOY_BLOCK(const CommonCmdPacket* packet)
 
   ack = PL_deploy_block_cmd(&(PH_tl_cmd_list[id]), block_no, TMGR_get_master_total_cycle());
 
-  if (ack != PL_SUCCESS)
+  if (ack == PL_BC_LIST_CLEARED)
+  {
+    EL_record_event((EL_GROUP)EL_CORE_GROUP_TLCD_DEPLOY_BLOCK,
+                    (uint32_t)PL_BC_LIST_CLEARED,
+                    EL_ERROR_LEVEL_HIGH,
+                    (uint32_t)( ((0x000000ff & id) << 24) | (0x00ffffff & block_no) ));
+    return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_CONTEXT, (uint32_t)ack);
+  }
+  else if (ack != PL_SUCCESS)
   {
     EL_record_event((EL_GROUP)EL_CORE_GROUP_TLCD_DEPLOY_BLOCK,
                     (uint32_t)ack,

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "c2a-core"
-version = "3.10.0"
+version = "3.10.1"
 edition = "2021"
 
 links = "c2a-core"

diff --git a/c2a_core_main.h b/c2a_core_main.h
@@ -9,7 +9,7 @@ void C2A_core_main(void);
 // 詳細: Docs/General/release.md
 #define C2A_CORE_VER_MAJOR (3)
 #define C2A_CORE_VER_MINOR (10)
-#define C2A_CORE_VER_PATCH (0)
+#define C2A_CORE_VER_PATCH (1)
 #define C2A_CORE_VER_PRE   ("")
 
 #endif