diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index 95d66f113..4dfc060d8 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -61,7 +61,7 @@ add_subdirectory(${C2A_USER_DIR}/Drivers) add_subdirectory(${C2A_USER_DIR}/hal) add_subdirectory(${C2A_USER_DIR}/library) add_subdirectory(${C2A_USER_DIR}/Settings) -add_subdirectory(${C2A_USER_DIR}/TlmCmd) +add_subdirectory(${C2A_USER_DIR}/tlm_cmd) set(C2A_SRCS ${C2A_USER_DIR}/c2a_main.c diff --git a/examples/subobc/package.json b/examples/subobc/package.json index 60b5c3338..2c660f657 100644 --- a/examples/subobc/package.json +++ b/examples/subobc/package.json @@ -1,7 +1,7 @@ { "name": "c2a-example-subobc", "scripts": { - "build:tlmcmddb": "tlmcmddb-cli bundle --pretty src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data src/src_user/Settings/TlmCmd/DataBase/CMD_DB tlmcmddb.json", + "build:tlmcmddb": "tlmcmddb-cli bundle --pretty src/src_user/Settings/tlm_cmd/DataBase/TLM_DB/calced_data src/src_user/Settings/tlm_cmd/DataBase/CMD_DB tlmcmddb.json", "run:c2a": "cargo run", "run:gaia": "tmtc-c2a --satconfig satconfig.json --tlmcmddb tlmcmddb.json", "run:kble": "bash -c 'while :; do kble -s <(jrsonnet spaghetti.jsonnet); sleep 1; done'", diff --git a/examples/subobc/src/src_user/Drivers/Etc/mobc.c b/examples/subobc/src/src_user/Drivers/Etc/mobc.c index d1370e022..a607b0d70 100644 --- a/examples/subobc/src/src_user/Drivers/Etc/mobc.c +++ b/examples/subobc/src/src_user/Drivers/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/Drivers/Etc/mobc.h b/examples/subobc/src/src_user/Drivers/Etc/mobc.h index 19f84f57a..85281dab3 100644 --- a/examples/subobc/src/src_user/Drivers/Etc/mobc.h +++ b/examples/subobc/src/src_user/Drivers/Etc/mobc.h @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include /** * @enum MOBC_TX_ERR_CODE diff --git a/examples/subobc/src/src_user/Settings/CMakeLists.txt b/examples/subobc/src/src_user/Settings/CMakeLists.txt index 04d0586d2..a0e28ff8c 100644 --- a/examples/subobc/src/src_user/Settings/CMakeLists.txt +++ b/examples/subobc/src/src_user/Settings/CMakeLists.txt @@ -12,8 +12,8 @@ set(C2A_SRCS Modes/Transitions/sl_nop.c system/event_logger_settings.c system/event_handler_rules/event_handler_rules.c - TlmCmd/common_cmd_packet_define.c - TlmCmd/Ccsds/apid_define.c + tlm_cmd/common_cmd_packet_define.c + tlm_cmd/ccsds/apid_define.c ) if(BUILD_C2A_AS_CXX) diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c index 08e5169f6..e5e442e35 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c +++ b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c @@ -2,9 +2,9 @@ #include "tl_elem_debug_display.h" #include "../../../../applications/app_registry.h" -#include "../../../../TlmCmd/block_command_definitions.h" +#include "../../../../tlm_cmd/block_command_definitions.h" -#include +#include void BCL_load_tl_elem_debug_display_initial(void) { diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c index 04f63839c..e1d5c44b4 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c +++ b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c @@ -1,10 +1,10 @@ #pragma section REPRO #include "tl_elem_gs_related_process.h" -#include "../../../../TlmCmd/block_command_definitions.h" +#include "../../../../tlm_cmd/block_command_definitions.h" #include "../../../../applications/app_registry.h" -#include +#include void BCL_load_tl_elem_gs_related_process(void) { diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c index a8ad590dc..c44a7ba61 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c +++ b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c @@ -2,9 +2,9 @@ #include "tl_elem_tlm_cmd_hirate.h" #include "../../../../applications/app_registry.h" -#include "../../../../TlmCmd/block_command_definitions.h" +#include "../../../../tlm_cmd/block_command_definitions.h" -#include +#include void BCL_load_tl_elem_tlm_cmd_hirate(void) diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c index a0900bec7..ea0f5118c 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c +++ b/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c @@ -2,9 +2,9 @@ #include "tl_initial.h" #include "../../../applications/app_registry.h" -#include "../../../TlmCmd/block_command_definitions.h" +#include "../../../tlm_cmd/block_command_definitions.h" -#include +#include void BCL_load_tl_initial(void) { diff --git a/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c b/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c index 9bce2f65e..a83ebc78e 100644 --- a/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c +++ b/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c @@ -1,11 +1,11 @@ #pragma section REPRO #include "sl_initial.h" -#include "../../../TlmCmd/block_command_definitions.h" -#include "../../../TlmCmd/command_definitions.h" +#include "../../../tlm_cmd/block_command_definitions.h" +#include "../../../tlm_cmd/command_definitions.h" #include -#include +#include #include void BCL_load_sl_start_up_to_initial(void) diff --git a/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_nop.c b/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_nop.c index c14f22216..17921cc06 100644 --- a/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_nop.c +++ b/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_nop.c @@ -1,9 +1,9 @@ #pragma section REPRO #include "sl_nop.h" -#include "../../../TlmCmd/command_definitions.h" +#include "../../../tlm_cmd/command_definitions.h" -#include +#include #include void BCL_load_sl_nop(void) diff --git a/examples/subobc/src/src_user/Settings/Modes/mode_definitions.c b/examples/subobc/src/src_user/Settings/Modes/mode_definitions.c index cc9b6e748..1a2147d03 100644 --- a/examples/subobc/src/src_user/Settings/Modes/mode_definitions.c +++ b/examples/subobc/src/src_user/Settings/Modes/mode_definitions.c @@ -7,7 +7,7 @@ #include -#include "../../TlmCmd/block_command_definitions.h" +#include "../../tlm_cmd/block_command_definitions.h" // モードごとのTLを指定 diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/block_command_table_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/block_command_table_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/block_command_table_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/block_command_table_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c b/examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/apid_define.c similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c rename to examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/apid_define.c diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/apid_define.h b/examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/apid_define.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/apid_define.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/apid_define.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/cmd_space_packet_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/cmd_space_packet_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/cmd_space_packet_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/cmd_space_packet_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/space_packet_typedef_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/space_packet_typedef_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/space_packet_typedef_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/space_packet_typedef_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/tlm_space_packet_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/tlm_space_packet_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/Ccsds/tlm_space_packet_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/ccsds/tlm_space_packet_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/command_analyze_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/command_analyze_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/command_analyze_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/command_analyze_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/command_dispatcher_manager_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/command_dispatcher_manager_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/command_dispatcher_manager_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/command_dispatcher_manager_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/common_cmd_packet_define.c b/examples/subobc/src/src_user/Settings/tlm_cmd/common_cmd_packet_define.c similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/common_cmd_packet_define.c rename to examples/subobc/src/src_user/Settings/tlm_cmd/common_cmd_packet_define.c diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/common_cmd_packet_define.h b/examples/subobc/src/src_user/Settings/tlm_cmd/common_cmd_packet_define.h similarity index 93% rename from examples/subobc/src/src_user/Settings/TlmCmd/common_cmd_packet_define.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/common_cmd_packet_define.h index 12107eb11..b21f5ee09 100644 --- a/examples/subobc/src/src_user/Settings/TlmCmd/common_cmd_packet_define.h +++ b/examples/subobc/src/src_user/Settings/tlm_cmd/common_cmd_packet_define.h @@ -5,8 +5,8 @@ #ifndef COMMON_CMD_PACKET_DEFINE_H_ #define COMMON_CMD_PACKET_DEFINE_H_ -#include -#include "./Ccsds/apid_define.h" +#include +#include "./ccsds/apid_define.h" // CommonCmdPacket として CmdSpacePacket をつかう typedef CmdSpacePacket CommonCmdPacket; diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/common_tlm_cmd_packet_define.h b/examples/subobc/src/src_user/Settings/tlm_cmd/common_tlm_cmd_packet_define.h similarity index 82% rename from examples/subobc/src/src_user/Settings/TlmCmd/common_tlm_cmd_packet_define.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/common_tlm_cmd_packet_define.h index afe277200..f4846059d 100644 --- a/examples/subobc/src/src_user/Settings/TlmCmd/common_tlm_cmd_packet_define.h +++ b/examples/subobc/src/src_user/Settings/tlm_cmd/common_tlm_cmd_packet_define.h @@ -5,7 +5,7 @@ #ifndef COMMON_TLM_CMD_PACKET_DEFINE_H_ #define COMMON_TLM_CMD_PACKET_DEFINE_H_ -#include +#include // CommonTlmCmdPacket として SpacePacket をつかう typedef SpacePacket CommonTlmCmdPacket; diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/common_tlm_packet_define.h b/examples/subobc/src/src_user/Settings/tlm_cmd/common_tlm_packet_define.h similarity index 81% rename from examples/subobc/src/src_user/Settings/TlmCmd/common_tlm_packet_define.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/common_tlm_packet_define.h index 16960ba83..b0785c362 100644 --- a/examples/subobc/src/src_user/Settings/TlmCmd/common_tlm_packet_define.h +++ b/examples/subobc/src/src_user/Settings/tlm_cmd/common_tlm_packet_define.h @@ -5,8 +5,8 @@ #ifndef COMMON_TLM_PACKET_DEFINE_H_ #define COMMON_TLM_PACKET_DEFINE_H_ -#include -#include "./Ccsds/apid_define.h" +#include +#include "./ccsds/apid_define.h" // CommonTlmPacket として TlmSpacePacket をつかう typedef TlmSpacePacket CommonTlmPacket; diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMDFILE/sample.ops b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMDFILE/sample.ops similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMDFILE/sample.ops rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMDFILE/sample.ops diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv similarity index 98% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv index 2c88d4f44..3f60331be 100644 --- a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv +++ b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv @@ -14,7 +14,7 @@ Comment,Name,ShortName,BCID,エイリアス,,,,,Danger Flag,Description,Note ,BC_AR_GS_RELATED_PROCESS,,44,,,,,,danger,, ,BC_AC_TLM_CMD_HIRATE,,50,,,,,,danger,, **,==== 各系領域 ====,,,,,,,,,, -*,./C2A/TlmCmd/NormalBlockCommandDefinition/で定義,,,,,,,,,, +*,./C2A/tlm_cmd/normal_block_command_definition/で定義,,,,,,,,,, *,イベントハンドラはBC_EH_など,接頭辞を適切につけること!,,,,,,,,,, **,CDH:60-79,,,,,,,,,, ,BC_HK_CYCLIC_TLM,BC_HK10S,60,○,○,○,○,○,,, diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/.gitkeep b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/calced_data/.gitkeep similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/.gitkeep rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/calced_data/.gitkeep diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv rename to examples/subobc/src/src_user/Settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/packet_handler_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/packet_handler_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/packet_handler_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/packet_handler_params.h diff --git a/examples/subobc/src/src_user/Settings/TlmCmd/telemetry_frame_params.h b/examples/subobc/src/src_user/Settings/tlm_cmd/telemetry_frame_params.h similarity index 100% rename from examples/subobc/src/src_user/Settings/TlmCmd/telemetry_frame_params.h rename to examples/subobc/src/src_user/Settings/tlm_cmd/telemetry_frame_params.h diff --git a/examples/subobc/src/src_user/applications/driver_instances/di_mobc.c b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.c index 5f0e80c3e..8db5eb741 100644 --- a/examples/subobc/src/src_user/applications/driver_instances/di_mobc.c +++ b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.c @@ -5,7 +5,7 @@ */ #include "di_mobc.h" -#include +#include #include #include "../../Settings/port_config.h" #include "../../Settings/DriverSuper/driver_buffer_define.h" diff --git a/examples/subobc/src/src_user/applications/driver_instances/di_mobc.h b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.h index eccf12c0b..b1c30687b 100644 --- a/examples/subobc/src/src_user/applications/driver_instances/di_mobc.h +++ b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.h @@ -7,7 +7,7 @@ #include "../../Drivers/Etc/mobc.h" #include -#include +#include extern const MOBC_Driver* const mobc_driver; //!< MOBC driver diff --git a/examples/subobc/src/src_user/applications/user_defined/debug_apps.c b/examples/subobc/src/src_user/applications/user_defined/debug_apps.c index f04c04f99..951ecfd5f 100644 --- a/examples/subobc/src/src_user/applications/user_defined/debug_apps.c +++ b/examples/subobc/src/src_user/applications/user_defined/debug_apps.c @@ -11,15 +11,15 @@ #include #include #include -#include -#include "../../TlmCmd/telemetry_definitions.h" -#include +#include +#include "../../tlm_cmd/telemetry_definitions.h" +#include #include #include #include #include #include "../../applications/driver_instances/di_mobc.h" -// #include +// #include #include "../../library/vt100.h" #include diff --git a/examples/subobc/src/src_user/script/add_section/settings.pl b/examples/subobc/src/src_user/script/add_section/settings.pl index 5d4ae9ed6..92d9341c6 100644 --- a/examples/subobc/src/src_user/script/add_section/settings.pl +++ b/examples/subobc/src/src_user/script/add_section/settings.pl @@ -21,7 +21,7 @@ sub GetSetting { 'hal', 'library', 'Settings', - 'TlmCmd' + 'tlm_cmd' ]; # スキップファイル diff --git a/examples/subobc/src/src_user/TlmCmd/CMakeLists.txt b/examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt similarity index 90% rename from examples/subobc/src/src_user/TlmCmd/CMakeLists.txt rename to examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt index 7d07ceeb0..bd81865dd 100644 --- a/examples/subobc/src/src_user/TlmCmd/CMakeLists.txt +++ b/examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt @@ -11,7 +11,7 @@ set(C2A_SRCS common_tlm_packet.c telemetry_definitions.c user_packet_handler.c - NormalBlockCommandDefinition/nbc_start_hk_tlm.c + normal_block_command_definition/nbc_start_hk_tlm.c ) if(BUILD_C2A_AS_CXX) diff --git a/examples/subobc/src/src_user/TlmCmd/block_command_definitions.c b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.c similarity index 90% rename from examples/subobc/src/src_user/TlmCmd/block_command_definitions.c rename to examples/subobc/src/src_user/tlm_cmd/block_command_definitions.c index a306d4fdc..21901a96d 100644 --- a/examples/subobc/src/src_user/TlmCmd/block_command_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "block_command_definitions.h" -#include -#include +#include +#include #include // for memcpy #include "command_definitions.h" @@ -11,7 +11,7 @@ #include "../Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.h" #include "../Settings/Modes/TaskLists/Elements/tl_elem_debug_display.h" #include "../Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.h" -#include "./NormalBlockCommandDefinition/nbc_header.h" +#include "./normal_block_command_definition/nbc_header.h" /** * @brief diff --git a/examples/subobc/src/src_user/TlmCmd/block_command_definitions.h b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h similarity index 95% rename from examples/subobc/src/src_user/TlmCmd/block_command_definitions.h rename to examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h index 69584d7ab..393ad1464 100644 --- a/examples/subobc/src/src_user/TlmCmd/block_command_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h @@ -27,7 +27,7 @@ typedef enum BC_AC_TLM_CMD_HIRATE = 50, // ==== 各系領域 ==== - // ./C2A/TlmCmd/NormalBlockCommandDefinition/で定義 + // ./C2A/tlm_cmd/normal_block_command_definition/で定義 // イベントハンドラはBC_EH_など,接頭辞を適切につけること! // CDH:60-79 diff --git a/examples/subobc/src/src_user/TlmCmd/block_command_user_settings.c b/examples/subobc/src/src_user/tlm_cmd/block_command_user_settings.c similarity index 100% rename from examples/subobc/src/src_user/TlmCmd/block_command_user_settings.c rename to examples/subobc/src/src_user/tlm_cmd/block_command_user_settings.c diff --git a/examples/subobc/src/src_user/TlmCmd/block_command_user_settings.h b/examples/subobc/src/src_user/tlm_cmd/block_command_user_settings.h similarity index 89% rename from examples/subobc/src/src_user/TlmCmd/block_command_user_settings.h rename to examples/subobc/src/src_user/tlm_cmd/block_command_user_settings.h index 2baa33a9e..18a37fec9 100644 --- a/examples/subobc/src/src_user/TlmCmd/block_command_user_settings.h +++ b/examples/subobc/src/src_user/tlm_cmd/block_command_user_settings.h @@ -1,8 +1,8 @@ #ifndef BLOCK_COMMAND_USER_SETTINGS_H_ #define BLOCK_COMMAND_USER_SETTINGS_H_ -#include -#include +#include +#include #define BCUS_MRAM_BCT_BLOCKS (10) // MRAMに確保する diff --git a/examples/subobc/src/src_user/TlmCmd/command_definitions.c b/examples/subobc/src/src_user/tlm_cmd/command_definitions.c similarity index 99% rename from examples/subobc/src/src_user/TlmCmd/command_definitions.c rename to examples/subobc/src/src_user/tlm_cmd/command_definitions.c index 38749b888..5dbf363f5 100644 --- a/examples/subobc/src/src_user/TlmCmd/command_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/command_definitions.c @@ -4,7 +4,7 @@ * @brief コマンド定義 * @note このコードは自動生成されています! */ -#include +#include #include "command_definitions.h" #include "command_source.h" diff --git a/examples/subobc/src/src_user/TlmCmd/command_definitions.h b/examples/subobc/src/src_user/tlm_cmd/command_definitions.h similarity index 100% rename from examples/subobc/src/src_user/TlmCmd/command_definitions.h rename to examples/subobc/src/src_user/tlm_cmd/command_definitions.h diff --git a/examples/subobc/src/src_user/TlmCmd/command_source.h b/examples/subobc/src/src_user/tlm_cmd/command_source.h similarity index 68% rename from examples/subobc/src/src_user/TlmCmd/command_source.h rename to examples/subobc/src/src_user/tlm_cmd/command_source.h index a0f3703f5..6f1c236f9 100644 --- a/examples/subobc/src/src_user/TlmCmd/command_source.h +++ b/examples/subobc/src/src_user/tlm_cmd/command_source.h @@ -12,11 +12,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "../applications/app_headers.h" #endif diff --git a/examples/subobc/src/src_user/TlmCmd/common_cmd_packet.c b/examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c similarity index 95% rename from examples/subobc/src/src_user/TlmCmd/common_cmd_packet.c rename to examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c index 154985a3b..f510cf381 100644 --- a/examples/subobc/src/src_user/TlmCmd/common_cmd_packet.c +++ b/examples/subobc/src/src_user/tlm_cmd/common_cmd_packet.c @@ -4,8 +4,8 @@ * @brief CTP 関連基本関数の定義 * @note CCP: CommonCmdPacket */ -#include -#include +#include +#include #include diff --git a/examples/subobc/src/src_user/TlmCmd/common_tlm_cmd_packet.c b/examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c similarity index 94% rename from examples/subobc/src/src_user/TlmCmd/common_tlm_cmd_packet.c rename to examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c index 314f1dfe4..259626eaa 100644 --- a/examples/subobc/src/src_user/TlmCmd/common_tlm_cmd_packet.c +++ b/examples/subobc/src/src_user/tlm_cmd/common_tlm_cmd_packet.c @@ -6,8 +6,8 @@ * @note CTP: CommonTlmPacket * @note CCP: CommonCmdPacket */ -#include -#include +#include +#include #include diff --git a/examples/subobc/src/src_user/TlmCmd/common_tlm_packet.c b/examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c similarity index 94% rename from examples/subobc/src/src_user/TlmCmd/common_tlm_packet.c rename to examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c index f981aee50..f8274edb5 100644 --- a/examples/subobc/src/src_user/TlmCmd/common_tlm_packet.c +++ b/examples/subobc/src/src_user/tlm_cmd/common_tlm_packet.c @@ -4,8 +4,8 @@ * @brief CTP 関連基本関数の定義 * @note CTP: CommonTlmPacket */ -#include -#include +#include +#include #include diff --git a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_header.h b/examples/subobc/src/src_user/tlm_cmd/normal_block_command_definition/nbc_header.h similarity index 73% rename from examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_header.h rename to examples/subobc/src/src_user/tlm_cmd/normal_block_command_definition/nbc_header.h index 82c84e5cb..a023be04e 100644 --- a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_header.h +++ b/examples/subobc/src/src_user/tlm_cmd/normal_block_command_definition/nbc_header.h @@ -1,7 +1,7 @@ #ifndef NBC_HEADER_H_ #define NBC_HEADER_H_ -#include +#include void BCL_load_start_hk_tlm(void); diff --git a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c b/examples/subobc/src/src_user/tlm_cmd/normal_block_command_definition/nbc_start_hk_tlm.c similarity index 90% rename from examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c rename to examples/subobc/src/src_user/tlm_cmd/normal_block_command_definition/nbc_start_hk_tlm.c index bae1cda67..2b8b6a9b2 100644 --- a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c +++ b/examples/subobc/src/src_user/tlm_cmd/normal_block_command_definition/nbc_start_hk_tlm.c @@ -6,7 +6,7 @@ #include "../telemetry_definitions.h" #include -#include +#include void BCL_load_start_hk_tlm(void) diff --git a/examples/subobc/src/src_user/TlmCmd/telemetry_definitions.c b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c similarity index 99% rename from examples/subobc/src/src_user/TlmCmd/telemetry_definitions.c rename to examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c index e4318ff71..4ac27ee76 100644 --- a/examples/subobc/src/src_user/TlmCmd/telemetry_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c @@ -4,7 +4,7 @@ * @brief テレメトリ定義 * @note このコードは自動生成されています! */ -#include +#include #include "telemetry_definitions.h" #include "telemetry_source.h" diff --git a/examples/subobc/src/src_user/TlmCmd/telemetry_definitions.h b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h similarity index 100% rename from examples/subobc/src/src_user/TlmCmd/telemetry_definitions.h rename to examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h diff --git a/examples/subobc/src/src_user/TlmCmd/telemetry_source.h b/examples/subobc/src/src_user/tlm_cmd/telemetry_source.h similarity index 81% rename from examples/subobc/src/src_user/TlmCmd/telemetry_source.h rename to examples/subobc/src/src_user/tlm_cmd/telemetry_source.h index d387c2757..44b691e77 100644 --- a/examples/subobc/src/src_user/TlmCmd/telemetry_source.h +++ b/examples/subobc/src/src_user/tlm_cmd/telemetry_source.h @@ -14,9 +14,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "../applications/app_headers.h" #include "../Settings/build_settings.h" diff --git a/examples/subobc/src/src_user/TlmCmd/user_packet_handler.c b/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.c similarity index 96% rename from examples/subobc/src/src_user/TlmCmd/user_packet_handler.c rename to examples/subobc/src/src_user/tlm_cmd/user_packet_handler.c index c04f8c400..de99ce09f 100644 --- a/examples/subobc/src/src_user/TlmCmd/user_packet_handler.c +++ b/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.c @@ -4,7 +4,7 @@ * @brief packet_handlerのコマンドルーター,コマンドアナライザのユーザー定義部分 */ #include "user_packet_handler.h" -#include +#include void PH_user_init(void) diff --git a/examples/subobc/src/src_user/TlmCmd/user_packet_handler.h b/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h similarity index 90% rename from examples/subobc/src/src_user/TlmCmd/user_packet_handler.h rename to examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h index 0847a3f1c..d26c7c69e 100644 --- a/examples/subobc/src/src_user/TlmCmd/user_packet_handler.h +++ b/examples/subobc/src/src_user/tlm_cmd/user_packet_handler.h @@ -5,13 +5,13 @@ #ifndef USER_PACKET_HANDLER_H_ #define USER_PACKET_HANDLER_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "telemetry_definitions.h" -#include "../Settings/TlmCmd/Ccsds/apid_define.h" +#include "../Settings/tlm_cmd/ccsds/apid_define.h" /** * @brief PH のユーザー固有部初期化処理 diff --git a/examples/subobc/sync_with_mobc_example.bat b/examples/subobc/sync_with_mobc_example.bat index 9edd83d1f..16067ff76 100644 --- a/examples/subobc/sync_with_mobc_example.bat +++ b/examples/subobc/sync_with_mobc_example.bat @@ -11,7 +11,7 @@ call :sync_dir ".\src\src_user\BootLoader\" "..\mobc\src\src_user\BootLoader\" call :sync_dir ".\src\src_user\library\" "..\mobc\src\src_user\library\" call :sync_dir ".\src\src_user\ReProgramming\" "..\mobc\src\src_user\ReProgramming\" call :sync_dir ".\src\src_user\script\" "..\mobc\src\src_user\script\" -call :sync_dir ".\src\src_user\Settings\TlmCmd\Ccsds\" "..\mobc\src\src_user\Settings\TlmCmd\Ccsds\" +call :sync_dir ".\src\src_user\Settings\tlm_cmd\ccsds\" "..\mobc\src\src_user\Settings\tlm_cmd\ccsds\" call :sync_file ".\src\src_user\applications\user_defined\debug_apps.h" "..\mobc\src\src_user\applications\user_defined\debug_apps.h" call :sync_file ".\src\src_user\hal\sils\uart_sils_sci_if.hpp" "..\mobc\src\src_user\hal\sils\uart_sils_sci_if.hpp" @@ -21,13 +21,13 @@ call :sync_file ".\src\src_user\hal\sils_mockup\uart_sils.c" "..\mobc\src\src_us call :sync_file ".\src\src_user\hal\sils_mockup\wdt_sils.c" "..\mobc\src\src_user\hal\sils_mockup\wdt_sils.c" call :sync_file ".\src\src_user\Settings\git_revision_config.h" "..\mobc\src\src_user\Settings\git_revision_config.h" call :sync_file ".\src\src_user\Settings\DriverSuper\driver_buffer_define.h" "..\mobc\src\src_user\Settings\DriverSuper\driver_buffer_define.h" -call :sync_file ".\src\src_user\Settings\TlmCmd\common_cmd_packet_define.c" "..\mobc\src\src_user\Settings\TlmCmd\common_cmd_packet_define.c" -call :sync_file ".\src\src_user\Settings\TlmCmd\common_tlm_cmd_packet_define.h" "..\mobc\src\src_user\Settings\TlmCmd\common_tlm_cmd_packet_define.h" -call :sync_file ".\src\src_user\TlmCmd\block_command_user_settings.c" "..\mobc\src\src_user\TlmCmd\block_command_user_settings.c" -call :sync_file ".\src\src_user\TlmCmd\block_command_user_settings.h" "..\mobc\src\src_user\TlmCmd\block_command_user_settings.h" -call :sync_file ".\src\src_user\TlmCmd\command_source.h" "..\mobc\src\src_user\TlmCmd\command_source.h" -call :sync_file ".\src\src_user\TlmCmd\common_cmd_packet.c" "..\mobc\src\src_user\TlmCmd\common_cmd_packet.c" -call :sync_file ".\src\src_user\TlmCmd\common_tlm_cmd_packet.c" "..\mobc\src\src_user\TlmCmd\common_tlm_cmd_packet.c" +call :sync_file ".\src\src_user\Settings\tlm_cmd\common_cmd_packet_define.c" "..\mobc\src\src_user\Settings\tlm_cmd\common_cmd_packet_define.c" +call :sync_file ".\src\src_user\Settings\tlm_cmd\common_tlm_cmd_packet_define.h" "..\mobc\src\src_user\Settings\tlm_cmd\common_tlm_cmd_packet_define.h" +call :sync_file ".\src\src_user\tlm_cmd\block_command_user_settings.c" "..\mobc\src\src_user\tlm_cmd\block_command_user_settings.c" +call :sync_file ".\src\src_user\tlm_cmd\block_command_user_settings.h" "..\mobc\src\src_user\tlm_cmd\block_command_user_settings.h" +call :sync_file ".\src\src_user\tlm_cmd\command_source.h" "..\mobc\src\src_user\tlm_cmd\command_source.h" +call :sync_file ".\src\src_user\tlm_cmd\common_cmd_packet.c" "..\mobc\src\src_user\tlm_cmd\common_cmd_packet.c" +call :sync_file ".\src\src_user\tlm_cmd\common_tlm_cmd_packet.c" "..\mobc\src\src_user\tlm_cmd\common_tlm_cmd_packet.c" call :sync_file ".\src\src_user\Test\utils\wings_utils.py" "..\mobc\src\src_user\Test\utils\wings_utils.py" call :sync_file ".\src\src_user\Test\pytest.ini" "..\mobc\src\src_user\Test\pytest.ini"