Skip to content

Commit

Permalink
Merge pull request #48 from arkedge/feature/rename-apps-examples
Browse files Browse the repository at this point in the history
Apply rename migration to example users: Applications -> applications
  • Loading branch information
sksat authored Aug 3, 2023
2 parents 27e7ea7 + fac655c commit f82f333
Show file tree
Hide file tree
Showing 67 changed files with 125 additions and 125 deletions.
2 changes: 1 addition & 1 deletion examples/mobc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
31 changes: 0 additions & 31 deletions examples/mobc/src/src_user/Applications/app_headers.h

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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を使うことはもう非推奨!!!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions examples/mobc/src/src_user/Test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` という関数を定義すれば,それが実行される.
Expand All @@ -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
```
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/TlmCmd/command_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/TlmCmd/telemetry_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/TlmCmd/user_packet_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -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サイズ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
31 changes: 31 additions & 0 deletions examples/mobc/src/src_user/applications/app_headers.h
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/script/add_section/settings.pl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sub GetSetting {
$SETTING{'FILE_ENCODING'} = 'utf8';
$SETTING{'LOG_FILE'} = './log.log';
$SETTING{'SEARCH_PATH'} = [
'Applications',
'applications',
'Drivers',
'hal',
'Library',
Expand Down
4 changes: 2 additions & 2 deletions examples/subobc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
22 changes: 0 additions & 22 deletions examples/subobc/src/src_user/Applications/CMakeLists.txt

This file was deleted.

24 changes: 0 additions & 24 deletions examples/subobc/src/src_user/Applications/app_headers.h

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
2 changes: 1 addition & 1 deletion examples/subobc/src/src_user/TlmCmd/command_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/subobc/src/src_user/TlmCmd/telemetry_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit f82f333

Please sign in to comment.