From 12f316e41d6f71245b30383ee21f77fe44b32775 Mon Sep 17 00:00:00 2001
From: sksat <sksat@arkedgespace.com>
Date: Thu, 18 May 2023 19:06:34 +0900
Subject: [PATCH 1/4] remove ObcTime config from obc_time.h

---
 System/TimeManager/obc_time.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/System/TimeManager/obc_time.h b/System/TimeManager/obc_time.h
index e45923775..e5dbf660e 100644
--- a/System/TimeManager/obc_time.h
+++ b/System/TimeManager/obc_time.h
@@ -7,14 +7,6 @@
 
 #include <stdint.h>
 
-// step, cycleについてはTimeManagerを参照のこと
-#define OBCT_STEP_IN_MSEC (1)                                                    //!< 1 step で何 ms か
-#define OBCT_STEPS_PER_CYCLE (100)                                               //!< 何 step で 1 cycle か
-#define OBCT_CYCLES_PER_SEC (1000 / OBCT_STEP_IN_MSEC / OBCT_STEPS_PER_CYCLE)    //!< 1 s で何 cycle か
-#define OBCT_MAX_CYCLE (0xfffffff0u)                                             //!< 最大 cycle 数．つまり TI がいくつでオーバーフローするか
-
-#include <src_user/Settings/System/obc_time_params.h>
-
 typedef uint32_t cycle_t;
 typedef uint32_t step_t;
 

From 9284b1ac81f635122ffb0ee4e3e2602d7941c295 Mon Sep 17 00:00:00 2001
From: sksat <sksat@arkedgespace.com>
Date: Thu, 18 May 2023 19:06:58 +0900
Subject: [PATCH 2/4] split ObcTime config into obc_time_config.h

---
 System/TimeManager/obc_time.c        |  1 +
 System/TimeManager/obc_time_config.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 System/TimeManager/obc_time_config.h

diff --git a/System/TimeManager/obc_time.c b/System/TimeManager/obc_time.c
index e5b83d294..080963606 100644
--- a/System/TimeManager/obc_time.c
+++ b/System/TimeManager/obc_time.c
@@ -4,6 +4,7 @@
  * @brief OBCの時刻情報の定義と演算
  */
 #include "obc_time.h"
+#include "obc_time_config.h"
 #include "../../Library/print.h"
 
 ObcTime OBCT_create(cycle_t total_cycle,
diff --git a/System/TimeManager/obc_time_config.h b/System/TimeManager/obc_time_config.h
new file mode 100644
index 000000000..342adcf98
--- /dev/null
+++ b/System/TimeManager/obc_time_config.h
@@ -0,0 +1,14 @@
+#ifndef OBC_TIME_CONFIG_H_
+#define OBC_TIME_CONFIG_H_
+
+// step, cycleについてはTimeManagerを参照のこと
+// デフォルト設定
+#define OBCT_STEP_IN_MSEC (1)                                                    //!< 1 step で何 ms か
+#define OBCT_STEPS_PER_CYCLE (100)                                               //!< 何 step で 1 cycle か
+#define OBCT_CYCLES_PER_SEC (1000 / OBCT_STEP_IN_MSEC / OBCT_STEPS_PER_CYCLE)    //!< 1 s で何 cycle か
+#define OBCT_MAX_CYCLE (0xfffffff0u)                                             //!< 最大 cycle 数．つまり TI がいくつでオーバーフローするか
+
+// user 設定
+#include <src_user/Settings/System/obc_time_params.h>
+
+#endif // OBC_TIME_CONFIG_H_

From 4864b86784e356f1fbca239478905b5434098f18 Mon Sep 17 00:00:00 2001
From: sksat <sksat@arkedgespace.com>
Date: Thu, 18 May 2023 19:16:51 +0900
Subject: [PATCH 3/4] task dispatcher use ObcTime config

---
 System/TaskManager/task_dispatcher.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/System/TaskManager/task_dispatcher.c b/System/TaskManager/task_dispatcher.c
index b891f0940..047754322 100644
--- a/System/TaskManager/task_dispatcher.c
+++ b/System/TaskManager/task_dispatcher.c
@@ -15,6 +15,7 @@
 #include "../../TlmCmd/common_cmd_packet_util.h"
 #include "../ModeManager/mode_manager.h"
 #include "../TimeManager/time_manager.h"
+#include "../TimeManager/obc_time_config.h"
 #include "../EventManager/event_logger.h"
 #include <src_user/TlmCmd/block_command_definitions.h>
 #include <src_user/TlmCmd/command_definitions.h>

From 80b3bfc63dada108be68e206ce8a9c9dd465fbb3 Mon Sep 17 00:00:00 2001
From: sksat <sksat@arkedgespace.com>
Date: Thu, 18 May 2023 19:20:35 +0900
Subject: [PATCH 4/4] time manager use ObcTime config

---
 System/TimeManager/time_manager.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/System/TimeManager/time_manager.c b/System/TimeManager/time_manager.c
index 70be48dbe..0360f8647 100644
--- a/System/TimeManager/time_manager.c
+++ b/System/TimeManager/time_manager.c
@@ -4,6 +4,7 @@
  * @brief OBC時刻のカウントアップと，各種衛星時刻関連処理
  */
 #include "time_manager.h"
+#include "obc_time_config.h"
 #include <string.h>
 #include "../../Library/c2a_round.h"
 #include "../TaskManager/task_dispatcher.h"