Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename user Settings dir #167

Merged
merged 10 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/divided_cmd_utility.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define DCU_LOG_MAX (16) //!< 保存するログの最大数

// DCU_LOG_MAX の user オーバーライド
#include <src_user/Settings/applications/divided_cmd_utility_params.h>
#include <src_user/settings/applications/divided_cmd_utility_params.h>

// key が uint8_t なので,それ以下を要請する
#if DCU_LOG_MAX > 255
Expand Down
4 changes: 2 additions & 2 deletions applications/telemetry_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#define TLM_MGR_BC_ROLE_AT_BC_9 (TLM_MGR_BC_ROLE_LOW_FREQ_TLM) // TLM_MGR_BC_ROLE_HIGH_FREQ_TLM が固まらないようにここに入れている

// user 設定
#include <src_user/Settings/applications/telemetry_manager_define.h>
#include <src_user/Settings/applications/telemetry_manager_params.h>
#include <src_user/settings/applications/telemetry_manager_define.h>
#include <src_user/settings/applications/telemetry_manager_params.h>

// 現状, BC#9 は low ではないとだめ (deploy と combine するため)
#if !(TLM_MGR_BC_ROLE_AT_BC_9 == TLM_MGR_BC_ROLE_LOW_FREQ_TLM)
Expand Down
2 changes: 1 addition & 1 deletion applications/telemetry_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "../tlm_cmd/common_cmd_packet_util.h"
#include "../tlm_cmd/block_command_table.h"
#include <src_user/tlm_cmd/telemetry_definitions.h>
#include <src_user/Settings/tlm_cmd/ccsds/apid_define.h>
#include <src_user/settings/tlm_cmd/ccsds/apid_define.h>


// 以下がともに 10 であることで, 10 x 10 x cycle で 10 秒周期に最大 100 個の tlm を登録できる.
Expand Down
2 changes: 1 addition & 1 deletion applications/timeline_command_dispatcher_id_define.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef TIMELINE_COMMAND_DISPATCHER_ID_DEFINE_H_
#define TIMELINE_COMMAND_DISPATCHER_ID_DEFINE_H_

#include <src_user/Settings/applications/timeline_command_dispatcher_define.h>
#include <src_user/settings/applications/timeline_command_dispatcher_define.h>

