From ae2b40d9bace5fedac124d9ef0c4f134e4b56ab7 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:04:14 +0900 Subject: [PATCH 1/7] move common packet src --- tlm_cmd/{ => common_packet}/common_cmd_packet.h | 0 tlm_cmd/{ => common_packet}/common_cmd_packet_util.c | 0 tlm_cmd/{ => common_packet}/common_cmd_packet_util.h | 0 tlm_cmd/{ => common_packet}/common_tlm_cmd_packet.h | 0 tlm_cmd/{ => common_packet}/common_tlm_packet.h | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename tlm_cmd/{ => common_packet}/common_cmd_packet.h (100%) rename tlm_cmd/{ => common_packet}/common_cmd_packet_util.c (100%) rename tlm_cmd/{ => common_packet}/common_cmd_packet_util.h (100%) rename tlm_cmd/{ => common_packet}/common_tlm_cmd_packet.h (100%) rename tlm_cmd/{ => common_packet}/common_tlm_packet.h (100%) diff --git a/tlm_cmd/common_cmd_packet.h b/tlm_cmd/common_packet/common_cmd_packet.h similarity index 100% rename from tlm_cmd/common_cmd_packet.h rename to tlm_cmd/common_packet/common_cmd_packet.h diff --git a/tlm_cmd/common_cmd_packet_util.c b/tlm_cmd/common_packet/common_cmd_packet_util.c similarity index 100% rename from tlm_cmd/common_cmd_packet_util.c rename to tlm_cmd/common_packet/common_cmd_packet_util.c diff --git a/tlm_cmd/common_cmd_packet_util.h b/tlm_cmd/common_packet/common_cmd_packet_util.h similarity index 100% rename from tlm_cmd/common_cmd_packet_util.h rename to tlm_cmd/common_packet/common_cmd_packet_util.h diff --git a/tlm_cmd/common_tlm_cmd_packet.h b/tlm_cmd/common_packet/common_tlm_cmd_packet.h similarity index 100% rename from tlm_cmd/common_tlm_cmd_packet.h rename to tlm_cmd/common_packet/common_tlm_cmd_packet.h diff --git a/tlm_cmd/common_tlm_packet.h b/tlm_cmd/common_packet/common_tlm_packet.h similarity index 100% rename from tlm_cmd/common_tlm_packet.h rename to tlm_cmd/common_packet/common_tlm_packet.h From d9d8071e9701afdff7cbeaf1702ff605aca22777 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:07:25 +0900 Subject: [PATCH 2/7] fix include path --- tlm_cmd/common_packet/common_cmd_packet.h | 2 +- tlm_cmd/common_packet/common_cmd_packet_util.c | 4 ++-- tlm_cmd/common_packet/common_cmd_packet_util.h | 6 +++--- tlm_cmd/common_packet/common_tlm_packet.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tlm_cmd/common_packet/common_cmd_packet.h b/tlm_cmd/common_packet/common_cmd_packet.h index 7e332de0b..8f81fe42f 100644 --- a/tlm_cmd/common_packet/common_cmd_packet.h +++ b/tlm_cmd/common_packet/common_cmd_packet.h @@ -6,7 +6,7 @@ #ifndef COMMON_CMD_PACKET_H_ #define COMMON_CMD_PACKET_H_ -#include "../system/time_manager/obc_time.h" +#include "../../system/time_manager/obc_time.h" #include // ここで CCP_DEST_TYPE を定義する diff --git a/tlm_cmd/common_packet/common_cmd_packet_util.c b/tlm_cmd/common_packet/common_cmd_packet_util.c index 8efc80c3b..9293280ec 100644 --- a/tlm_cmd/common_packet/common_cmd_packet_util.c +++ b/tlm_cmd/common_packet/common_cmd_packet_util.c @@ -4,8 +4,8 @@ * @brief CCP の汎用 Utility */ #include "common_cmd_packet_util.h" -#include "command_analyze.h" -#include "../library/endian.h" +#include "../command_analyze.h" +#include "../../library/endian.h" #include // for NULL #include diff --git a/tlm_cmd/common_packet/common_cmd_packet_util.h b/tlm_cmd/common_packet/common_cmd_packet_util.h index d0d89b763..752b84f57 100644 --- a/tlm_cmd/common_packet/common_cmd_packet_util.h +++ b/tlm_cmd/common_packet/common_cmd_packet_util.h @@ -6,9 +6,9 @@ #define COMMON_CMD_PACKET_UTIL_H_ #include "common_cmd_packet.h" -#include "packet_handler.h" -#include "../applications/timeline_command_dispatcher_id_define.h" -#include "block_command_table.h" // for bct_id +#include "../packet_handler.h" +#include "../../applications/timeline_command_dispatcher_id_define.h" +#include "../block_command_table.h" // for bct_id #include /** diff --git a/tlm_cmd/common_packet/common_tlm_packet.h b/tlm_cmd/common_packet/common_tlm_packet.h index 1c0c9fd04..8f1a2bc86 100644 --- a/tlm_cmd/common_packet/common_tlm_packet.h +++ b/tlm_cmd/common_packet/common_tlm_packet.h @@ -6,7 +6,7 @@ #ifndef COMMON_TLM_PACKET_H_ #define COMMON_TLM_PACKET_H_ -#include "../system/time_manager/obc_time.h" +#include "../../system/time_manager/obc_time.h" #include // ここで， CTP_APID_TLM_FROM_ME, CTP_MAX_LEN, CommonTlmPacket として使うパケット型を指定する From e394568a2f62e3fdd5de304166252eb91e15cd93 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:12:28 +0900 Subject: [PATCH 3/7] fix include --- CMakeLists.txt | 2 +- applications/ccp_dump.h | 2 +- applications/component_driver_utility.c | 2 +- applications/component_driver_utility.h | 2 +- applications/divided_cmd_utility.c | 2 +- applications/divided_cmd_utility.h | 2 +- applications/event_utility.c | 2 +- applications/event_utility.h | 2 +- applications/gs_command_dispatcher.c | 2 +- applications/memory_dump.c | 4 ++-- applications/memory_dump.h | 2 +- applications/nop.c | 2 +- applications/nop.h | 2 +- applications/realtime_command_dispatcher.c | 2 +- applications/realtime_command_dispatcher.h | 2 +- applications/telemetry_manager.c | 2 +- applications/telemetry_manager.h | 4 ++-- applications/test_app/test_ccp_util.c | 2 +- applications/test_app/test_ccp_util.h | 2 +- applications/timeline_command_dispatcher.c | 2 +- applications/timeline_command_dispatcher.h | 2 +- applications/tl_bct_digest.h | 2 +- applications/utility_command.c | 2 +- applications/utility_command.h | 2 +- applications/utility_counter.c | 2 +- applications/utility_counter.h | 2 +- code-generator/my_mod/tlm_buffer.py | 2 +- component_driver/cdrv_common_tlm_cmd_packet.c | 2 +- component_driver/cdrv_common_tlm_cmd_packet.h | 4 ++-- component_driver/driver_super.c | 2 +- .../src/src_user/applications/component_service/csrv_aobc.c | 2 +- .../src/src_user/applications/component_service/csrv_aobc.h | 2 +- .../src/src_user/applications/component_service/csrv_gs.c | 2 +- .../src_user/applications/component_service/csrv_uart_test.c | 2 +- .../src_user/applications/component_service/csrv_uart_test.h | 2 +- examples/mobc/src/src_user/component_driver/aocs/aobc.c | 4 ++-- examples/mobc/src/src_user/component_driver/aocs/aobc.h | 2 +- .../src_user/component_driver/aocs/aobc_telemetry_buffer.h | 2 +- examples/mobc/src/src_user/component_driver/etc/uart_test.c | 2 +- examples/mobc/src/src_user/settings/CMakeLists.txt | 2 +- .../src/src_user/settings/modes/transitions/sequence_items.c | 2 +- .../mobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h | 2 +- examples/mobc/src/src_user/tlm_cmd/common_cmd_packet.c | 2 +- examples/mobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c | 2 +- examples/mobc/src/src_user/tlm_cmd/common_tlm_packet.c | 2 +- examples/mobc/src/src_user/tlm_cmd/user_packet_handler.h | 4 ++-- .../src/src_user/applications/component_service/csrv_mobc.h | 2 +- examples/subobc/src/src_user/component_driver/etc/mobc.c | 2 +- examples/subobc/src/src_user/component_driver/etc/mobc.h | 2 +- examples/subobc/src/src_user/settings/CMakeLists.txt | 2 +- .../subobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h | 2 +- examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c | 2 +- examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c | 2 +- examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c | 2 +- examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h | 4 ++-- system/application_manager/app_manager.c | 2 +- system/application_manager/app_manager.h | 2 +- system/event_manager/event_handler.c | 2 +- system/event_manager/event_logger.c | 2 +- system/event_manager/event_logger.h | 2 +- system/mode_manager/mode_manager.c | 2 +- system/mode_manager/mode_manager.h | 2 +- system/task_manager/task_dispatcher.c | 2 +- system/time_manager/time_manager.c | 2 +- system/time_manager/time_manager.h | 2 +- system/watchdog_timer/watchdog_timer.c | 2 +- system/watchdog_timer/watchdog_timer.h | 2 +- tlm_cmd/common_packet/common_cmd_packet.h | 4 ++-- tlm_cmd/common_packet/common_tlm_cmd_packet.h | 2 +- tlm_cmd/common_packet/common_tlm_packet.h | 2 +- tlm_cmd/telemetry_generator.c | 2 +- 71 files changed, 78 insertions(+), 78 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5e246eba..1e60650e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ set(C2A_SRCS tlm_cmd/command_analyze.c tlm_cmd/command_dispatcher.c tlm_cmd/command_dispatcher_manager.c - tlm_cmd/common_cmd_packet_util.c + tlm_cmd/common_packet/common_cmd_packet_util.c tlm_cmd/packet_handler.c tlm_cmd/packet_list_util.c tlm_cmd/packet_list.c diff --git a/applications/ccp_dump.h b/applications/ccp_dump.h index 7b5422cf0..c804d1f9f 100644 --- a/applications/ccp_dump.h +++ b/applications/ccp_dump.h @@ -6,7 +6,7 @@ #define CCP_DUMP_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" #include "../tlm_cmd/block_command_table.h" #include "../system/time_manager/obc_time.h" diff --git a/applications/component_driver_utility.c b/applications/component_driver_utility.c index 87cbf79f7..667ee82f4 100644 --- a/applications/component_driver_utility.c +++ b/applications/component_driver_utility.c @@ -4,7 +4,7 @@ * @brief 様々な Component Driver に統一的な Cmd を提供する */ #include "component_driver_utility.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../component_driver/component_driver.h" #include "../component_driver/driver_super.h" #include diff --git a/applications/component_driver_utility.h b/applications/component_driver_utility.h index 929341c06..5792da657 100644 --- a/applications/component_driver_utility.h +++ b/applications/component_driver_utility.h @@ -6,7 +6,7 @@ #define COMPONENT_DRIVER_UTILITY_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" #include "../component_driver/component_driver.h" #define CDRV_UTIL_HAX_RX_BUFFER_SIZE (256) //!< Cmd_CDRV_UTIL_HAL_RX で受信するデータのバッファサイズ diff --git a/applications/divided_cmd_utility.c b/applications/divided_cmd_utility.c index c6bc78ee3..f59da87d4 100644 --- a/applications/divided_cmd_utility.c +++ b/applications/divided_cmd_utility.c @@ -13,7 +13,7 @@ */ #include "divided_cmd_utility.h" #include "../tlm_cmd/packet_handler.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../system/time_manager/time_manager.h" #include "../system/event_manager/event_logger.h" #include "../library/result.h" diff --git a/applications/divided_cmd_utility.h b/applications/divided_cmd_utility.h index c56f6ca8b..04d357422 100644 --- a/applications/divided_cmd_utility.h +++ b/applications/divided_cmd_utility.h @@ -14,7 +14,7 @@ #define DIVIDED_CMD_UTILITY_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" #include "../system/time_manager/obc_time.h" #include diff --git a/applications/event_utility.c b/applications/event_utility.c index 6af1f3c88..5812b62be 100644 --- a/applications/event_utility.c +++ b/applications/event_utility.c @@ -6,7 +6,7 @@ */ #include "event_utility.h" #include "../system/event_manager/event_handler.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" #include // for NULL diff --git a/applications/event_utility.h b/applications/event_utility.h index 94ddb3ba3..c076bd682 100644 --- a/applications/event_utility.h +++ b/applications/event_utility.h @@ -7,7 +7,7 @@ #define EVENT_UTILITY_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" AppInfo EVENT_UTIL_create_app(void); diff --git a/applications/gs_command_dispatcher.c b/applications/gs_command_dispatcher.c index 346db5b6f..c2d596a45 100644 --- a/applications/gs_command_dispatcher.c +++ b/applications/gs_command_dispatcher.c @@ -6,7 +6,7 @@ #include "gs_command_dispatcher.h" #include "../tlm_cmd/packet_handler.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" static CommandDispatcher gs_command_dispatcher_; diff --git a/applications/memory_dump.c b/applications/memory_dump.c index 87243de97..5aef255c8 100644 --- a/applications/memory_dump.c +++ b/applications/memory_dump.c @@ -5,8 +5,8 @@ #include "../system/time_manager/time_manager.h" #include "../tlm_cmd/packet_handler.h" -#include "../tlm_cmd/common_cmd_packet_util.h" -#include "../tlm_cmd/common_tlm_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_tlm_packet.h" // TODO: いずれは Space Packet への依存をなくしたい (CTP の依存だけにしたい) #include "../tlm_cmd/ccsds/space_packet_protocol/space_packet.h" #include "../tlm_cmd/ccsds/space_packet_protocol/tlm_space_packet.h" diff --git a/applications/memory_dump.h b/applications/memory_dump.h index 5627ce7b6..e28cb5639 100644 --- a/applications/memory_dump.h +++ b/applications/memory_dump.h @@ -2,7 +2,7 @@ #define MEMORY_DUMP_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" /** diff --git a/applications/nop.c b/applications/nop.c index 85bbbc8c2..db2353f9b 100644 --- a/applications/nop.c +++ b/applications/nop.c @@ -7,7 +7,7 @@ */ #include "nop.h" #include -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" static RESULT NOP_nop_(void); diff --git a/applications/nop.h b/applications/nop.h index 79f3fe6f1..bf7592643 100644 --- a/applications/nop.h +++ b/applications/nop.h @@ -8,7 +8,7 @@ #define NOP_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" AppInfo NOP_create_app(void); diff --git a/applications/realtime_command_dispatcher.c b/applications/realtime_command_dispatcher.c index 8e95f2851..5afa509bf 100644 --- a/applications/realtime_command_dispatcher.c +++ b/applications/realtime_command_dispatcher.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "realtime_command_dispatcher.h" #include "../tlm_cmd/packet_handler.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" static CommandDispatcher realtime_command_dispatcher_; diff --git a/applications/realtime_command_dispatcher.h b/applications/realtime_command_dispatcher.h index 5cd8a8703..6277534b8 100644 --- a/applications/realtime_command_dispatcher.h +++ b/applications/realtime_command_dispatcher.h @@ -3,7 +3,7 @@ #include "../tlm_cmd/command_dispatcher.h" #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" extern const CommandDispatcher* const realtime_command_dispatcher; diff --git a/applications/telemetry_manager.c b/applications/telemetry_manager.c index 3cf2229f3..442947562 100644 --- a/applications/telemetry_manager.c +++ b/applications/telemetry_manager.c @@ -15,7 +15,7 @@ #include "../library/print.h" #include "../library/endian.h" #include "../library/result.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include #include #include diff --git a/applications/telemetry_manager.h b/applications/telemetry_manager.h index 15e4240ad..a05325ad0 100644 --- a/applications/telemetry_manager.h +++ b/applications/telemetry_manager.h @@ -7,8 +7,8 @@ #define TELEMETRY_MANAGER_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../tlm_cmd/block_command_table.h" #include #include diff --git a/applications/test_app/test_ccp_util.c b/applications/test_app/test_ccp_util.c index 7248a8680..1b9c74cfd 100644 --- a/applications/test_app/test_ccp_util.c +++ b/applications/test_app/test_ccp_util.c @@ -5,7 +5,7 @@ */ #include "test_ccp_util.h" -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" #include CCP_CmdRet Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet) diff --git a/applications/test_app/test_ccp_util.h b/applications/test_app/test_ccp_util.h index 4cb5e4f91..4b577286d 100644 --- a/applications/test_app/test_ccp_util.h +++ b/applications/test_app/test_ccp_util.h @@ -5,7 +5,7 @@ #ifndef TEST_CCP_UTIL_H_ #define TEST_CCP_UTIL_H_ -#include "../../tlm_cmd/common_cmd_packet.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet.h" CCP_CmdRet Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet); CCP_CmdRet Cmd_TEST_CCP_GET_RAW_PARAM_INFO(const CommonCmdPacket* packet); diff --git a/applications/timeline_command_dispatcher.c b/applications/timeline_command_dispatcher.c index fed7c7c38..84bfd407f 100644 --- a/applications/timeline_command_dispatcher.c +++ b/applications/timeline_command_dispatcher.c @@ -3,7 +3,7 @@ #include "../tlm_cmd/packet_handler.h" #include "../system/time_manager/time_manager.h" #include "../system/event_manager/event_logger.h" -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" #include // for memset diff --git a/applications/timeline_command_dispatcher.h b/applications/timeline_command_dispatcher.h index f59cc9f57..bcfac7411 100644 --- a/applications/timeline_command_dispatcher.h +++ b/applications/timeline_command_dispatcher.h @@ -3,7 +3,7 @@ #include "timeline_command_dispatcher_id_define.h" #include "../tlm_cmd/command_dispatcher.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" #include "../tlm_cmd/packet_handler.h" #include "../system/application_manager/app_info.h" diff --git a/applications/tl_bct_digest.h b/applications/tl_bct_digest.h index 7e0fdf04a..d3d000843 100644 --- a/applications/tl_bct_digest.h +++ b/applications/tl_bct_digest.h @@ -6,7 +6,7 @@ #define TL_BCT_DIGEST_H_ #include "../system/application_manager/app_info.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" #include "../tlm_cmd/block_command_table.h" #include "../tlm_cmd/packet_handler.h" #include "../system/time_manager/obc_time.h" diff --git a/applications/utility_command.c b/applications/utility_command.c index 42774f89d..6a9bf97a3 100644 --- a/applications/utility_command.c +++ b/applications/utility_command.c @@ -4,7 +4,7 @@ #include "../hal/uart.h" #include #include // for memcpy -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" diff --git a/applications/utility_command.h b/applications/utility_command.h index 66594fa30..33bd06342 100644 --- a/applications/utility_command.h +++ b/applications/utility_command.h @@ -3,7 +3,7 @@ // FIXME: このAppは現在管理されていない！ // 使用する前に確認すること -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" #include "../hal/uart.h" #include "../system/application_manager/app_info.h" diff --git a/applications/utility_counter.c b/applications/utility_counter.c index f0ea3a868..6965b97a1 100644 --- a/applications/utility_counter.c +++ b/applications/utility_counter.c @@ -13,7 +13,7 @@ int UTIL_COUNTER_dummy(void) #include "../tlm_cmd/packet_handler.h" #include "../system/AnomalyLogger/anomaly_logger.h" #include // for memcpy -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../library/result.h" static UtilityCounter utility_counter_; diff --git a/applications/utility_counter.h b/applications/utility_counter.h index 1d5fd2918..5dd78e780 100644 --- a/applications/utility_counter.h +++ b/applications/utility_counter.h @@ -10,7 +10,7 @@ #include "../system/application_manager/app_info.h" #include "../system/AnomalyLogger/anomaly_logger.h" -#include "../tlm_cmd/common_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_cmd_packet.h" // 汎用カウンタ用構造体 typedef enum diff --git a/code-generator/my_mod/tlm_buffer.py b/code-generator/my_mod/tlm_buffer.py index d54f7d82a..52ed01a76 100644 --- a/code-generator/my_mod/tlm_buffer.py +++ b/code-generator/my_mod/tlm_buffer.py @@ -469,7 +469,7 @@ def OutputTlmBufferH_(file_path, name, body, settings, obc_idx): #include "./{_obc_name_lower}_telemetry_definitions.h" #include -#include +#include #include """[ diff --git a/component_driver/cdrv_common_tlm_cmd_packet.c b/component_driver/cdrv_common_tlm_cmd_packet.c index 6969f60a9..533263d1e 100644 --- a/component_driver/cdrv_common_tlm_cmd_packet.c +++ b/component_driver/cdrv_common_tlm_cmd_packet.c @@ -4,7 +4,7 @@ * @brief コンポ間通信などで標準的に使う ネットワーク層 の Common Tlm Cmd Packet (概ね Space Packet) * @note ここでは，データリンク層は CCSDS ではなく EB90 Frame を使うことを想定 (TODO: 今後拡張予定) * @note データリンク層は CDS_StreamConfig.data_link_layer_ で規定する - * @note packet 構造 などは tlm_cmd/common_tlm_cmd_packet.h を参照のこと + * @note packet 構造 などは tlm_cmd/common_packet/common_tlm_cmd_packet.h を参照のこと */ #include "cdrv_common_tlm_cmd_packet.h" #include "cdrv_eb90_frame.h" diff --git a/component_driver/cdrv_common_tlm_cmd_packet.h b/component_driver/cdrv_common_tlm_cmd_packet.h index 83fb4b18f..1876ae929 100644 --- a/component_driver/cdrv_common_tlm_cmd_packet.h +++ b/component_driver/cdrv_common_tlm_cmd_packet.h @@ -3,14 +3,14 @@ * @brief コンポ間通信などで標準的に使う ネットワーク層 の Common Tlm Cmd Packet (概ね Space Packet) * @note ここでは，データリンク層は CCSDS ではなく EB90 Frame を使うことを想定 (TODO: 今後拡張予定) * @note データリンク層は CDS_StreamConfig.data_link_layer_ で規定する - * @note packet 構造 などは tlm_cmd/common_tlm_cmd_packet.h を参照のこと + * @note packet 構造 などは tlm_cmd/common_packet/common_tlm_cmd_packet.h を参照のこと */ #ifndef CDRV_COMMON_TLM_CMD_PACKET_H_ #define CDRV_COMMON_TLM_CMD_PACKET_H_ #include #include "driver_super.h" -#include "../tlm_cmd/common_tlm_cmd_packet.h" +#include "../tlm_cmd/common_packet/common_tlm_cmd_packet.h" /** * @brief CommonTlmCmdPacket を受信データからコピーして取得する diff --git a/component_driver/driver_super.c b/component_driver/driver_super.c index 73e465186..1087dfc6b 100644 --- a/component_driver/driver_super.c +++ b/component_driver/driver_super.c @@ -13,7 +13,7 @@ #include "../library/print.h" #include // for memset などの mem 系 #include // for NULL -#include "../tlm_cmd/common_cmd_packet_util.h" +#include "../tlm_cmd/common_packet/common_cmd_packet_util.h" // #define CDS_DEBUG // 適切なときにコメントアウトする // #define CDS_DEBUG_SHOW_REC_DATA // 適切なときにコメントアウトする diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c b/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c index d8f4925e3..63a434120 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c +++ b/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c @@ -9,7 +9,7 @@ #include "../../component_driver/aocs/aobc.h" #include "../../tlm_cmd/user_packet_handler.h" #include -#include +#include #include "../../settings/port_config.h" #include "../../settings/component_driver/driver_buffer_define.h" #include diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_aobc.h b/examples/mobc/src/src_user/applications/component_service/csrv_aobc.h index 67e08d176..cdb8e67b2 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_aobc.h +++ b/examples/mobc/src/src_user/applications/component_service/csrv_aobc.h @@ -11,7 +11,7 @@ #include "../../component_driver/aocs/aobc_telemetry_definitions.h" #include #include -#include +#include extern const AOBC_Driver* const aobc_driver; //!< AOBC driver extern const CommandDispatcher* const CSRV_AOBC_cdis; //!< AOBC cmd dispatcher diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_gs.c b/examples/mobc/src/src_user/applications/component_service/csrv_gs.c index 3ec82c1de..1b6fe3a02 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_gs.c +++ b/examples/mobc/src/src_user/applications/component_service/csrv_gs.c @@ -5,7 +5,7 @@ */ #include "csrv_gs.h" #include -#include +#include #include #include #include "../../component_driver/com/gs_validate.h" diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c b/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c index 6ff6c57eb..26d44cdc2 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c +++ b/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c @@ -6,7 +6,7 @@ #include "csrv_uart_test.h" #include // for NULL #include -#include +#include #include "../../settings/port_config.h" #include "../../settings/component_driver/driver_buffer_define.h" #include diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.h b/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.h index 6218202c7..5b6d8e505 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.h +++ b/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.h @@ -7,7 +7,7 @@ #include "../../component_driver/etc/uart_test.h" #include -#include +#include extern const UART_TEST_Driver* const uart_test_driver; diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc.c b/examples/mobc/src/src_user/component_driver/aocs/aobc.c index 5913e65f3..cc03ac1ec 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc.c +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc.c @@ -7,8 +7,8 @@ #include "./aobc_command_definitions.h" #include "./aobc_telemetry_definitions.h" #include "./aobc_telemetry_buffer.h" -#include -#include +#include +#include #include #include #include diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc.h b/examples/mobc/src/src_user/component_driver/aocs/aobc.h index 1f6475c0a..6f154d992 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "./aobc_telemetry_data_definitions.h" #include "./aobc_telemetry_buffer.h" diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h index b0a824ea1..9a8279050 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h @@ -23,7 +23,7 @@ #include "./aobc_telemetry_definitions.h" #include -#include +#include #include typedef struct AOBC_Driver AOBC_Driver; diff --git a/examples/mobc/src/src_user/component_driver/etc/uart_test.c b/examples/mobc/src/src_user/component_driver/etc/uart_test.c index d8d636553..dc180d089 100644 --- a/examples/mobc/src/src_user/component_driver/etc/uart_test.c +++ b/examples/mobc/src/src_user/component_driver/etc/uart_test.c @@ -5,7 +5,7 @@ */ #include "uart_test.h" -#include +#include #include #include "../../settings/sils_define.h" #include "string.h" // for memcpy diff --git a/examples/mobc/src/src_user/settings/CMakeLists.txt b/examples/mobc/src/src_user/settings/CMakeLists.txt index 85905036d..9acf45472 100644 --- a/examples/mobc/src/src_user/settings/CMakeLists.txt +++ b/examples/mobc/src/src_user/settings/CMakeLists.txt @@ -17,7 +17,7 @@ set(C2A_SRCS system/event_logger_settings.c system/event_handler_rules/event_handler_rules.c system/event_handler_rules/event_handler_rule_test.c - tlm_cmd/common_cmd_packet_define.c + tlm_cmd/common_packet/common_cmd_packet_define.c tlm_cmd/ccsds/aos_transfer_frame_define.c tlm_cmd/ccsds/apid_define.c tlm_cmd/ccsds/tc_transfer_frame_define.c diff --git a/examples/mobc/src/src_user/settings/modes/transitions/sequence_items.c b/examples/mobc/src/src_user/settings/modes/transitions/sequence_items.c index c7a77135e..84e123d20 100644 --- a/examples/mobc/src/src_user/settings/modes/transitions/sequence_items.c +++ b/examples/mobc/src/src_user/settings/modes/transitions/sequence_items.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "sequence_items.h" #include "../../../tlm_cmd/block_command_definitions.h" -#include +#include #include "../mode_definitions.h" diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h b/examples/mobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h index 72ce98107..53630c19b 100644 --- a/examples/mobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h +++ b/examples/mobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h @@ -12,7 +12,7 @@ * @enum APID * @brief Application Process ID * @note 11bit - * @note 命名規則は tlm_cmd/common_tlm_cmd_packet.h を参照 + * @note 命名規則は tlm_cmd/common_packet/common_tlm_cmd_packet.h を参照 */ typedef enum { diff --git a/examples/mobc/src/src_user/tlm_cmd/common_cmd_packet.c b/examples/mobc/src/src_user/tlm_cmd/common_cmd_packet.c index a0da7a640..851227d07 100644 --- a/examples/mobc/src/src_user/tlm_cmd/common_cmd_packet.c +++ b/examples/mobc/src/src_user/tlm_cmd/common_cmd_packet.c @@ -4,7 +4,7 @@ * @brief CTP 関連基本関数の定義 * @note CCP: CommonCmdPacket */ -#include +#include #include #include diff --git a/examples/mobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c b/examples/mobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c index c02e70958..0ab4f01f9 100644 --- a/examples/mobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c +++ b/examples/mobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c @@ -6,7 +6,7 @@ * @note CTP: CommonTlmPacket * @note CCP: CommonCmdPacket */ -#include +#include #include #include diff --git a/examples/mobc/src/src_user/tlm_cmd/common_tlm_packet.c b/examples/mobc/src/src_user/tlm_cmd/common_tlm_packet.c index f0d6674e7..f08fd37cc 100644 --- a/examples/mobc/src/src_user/tlm_cmd/common_tlm_packet.c +++ b/examples/mobc/src/src_user/tlm_cmd/common_tlm_packet.c @@ -4,7 +4,7 @@ * @brief CTP 関連基本関数の定義 * @note CTP: CommonTlmPacket */ -#include +#include #include #include #include diff --git a/examples/mobc/src/src_user/tlm_cmd/user_packet_handler.h b/examples/mobc/src/src_user/tlm_cmd/user_packet_handler.h index 532436ada..cf32b7f7f 100644 --- a/examples/mobc/src/src_user/tlm_cmd/user_packet_handler.h +++ b/examples/mobc/src/src_user/tlm_cmd/user_packet_handler.h @@ -6,8 +6,8 @@ #define USER_PACKET_HANDLER_H_ #include -#include -#include +#include +#include #include #include #include "telemetry_definitions.h" diff --git a/examples/subobc/src/src_user/applications/component_service/csrv_mobc.h b/examples/subobc/src/src_user/applications/component_service/csrv_mobc.h index 607f8fbce..a7ff11f76 100644 --- a/examples/subobc/src/src_user/applications/component_service/csrv_mobc.h +++ b/examples/subobc/src/src_user/applications/component_service/csrv_mobc.h @@ -7,7 +7,7 @@ #include "../../component_driver/etc/mobc.h" #include -#include +#include extern const MOBC_Driver* const mobc_driver; //!< MOBC driver diff --git a/examples/subobc/src/src_user/component_driver/etc/mobc.c b/examples/subobc/src/src_user/component_driver/etc/mobc.c index f85d916cd..4a4af4d7a 100644 --- a/examples/subobc/src/src_user/component_driver/etc/mobc.c +++ b/examples/subobc/src/src_user/component_driver/etc/mobc.c @@ -7,7 +7,7 @@ // FIXME: DS 側の TCP が整理されたら， TCP 関連を撲滅し， CTCP に統一する #include "./mobc.h" -#include +#include #include #include #include diff --git a/examples/subobc/src/src_user/component_driver/etc/mobc.h b/examples/subobc/src/src_user/component_driver/etc/mobc.h index f2e908480..57e157895 100644 --- a/examples/subobc/src/src_user/component_driver/etc/mobc.h +++ b/examples/subobc/src/src_user/component_driver/etc/mobc.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include /** diff --git a/examples/subobc/src/src_user/settings/CMakeLists.txt b/examples/subobc/src/src_user/settings/CMakeLists.txt index 93716c0c5..d5dcf8eac 100644 --- a/examples/subobc/src/src_user/settings/CMakeLists.txt +++ b/examples/subobc/src/src_user/settings/CMakeLists.txt @@ -14,7 +14,7 @@ set(C2A_SRCS modes/transitions/sl_nop.c system/event_logger_settings.c system/event_handler_rules/event_handler_rules.c - tlm_cmd/common_cmd_packet_define.c + tlm_cmd/common_packet/common_cmd_packet_define.c tlm_cmd/ccsds/apid_define.c ) diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h b/examples/subobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h index 72ce98107..53630c19b 100644 --- a/examples/subobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h +++ b/examples/subobc/src/src_user/settings/tlm_cmd/ccsds/apid_define.h @@ -12,7 +12,7 @@ * @enum APID * @brief Application Process ID * @note 11bit - * @note 命名規則は tlm_cmd/common_tlm_cmd_packet.h を参照 + * @note 命名規則は tlm_cmd/common_packet/common_tlm_cmd_packet.h を参照 */ typedef enum { diff --git a/examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c b/examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c index a0da7a640..851227d07 100644 --- a/examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c +++ b/examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c @@ -4,7 +4,7 @@ * @brief CTP 関連基本関数の定義 * @note CCP: CommonCmdPacket */ -#include +#include #include #include diff --git a/examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c b/examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c index c02e70958..0ab4f01f9 100644 --- a/examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c +++ b/examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c @@ -6,7 +6,7 @@ * @note CTP: CommonTlmPacket * @note CCP: CommonCmdPacket */ -#include +#include #include #include diff --git a/examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c b/examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c index ee1d2789d..0bab0a732 100644 --- a/examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c +++ b/examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c @@ -4,7 +4,7 @@ * @brief CTP 関連基本関数の定義 * @note CTP: CommonTlmPacket */ -#include +#include #include #include diff --git a/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h b/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h index 5bbbe7d48..cae6d7dcc 100644 --- a/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h +++ b/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h @@ -6,8 +6,8 @@ #define USER_PACKET_HANDLER_H_ #include -#include -#include +#include +#include #include #include #include "telemetry_definitions.h" diff --git a/system/application_manager/app_manager.c b/system/application_manager/app_manager.c index 63e3f47cd..24fd36203 100644 --- a/system/application_manager/app_manager.c +++ b/system/application_manager/app_manager.c @@ -14,7 +14,7 @@ #include "../watchdog_timer/watchdog_timer.h" #include #include "../../library/print.h" -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" static AM_ACK AM_initialize_app_(size_t id); static AM_ACK AM_execute_app_(size_t id); diff --git a/system/application_manager/app_manager.h b/system/application_manager/app_manager.h index 27821f4fe..6d2fc74d4 100644 --- a/system/application_manager/app_manager.h +++ b/system/application_manager/app_manager.h @@ -8,7 +8,7 @@ #include #include "app_info.h" -#include "../../tlm_cmd/common_cmd_packet.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet.h" #define AM_TLM_PAGE_SIZE (16) //!< AMのAppInfoテーブルの1テレメトリパケット(=1ページ)に格納されるAppInfo数（ページネーション用） #define AM_TLM_PAGE_MAX (8) //!< AMのAppInfoテーブルのページ数（ページネーション用） diff --git a/system/event_manager/event_handler.c b/system/event_manager/event_handler.c index 559191612..9f890eea7 100644 --- a/system/event_manager/event_handler.c +++ b/system/event_manager/event_handler.c @@ -7,7 +7,7 @@ #include "event_handler.h" #include #include -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../../applications/timeline_command_dispatcher_id_define.h" #include "../time_manager/time_manager.h" diff --git a/system/event_manager/event_logger.c b/system/event_manager/event_logger.c index df014d816..8e9484bc8 100644 --- a/system/event_manager/event_logger.c +++ b/system/event_manager/event_logger.c @@ -13,7 +13,7 @@ #include "../time_manager/time_manager.h" #include "../watchdog_timer/watchdog_timer.h" #include -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" #ifdef EL_IS_ENABLE_CLOG diff --git a/system/event_manager/event_logger.h b/system/event_manager/event_logger.h index a794abd2f..dfd7e37e0 100644 --- a/system/event_manager/event_logger.h +++ b/system/event_manager/event_logger.h @@ -42,7 +42,7 @@ #include #include -#include "../../tlm_cmd/common_cmd_packet.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet.h" #include "../time_manager/obc_time.h" // EL_GROUP (uint32_t を想定) をここで定義する diff --git a/system/mode_manager/mode_manager.c b/system/mode_manager/mode_manager.c index 082e58a21..06db294bc 100644 --- a/system/mode_manager/mode_manager.c +++ b/system/mode_manager/mode_manager.c @@ -11,7 +11,7 @@ #include "../task_manager/task_dispatcher.h" #include "../event_manager/event_logger.h" #include "../../tlm_cmd/block_command_executor.h" -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" #include #include "../../tlm_cmd/packet_handler.h" #include "../../applications/timeline_command_dispatcher_id_define.h" diff --git a/system/mode_manager/mode_manager.h b/system/mode_manager/mode_manager.h index b0b054ae7..bc6ec2fbb 100644 --- a/system/mode_manager/mode_manager.h +++ b/system/mode_manager/mode_manager.h @@ -7,7 +7,7 @@ #include "../time_manager/obc_time.h" #include -#include "../../tlm_cmd/common_cmd_packet.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet.h" #include "../../tlm_cmd/block_command_table.h" #define MM_NOT_DEFINED (BCT_MAX_BLOCKS) diff --git a/system/task_manager/task_dispatcher.c b/system/task_manager/task_dispatcher.c index a4f45a0fa..55840fbca 100644 --- a/system/task_manager/task_dispatcher.c +++ b/system/task_manager/task_dispatcher.c @@ -12,7 +12,7 @@ #include "../../tlm_cmd/packet_list_util.h" #include "../../tlm_cmd/block_command_executor.h" -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" #include "../mode_manager/mode_manager.h" #include "../time_manager/time_manager.h" #include "../time_manager/obc_time_config.h" diff --git a/system/time_manager/time_manager.c b/system/time_manager/time_manager.c index f41631aa4..d9409cdaf 100644 --- a/system/time_manager/time_manager.c +++ b/system/time_manager/time_manager.c @@ -8,7 +8,7 @@ #include #include "../../library/c2a_round.h" #include "../task_manager/task_dispatcher.h" -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" static TimeManager time_manager_; const TimeManager* const time_manager = &time_manager_; diff --git a/system/time_manager/time_manager.h b/system/time_manager/time_manager.h index 5a1ce2d9b..27a376be3 100644 --- a/system/time_manager/time_manager.h +++ b/system/time_manager/time_manager.h @@ -6,7 +6,7 @@ #define TIME_MANAGER_H_ #include "obc_time.h" -#include "../../tlm_cmd/common_cmd_packet.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet.h" #define TMGR_DEFAULT_UNIXTIME_EPOCH_FOR_UTL (1577836800.0) /*!< 2020-01-01T00:00:00Z 時点の unixtime. utl_unixtime_epoch のデフォルト値 */ diff --git a/system/watchdog_timer/watchdog_timer.c b/system/watchdog_timer/watchdog_timer.c index 1484713e2..fb4e3b0dd 100644 --- a/system/watchdog_timer/watchdog_timer.c +++ b/system/watchdog_timer/watchdog_timer.c @@ -6,7 +6,7 @@ */ #include "watchdog_timer.h" #include "../../library/print.h" -#include "../../tlm_cmd/common_cmd_packet_util.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet_util.h" static WDT_Config wdt_config_; const WDT_Config* const wdt_config = &wdt_config_; diff --git a/system/watchdog_timer/watchdog_timer.h b/system/watchdog_timer/watchdog_timer.h index 8b801d62f..bcc00f5af 100644 --- a/system/watchdog_timer/watchdog_timer.h +++ b/system/watchdog_timer/watchdog_timer.h @@ -8,7 +8,7 @@ #define WATCHDOG_TIMER_H_ #include "../../hal/wdt.h" -#include "../../tlm_cmd/common_cmd_packet.h" +#include "../../tlm_cmd/common_packet/common_cmd_packet.h" extern const WDT_Config* const wdt_config; diff --git a/tlm_cmd/common_packet/common_cmd_packet.h b/tlm_cmd/common_packet/common_cmd_packet.h index 8f81fe42f..7142e2782 100644 --- a/tlm_cmd/common_packet/common_cmd_packet.h +++ b/tlm_cmd/common_packet/common_cmd_packet.h @@ -11,7 +11,7 @@ // ここで CCP_DEST_TYPE を定義する // 詳細は -// - /examples/mobc/src/src_user/settings/tlm_cmd/common_cmd_packet_define.h +// - /examples/mobc/src/src_user/settings/tlm_cmd/common_packet/common_cmd_packet_define.h // - https://github.com/arkedge/c2a-core/blob/develop/docs/core/communication.md // を参照 /* 例 @@ -26,7 +26,7 @@ typedef enum } CCP_DEST_TYPE; */ // さらに， CCP_APID_CMD_TO_ME, CCP_MAX_LEN, CommonCmdPacket として使うパケット型を指定する -#include +#include // ここで APID を定義する // 詳細は common_tlm_cmd_packet.h を参照 diff --git a/tlm_cmd/common_packet/common_tlm_cmd_packet.h b/tlm_cmd/common_packet/common_tlm_cmd_packet.h index 33b156ab1..a7c012673 100644 --- a/tlm_cmd/common_packet/common_tlm_cmd_packet.h +++ b/tlm_cmd/common_packet/common_tlm_cmd_packet.h @@ -10,7 +10,7 @@ #include // ここで， CTCP_MAX_LEN, CommonTlmCmdPacket として使うパケット型を指定する -#include +#include #include "./common_tlm_packet.h" #include "./common_cmd_packet.h" diff --git a/tlm_cmd/common_packet/common_tlm_packet.h b/tlm_cmd/common_packet/common_tlm_packet.h index 8f1a2bc86..bd43f5503 100644 --- a/tlm_cmd/common_packet/common_tlm_packet.h +++ b/tlm_cmd/common_packet/common_tlm_packet.h @@ -10,7 +10,7 @@ #include // ここで， CTP_APID_TLM_FROM_ME, CTP_MAX_LEN, CommonTlmPacket として使うパケット型を指定する -#include +#include // ここで APID を定義する // 詳細は common_tlm_cmd_packet.h を参照 diff --git a/tlm_cmd/telemetry_generator.c b/tlm_cmd/telemetry_generator.c index e470fa73a..ba06c16e0 100644 --- a/tlm_cmd/telemetry_generator.c +++ b/tlm_cmd/telemetry_generator.c @@ -10,7 +10,7 @@ #include "common_cmd_packet_util.h" #include #include -#include +#include #include "./ccsds/space_packet_protocol/tlm_space_packet.h" // FIXME: TSP 依存性はNGなので， TCP → SP 大工事終わったら直す From 8960df328ffe02a29826ebd75ec4e8b609f9e37c Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:13:31 +0900 Subject: [PATCH 4/7] revert some replacement --- tlm_cmd/common_packet/common_cmd_packet.h | 4 ++-- tlm_cmd/common_packet/common_tlm_cmd_packet.h | 2 +- tlm_cmd/common_packet/common_tlm_packet.h | 2 +- tlm_cmd/telemetry_generator.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tlm_cmd/common_packet/common_cmd_packet.h b/tlm_cmd/common_packet/common_cmd_packet.h index 7142e2782..8f81fe42f 100644 --- a/tlm_cmd/common_packet/common_cmd_packet.h +++ b/tlm_cmd/common_packet/common_cmd_packet.h @@ -11,7 +11,7 @@ // ここで CCP_DEST_TYPE を定義する // 詳細は -// - /examples/mobc/src/src_user/settings/tlm_cmd/common_packet/common_cmd_packet_define.h +// - /examples/mobc/src/src_user/settings/tlm_cmd/common_cmd_packet_define.h // - https://github.com/arkedge/c2a-core/blob/develop/docs/core/communication.md // を参照 /* 例 @@ -26,7 +26,7 @@ typedef enum } CCP_DEST_TYPE; */ // さらに， CCP_APID_CMD_TO_ME, CCP_MAX_LEN, CommonCmdPacket として使うパケット型を指定する -#include +#include // ここで APID を定義する // 詳細は common_tlm_cmd_packet.h を参照 diff --git a/tlm_cmd/common_packet/common_tlm_cmd_packet.h b/tlm_cmd/common_packet/common_tlm_cmd_packet.h index a7c012673..33b156ab1 100644 --- a/tlm_cmd/common_packet/common_tlm_cmd_packet.h +++ b/tlm_cmd/common_packet/common_tlm_cmd_packet.h @@ -10,7 +10,7 @@ #include // ここで， CTCP_MAX_LEN, CommonTlmCmdPacket として使うパケット型を指定する -#include +#include #include "./common_tlm_packet.h" #include "./common_cmd_packet.h" diff --git a/tlm_cmd/common_packet/common_tlm_packet.h b/tlm_cmd/common_packet/common_tlm_packet.h index bd43f5503..8f1a2bc86 100644 --- a/tlm_cmd/common_packet/common_tlm_packet.h +++ b/tlm_cmd/common_packet/common_tlm_packet.h @@ -10,7 +10,7 @@ #include // ここで， CTP_APID_TLM_FROM_ME, CTP_MAX_LEN, CommonTlmPacket として使うパケット型を指定する -#include +#include // ここで APID を定義する // 詳細は common_tlm_cmd_packet.h を参照 diff --git a/tlm_cmd/telemetry_generator.c b/tlm_cmd/telemetry_generator.c index ba06c16e0..e470fa73a 100644 --- a/tlm_cmd/telemetry_generator.c +++ b/tlm_cmd/telemetry_generator.c @@ -10,7 +10,7 @@ #include "common_cmd_packet_util.h" #include #include -#include +#include #include "./ccsds/space_packet_protocol/tlm_space_packet.h" // FIXME: TSP 依存性はNGなので， TCP → SP 大工事終わったら直す From eb98e1df667f36cf4a8c85b2819a8dfa0766805c Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:16:03 +0900 Subject: [PATCH 5/7] fix cmake --- examples/mobc/src/src_user/settings/CMakeLists.txt | 2 +- examples/subobc/src/src_user/settings/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/mobc/src/src_user/settings/CMakeLists.txt b/examples/mobc/src/src_user/settings/CMakeLists.txt index 9acf45472..85905036d 100644 --- a/examples/mobc/src/src_user/settings/CMakeLists.txt +++ b/examples/mobc/src/src_user/settings/CMakeLists.txt @@ -17,7 +17,7 @@ set(C2A_SRCS system/event_logger_settings.c system/event_handler_rules/event_handler_rules.c system/event_handler_rules/event_handler_rule_test.c - tlm_cmd/common_packet/common_cmd_packet_define.c + tlm_cmd/common_cmd_packet_define.c tlm_cmd/ccsds/aos_transfer_frame_define.c tlm_cmd/ccsds/apid_define.c tlm_cmd/ccsds/tc_transfer_frame_define.c diff --git a/examples/subobc/src/src_user/settings/CMakeLists.txt b/examples/subobc/src/src_user/settings/CMakeLists.txt index d5dcf8eac..93716c0c5 100644 --- a/examples/subobc/src/src_user/settings/CMakeLists.txt +++ b/examples/subobc/src/src_user/settings/CMakeLists.txt @@ -14,7 +14,7 @@ set(C2A_SRCS modes/transitions/sl_nop.c system/event_logger_settings.c system/event_handler_rules/event_handler_rules.c - tlm_cmd/common_packet/common_cmd_packet_define.c + tlm_cmd/common_cmd_packet_define.c tlm_cmd/ccsds/apid_define.c ) From c27f0a80dc6b3ae314d130b6466901835a66b255 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:21:13 +0900 Subject: [PATCH 6/7] 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); From a6543036b9fb04451385c9833357f8c605c3dd39 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Feb 2024 14:28:39 +0900 Subject: [PATCH 7/7] fix include --- tlm_cmd/ccsds/space_packet_protocol/cmd_space_packet.h | 2 +- tlm_cmd/ccsds/space_packet_protocol/space_packet.h | 2 +- tlm_cmd/ccsds/space_packet_protocol/tlm_space_packet.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tlm_cmd/ccsds/space_packet_protocol/cmd_space_packet.h b/tlm_cmd/ccsds/space_packet_protocol/cmd_space_packet.h index 65dbfeabd..9a1a8a32a 100644 --- a/tlm_cmd/ccsds/space_packet_protocol/cmd_space_packet.h +++ b/tlm_cmd/ccsds/space_packet_protocol/cmd_space_packet.h @@ -62,7 +62,7 @@ typedef enum #include #include "space_packet_typedef.h" #include "space_packet.h" -#include "../../common_cmd_packet.h" +#include "../../common_packet/common_cmd_packet.h" #if CSP_MAX_LEN <= SP_PRM_HDR_LEN #error CSP_MAX_LEN is too small diff --git a/tlm_cmd/ccsds/space_packet_protocol/space_packet.h b/tlm_cmd/ccsds/space_packet_protocol/space_packet.h index d1e91d739..5830b0238 100644 --- a/tlm_cmd/ccsds/space_packet_protocol/space_packet.h +++ b/tlm_cmd/ccsds/space_packet_protocol/space_packet.h @@ -38,7 +38,7 @@ #include #include "space_packet_typedef.h" -#include "../../common_tlm_cmd_packet.h" +#include "../../common_packet/common_tlm_cmd_packet.h" #define SP_PRM_HDR_LEN (6) //!< Packet Primary Header 長 diff --git a/tlm_cmd/ccsds/space_packet_protocol/tlm_space_packet.h b/tlm_cmd/ccsds/space_packet_protocol/tlm_space_packet.h index fe4259b3c..9f75a74c0 100644 --- a/tlm_cmd/ccsds/space_packet_protocol/tlm_space_packet.h +++ b/tlm_cmd/ccsds/space_packet_protocol/tlm_space_packet.h @@ -75,7 +75,7 @@ typedef enum #include #include "space_packet_typedef.h" #include "space_packet.h" -#include "../../common_tlm_packet.h" +#include "../../common_packet/common_tlm_packet.h" #if TSP_MAX_LEN <= SP_PRM_HDR_LEN #error TSP_MAX_LEN is too small