From 2b84af7ffd9c99ac2e1baa63cc57e66133ec7e4e Mon Sep 17 00:00:00 2001
From: sksat <sksat@arkedgespace.com>
Date: Thu, 18 May 2023 20:27:49 +0900
Subject: [PATCH 1/2] split task dispatcher Cmd declaration into
 task_dispatcher_cmd.h

---
 System/TaskManager/task_dispatcher.h     |  6 ------
 System/TaskManager/task_dispatcher_cmd.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 System/TaskManager/task_dispatcher_cmd.h

diff --git a/System/TaskManager/task_dispatcher.h b/System/TaskManager/task_dispatcher.h
index 5ffdcf33d..400489363 100644
--- a/System/TaskManager/task_dispatcher.h
+++ b/System/TaskManager/task_dispatcher.h
@@ -7,7 +7,6 @@
 #ifndef TASK_DISPATCHER_H_
 #define TASK_DISPATCHER_H_
 
-#include "../../TlmCmd/block_command_table.h"
 #include "../../TlmCmd/command_dispatcher.h"
 #include "../ApplicationManager/app_info.h"
 
@@ -71,11 +70,6 @@ void TDSP_execute_pl_as_task_list(void);
  */
 void TDSP_resync_internal_counter(void);
 
-/**
- * @brief 指定したブロックコマンドを、次にタスクリストに展開するものとして登録するコマンド
- */
-CCP_CmdRet Cmd_TDSP_SET_TASK_LIST(const CommonCmdPacket* packet);
-
 // debug_apps にあるべき & 今はつわかないので無効化
 #if 0
 AppInfo TDSP_print_tdsp_status(void);
diff --git a/System/TaskManager/task_dispatcher_cmd.h b/System/TaskManager/task_dispatcher_cmd.h
new file mode 100644
index 000000000..69b1ba078
--- /dev/null
+++ b/System/TaskManager/task_dispatcher_cmd.h
@@ -0,0 +1,11 @@
+#ifndef TASK_DISPATCHER_CMD_H_
+#define TASK_DISPATCHER_CMD_H_
+
+#include "../../TlmCmd/common_cmd_packet.h"
+
+/**
+ * @brief 指定したブロックコマンドを、次にタスクリストに展開するものとして登録するコマンド
+ */
+CCP_CmdRet Cmd_TDSP_SET_TASK_LIST(const CommonCmdPacket* packet);
+
+#endif // TASK_DISPATCHER_CMD_H_

From 61cf9bc416631ee256abb0ed7729327faec05475 Mon Sep 17 00:00:00 2001
From: sksat <sksat@arkedgespace.com>
Date: Thu, 18 May 2023 20:31:37 +0900
Subject: [PATCH 2/2] command_source use task dispatcher command declaration

---
 Examples/2nd_obc_user/src/src_user/TlmCmd/command_source.h | 2 +-
 Examples/minimum_user/src/src_user/TlmCmd/command_source.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/2nd_obc_user/src/src_user/TlmCmd/command_source.h b/Examples/2nd_obc_user/src/src_user/TlmCmd/command_source.h
index dd3d5cf38..7eca582f0 100644
--- a/Examples/2nd_obc_user/src/src_user/TlmCmd/command_source.h
+++ b/Examples/2nd_obc_user/src/src_user/TlmCmd/command_source.h
@@ -10,7 +10,7 @@
 #include <src_core/System/TimeManager/time_manager_cmd.h>
 #include <src_core/System/ModeManager/mode_manager.h>
 #include <src_core/System/ApplicationManager/app_manager.h>
-#include <src_core/System/TaskManager/task_dispatcher.h>
+#include <src_core/System/TaskManager/task_dispatcher_cmd.h>
 #include <src_core/System/WatchdogTimer/watchdog_timer.h>
 #include <src_core/TlmCmd/block_command_executor.h>
 #include <src_user/TlmCmd/block_command_user_settings.h>
diff --git a/Examples/minimum_user/src/src_user/TlmCmd/command_source.h b/Examples/minimum_user/src/src_user/TlmCmd/command_source.h
index dd3d5cf38..7eca582f0 100644
--- a/Examples/minimum_user/src/src_user/TlmCmd/command_source.h
+++ b/Examples/minimum_user/src/src_user/TlmCmd/command_source.h
@@ -10,7 +10,7 @@
 #include <src_core/System/TimeManager/time_manager_cmd.h>
 #include <src_core/System/ModeManager/mode_manager.h>
 #include <src_core/System/ApplicationManager/app_manager.h>
-#include <src_core/System/TaskManager/task_dispatcher.h>
+#include <src_core/System/TaskManager/task_dispatcher_cmd.h>
 #include <src_core/System/WatchdogTimer/watchdog_timer.h>
 #include <src_core/TlmCmd/block_command_executor.h>
 #include <src_user/TlmCmd/block_command_user_settings.h>