/**
* @enum TLCD_ID
Expand Down
2 changes: 1 addition & 1 deletion applications/utility_command.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "utility_command.h"
#include "../system/application_manager/app_info.h"
#include "../hal/uart.h"
#include <src_user/Settings/port_config.h>
#include <src_user/settings/port_config.h>
#include <string.h> // for memcpy
#include "../tlm_cmd/common_cmd_packet_util.h"
#include "../library/result.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/utility_counter.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#if 0
// FIXME: 現在 AL に依存してしまっている
#include <src_user/Settings/system/anomaly_logger_define.h>
#include <src_user/settings/system/anomaly_logger_define.h>
#ifdef AL_ENABLE

#include "../system/application_manager/app_info.h"
Expand Down
4 changes: 2 additions & 2 deletions code-generator/settings_mobc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"path_to_src" : "../examples/mobc/src/",
"path_to_db" : "../examples/mobc/src/src_user/Settings/tlm_cmd/data_base/",
"path_to_db" : "../examples/mobc/src/src_user/settings/tlm_cmd/data_base/",
"db_prefix" : "SAMPLE_MOBC",
"tlm_id_range" : ["0x00", "0x100"],
"is_cmd_prefixed_in_db" : 0,
Expand All @@ -15,7 +15,7 @@
"tlm_id_range" : ["0x90", "0xc0"],
"is_cmd_prefixed_in_db" : 0,
"input_file_encoding" : "utf-8",
"path_to_db" : "../examples/subobc/src/src_user/Settings/tlm_cmd/data_base/",
"path_to_db" : "../examples/subobc/src/src_user/settings/tlm_cmd/data_base/",
"max_tlm_num" : 256,
"driver_path" : "aocs/",
"driver_type" : "AOBC_Driver",
Expand Down
2 changes: 1 addition & 1 deletion code-generator/settings_subobc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"path_to_src" : "../examples/subobc/src/",
"path_to_db" : "../examples/subobc/src/src_user/Settings/tlm_cmd/data_base/",
"path_to_db" : "../examples/subobc/src/src_user/settings/tlm_cmd/data_base/",
"db_prefix" : "SAMPLE_AOBC",
"tlm_id_range" : ["0x00", "0x100"],
"is_cmd_prefixed_in_db" : 0,
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_super/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_super/driver_super_params.h>

typedef struct ComponentDriverSuper ComponentDriverSuper;
typedef struct CDS_StreamConfig CDS_StreamConfig;
Expand Down
18 changes: 9 additions & 9 deletions docs/general/coding_rule.md
Original file line number Diff line number Diff line change
Expand Up @@ -399,20 +399,20 @@ C言語におけるファイル名のユニーク性を担保するために,
名前空間を切るために用いる接頭辞(変数名・関数名につけるもの)とは異なることに注意すること.

```
Settings/Modes/TaskLists
settings/modes/task_lists
-> tl_

Settings/Modes/TaskLists/Elements
settings/modes/task_lists/elements
-> tl_elem_
Settings/Modes/TaskLists/Composition
settings/modes/task_lists/composition

Settings/Modes/Transitions
settings/modes/transitions
-> sl_

Settings/AnomalyHandlerRules
settings/anomaly_handler_rules
-> ahr_

Settings/AnomalyLogger
settings/anomaly_logger
-> al_

TlmCmd/NormalBlockCommandDefinition
Expand All @@ -427,13 +427,13 @@ TlmCmd/NormalBlockCommandDefinition
Block Command は各所で定義されるため, TL, SL に関しては以下のようにする.

```
Settings/Modes/TaskLists
settings/modes/task_lists
-> void BCL_load_tl_hoge(void);

Settings/Modes/TaskLists/Elements
settings/modes/task_lists/elements
-> void BCL_load_tl_elem_hoge(void);

Settings/Modes/Transitions
settings/modes/transitions
-> void BCL_load_sl_hoge(void);
```

Expand Down
16 changes: 8 additions & 8 deletions docs/tips/parameter_settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ NOTE: `sizeof(bct_id_t)` は `SIZE_OF_BCT_ID_T` にて設定可能である.

#### 定義
- core: [`/src_core/tlm_cmd/block_command_table.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/block_command_table.h),[`/src_core/tlm_cmd/block_command_executor.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/block_command_executor.h)
- user: `/src_user/Settings/tlm_cmd/block_command_table_params.h`,`/src_user/tlm_cmd/block_command_user_settings.h`
- user: `/src_user/settings/tlm_cmd/block_command_table_params.h`,`/src_user/tlm_cmd/block_command_user_settings.h`

#### 詳細説明
[`/src_core/tlm_cmd/block_command_table.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/block_command_table.h),[`/src_core/tlm_cmd/block_command_executor.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/block_command_executor.h) を参照.
Expand Down Expand Up @@ -116,7 +116,7 @@ struct pointer size: 4 byte

#### 定義
- core: [`/src_core/tlm_cmd/PacketHandler.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/PacketHandler.h)
- user: `/src_user/Settings/tlm_cmd/packet_handler_params.h`
- user: `/src_user/settings/tlm_cmd/packet_handler_params.h`

#### 詳細説明
[`/src_core/tlm_cmd/PacketHandler.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/PacketHandler.h) を参照.
Expand Down Expand Up @@ -146,7 +146,7 @@ DriverSuperを継承したDriver数: 4

#### 定義
- core: [`/src_core/component_driver/driver_super.h`](https://github.com/arkedge/c2a-core/blob/develop/component_driver/driver_super.h)
- user: `/src_user/Settings/DriverSuper/driver_super_params.h`
- user: `/src_user/settings/DriverSuper/driver_super_params.h`

#### 詳細説明
[`/src_core/driver/Super/DriverSuper.h`](https://github.com/arkedge/c2a-core/blob/develop/driver/driver_super.h) を参照.
Expand All @@ -168,7 +168,7 @@ NOTE: つまり関数ポインタのサイズ次第(コンパイラ依存)

#### 定義
- core: [`/src_core/tlm_cmd/CommandAnalyze.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/CommandAnalyze.h)
- user: `/src_user/Settings/tlm_cmd/command_analyze_params.h`
- user: `/src_user/settings/tlm_cmd/command_analyze_params.h`

#### 詳細説明
[`/src_core/tlm_cmd/CommandAnalyze.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/CommandAnalyze.h) を参照.
Expand All @@ -188,7 +188,7 @@ NOTE: つまり関数ポインタのサイズ次第(コンパイラ依存)

#### 定義
- core: [`/src_core/tlm_cmd/TelemetryFrame.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/TelemetryFrame.h)
- user: `/src_user/Settings/tlm_cmd/telemetry_frame_params.h`
- user: `/src_user/settings/tlm_cmd/telemetry_frame_params.h`

#### 詳細説明
[`/src_core/tlm_cmd/TelemetryFrame.h`](https://github.com/arkedge/c2a-core/blob/develop/tlm_cmd/TelemetryFrame.h) を参照.
Expand Down Expand Up @@ -243,7 +243,7 @@ Event Logger 全体のメモリ使用量は以下Byte.

#### 定義
- core: [`/src_core/system/event_manager/event_logger.h`](https://github.com/arkedge/c2a-core/blob/develop/system/event_manager/event_logger.h)
- user: `/src_user/Settings/system/event_handler_params.h`
- user: `/src_user/settings/system/event_handler_params.h`

#### 詳細説明
[`/src_core/system/event_manager/event_logger.h`](https://github.com/arkedge/c2a-core/blob/develop/system/event_manager/event_logger.h) を参照.
Expand All @@ -270,7 +270,7 @@ NOTE: この値が関わる部分を抽出しているため,AppManagerの他

#### 定義
- core: [`/src_core/system/application_manager/AppManager.h`](https://github.com/arkedge/c2a-core/blob/develop/system/application_manager/AppManager.h)
- user: `/src_user/Settings/system/app_manager_params.h`
- user: `/src_user/settings/system/app_manager_params.h`

#### 詳細説明
[`/src_core/system/application_manager/AppManager.h`](https://github.com/arkedge/c2a-core/blob/develop/system/application_manager/AppManager.h) を参照.
Expand All @@ -285,7 +285,7 @@ NOTE: メモリ使用量にほぼ関係なし

#### 定義
- core: [`/src_core/system/time_manager/obc_time.h`](https://github.com/arkedge/c2a-core/blob/develop/system/time_manager/obc_time.h)
- user: `/src_user/Settings/system/obc_time_params.h`
- user: `/src_user/settings/system/obc_time_params.h`

#### 詳細説明
[`/src_core/system/time_manager/obc_time.h`](https://github.com/arkedge/c2a-core/blob/develop/system/time_manager/obc_time.h) を参照.
Expand Down
2 changes: 1 addition & 1 deletion library/endian.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
#pragma section REPRO
#include "endian.h"
#include <src_user/Settings/build_settings.h>
#include <src_user/settings/build_settings.h>
#include <stdint.h>
#include <string.h>

Expand Down
16 changes: 8 additions & 8 deletions library/git_revision.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <stdint.h>

#include <src_user/Settings/git_revision_config.h> //!< 設定ないしcommit hashを読み込む
#include <src_user/settings/git_revision_config.h> //!< 設定ないしcommit hashを読み込む

/*!< @brief コンパイルオプションないしuserの設定で定義されたcommit hashを読み込んで埋め込みます
* git revisionの埋め込みは,以下の定数を通して行われます(経緯: #82).
Expand All @@ -16,24 +16,24 @@
* GIT_REVISION_C2A_USER C2A userのcommit hash(文字列)
* GIT_REVISION_C2A_USER_SHORT C2A userのcommit hash short(0xから始まる数値)
* これらの定数は,Cコンパイラの引数からdefine(-Dなど)してもよいですし,
* src_user/Settings/git_revision_config.hでdefineしてもよいです.
* src_user/settings/git_revision_config.hでdefineしてもよいです.
*/

