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

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

Hide file tree

Showing 41 changed files with 61 additions and 61 deletions.
diff --git 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
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
@@ -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/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 <src_core/TlmCmd/block_command_loader.h>

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

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
@@ -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/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 <src_core/TlmCmd/block_command_table.h>
-#include <src_core/Applications/timeline_command_dispatcher_id_define.h>
+#include <src_core/applications/timeline_command_dispatcher_id_define.h>
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 // 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
@@ -6,7 +6,7 @@
 
 #include "../../../Drivers/Com/gs.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/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/...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/...Applications/divided_cmd_utility_params.h → ...applications/divided_cmd_utility_params.h b/...Applications/divided_cmd_utility_params.h → ...applications/divided_cmd_utility_params.h
diff --git a/...s/Applications/telemetry_manager_define.h → ...s/applications/telemetry_manager_define.h b/...s/Applications/telemetry_manager_define.h → ...s/applications/telemetry_manager_define.h
diff --git a/...s/Applications/telemetry_manager_params.h → ...s/applications/telemetry_manager_params.h b/...s/Applications/telemetry_manager_params.h → ...s/applications/telemetry_manager_params.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/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/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 <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/mobc/src/src_user/TlmCmd/command_source.h b/examples/mobc/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/mobc/src/src_user/TlmCmd/telemetry_source.h b/examples/mobc/src/src_user/TlmCmd/telemetry_source.h
@@ -16,7 +16,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 "../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
@@ -5,8 +5,8 @@
  */
 #include "user_packet_handler.h"
 #include <src_core/TlmCmd/packet_list_util.h>
-#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/.../src/src_user/Applications/CMakeLists.txt → .../src/src_user/applications/CMakeLists.txt b/.../src/src_user/Applications/CMakeLists.txt → .../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
@@ -0,0 +1,31 @@
+/**
+ * @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>
+#include <src_core/applications/memory_dump.h>
+#include <src_core/applications/telemetry_manager.h>
+#include <src_core/applications/utility_command.h>
+#include <src_core/applications/utility_counter.h>
+#include <src_core/applications/divided_cmd_utility.h>
+
+// Core TestApp
+#include <src_core/applications/test_app/test_ccp_util.h>
+
+// 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/.../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_aobc.c → ...r/applications/driver_instances/di_aobc.c b/...er/Applications/DriverInstances/di_aobc.c → ...r/applications/driver_instances/di_aobc.c
diff --git a/...er/Applications/DriverInstances/di_aobc.h → ...r/applications/driver_instances/di_aobc.h b/...er/Applications/DriverInstances/di_aobc.h → ...r/applications/driver_instances/di_aobc.h
diff --git a/...user/Applications/DriverInstances/di_gs.c → ...ser/applications/driver_instances/di_gs.c b/...user/Applications/DriverInstances/di_gs.c → ...ser/applications/driver_instances/di_gs.c
diff --git a/...user/Applications/DriverInstances/di_gs.h → ...ser/applications/driver_instances/di_gs.h b/...user/Applications/DriverInstances/di_gs.h → ...ser/applications/driver_instances/di_gs.h
diff --git a/...plications/DriverInstances/di_uart_test.c → ...lications/driver_instances/di_uart_test.c b/...plications/DriverInstances/di_uart_test.c → ...lications/driver_instances/di_uart_test.c
diff --git a/...plications/DriverInstances/di_uart_test.h → ...lications/driver_instances/di_uart_test.h b/...plications/DriverInstances/di_uart_test.h → ...lications/driver_instances/di_uart_test.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/...er/Applications/UserDefined/Aocs/.gitkeep → ...r/applications/user_defined/Aocs/.gitkeep b/...er/Applications/UserDefined/Aocs/.gitkeep → ...r/applications/user_defined/Aocs/.gitkeep
diff --git a/...ser/Applications/UserDefined/Cdh/.gitkeep → ...er/applications/user_defined/Cdh/.gitkeep b/...ser/Applications/UserDefined/Cdh/.gitkeep → ...er/applications/user_defined/Cdh/.gitkeep
diff --git a/...ser/Applications/UserDefined/Com/.gitkeep → ...er/applications/user_defined/Com/.gitkeep b/...ser/Applications/UserDefined/Com/.gitkeep → ...er/applications/user_defined/Com/.gitkeep
diff --git a/...Applications/UserDefined/Mission/.gitkeep → ...pplications/user_defined/Mission/.gitkeep b/...Applications/UserDefined/Mission/.gitkeep → ...pplications/user_defined/Mission/.gitkeep
diff --git a/...r/Applications/UserDefined/Power/.gitkeep → .../applications/user_defined/Power/.gitkeep b/...r/Applications/UserDefined/Power/.gitkeep → .../applications/user_defined/Power/.gitkeep
diff --git a/...er/Applications/UserDefined/Prop/.gitkeep → ...r/applications/user_defined/Prop/.gitkeep b/...er/Applications/UserDefined/Prop/.gitkeep → ...r/applications/user_defined/Prop/.gitkeep
diff --git a/...Applications/UserDefined/Thermal/.gitkeep → ...pplications/user_defined/Thermal/.gitkeep b/...Applications/UserDefined/Thermal/.gitkeep → ...pplications/user_defined/Thermal/.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_gs.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_gs.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/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',