From ee19f9e9626b8c319b0da928956e27d0696b9c37 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Sun, 31 Dec 2023 23:54:06 +0900 Subject: [PATCH 1/5] rename settings component_driver_super to component_driver --- .../driver_buffer_define.h | 0 .../driver_super_params.h | 0 .../hal_handler_registry.c | 0 .../hal_handler_registry.h | 0 .../driver_buffer_define.h | 0 .../driver_super_params.h | 0 .../hal_handler_registry.c | 0 .../hal_handler_registry.h | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename examples/mobc/src/src_user/settings/{component_driver_super => component_driver}/driver_buffer_define.h (100%) rename examples/mobc/src/src_user/settings/{component_driver_super => component_driver}/driver_super_params.h (100%) rename examples/mobc/src/src_user/settings/{component_driver_super => component_driver}/hal_handler_registry.c (100%) rename examples/mobc/src/src_user/settings/{component_driver_super => component_driver}/hal_handler_registry.h (100%) rename examples/subobc/src/src_user/settings/{component_driver_super => component_driver}/driver_buffer_define.h (100%) rename examples/subobc/src/src_user/settings/{component_driver_super => component_driver}/driver_super_params.h (100%) rename examples/subobc/src/src_user/settings/{component_driver_super => component_driver}/hal_handler_registry.c (100%) rename examples/subobc/src/src_user/settings/{component_driver_super => component_driver}/hal_handler_registry.h (100%) diff --git a/examples/mobc/src/src_user/settings/component_driver_super/driver_buffer_define.h b/examples/mobc/src/src_user/settings/component_driver/driver_buffer_define.h similarity index 100% rename from examples/mobc/src/src_user/settings/component_driver_super/driver_buffer_define.h rename to examples/mobc/src/src_user/settings/component_driver/driver_buffer_define.h diff --git a/examples/mobc/src/src_user/settings/component_driver_super/driver_super_params.h b/examples/mobc/src/src_user/settings/component_driver/driver_super_params.h similarity index 100% rename from examples/mobc/src/src_user/settings/component_driver_super/driver_super_params.h rename to examples/mobc/src/src_user/settings/component_driver/driver_super_params.h diff --git a/examples/mobc/src/src_user/settings/component_driver_super/hal_handler_registry.c b/examples/mobc/src/src_user/settings/component_driver/hal_handler_registry.c similarity index 100% rename from examples/mobc/src/src_user/settings/component_driver_super/hal_handler_registry.c rename to examples/mobc/src/src_user/settings/component_driver/hal_handler_registry.c diff --git a/examples/mobc/src/src_user/settings/component_driver_super/hal_handler_registry.h b/examples/mobc/src/src_user/settings/component_driver/hal_handler_registry.h similarity index 100% rename from examples/mobc/src/src_user/settings/component_driver_super/hal_handler_registry.h rename to examples/mobc/src/src_user/settings/component_driver/hal_handler_registry.h diff --git a/examples/subobc/src/src_user/settings/component_driver_super/driver_buffer_define.h b/examples/subobc/src/src_user/settings/component_driver/driver_buffer_define.h similarity index 100% rename from examples/subobc/src/src_user/settings/component_driver_super/driver_buffer_define.h rename to examples/subobc/src/src_user/settings/component_driver/driver_buffer_define.h diff --git a/examples/subobc/src/src_user/settings/component_driver_super/driver_super_params.h b/examples/subobc/src/src_user/settings/component_driver/driver_super_params.h similarity index 100% rename from examples/subobc/src/src_user/settings/component_driver_super/driver_super_params.h rename to examples/subobc/src/src_user/settings/component_driver/driver_super_params.h diff --git a/examples/subobc/src/src_user/settings/component_driver_super/hal_handler_registry.c b/examples/subobc/src/src_user/settings/component_driver/hal_handler_registry.c similarity index 100% rename from examples/subobc/src/src_user/settings/component_driver_super/hal_handler_registry.c rename to examples/subobc/src/src_user/settings/component_driver/hal_handler_registry.c diff --git a/examples/subobc/src/src_user/settings/component_driver_super/hal_handler_registry.h b/examples/subobc/src/src_user/settings/component_driver/hal_handler_registry.h similarity index 100% rename from examples/subobc/src/src_user/settings/component_driver_super/hal_handler_registry.h rename to examples/subobc/src/src_user/settings/component_driver/hal_handler_registry.h From 32a6ca09e8ff10552f390c975542fbc31992cc09 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Sun, 31 Dec 2023 23:55:56 +0900 Subject: [PATCH 2/5] sed /component_driver_super/ to /component_driver/ --- component_driver/driver_super.h | 4 ++-- .../src/src_user/applications/component_service/csrv_aobc.c | 2 +- .../src/src_user/applications/component_service/csrv_gs.c | 2 +- .../src_user/applications/component_service/csrv_uart_test.c | 2 +- .../src/src_user/applications/component_service/csrv_mobc.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/component_driver/driver_super.h b/component_driver/driver_super.h index 71956d88c..8d1b23345 100644 --- a/component_driver/driver_super.h +++ b/component_driver/driver_super.h @@ -23,7 +23,7 @@ #ifndef DRIVER_SUPER_H_ #define DRIVER_SUPER_H_ -#include +#include #include #include "../library/endian.h" // パスが不定な自動生成コード類で使えるように #include "../system/time_manager/time_manager.h" @@ -34,7 +34,7 @@ HAL_rx_handlers から受信できる最大数を規定する OBC の物理的な信号ラインのバッファサイズ以上とするともっともパフォーマンスが出る */ -#include +#include typedef struct ComponentDriverSuper ComponentDriverSuper; typedef struct CDS_StreamConfig CDS_StreamConfig; diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c b/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c index 4f3355d26..d8f4925e3 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c +++ b/examples/mobc/src/src_user/applications/component_service/csrv_aobc.c @@ -11,7 +11,7 @@ #include #include #include "../../settings/port_config.h" -#include "../../settings/component_driver_super/driver_buffer_define.h" +#include "../../settings/component_driver/driver_buffer_define.h" #include static RESULT CSRV_AOBC_init_(void); diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_gs.c b/examples/mobc/src/src_user/applications/component_service/csrv_gs.c index 1b06015ed..3ec82c1de 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_gs.c +++ b/examples/mobc/src/src_user/applications/component_service/csrv_gs.c @@ -10,7 +10,7 @@ #include #include "../../component_driver/com/gs_validate.h" #include "../../settings/port_config.h" -#include "../../settings/component_driver_super/driver_buffer_define.h" +#include "../../settings/component_driver/driver_buffer_define.h" static RESULT CSRV_GS_init_(void); diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c b/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c index 8485db69d..6ff6c57eb 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c +++ b/examples/mobc/src/src_user/applications/component_service/csrv_uart_test.c @@ -8,7 +8,7 @@ #include #include #include "../../settings/port_config.h" -#include "../../settings/component_driver_super/driver_buffer_define.h" +#include "../../settings/component_driver/driver_buffer_define.h" #include static RESULT UART_TEST_init_by_AM_(void); diff --git a/examples/subobc/src/src_user/applications/component_service/csrv_mobc.c b/examples/subobc/src/src_user/applications/component_service/csrv_mobc.c index 2cc2c107d..3c989a5f8 100644 --- a/examples/subobc/src/src_user/applications/component_service/csrv_mobc.c +++ b/examples/subobc/src/src_user/applications/component_service/csrv_mobc.c @@ -8,7 +8,7 @@ #include #include #include "../../settings/port_config.h" -#include "../../settings/component_driver_super/driver_buffer_define.h" +#include "../../settings/component_driver/driver_buffer_define.h" #include static RESULT CSRV_MOBC_init_(void); From 39be2b4072ce97ac4ce4a3a4f74453909d6be7a8 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 1 Jan 2024 00:00:24 +0900 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1ad277cb..386aeba28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ### Breaking Changes - [#245](https://github.com/arkedge/c2a-core/pull/245): memory dump application のリファクタリング +- [#269](https://github.com/arkedge/c2a-core/pull/269): Rename `src_user/settings/component_driver_super/` dir to `src_user/settings/component_driver/` dir ### Fixed @@ -58,6 +59,8 @@ - `examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv` の `TL_BCT_DIGEST_*` コマンドを user 側の cmd db に追加し，コード生成をする． - `examples/mobc/src/src_user/test/src_core/applications/test_tl_bct_digest.py` を user 側の test にも加える． - もし，汎用テスト用 BCT `BC_TEST_USE_PYTEST` が user 側に存在しない場合， user 側の BCT ID にも加える． +- [#269](https://github.com/arkedge/c2a-core/pull/269): + - user 側の include path を，`/settings/component_driver_super/` から `/settings/component_driver/` に一斉置換する． ## v4.1.0 (2023-12-11) From 7a22353d786833316c525ec22b5fa8d81a195675 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 1 Jan 2024 00:00:54 +0900 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 386aeba28..3772bfd47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,7 +60,7 @@ - `examples/mobc/src/src_user/test/src_core/applications/test_tl_bct_digest.py` を user 側の test にも加える． - もし，汎用テスト用 BCT `BC_TEST_USE_PYTEST` が user 側に存在しない場合， user 側の BCT ID にも加える． - [#269](https://github.com/arkedge/c2a-core/pull/269): - - user 側の include path を，`/settings/component_driver_super/` から `/settings/component_driver/` に一斉置換する． + - user 側の include path を，`/component_driver_super/` から `/component_driver/` に一斉置換する． ## v4.1.0 (2023-12-11) From c062f2f80735702ea7a2d680871ae8ed29481ed2 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 1 Jan 2024 00:03:10 +0900 Subject: [PATCH 5/5] update cmakelists --- CHANGELOG.md | 1 + examples/mobc/src/src_user/settings/CMakeLists.txt | 2 +- examples/subobc/src/src_user/settings/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3772bfd47..e1c90d0b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ - もし，汎用テスト用 BCT `BC_TEST_USE_PYTEST` が user 側に存在しない場合， user 側の BCT ID にも加える． - [#269](https://github.com/arkedge/c2a-core/pull/269): - user 側の include path を，`/component_driver_super/` から `/component_driver/` に一斉置換する． + - `src_user/settings/CMakeLists.txt` の `/component_driver_super/` が含まれる path を `/component_driver/` に一斉置換する． ## v4.1.0 (2023-12-11) diff --git a/examples/mobc/src/src_user/settings/CMakeLists.txt b/examples/mobc/src/src_user/settings/CMakeLists.txt index ee69efb9c..baf7a4117 100644 --- a/examples/mobc/src/src_user/settings/CMakeLists.txt +++ b/examples/mobc/src/src_user/settings/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13) project(C2A_USER_SETTINGS) set(C2A_SRCS - component_driver_super/hal_handler_registry.c + component_driver/hal_handler_registry.c modes/mode_definitions.c modes/task_lists/tl_initial.c modes/task_lists/elements/tl_elem_debug_display.c diff --git a/examples/subobc/src/src_user/settings/CMakeLists.txt b/examples/subobc/src/src_user/settings/CMakeLists.txt index 108bad2f5..3099bbcbb 100644 --- a/examples/subobc/src/src_user/settings/CMakeLists.txt +++ b/examples/subobc/src/src_user/settings/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13) project(C2A_USER_SETTINGS) set(C2A_SRCS - component_driver_super/hal_handler_registry.c + component_driver/hal_handler_registry.c modes/mode_definitions.c modes/task_lists/tl_initial.c modes/task_lists/elements/tl_elem_debug_display.c