/**
* @note CMakeを使う場合はコマンドラインオプションからのdefineを推奨します.
* この場合,src_user/Settings/git_revision_config.hでC2A_GIT_REVISION_FROM_OPTIONをdefineしてください(他には何も要りません).
* この場合,src_user/settings/git_revision_config.hでC2A_GIT_REVISION_FROM_OPTIONをdefineしてください(他には何も要りません).
*/

/**
* @note コマンドラインオプションからのdefineが開発環境の都合などにより困難な場合は,
* src_user/script/git/revision.sh/batをビルドパイプライン上で実行するようにします.
* このスクリプトは上記の定数群をdefineしたsrc_user/Settings/git_revision_config.hを自動生成します.
* この場合,src_user/Settings/git_revision_config.hはcommit・ビルドの度に変更されるため,gitignoreしておいた方がよいでしょう.
* このスクリプトは上記の定数群をdefineしたsrc_user/settings/git_revision_config.hを自動生成します.
* この場合,src_user/settings/git_revision_config.hはcommit・ビルドの度に変更されるため,gitignoreしておいた方がよいでしょう.
*/

/**
* @note ビルドパイプラインをうまく組めないなど,上記2つの手段が使えない,かつ,revisionを埋め込まなくてもよい場合は,
* src_user/Settings/git_revision_config.hでC2A_GIT_REVISION_IGNOREをdefineしてください.
* src_user/settings/git_revision_config.hでC2A_GIT_REVISION_IGNOREをdefineしてください.
* こうすると,0が埋め込まれます.
*/

