From 18ad1e91d3d185841c7ab83ebd84e7e426f07c32 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:21:13 +0900 Subject: [PATCH] fix include --- tlm_cmd/block_command_executor.c | 2 +- tlm_cmd/block_command_executor.h | 2 +- tlm_cmd/block_command_loader.c | 2 +- tlm_cmd/block_command_table.c | 2 +- tlm_cmd/block_command_table.h | 2 +- tlm_cmd/command_analyze.c | 2 +- tlm_cmd/command_analyze.h | 4 ++-- tlm_cmd/command_dispatcher.h | 4 ++-- tlm_cmd/command_dispatcher_manager.c | 2 +- tlm_cmd/command_dispatcher_manager.h | 2 +- tlm_cmd/packet_handler.h | 2 +- tlm_cmd/packet_list.c | 2 +- tlm_cmd/packet_list.h | 2 +- tlm_cmd/packet_list_util.h | 2 +- tlm_cmd/telemetry_frame.c | 2 +- tlm_cmd/telemetry_frame.h | 2 +- tlm_cmd/telemetry_generator.c | 4 ++-- tlm_cmd/telemetry_generator.h | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tlm_cmd/block_command_executor.c b/tlm_cmd/block_command_executor.c index 82c7bded2..b3fd55a1c 100644 --- a/tlm_cmd/block_command_executor.c +++ b/tlm_cmd/block_command_executor.c @@ -14,7 +14,7 @@ #include "packet_handler.h" #include "../library/endian.h" #include "../system/time_manager/time_manager.h" -#include "common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet_util.h" static BlockCommandExecutor block_command_executor_; const BlockCommandExecutor* const block_command_executor = &block_command_executor_; diff --git a/tlm_cmd/block_command_executor.h b/tlm_cmd/block_command_executor.h index b7d5af322..16e8042e0 100644 --- a/tlm_cmd/block_command_executor.h +++ b/tlm_cmd/block_command_executor.h @@ -9,7 +9,7 @@ #ifndef BLOCK_COMMAND_EXECUTOR_H_ #define BLOCK_COMMAND_EXECUTOR_H_ -#include "common_cmd_packet.h" +#include "./common_packet/common_cmd_packet.h" #include "block_command_table.h" /** diff --git a/tlm_cmd/block_command_loader.c b/tlm_cmd/block_command_loader.c index f92ed0bc4..5765e30a2 100644 --- a/tlm_cmd/block_command_loader.c +++ b/tlm_cmd/block_command_loader.c @@ -12,7 +12,7 @@ #include "../applications/timeline_command_dispatcher_id_define.h" #include "block_command_executor.h" #include // for rotate/combine block -#include "common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet_util.h" #include "../library/endian.h" #define BCL_PARAM_MAX_LENGTH BCT_CMD_MAX_LENGTH diff --git a/tlm_cmd/block_command_table.c b/tlm_cmd/block_command_table.c index b122002a8..b2053b82c 100644 --- a/tlm_cmd/block_command_table.c +++ b/tlm_cmd/block_command_table.c @@ -18,7 +18,7 @@ #include "../system/time_manager/time_manager.h" #include "../library/endian.h" #include "../system/watchdog_timer/watchdog_timer.h" -#include "common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet_util.h" // FIXME: この include は依存的にダメなので， TCP → Space Packet 大工事が終わったら直す #include "./ccsds/space_packet_protocol/space_packet.h" diff --git a/tlm_cmd/block_command_table.h b/tlm_cmd/block_command_table.h index 64e4e4518..ef0c4ddb5 100644 --- a/tlm_cmd/block_command_table.h +++ b/tlm_cmd/block_command_table.h @@ -35,7 +35,7 @@ typedef uint32_t bct_id_t; #error Illegal value for SIZE_OF_BCT_ID_T #endif -#include "common_cmd_packet.h" // bct_id_t の定義よりあとにinclude +#include "./common_packet/common_cmd_packet.h" // bct_id_t の定義よりあとにinclude /* Block Command Table は diff --git a/tlm_cmd/command_analyze.c b/tlm_cmd/command_analyze.c index 524a2ac75..4660a69b7 100644 --- a/tlm_cmd/command_analyze.c +++ b/tlm_cmd/command_analyze.c @@ -4,7 +4,7 @@ * @brief コマンドの実行・登録，コマンド関連処理 */ #include "command_analyze.h" -#include "common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet_util.h" #include #include "../library/print.h" #include "../system/event_manager/event_logger.h" diff --git a/tlm_cmd/command_analyze.h b/tlm_cmd/command_analyze.h index 196f92ab9..5fc5941ff 100644 --- a/tlm_cmd/command_analyze.h +++ b/tlm_cmd/command_analyze.h @@ -5,8 +5,8 @@ #ifndef COMMAND_ANALYZE_H_ #define COMMAND_ANALYZE_H_ -#include "common_cmd_packet.h" -#include "common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet.h" +#include "./common_packet/common_cmd_packet_util.h" #include #define CA_TLM_PAGE_SIZE (32) //!< コマンドテーブルの1テレメトリパケット(=1ページ)に格納されるコマンド数（ページネーション用） diff --git a/tlm_cmd/command_dispatcher.h b/tlm_cmd/command_dispatcher.h index e5b8489f4..cabbc18e7 100644 --- a/tlm_cmd/command_dispatcher.h +++ b/tlm_cmd/command_dispatcher.h @@ -5,8 +5,8 @@ #ifndef COMMAND_DISPATCHER_H_ #define COMMAND_DISPATCHER_H_ -#include "common_cmd_packet_util.h" -#include "common_cmd_packet.h" +#include "./common_packet/common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet.h" #include "packet_list.h" #include "../system/time_manager/obc_time.h" #include "../library/result.h" diff --git a/tlm_cmd/command_dispatcher_manager.c b/tlm_cmd/command_dispatcher_manager.c index 0c3d72d46..e9d29f7d6 100644 --- a/tlm_cmd/command_dispatcher_manager.c +++ b/tlm_cmd/command_dispatcher_manager.c @@ -8,7 +8,7 @@ #include "command_dispatcher_manager.h" #include #include -#include "./common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet_util.h" /** * @brief cdis を cdis mgr に登録されているか探し，見つかった場合は idx を返す diff --git a/tlm_cmd/command_dispatcher_manager.h b/tlm_cmd/command_dispatcher_manager.h index e1bddb6d6..c14231951 100644 --- a/tlm_cmd/command_dispatcher_manager.h +++ b/tlm_cmd/command_dispatcher_manager.h @@ -7,7 +7,7 @@ #ifndef COMMAND_DISPATCHER_MANAGER_H_ #define COMMAND_DISPATCHER_MANAGER_H_ -#include "./common_cmd_packet.h" +#include "./common_packet/common_cmd_packet.h" #include "./command_dispatcher.h" #include "../library/result.h" diff --git a/tlm_cmd/packet_handler.h b/tlm_cmd/packet_handler.h index 3a5fbf1f3..1a82d0116 100644 --- a/tlm_cmd/packet_handler.h +++ b/tlm_cmd/packet_handler.h @@ -5,7 +5,7 @@ #ifndef PACKET_HANDLER_H_ #define PACKET_HANDLER_H_ -#include "common_tlm_cmd_packet.h" +#include "./common_packet/common_tlm_cmd_packet.h" #include "packet_list.h" #include "../applications/timeline_command_dispatcher_id_define.h" diff --git a/tlm_cmd/packet_list.c b/tlm_cmd/packet_list.c index 225c47d4a..584e66638 100644 --- a/tlm_cmd/packet_list.c +++ b/tlm_cmd/packet_list.c @@ -6,7 +6,7 @@ #include "packet_list.h" #include "../system/time_manager/time_manager.h" -#include "common_tlm_cmd_packet.h" +#include "./common_packet/common_tlm_cmd_packet.h" #include "./ccsds/space_packet_protocol/cmd_space_packet.h" // FIXME: CSP 依存をなくすべき #include "block_command_executor.h" #include "block_command_table.h" diff --git a/tlm_cmd/packet_list.h b/tlm_cmd/packet_list.h index 3fc73782c..98a17c74e 100644 --- a/tlm_cmd/packet_list.h +++ b/tlm_cmd/packet_list.h @@ -7,7 +7,7 @@ #include -#include "common_cmd_packet.h" +#include "./common_packet/common_cmd_packet.h" #include "block_command_table.h" diff --git a/tlm_cmd/packet_list_util.h b/tlm_cmd/packet_list_util.h index 6610e8f8c..9d7ae7f00 100644 --- a/tlm_cmd/packet_list_util.h +++ b/tlm_cmd/packet_list_util.h @@ -6,7 +6,7 @@ #define PACKET_LIST_UTIL_H_ #include "packet_list.h" -#include "common_tlm_cmd_packet.h" +#include "./common_packet/common_tlm_cmd_packet.h" /** * @brief static に確保された PL_Node 配列と CTCP 配列を受け取りその領域を使用して PL を初期化 diff --git a/tlm_cmd/telemetry_frame.c b/tlm_cmd/telemetry_frame.c index 39310b268..77ccc4d17 100644 --- a/tlm_cmd/telemetry_frame.c +++ b/tlm_cmd/telemetry_frame.c @@ -8,7 +8,7 @@ #include #include "../library/print.h" #include "../library/endian.h" -#include "./common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet_util.h" static void initialize_tlm_table_(void); diff --git a/tlm_cmd/telemetry_frame.h b/tlm_cmd/telemetry_frame.h index a54a32cb7..32ecde7cd 100644 --- a/tlm_cmd/telemetry_frame.h +++ b/tlm_cmd/telemetry_frame.h @@ -5,7 +5,7 @@ #ifndef TELEMETRY_FRAME_H_ #define TELEMETRY_FRAME_H_ -#include "./common_cmd_packet.h" +#include "./common_packet/common_cmd_packet.h" #include #define TF_TLM_PAGE_SIZE (64) //!< テレメテーブルの1テレメトリパケット(=1ページ)に格納されるテレメ数 diff --git a/tlm_cmd/telemetry_generator.c b/tlm_cmd/telemetry_generator.c index e470fa73a..4b60c3d10 100644 --- a/tlm_cmd/telemetry_generator.c +++ b/tlm_cmd/telemetry_generator.c @@ -6,8 +6,8 @@ #include "telemetry_frame.h" #include "packet_handler.h" #include "../system/time_manager/time_manager.h" -#include "common_cmd_packet.h" -#include "common_cmd_packet_util.h" +#include "./common_packet/common_cmd_packet.h" +#include "./common_packet/common_cmd_packet_util.h" #include #include #include diff --git a/tlm_cmd/telemetry_generator.h b/tlm_cmd/telemetry_generator.h index 43874952e..d886f8dfb 100644 --- a/tlm_cmd/telemetry_generator.h +++ b/tlm_cmd/telemetry_generator.h @@ -1,7 +1,7 @@ #ifndef TELEMETRY_GENERATOR_H_ #define TELEMETRY_GENERATOR_H_ -#include "common_cmd_packet.h" +#include "./common_packet/common_cmd_packet.h" // deprecated CCP_CmdRet Cmd_GENERATE_TLM(const CommonCmdPacket* packet);