diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index 185ad1798..6252613d9 100644 --- a/examples/mobc/CMakeLists.txt +++ b/examples/mobc/CMakeLists.txt @@ -58,7 +58,7 @@ add_definitions("-DGIT_REVISION_C2A_USER_SHORT=0x${GIT_REVISION_C2A_USER_SHORT}" add_subdirectory(${C2A_CORE_DIR}) -add_subdirectory(${C2A_USER_DIR}/Applications) +add_subdirectory(${C2A_USER_DIR}/applications) add_subdirectory(${C2A_USER_DIR}/Drivers) add_subdirectory(${C2A_USER_DIR}/hal) add_subdirectory(${C2A_USER_DIR}/Library) diff --git a/examples/mobc/src/src_user/Applications/app_headers.h b/examples/mobc/src/src_user/Applications/app_headers.h deleted file mode 100644 index 96f1c7b06..000000000 --- a/examples/mobc/src/src_user/Applications/app_headers.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file - * @brief Appのヘッダをまとめたヘッダ - */ -#ifndef APP_HEADERS_H_ -#define APP_HEADERS_H_ - -// Core -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Core TestApp -#include - -// DI -#include "DriverInstances/di_aobc.h" -#include "DriverInstances/di_uart_test.h" -#include "DriverInstances/di_gs.h" - -// UserDefined -#include "UserDefined/debug_apps.h" - -#endif diff --git a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c index 91850d88b..08e5169f6 100644 --- a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c +++ b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_elem_debug_display.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include "../../../../TlmCmd/block_command_definitions.h" #include diff --git a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_drivers_update.c b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_drivers_update.c index fad4d6c90..d989aa165 100644 --- a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_drivers_update.c +++ b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_drivers_update.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_elem_drivers_update.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include "../../../../TlmCmd/block_command_definitions.h" #include diff --git a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c index c2d03513c..e510d28af 100644 --- a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c +++ b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c @@ -2,7 +2,7 @@ #include "tl_elem_gs_related_process.h" #include "../../../../TlmCmd/block_command_definitions.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include diff --git a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c index c5c5740ab..ea06053bb 100644 --- a/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c +++ b/examples/mobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_elem_tlm_cmd_hirate.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include "../../../../TlmCmd/block_command_definitions.h" #include diff --git a/examples/mobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c b/examples/mobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c index 41c63cb4a..93549da30 100644 --- a/examples/mobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c +++ b/examples/mobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_initial.h" -#include "../../../Applications/app_registry.h" +#include "../../../applications/app_registry.h" #include "../../../TlmCmd/block_command_definitions.h" #include diff --git a/examples/mobc/src/src_user/Settings/Modes/Transitions/sequence_items.h b/examples/mobc/src/src_user/Settings/Modes/Transitions/sequence_items.h index 891a88749..fdc675646 100644 --- a/examples/mobc/src/src_user/Settings/Modes/Transitions/sequence_items.h +++ b/examples/mobc/src/src_user/Settings/Modes/Transitions/sequence_items.h @@ -2,7 +2,7 @@ #define SEQUENCE_ITEMS_H_ #include -#include +#include // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // SIを使うことはもう非推奨!!! diff --git a/examples/mobc/src/src_user/Settings/Modes/Transitions/sl_initial.c b/examples/mobc/src/src_user/Settings/Modes/Transitions/sl_initial.c index 5a91cefca..fc274aeb6 100644 --- a/examples/mobc/src/src_user/Settings/Modes/Transitions/sl_initial.c +++ b/examples/mobc/src/src_user/Settings/Modes/Transitions/sl_initial.c @@ -6,7 +6,7 @@ #include "../../../Drivers/Com/gs.h" -#include +#include #include #include diff --git a/examples/mobc/src/src_user/Settings/TlmCmd/packet_handler_params.h b/examples/mobc/src/src_user/Settings/TlmCmd/packet_handler_params.h index 1f6e03e71..6a6b4f635 100644 --- a/examples/mobc/src/src_user/Settings/TlmCmd/packet_handler_params.h +++ b/examples/mobc/src/src_user/Settings/TlmCmd/packet_handler_params.h @@ -6,8 +6,8 @@ #define PACKET_HANDLER_PARAMS_H_ // TL_MIS, DR の利用の有無で必要な PL が変わるので, include する -#include "../Applications/timeline_command_dispatcher_define.h" -#include "../Applications/data_recorder_define.h" +#include "../applications/timeline_command_dispatcher_define.h" +#include "../applications/data_recorder_define.h" #undef TL_TLM_PAGE_SIZE diff --git a/examples/mobc/src/src_user/Settings/Applications/data_recorder_define.h b/examples/mobc/src/src_user/Settings/applications/data_recorder_define.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/data_recorder_define.h rename to examples/mobc/src/src_user/Settings/applications/data_recorder_define.h diff --git a/examples/mobc/src/src_user/Settings/Applications/divided_cmd_utility_params.h b/examples/mobc/src/src_user/Settings/applications/divided_cmd_utility_params.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/divided_cmd_utility_params.h rename to examples/mobc/src/src_user/Settings/applications/divided_cmd_utility_params.h diff --git a/examples/mobc/src/src_user/Settings/Applications/telemetry_manager_define.h b/examples/mobc/src/src_user/Settings/applications/telemetry_manager_define.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/telemetry_manager_define.h rename to examples/mobc/src/src_user/Settings/applications/telemetry_manager_define.h diff --git a/examples/mobc/src/src_user/Settings/Applications/telemetry_manager_params.h b/examples/mobc/src/src_user/Settings/applications/telemetry_manager_params.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/telemetry_manager_params.h rename to examples/mobc/src/src_user/Settings/applications/telemetry_manager_params.h diff --git a/examples/mobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h b/examples/mobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h rename to examples/mobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h diff --git a/examples/mobc/src/src_user/Test/README.md b/examples/mobc/src/src_user/Test/README.md index 027681d07..042c71489 100644 --- a/examples/mobc/src/src_user/Test/README.md +++ b/examples/mobc/src/src_user/Test/README.md @@ -14,8 +14,8 @@ ### フォルダ構成 - C2A と揃える. - ファイル名は, `test_${c2a_src_filename}.py`.例えば次のようなもの. - - './test/src_core/Applications/test_nop.py' - - './test/src_user/Applications/UserDefined/test_tlm_mem_dump.py' + - './test/src_core/applications/test_nop.py' + - './test/src_user/applications/user_defined/test_tlm_mem_dump.py' ### 関数名 `test_hoge` という関数を定義すれば,それが実行される. @@ -41,10 +41,10 @@ pytest -m sils -v ./test/ # SILSの場合 個別ファイルをテストしたい場合は,以下などでOK. ``` -pytest -m real -v ./test/src_user/Applications/UserDefined/test_tlm_mem_dump.py +pytest -m real -v ./test/src_user/applications/user_defined/test_tlm_mem_dump.py or -cd ./test/src_user/Applications/UserDefined/ +cd ./test/src_user/applications/user_defined/ pytest -m real -v test_tlm_mem_dump.py ``` diff --git a/examples/mobc/src/src_user/Test/test/src_core/Applications/test_event_utility.py b/examples/mobc/src/src_user/Test/test/src_core/applications/test_event_utility.py similarity index 100% rename from examples/mobc/src/src_user/Test/test/src_core/Applications/test_event_utility.py rename to examples/mobc/src/src_user/Test/test/src_core/applications/test_event_utility.py diff --git a/examples/mobc/src/src_user/Test/test/src_core/Applications/test_timeline_command_dispatcher.py b/examples/mobc/src/src_user/Test/test/src_core/applications/test_timeline_command_dispatcher.py similarity index 100% rename from examples/mobc/src/src_user/Test/test/src_core/Applications/test_timeline_command_dispatcher.py rename to examples/mobc/src/src_user/Test/test/src_core/applications/test_timeline_command_dispatcher.py diff --git a/examples/mobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c b/examples/mobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c index e8e23aae4..5c6bbc6e0 100644 --- a/examples/mobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c +++ b/examples/mobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c @@ -5,7 +5,7 @@ #include "../command_definitions.h" #include "../telemetry_definitions.h" -#include +#include #include diff --git a/examples/mobc/src/src_user/TlmCmd/command_source.h b/examples/mobc/src/src_user/TlmCmd/command_source.h index 3ec420163..328ce1647 100644 --- a/examples/mobc/src/src_user/TlmCmd/command_source.h +++ b/examples/mobc/src/src_user/TlmCmd/command_source.h @@ -17,6 +17,6 @@ #include #include #include -#include "../Applications/app_headers.h" +#include "../applications/app_headers.h" #endif diff --git a/examples/mobc/src/src_user/TlmCmd/telemetry_source.h b/examples/mobc/src/src_user/TlmCmd/telemetry_source.h index c37e1567e..da45e090b 100644 --- a/examples/mobc/src/src_user/TlmCmd/telemetry_source.h +++ b/examples/mobc/src/src_user/TlmCmd/telemetry_source.h @@ -16,7 +16,7 @@ #include #include #include -#include "../Applications/app_headers.h" +#include "../applications/app_headers.h" #include "../Drivers/Aocs/aobc_telemetry_buffer.h" #include "../Drivers/Com/gs_validate.h" #include "../Settings/build_settings.h" diff --git a/examples/mobc/src/src_user/TlmCmd/user_packet_handler.c b/examples/mobc/src/src_user/TlmCmd/user_packet_handler.c index 0d22ef806..4e02fd2fc 100644 --- a/examples/mobc/src/src_user/TlmCmd/user_packet_handler.c +++ b/examples/mobc/src/src_user/TlmCmd/user_packet_handler.c @@ -5,8 +5,8 @@ */ #include "user_packet_handler.h" #include -#include "../Applications/DriverInstances/di_aobc.h" -// #include "../Applications/DriverInstances/di_tobc.h" +#include "../applications/driver_instances/di_aobc.h" +// #include "../applications/driver_instances/di_tobc.h" #define PH_AOBC_CMD_LIST_MAX (16) //!< AOBC CMD QUEUEサイズ #define PH_TOBC_CMD_LIST_MAX (16) //!< TOBC CMD QUEUEサイズ diff --git a/examples/mobc/src/src_user/Applications/CMakeLists.txt b/examples/mobc/src/src_user/applications/CMakeLists.txt similarity index 70% rename from examples/mobc/src/src_user/Applications/CMakeLists.txt rename to examples/mobc/src/src_user/applications/CMakeLists.txt index 8d7b242b3..1bef2501e 100644 --- a/examples/mobc/src/src_user/Applications/CMakeLists.txt +++ b/examples/mobc/src/src_user/applications/CMakeLists.txt @@ -4,10 +4,10 @@ project(C2A_USER_APPS) set(C2A_SRCS app_registry.c - DriverInstances/di_aobc.c - DriverInstances/di_gs.c - DriverInstances/di_uart_test.c - UserDefined/debug_apps.c + driver_instances/di_aobc.c + driver_instances/di_gs.c + driver_instances/di_uart_test.c + user_defined/debug_apps.c ) if(BUILD_C2A_AS_CXX) diff --git a/examples/mobc/src/src_user/applications/app_headers.h b/examples/mobc/src/src_user/applications/app_headers.h new file mode 100644 index 000000000..77be8a6bb --- /dev/null +++ b/examples/mobc/src/src_user/applications/app_headers.h @@ -0,0 +1,31 @@ +/** + * @file + * @brief Appのヘッダをまとめたヘッダ + */ +#ifndef APP_HEADERS_H_ +#define APP_HEADERS_H_ + +// Core +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Core TestApp +#include + +// DI +#include "driver_instances/di_aobc.h" +#include "driver_instances/di_uart_test.h" +#include "driver_instances/di_gs.h" + +// UserDefined +#include "user_defined/debug_apps.h" + +#endif diff --git a/examples/mobc/src/src_user/Applications/app_registry.c b/examples/mobc/src/src_user/applications/app_registry.c similarity index 100% rename from examples/mobc/src/src_user/Applications/app_registry.c rename to examples/mobc/src/src_user/applications/app_registry.c diff --git a/examples/mobc/src/src_user/Applications/app_registry.h b/examples/mobc/src/src_user/applications/app_registry.h similarity index 92% rename from examples/mobc/src/src_user/Applications/app_registry.h rename to examples/mobc/src/src_user/applications/app_registry.h index e54aebcf7..6580b95bb 100644 --- a/examples/mobc/src/src_user/Applications/app_registry.h +++ b/examples/mobc/src/src_user/applications/app_registry.h @@ -1,6 +1,6 @@ #ifndef APP_REGISTRY_H_ #define APP_REGISTRY_H_ -#include +#include // こいつの自動生成がほしい... typedef enum diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.c b/examples/mobc/src/src_user/applications/driver_instances/di_aobc.c similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.c rename to examples/mobc/src/src_user/applications/driver_instances/di_aobc.c diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.h b/examples/mobc/src/src_user/applications/driver_instances/di_aobc.h similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.h rename to examples/mobc/src/src_user/applications/driver_instances/di_aobc.h diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_gs.c b/examples/mobc/src/src_user/applications/driver_instances/di_gs.c similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_gs.c rename to examples/mobc/src/src_user/applications/driver_instances/di_gs.c diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_gs.h b/examples/mobc/src/src_user/applications/driver_instances/di_gs.h similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_gs.h rename to examples/mobc/src/src_user/applications/driver_instances/di_gs.h diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.c b/examples/mobc/src/src_user/applications/driver_instances/di_uart_test.c similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.c rename to examples/mobc/src/src_user/applications/driver_instances/di_uart_test.c diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.h b/examples/mobc/src/src_user/applications/driver_instances/di_uart_test.h similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.h rename to examples/mobc/src/src_user/applications/driver_instances/di_uart_test.h diff --git a/examples/mobc/src/src_user/Applications/Middleware/.gitkeep b/examples/mobc/src/src_user/applications/middleware/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/Middleware/.gitkeep rename to examples/mobc/src/src_user/applications/middleware/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Aocs/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Aocs/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Aocs/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Aocs/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Cdh/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Cdh/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Cdh/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Cdh/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Com/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Com/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Com/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Com/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Mission/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Mission/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Mission/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Mission/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Power/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Power/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Power/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Power/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Prop/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Prop/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Prop/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Prop/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Thermal/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Thermal/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Thermal/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Thermal/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/debug_apps.c b/examples/mobc/src/src_user/applications/user_defined/debug_apps.c similarity index 95% rename from examples/mobc/src/src_user/Applications/UserDefined/debug_apps.c rename to examples/mobc/src/src_user/applications/user_defined/debug_apps.c index 194c828c6..8b86e7eea 100644 --- a/examples/mobc/src/src_user/Applications/UserDefined/debug_apps.c +++ b/examples/mobc/src/src_user/applications/user_defined/debug_apps.c @@ -14,11 +14,11 @@ #include #include "../../TlmCmd/telemetry_definitions.h" #include -#include -#include -#include -#include -#include "../../Applications/DriverInstances/di_gs.h" +#include +#include +#include +#include +#include "../../applications/driver_instances/di_gs.h" // #include #include "../../Library/vt100.h" #include diff --git a/examples/mobc/src/src_user/Applications/UserDefined/debug_apps.h b/examples/mobc/src/src_user/applications/user_defined/debug_apps.h similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/debug_apps.h rename to examples/mobc/src/src_user/applications/user_defined/debug_apps.h diff --git a/examples/mobc/src/src_user/script/add_section/settings.pl b/examples/mobc/src/src_user/script/add_section/settings.pl index 433f33619..93a007277 100644 --- a/examples/mobc/src/src_user/script/add_section/settings.pl +++ b/examples/mobc/src/src_user/script/add_section/settings.pl @@ -16,7 +16,7 @@ sub GetSetting { $SETTING{'FILE_ENCODING'} = 'utf8'; $SETTING{'LOG_FILE'} = './log.log'; $SETTING{'SEARCH_PATH'} = [ - 'Applications', + 'applications', 'Drivers', 'hal', 'Library', diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index 150e09e74..dd830bb50 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -15,7 +15,7 @@ option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 o option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON) set(USE_ALL_C2A_CORE_APPS OFF) -# Core App のターゲット追加は src_user/Applications/CMakeLists.txt で行う +# Core App のターゲット追加は src_user/applications/CMakeLists.txt で行う set(USE_ALL_C2A_CORE_TEST_APPS OFF) if(USE_SILS_MOCKUP) @@ -56,7 +56,7 @@ add_definitions("-DGIT_REVISION_C2A_USER_SHORT=0x${GIT_REVISION_C2A_USER_SHORT}" add_subdirectory(${C2A_CORE_DIR}) -add_subdirectory(${C2A_USER_DIR}/Applications) +add_subdirectory(${C2A_USER_DIR}/applications) add_subdirectory(${C2A_USER_DIR}/Drivers) add_subdirectory(${C2A_USER_DIR}/hal) add_subdirectory(${C2A_USER_DIR}/Library) diff --git a/examples/subobc/src/src_user/Applications/CMakeLists.txt b/examples/subobc/src/src_user/Applications/CMakeLists.txt deleted file mode 100644 index 2acceeefc..000000000 --- a/examples/subobc/src/src_user/Applications/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -cmake_minimum_required(VERSION 3.13) - -project(C2A_USER_APPS) - -set(C2A_SRCS - app_registry.c - DriverInstances/di_mobc.c - UserDefined/debug_apps.c - ${C2A_CORE_DIR}/Applications/gs_command_dispatcher.c - ${C2A_CORE_DIR}/Applications/event_utility.c - ${C2A_CORE_DIR}/Applications/nop.c - ${C2A_CORE_DIR}/Applications/realtime_command_dispatcher.c - ${C2A_CORE_DIR}/Applications/timeline_command_dispatcher.c -) - -if(BUILD_C2A_AS_CXX) - set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ -endif() - -add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) - -include(${C2A_USER_DIR}/common.cmake) diff --git a/examples/subobc/src/src_user/Applications/app_headers.h b/examples/subobc/src/src_user/Applications/app_headers.h deleted file mode 100644 index 6d88caa99..000000000 --- a/examples/subobc/src/src_user/Applications/app_headers.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @brief Appのヘッダをまとめたヘッダ - */ -#ifndef APP_HEADERS_H_ -#define APP_HEADERS_H_ - -// Core -#include -#include -#include -#include -#include - -// Core TestApp -#include - -// DI -#include "DriverInstances/di_mobc.h" - -// UserDefined -#include "UserDefined/debug_apps.h" - -#endif 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 91850d88b..08e5169f6 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 @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_elem_debug_display.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include "../../../../TlmCmd/block_command_definitions.h" #include 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 dadb3ef1a..04f63839c 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 @@ -2,7 +2,7 @@ #include "tl_elem_gs_related_process.h" #include "../../../../TlmCmd/block_command_definitions.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include 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 62b215ba2..a8ad590dc 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 @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_elem_tlm_cmd_hirate.h" -#include "../../../../Applications/app_registry.h" +#include "../../../../applications/app_registry.h" #include "../../../../TlmCmd/block_command_definitions.h" #include 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 ba7038fef..a0900bec7 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 @@ -1,7 +1,7 @@ #pragma section REPRO #include "tl_initial.h" -#include "../../../Applications/app_registry.h" +#include "../../../applications/app_registry.h" #include "../../../TlmCmd/block_command_definitions.h" #include 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 180fcf23d..f66fea013 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 @@ -4,7 +4,7 @@ #include "../../../TlmCmd/block_command_definitions.h" #include "../../../TlmCmd/command_definitions.h" -#include +#include #include #include diff --git a/examples/subobc/src/src_user/Settings/Applications/data_recorder_define.h b/examples/subobc/src/src_user/Settings/applications/data_recorder_define.h similarity index 100% rename from examples/subobc/src/src_user/Settings/Applications/data_recorder_define.h rename to examples/subobc/src/src_user/Settings/applications/data_recorder_define.h diff --git a/examples/subobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h b/examples/subobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h similarity index 100% rename from examples/subobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h rename to examples/subobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h diff --git a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c b/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c index 7aea406d1..bae1cda67 100644 --- a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c +++ b/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c @@ -5,7 +5,7 @@ #include "../command_definitions.h" #include "../telemetry_definitions.h" -#include +#include #include diff --git a/examples/subobc/src/src_user/TlmCmd/command_source.h b/examples/subobc/src/src_user/TlmCmd/command_source.h index 3ec420163..328ce1647 100644 --- a/examples/subobc/src/src_user/TlmCmd/command_source.h +++ b/examples/subobc/src/src_user/TlmCmd/command_source.h @@ -17,6 +17,6 @@ #include #include #include -#include "../Applications/app_headers.h" +#include "../applications/app_headers.h" #endif diff --git a/examples/subobc/src/src_user/TlmCmd/telemetry_source.h b/examples/subobc/src/src_user/TlmCmd/telemetry_source.h index 9db9e05ef..eff4b1160 100644 --- a/examples/subobc/src/src_user/TlmCmd/telemetry_source.h +++ b/examples/subobc/src/src_user/TlmCmd/telemetry_source.h @@ -17,7 +17,7 @@ #include #include #include -#include "../Applications/app_headers.h" +#include "../applications/app_headers.h" #include "../Settings/build_settings.h" #endif diff --git a/examples/subobc/src/src_user/applications/CMakeLists.txt b/examples/subobc/src/src_user/applications/CMakeLists.txt new file mode 100644 index 000000000..892932512 --- /dev/null +++ b/examples/subobc/src/src_user/applications/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.13) + +project(C2A_USER_APPS) + +set(C2A_SRCS + app_registry.c + driver_instances/di_mobc.c + user_defined/debug_apps.c + ${C2A_CORE_DIR}/applications/gs_command_dispatcher.c + ${C2A_CORE_DIR}/applications/event_utility.c + ${C2A_CORE_DIR}/applications/nop.c + ${C2A_CORE_DIR}/applications/realtime_command_dispatcher.c + ${C2A_CORE_DIR}/applications/timeline_command_dispatcher.c +) + +if(BUILD_C2A_AS_CXX) + set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ +endif() + +add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) + +include(${C2A_USER_DIR}/common.cmake) diff --git a/examples/subobc/src/src_user/applications/app_headers.h b/examples/subobc/src/src_user/applications/app_headers.h new file mode 100644 index 000000000..d87156c6a --- /dev/null +++ b/examples/subobc/src/src_user/applications/app_headers.h @@ -0,0 +1,24 @@ +/** + * @file + * @brief Appのヘッダをまとめたヘッダ + */ +#ifndef APP_HEADERS_H_ +#define APP_HEADERS_H_ + +// Core +#include +#include +#include +#include +#include + +// Core TestApp +#include + +// DI +#include "driver_instances/di_mobc.h" + +// UserDefined +#include "user_defined/debug_apps.h" + +#endif diff --git a/examples/subobc/src/src_user/Applications/app_registry.c b/examples/subobc/src/src_user/applications/app_registry.c similarity index 100% rename from examples/subobc/src/src_user/Applications/app_registry.c rename to examples/subobc/src/src_user/applications/app_registry.c diff --git a/examples/subobc/src/src_user/Applications/app_registry.h b/examples/subobc/src/src_user/applications/app_registry.h similarity index 91% rename from examples/subobc/src/src_user/Applications/app_registry.h rename to examples/subobc/src/src_user/applications/app_registry.h index c9975612e..fb8c50914 100644 --- a/examples/subobc/src/src_user/Applications/app_registry.h +++ b/examples/subobc/src/src_user/applications/app_registry.h @@ -1,6 +1,6 @@ #ifndef APP_REGISTRY_H_ #define APP_REGISTRY_H_ -#include +#include // こいつの自動生成がほしい... typedef enum diff --git a/examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.c b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.c similarity index 100% rename from examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.c rename to examples/subobc/src/src_user/applications/driver_instances/di_mobc.c diff --git a/examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.h b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.h similarity index 100% rename from examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.h rename to examples/subobc/src/src_user/applications/driver_instances/di_mobc.h diff --git a/examples/subobc/src/src_user/Applications/Middleware/.gitkeep b/examples/subobc/src/src_user/applications/middleware/.gitkeep similarity index 100% rename from examples/subobc/src/src_user/Applications/Middleware/.gitkeep rename to examples/subobc/src/src_user/applications/middleware/.gitkeep diff --git a/examples/subobc/src/src_user/Applications/UserDefined/debug_apps.c b/examples/subobc/src/src_user/applications/user_defined/debug_apps.c similarity index 95% rename from examples/subobc/src/src_user/Applications/UserDefined/debug_apps.c rename to examples/subobc/src/src_user/applications/user_defined/debug_apps.c index 0aff9a00c..eabfe7e51 100644 --- a/examples/subobc/src/src_user/Applications/UserDefined/debug_apps.c +++ b/examples/subobc/src/src_user/applications/user_defined/debug_apps.c @@ -14,11 +14,11 @@ #include #include "../../TlmCmd/telemetry_definitions.h" #include -#include -#include -#include -#include -#include "../../Applications/DriverInstances/di_mobc.h" +#include +#include +#include +#include +#include "../../applications/driver_instances/di_mobc.h" // #include #include "../../Library/vt100.h" #include diff --git a/examples/subobc/src/src_user/Applications/UserDefined/debug_apps.h b/examples/subobc/src/src_user/applications/user_defined/debug_apps.h similarity index 100% rename from examples/subobc/src/src_user/Applications/UserDefined/debug_apps.h rename to examples/subobc/src/src_user/applications/user_defined/debug_apps.h 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 433f33619..93a007277 100644 --- a/examples/subobc/src/src_user/script/add_section/settings.pl +++ b/examples/subobc/src/src_user/script/add_section/settings.pl @@ -16,7 +16,7 @@ sub GetSetting { $SETTING{'FILE_ENCODING'} = 'utf8'; $SETTING{'LOG_FILE'} = './log.log'; $SETTING{'SEARCH_PATH'} = [ - 'Applications', + 'applications', 'Drivers', 'hal', 'Library', diff --git a/examples/subobc/sync_with_mobc_example.bat b/examples/subobc/sync_with_mobc_example.bat index 9920a6724..665cb4e61 100644 --- a/examples/subobc/sync_with_mobc_example.bat +++ b/examples/subobc/sync_with_mobc_example.bat @@ -13,7 +13,7 @@ call :sync_dir ".\src\src_user\ReProgramming\" "..\mobc\src\src_user\ReProgrammi 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_file ".\src\src_user\Applications\UserDefined\debug_apps.h" "..\mobc\src\src_user\Applications\UserDefined\debug_apps.h" +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" call :sync_file ".\src\src_user\hal\sils\wdt_sils.cpp" "..\mobc\src\src_user\hal\sils\wdt_sils.cpp" call :sync_file ".\src\src_user\hal\sils_mockup\README.md" "..\mobc\src\src_user\hal\sils_mockup\README.md"