Expand All @@ -47,9 +47,9 @@

#else

// commit hashを埋め込むはずなのにsrc_user/Settings/git_revision_config.hで設定されていない
// commit hashを埋め込むはずなのにsrc_user/settings/git_revision_config.hで設定されていない
#if !defined(C2A_GIT_REVISION_FROM_OPTION) && !defined(C2A_GIT_REVISION_GENERATED)
#error "please specify git revision config in src_user/Settings/git_revision_config.h"
#error "please specify git revision config in src_user/settings/git_revision_config.h"
#endif // error

#endif // C2A_GIT_REVISION_IGNORE
Expand Down
2 changes: 1 addition & 1 deletion library/print.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @brief HW 依存 Print, つまり ログ情報のフォーマット出力(デバッグ出力)
*/

// #include "../Settings/sils_define.h" //ここでincludeしておくと,Printf系のものは全てOKになる
// #include "../settings/sils_define.h" //ここでincludeしておくと,Printf系のものは全てOKになる

// かなり危険な定義なので,一旦コメントアウト 2020/08/22
// typedef unsigned char u_char;
Expand Down
16 changes: 8 additions & 8 deletions script/git_hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ my $DEBUG = 0;
my $err_flag = 0;

my @Targets = (
"examples/mobc/src/src_user/Settings/tlm_cmd/DataBase/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm",
"examples/mobc/src/src_user/Settings/tlm_cmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm",
"examples/mobc/src/src_user/Settings/sils_define.h",
"examples/mobc/src/src_user/Settings/build_settings.h",
"examples/subobc/src/src_user/Settings/tlm_cmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm",
"examples/subobc/src/src_user/Settings/tlm_cmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm",
Comment on lines -12 to -17
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DataBase,いま data_base になってるよな...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#170

"examples/subobc/src/src_user/Settings/sils_define.h",
"examples/subobc/src/src_user/Settings/build_settings.h",
"examples/mobc/src/src_user/settings/tlm_cmd/DataBase/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm",
"examples/mobc/src/src_user/settings/tlm_cmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm",
"examples/mobc/src/src_user/settings/sils_define.h",
"examples/mobc/src/src_user/settings/build_settings.h",
"examples/subobc/src/src_user/settings/tlm_cmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm",
"examples/subobc/src/src_user/settings/tlm_cmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm",
"examples/subobc/src/src_user/settings/sils_define.h",
"examples/subobc/src/src_user/settings/build_settings.h",
);

