examples/subobc: apply rename migration(Applications -> applications)

arkedge · Aug 3, 2023 · bd4056d · bd4056d
1 parent c6da695
commit bd4056d
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 64 deletions.
diff --git 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
diff --git a/examples/subobc/src/src_user/Applications/app_headers.h b/examples/subobc/src/src_user/Applications/app_headers.h
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
@@ -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 <src_core/TlmCmd/block_command_loader.h>

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
@@ -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 <src_core/TlmCmd/block_command_loader.h>
 

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
@@ -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 <src_core/TlmCmd/block_command_loader.h>

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
@@ -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 <src_core/TlmCmd/block_command_loader.h>

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
@@ -4,7 +4,7 @@
 #include "../../../TlmCmd/block_command_definitions.h"
 #include "../../../TlmCmd/command_definitions.h"
 
-#include <src_core/Applications/timeline_command_dispatcher_id_define.h>
+#include <src_core/applications/timeline_command_dispatcher_id_define.h>
 #include <src_core/TlmCmd/block_command_loader.h>
 #include <src_core/System/TimeManager/obc_time.h>
 

diff --git a/...tings/Applications/data_recorder_define.h → ...tings/applications/data_recorder_define.h b/...tings/Applications/data_recorder_define.h → ...tings/applications/data_recorder_define.h
diff --git a/...ions/timeline_command_dispatcher_define.h → ...ions/timeline_command_dispatcher_define.h b/...ions/timeline_command_dispatcher_define.h → ...ions/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
@@ -5,7 +5,7 @@
 #include "../command_definitions.h"
 #include "../telemetry_definitions.h"
 
-#include <src_core/Applications/timeline_command_dispatcher_id_define.h>
+#include <src_core/applications/timeline_command_dispatcher_id_define.h>
 #include <src_core/TlmCmd/block_command_loader.h>
 
 

diff --git 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 <src_core/TlmCmd/command_dispatcher_manager.h>
 #include <src_core/TlmCmd/telemetry_generator.h>
 #include <src_core/TlmCmd/telemetry_frame.h>
-#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
@@ -17,7 +17,7 @@
 #include <src_core/TlmCmd/command_analyze.h>
 #include <src_core/TlmCmd/command_dispatcher_manager.h>
 #include <src_core/TlmCmd/block_command_executor.h>
-#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
@@ -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
@@ -0,0 +1,24 @@
+/**
+ * @file
+ * @brief Appのヘッダをまとめたヘッダ
+ */
+#ifndef APP_HEADERS_H_
+#define APP_HEADERS_H_
+
+// Core
+#include <src_core/applications/nop.h>
+#include <src_core/applications/gs_command_dispatcher.h>
+#include <src_core/applications/realtime_command_dispatcher.h>
+#include <src_core/applications/timeline_command_dispatcher.h>
+#include <src_core/applications/event_utility.h>
+
+// Core TestApp
+#include <src_core/applications/test_app/test_ccp_util.h>
+
+// DI
+#include "driver_instances/di_mobc.h"
+
+// UserDefined
+#include "user_defined/debug_apps.h"
+
+#endif
diff --git a/.../src/src_user/Applications/app_registry.c → .../src/src_user/applications/app_registry.c b/.../src/src_user/Applications/app_registry.c → .../src/src_user/applications/app_registry.c
diff --git a/.../src/src_user/Applications/app_registry.h → .../src/src_user/applications/app_registry.h b/.../src/src_user/Applications/app_registry.h → .../src/src_user/applications/app_registry.h
@@ -1,6 +1,6 @@
 #ifndef APP_REGISTRY_H_
 #define APP_REGISTRY_H_
-#include <src_user/Settings/Applications/timeline_command_dispatcher_define.h>
+#include <src_user/Settings/applications/timeline_command_dispatcher_define.h>
 
 // こいつの自動生成がほしい．．．
 typedef enum

diff --git a/...er/Applications/DriverInstances/di_mobc.c → ...r/applications/driver_instances/di_mobc.c b/...er/Applications/DriverInstances/di_mobc.c → ...r/applications/driver_instances/di_mobc.c
diff --git a/...er/Applications/DriverInstances/di_mobc.h → ...r/applications/driver_instances/di_mobc.h b/...er/Applications/DriverInstances/di_mobc.h → ...r/applications/driver_instances/di_mobc.h
diff --git a/...src_user/Applications/Middleware/.gitkeep → ...src_user/applications/middleware/.gitkeep b/...src_user/Applications/Middleware/.gitkeep → ...src_user/applications/middleware/.gitkeep
diff --git a/...ser/Applications/UserDefined/debug_apps.c → ...er/applications/user_defined/debug_apps.c b/...ser/Applications/UserDefined/debug_apps.c → ...er/applications/user_defined/debug_apps.c
@@ -14,11 +14,11 @@
 #include <src_core/TlmCmd/packet_handler.h>
 #include "../../TlmCmd/telemetry_definitions.h"
 #include <src_core/TlmCmd/block_command_table.h>
-#include <src_core/Applications/memory_dump.h>
-#include <src_core/Applications/gs_command_dispatcher.h>
-#include <src_core/Applications/realtime_command_dispatcher.h>
-#include <src_core/Applications/timeline_command_dispatcher.h>
-#include "../../Applications/DriverInstances/di_mobc.h"
+#include <src_core/applications/memory_dump.h>
+#include <src_core/applications/gs_command_dispatcher.h>
+#include <src_core/applications/realtime_command_dispatcher.h>
+#include <src_core/applications/timeline_command_dispatcher.h>
+#include "../../applications/driver_instances/di_mobc.h"
 // #include <src_core/TlmCmd/telemetry_generator.h>
 #include "../../Library/vt100.h"
 #include <src_core/Library/result.h>

diff --git a/...ser/Applications/UserDefined/debug_apps.h → ...er/applications/user_defined/debug_apps.h b/...ser/Applications/UserDefined/debug_apps.h → ...er/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
@@ -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
@@ -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"