Common Packet のディレクトリ変更

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

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"
 

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 <stddef.h>

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 で受信するデータのバッファサイズ

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"

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 <src_user/tlm_cmd/command_definitions.h>
 

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 <stddef.h> // for NULL

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);
 

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_;

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"

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"
 
 
 /**

applications/nop.c

@@ -7,7 +7,7 @@
  */
 #include "nop.h"
 #include <stddef.h>
-#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);

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);
 

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_;

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;
 

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 <src_user/tlm_cmd/block_command_definitions.h>
 #include <src_user/tlm_cmd/command_definitions.h>
 #include <src_user/tlm_cmd/telemetry_definitions.h>

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 <src_user/tlm_cmd/telemetry_definitions.h>
 #include <src_user/settings/tlm_cmd/ccsds/apid_define.h>

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 <src_user/tlm_cmd/command_definitions.h>
 
 CCP_CmdRet Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet)

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);

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 <string.h> // for memset

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"
 

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"

applications/utility_command.c

@@ -4,7 +4,7 @@
 #include "../hal/uart.h"
 #include <src_user/settings/port_config.h>
 #include <string.h>                     // for memcpy
-#include "../tlm_cmd/common_cmd_packet_util.h"
+#include "../tlm_cmd/common_packet/common_cmd_packet_util.h"
 #include "../library/result.h"
 
 

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"
 

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 <string.h>   // 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_;

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

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 <src_core/component_driver/driver_super.h>
-#include <src_core/tlm_cmd/common_tlm_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_tlm_packet.h>
 #include <src_core/tlm_cmd/telemetry_frame.h>
 
 """[

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"

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 <stdint.h>
 #include "driver_super.h"
-#include "../tlm_cmd/common_tlm_cmd_packet.h"
+#include "../tlm_cmd/common_packet/common_tlm_cmd_packet.h"
 
 /**
  * @brief  CommonTlmCmdPacket を受信データからコピーして取得する

component_driver/driver_super.c

@@ -13,7 +13,7 @@
 #include "../library/print.h"
 #include <string.h>     // for memset などの mem 系
 #include <stddef.h>     // 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         // 適切なときにコメントアウトする

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 <src_core/library/print.h>
-#include <src_core/tlm_cmd/common_cmd_packet_util.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet_util.h>
 #include "../../settings/port_config.h"
 #include "../../settings/component_driver/driver_buffer_define.h"
 #include <src_core/library/result.h>

examples/mobc/src/src_user/applications/component_service/csrv_aobc.h

@@ -11,7 +11,7 @@
 #include "../../component_driver/aocs/aobc_telemetry_definitions.h"
 #include <src_core/system/application_manager/app_info.h>
 #include <src_core/tlm_cmd/command_dispatcher.h>
-#include <src_core/tlm_cmd/common_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet.h>
 
 extern const AOBC_Driver* const aobc_driver;            //!< AOBC driver
 extern const CommandDispatcher* const CSRV_AOBC_cdis;     //!< AOBC cmd dispatcher

examples/mobc/src/src_user/applications/component_service/csrv_gs.c

@@ -5,7 +5,7 @@
  */
 #include "csrv_gs.h"
 #include <src_core/tlm_cmd/packet_handler.h>
-#include <src_core/tlm_cmd/common_cmd_packet_util.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet_util.h>
 #include <src_core/library/print.h>
 #include <src_core/library/result.h>
 #include "../../component_driver/com/gs_validate.h"

examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c

@@ -6,7 +6,7 @@
 #include "csrv_uart_test.h"
 #include <stddef.h> // for NULL
 #include <src_core/library/print.h>
-#include <src_core/tlm_cmd/common_cmd_packet_util.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet_util.h>
 #include "../../settings/port_config.h"
 #include "../../settings/component_driver/driver_buffer_define.h"
 #include <src_core/library/result.h>

examples/mobc/src/src_user/applications/component_service/csrv_uart_test.h

@@ -7,7 +7,7 @@
 
 #include "../../component_driver/etc/uart_test.h"
 #include <src_core/system/application_manager/app_info.h>
-#include <src_core/tlm_cmd/common_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet.h>
 
 extern const UART_TEST_Driver* const uart_test_driver;
 

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 <src_core/tlm_cmd/common_tlm_cmd_packet.h>
-#include <src_core/tlm_cmd/common_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_tlm_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet.h>
 #include <src_core/component_driver/cdrv_eb90_frame.h>
 #include <src_core/component_driver/cdrv_common_tlm_cmd_packet.h>
 #include <string.h>

examples/mobc/src/src_user/component_driver/aocs/aobc.h

@@ -8,7 +8,7 @@
 #include <src_core/hal/uart.h>
 #include <src_core/component_driver/driver_super.h>
 #include <src_core/system/time_manager/obc_time.h>
-#include <src_core/tlm_cmd/common_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet.h>
 #include "./aobc_telemetry_data_definitions.h"
 #include "./aobc_telemetry_buffer.h"
 

examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h

@@ -23,7 +23,7 @@
 
 #include "./aobc_telemetry_definitions.h"
 #include <src_core/component_driver/driver_super.h>
-#include <src_core/tlm_cmd/common_tlm_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_tlm_packet.h>
 #include <src_core/tlm_cmd/telemetry_frame.h>
 
 typedef struct AOBC_Driver AOBC_Driver;

examples/mobc/src/src_user/component_driver/etc/uart_test.c

@@ -5,7 +5,7 @@
  */
 
 #include "uart_test.h"
-#include <src_core/tlm_cmd/common_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet.h>
 #include <src_core/library/print.h>
 #include "../../settings/sils_define.h"
 #include "string.h"   // for memcpy

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 <src_core/tlm_cmd/common_cmd_packet_util.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet_util.h>
 #include "../mode_definitions.h"
 
 

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
 {

examples/mobc/src/src_user/tlm_cmd/common_cmd_packet.c

@@ -4,7 +4,7 @@
  * @brief  CTP 関連基本関数の定義
  * @note   CCP:  CommonCmdPacket
  */
-#include <src_core/tlm_cmd/common_cmd_packet.h>
+#include <src_core/tlm_cmd/common_packet/common_cmd_packet.h>
 #include <src_core/tlm_cmd/ccsds/space_packet_protocol/cmd_space_packet.h>
 #include <string.h>