print "[] pwd\n" if $DEBUG;
Expand Down
67 changes: 67 additions & 0 deletions script/migration/v4-rename-settings.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#!/bin/bash
# rename Settings directory

echo "rename src/src_user/Settings -> src/src_user/settings"
mv src/src_user/Settings src/src_user/settings
sed -i -e "s#add_subdirectory(\${C2A_USER_DIR}/Settings)#add_subdirectory(\${C2A_USER_DIR}/settings)#g" CMakeLists.txt


echo " /settings/Modes -> modes"
mv src/src_user/settings/Modes src/src_user/settings/modes
sed -i -e "s#Modes/#modes/#g" src/src_user/settings/CMakeLists.txt


echo " /modes/TaskLists -> task_lists"
sed -i -e "s#modes/TaskLists/#modes/task_lists/#g" src/src_user/settings/CMakeLists.txt

tl_org=("Anomaly" "Elements" "GroundTest" "Composition")
tl_new=("anomaly" "elements" "ground_test" "composition")
mv src/src_user/settings/modes/TaskLists src/src_user/settings/modes/task_lists
for ((i=0; i<${#tl_org[@]}; i++)); do
echo " /task_lists/${tl_org[i]} -> ${tl_new[i]}"

sed -i -e "s#modes/task_lists/${tl_org[i]}#modes/task_lists/${tl_new[i]}#g" src/src_user/settings/CMakeLists.txt

find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/Modes/TaskLists/${tl_org[i]}#settings/modes/task_lists/${tl_new[i]}#g"

if [ -e src/src_user/settings/modes/task_lists/${tl_org[i]} ]; then
mv src/src_user/settings/modes/task_lists/${tl_org[i]} src/src_user/settings/modes/task_lists/${tl_new[i]}
fi

done
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/Modes/TaskLists#settings/modes/task_lists#g"


echo " /modes/Transitions -> transitions"
sed -i -e "s#modes/Transitions/#modes/transitions/#g" src/src_user/settings/CMakeLists.txt

tr_org=("Anomaly" "GroundTest")
tr_new=("anomaly" "ground_test")
mv src/src_user/settings/modes/Transitions src/src_user/settings/modes/transitions
for ((i=0; i<${#tr_org[@]}; i++)); do
echo " /transitions/${tr_org[i]} -> ${tr_new[i]}"

find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/Modes/Transitions/${tr_org[i]}#settings/modes/transitions/${tr_new[i]}#g"

if [ -e src/src_user/settings/modes/transitions/${tr_org[i]} ]; then
mv src/src_user/settings/modes/transitions/${tr_org[i]} src/src_user/settings/modes/transitions/${tr_new[i]}
fi
done
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/Modes/Transitions#settings/modes/transitions#g"

# ref
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/Modes#settings/modes#g"
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/AnomalyHandlerRules#settings/anomaly_handler_rules#g"
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/AnomalyLogger#settings/anomaly_logger#g"

find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/ComponentDriverSuper#settings/component_driver_super#g"
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings\\\ComponentDriverSuper#settings\\\component_driver_super#g"

find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#src_user/Settings/#src_user/settings/#g"
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#src_user\\\Settings/#src_user\\\settings/#g"

find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings/#settings/#g"
find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings\\\#settings\\\#g"

# script
find ./src/src_user/script -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Settings#settings#g"
2 changes: 1 addition & 1 deletion system/application_manager/app_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @note C2A の App を管理する
*/
#include "app_manager.h"
#include <src_user/Settings/sils_define.h>
#include <src_user/settings/sils_define.h>

#include <string.h>
#include "../../applications/nop.h"
Expand Down
2 changes: 1 addition & 1 deletion system/application_manager/app_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define AM_TLM_PAGE_MAX (4) //!< AMのAppInfoテーブルのページ数(ページネーション用)
#define AM_MAX_APPS (AM_TLM_PAGE_SIZE * AM_TLM_PAGE_MAX) //!< 登録できる最大AppInfo数,これは登録できる最大アプリ数と等しい

#include <src_user/Settings/system/app_manager_params.h>
#include <src_user/settings/system/app_manager_params.h>

/**
* @struct AppManager
Expand Down
Loading
Loading