Skip to content

Commit

Permalink
Merge pull request #269 from arkedge/feature/rename_component_driver_…
Browse files Browse the repository at this point in the history
…super

Rename `src_user/settings/component_driver_super/` dir to `src_user/settings/component_driver/` dir
  • Loading branch information
meltingrabbit authored Jan 5, 2024
2 parents bbef22b + c062f2f commit dff28e5
Show file tree
Hide file tree
Showing 16 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -58,6 +59,9 @@
- `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 を,`/component_driver_super/` から `/component_driver/` に一斉置換する.
- `src_user/settings/CMakeLists.txt``/component_driver_super/` が含まれる path を `/component_driver/` に一斉置換する.


## v4.1.0 (2023-12-11)
Expand Down
4 changes: 2 additions & 2 deletions component_driver/driver_super.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef DRIVER_SUPER_H_
#define DRIVER_SUPER_H_

#include <src_user/settings/component_driver_super/hal_handler_registry.h>
#include <src_user/settings/component_driver/hal_handler_registry.h>
#include <stdint.h>
#include "../library/endian.h" // パスが不定な自動生成コード類で使えるように
#include "../system/time_manager/time_manager.h"
Expand All @@ -34,7 +34,7 @@
HAL_rx_handlers から受信できる最大数を規定する
OBC の物理的な信号ラインのバッファサイズ以上とするともっともパフォーマンスが出る */

#include <src_user/settings/component_driver_super/driver_super_params.h>
#include <src_user/settings/component_driver/driver_super_params.h>

typedef struct ComponentDriverSuper ComponentDriverSuper;
typedef struct CDS_StreamConfig CDS_StreamConfig;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <src_core/library/print.h>
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include "../../settings/port_config.h"
#include "../../settings/component_driver_super/driver_buffer_define.h"
#include "../../settings/component_driver/driver_buffer_define.h"
#include <src_core/library/result.h>

static RESULT CSRV_AOBC_init_(void);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <src_core/library/result.h>
#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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <src_core/library/print.h>
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include "../../settings/port_config.h"
#include "../../settings/component_driver_super/driver_buffer_define.h"
#include "../../settings/component_driver/driver_buffer_define.h"
#include <src_core/library/result.h>

static RESULT UART_TEST_init_by_AM_(void);
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/settings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <src_core/tlm_cmd/packet_handler.h>
#include <src_core/library/print.h>
#include "../../settings/port_config.h"
#include "../../settings/component_driver_super/driver_buffer_define.h"
#include "../../settings/component_driver/driver_buffer_define.h"
#include <src_core/library/result.h>

static RESULT CSRV_MOBC_init_(void);
Expand Down
2 changes: 1 addition & 1 deletion examples/subobc/src/src_user/settings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dff28e5

Please sign in to comment.