diff --git a/CMakeLists.txt b/CMakeLists.txt index ecb9a12c3..c77bd1ea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(C2A_CORE) # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) -option(USE_ALL_C2A_CORE_LIB "use C2A-core all Library" ON) +option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) option(USE_32BIT_COMPILER "use 32bit compiler" OFF) option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementation" OFF) @@ -54,7 +54,7 @@ set(C2A_SRCS if(NOT C2A_USE_C99_STDINT) message("Use stdint.h wrapper") - include_directories(Library/stdint_wrapper) + include_directories(library/stdint_wrapper) endif() execute_process( @@ -89,7 +89,7 @@ if(USE_ALL_C2A_CORE_TEST_APPS) endif() if(USE_ALL_C2A_CORE_LIB) - add_subdirectory(Library) + add_subdirectory(library) target_sources(${PROJECT_NAME} PUBLIC $) endif() diff --git a/Cargo.toml b/Cargo.toml index f8791712d..736a1c475 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ resolver = "2" members = [ "./sils-runtime", - "./Library/bind-utils", + "./library/bind-utils", "./hal/i2c-noop", "./hal/spi-noop", @@ -46,7 +46,7 @@ no-c2a-link = [] [build-dependencies] semver = "1.0.18" clang = "2.0.0" -c2a-bind-utils = { path = "./Library/bind-utils", version = "3.10" } # TODO: release +c2a-bind-utils = { path = "./library/bind-utils", version = "3.10" } # TODO: release [dev-dependencies] # unit test 時に libC2A.a を要求しないようにする diff --git a/Drivers/Protocol/eb90_frame_for_driver_super.c b/Drivers/Protocol/eb90_frame_for_driver_super.c index 1032be2de..2ff88a4e6 100644 --- a/Drivers/Protocol/eb90_frame_for_driver_super.c +++ b/Drivers/Protocol/eb90_frame_for_driver_super.c @@ -4,8 +4,8 @@ * @brief コンポ間通信などで標準的に使う データリンク層 の EB90 Frame */ #include "eb90_frame_for_driver_super.h" -#include "../../Library/endian.h" -#include "../../Library/crc.h" +#include "../../library/endian.h" +#include "../../library/crc.h" const uint8_t EB90_FRAME_kStx[EB90_FRAME_STX_SIZE] = {EB90_FRAME_STX_1ST_BYTE, EB90_FRAME_STX_2ND_BYTE}; const uint8_t EB90_FRAME_kEtx[EB90_FRAME_ETX_SIZE] = {EB90_FRAME_ETX_1ST_BYTE, EB90_FRAME_ETX_2ND_BYTE}; diff --git a/Drivers/Protocol/eb90_packet_for_driver_super.c b/Drivers/Protocol/eb90_packet_for_driver_super.c index d2b2e45a2..1c1b87abe 100644 --- a/Drivers/Protocol/eb90_packet_for_driver_super.c +++ b/Drivers/Protocol/eb90_packet_for_driver_super.c @@ -8,7 +8,7 @@ */ #include "eb90_packet_for_driver_super.h" #include "eb90_frame_for_driver_super.h" -#include "../../Library/endian.h" +#include "../../library/endian.h" // FIXME: DS_StreamConfig.data_link_layer_ をちゃんと見る！ diff --git a/Drivers/Super/driver_super.c b/Drivers/Super/driver_super.c index 2a103e75f..5336d7e34 100644 --- a/Drivers/Super/driver_super.c +++ b/Drivers/Super/driver_super.c @@ -10,7 +10,7 @@ */ #include "driver_super.h" -#include "../../Library/print.h" +#include "../../library/print.h" #include // for memset などの mem 系 #include // for NULL #include "../../TlmCmd/common_cmd_packet_util.h" diff --git a/Drivers/Super/driver_super.h b/Drivers/Super/driver_super.h index 150ba0228..2a8d5e256 100644 --- a/Drivers/Super/driver_super.h +++ b/Drivers/Super/driver_super.h @@ -25,7 +25,7 @@ #include #include -#include "../../Library/endian.h" // パスが不定な自動生成コード類で使えるように +#include "../../library/endian.h" // パスが不定な自動生成コード類で使えるように #include "../../System/TimeManager/time_manager.h" #define DS_STREAM_MAX (3) /*!< DS_StreamConfig の最大数 diff --git a/System/ApplicationManager/app_info.h b/System/ApplicationManager/app_info.h index a78cd70c0..d3a5a8fef 100644 --- a/System/ApplicationManager/app_info.h +++ b/System/ApplicationManager/app_info.h @@ -6,7 +6,7 @@ #define APP_INFO_H_ #include "../TimeManager/obc_time.h" -#include "../../Library/result.h" +#include "../../library/result.h" typedef struct { diff --git a/System/ApplicationManager/app_manager.c b/System/ApplicationManager/app_manager.c index 6ee077794..868a22351 100644 --- a/System/ApplicationManager/app_manager.c +++ b/System/ApplicationManager/app_manager.c @@ -13,7 +13,7 @@ #include "../TimeManager/time_manager.h" #include "../WatchdogTimer/watchdog_timer.h" #include -#include "../../Library/print.h" +#include "../../library/print.h" #include "../../TlmCmd/common_cmd_packet_util.h" static AM_ACK AM_initialize_app_(size_t id); diff --git a/System/ModeManager/mode_manager.c b/System/ModeManager/mode_manager.c index 08764edd5..1fbc58cfe 100644 --- a/System/ModeManager/mode_manager.c +++ b/System/ModeManager/mode_manager.c @@ -15,7 +15,7 @@ #include #include "../../TlmCmd/packet_handler.h" #include "../../applications/timeline_command_dispatcher_id_define.h" -#include "../../Library/endian.h" +#include "../../library/endian.h" /** * @brief Cmd_MM_START_TRANSITIONの実体 diff --git a/System/TaskManager/task_dispatcher.c b/System/TaskManager/task_dispatcher.c index 74193924e..e3a3d4a07 100644 --- a/System/TaskManager/task_dispatcher.c +++ b/System/TaskManager/task_dispatcher.c @@ -36,8 +36,8 @@ static void TDSP_deploy_block_as_task_list_(void); // debug_apps にあるべき & 今はつわかないので無効化 #if 0 -#include "../../Library/print.h" -#include +#include "../../library/print.h" +#include /** * @brief デバッグ情報表示 */ diff --git a/System/TimeManager/obc_time.c b/System/TimeManager/obc_time.c index 080963606..0f87be73a 100644 --- a/System/TimeManager/obc_time.c +++ b/System/TimeManager/obc_time.c @@ -5,7 +5,7 @@ */ #include "obc_time.h" #include "obc_time_config.h" -#include "../../Library/print.h" +#include "../../library/print.h" ObcTime OBCT_create(cycle_t total_cycle, cycle_t mode_cycle, diff --git a/System/TimeManager/time_manager.c b/System/TimeManager/time_manager.c index 0360f8647..af82abcfc 100644 --- a/System/TimeManager/time_manager.c +++ b/System/TimeManager/time_manager.c @@ -6,7 +6,7 @@ #include "time_manager.h" #include "obc_time_config.h" #include -#include "../../Library/c2a_round.h" +#include "../../library/c2a_round.h" #include "../TaskManager/task_dispatcher.h" #include "../../TlmCmd/common_cmd_packet_util.h" diff --git a/System/WatchdogTimer/watchdog_timer.c b/System/WatchdogTimer/watchdog_timer.c index 17c0133f2..23d346b05 100644 --- a/System/WatchdogTimer/watchdog_timer.c +++ b/System/WatchdogTimer/watchdog_timer.c @@ -5,7 +5,7 @@ * なお，CMDはリプロ対象内！！ */ #include "watchdog_timer.h" -#include "../../Library/print.h" +#include "../../library/print.h" #include "../../TlmCmd/common_cmd_packet_util.h" static WDT_Config wdt_config_; diff --git a/TlmCmd/Ccsds/space_packet.c b/TlmCmd/Ccsds/space_packet.c index 58813dd3a..938a81c21 100644 --- a/TlmCmd/Ccsds/space_packet.c +++ b/TlmCmd/Ccsds/space_packet.c @@ -5,7 +5,7 @@ * @note 詳細は space_packet.h を参照 */ #include "space_packet.h" -#include "../../Library/endian.h" +#include "../../library/endian.h" #include diff --git a/TlmCmd/block_command_executor.c b/TlmCmd/block_command_executor.c index 03b1f9204..73f42dac7 100644 --- a/TlmCmd/block_command_executor.c +++ b/TlmCmd/block_command_executor.c @@ -12,7 +12,7 @@ #include "block_command_executor.h" #include "packet_handler.h" -#include "../Library/endian.h" +#include "../library/endian.h" #include "../System/TimeManager/time_manager.h" #include "common_cmd_packet_util.h" diff --git a/TlmCmd/block_command_loader.c b/TlmCmd/block_command_loader.c index 3e74e33ea..48b596ef9 100644 --- a/TlmCmd/block_command_loader.c +++ b/TlmCmd/block_command_loader.c @@ -13,7 +13,7 @@ #include "block_command_executor.h" #include // for rotate/combine block #include "common_cmd_packet_util.h" -#include "../Library/endian.h" +#include "../library/endian.h" #define BCL_PARAM_MAX_LENGTH BCT_CMD_MAX_LENGTH diff --git a/TlmCmd/block_command_table.c b/TlmCmd/block_command_table.c index a0623112a..7cb72b12f 100644 --- a/TlmCmd/block_command_table.c +++ b/TlmCmd/block_command_table.c @@ -16,7 +16,7 @@ #include "command_analyze.h" #include #include "../System/TimeManager/time_manager.h" -#include "../Library/endian.h" +#include "../library/endian.h" #include "../System/WatchdogTimer/watchdog_timer.h" #include "common_cmd_packet_util.h" diff --git a/TlmCmd/command_analyze.c b/TlmCmd/command_analyze.c index f950f162d..26e3a6383 100644 --- a/TlmCmd/command_analyze.c +++ b/TlmCmd/command_analyze.c @@ -6,7 +6,7 @@ #include "command_analyze.h" #include "common_cmd_packet_util.h" #include -#include "../Library/print.h" +#include "../library/print.h" #include "../System/EventManager/event_logger.h" #include diff --git a/TlmCmd/command_dispatcher.h b/TlmCmd/command_dispatcher.h index 94c16419f..4b6c73bc0 100644 --- a/TlmCmd/command_dispatcher.h +++ b/TlmCmd/command_dispatcher.h @@ -9,7 +9,7 @@ #include "common_cmd_packet.h" #include "packet_list.h" #include "../System/TimeManager/obc_time.h" -#include "../Library/result.h" +#include "../library/result.h" #include /** diff --git a/TlmCmd/command_dispatcher_manager.h b/TlmCmd/command_dispatcher_manager.h index d4e586bc0..7dd2fbca6 100644 --- a/TlmCmd/command_dispatcher_manager.h +++ b/TlmCmd/command_dispatcher_manager.h @@ -9,7 +9,7 @@ #include "./common_cmd_packet.h" #include "./command_dispatcher.h" -#include "../Library/result.h" +#include "../library/result.h" #define CDIS_MGR_MAX_NUM_OF_CDIS (7) /*!< 保持する CDIS の最大数 RT, TL * 4, GS, TDSP */ diff --git a/TlmCmd/common_cmd_packet_util.c b/TlmCmd/common_cmd_packet_util.c index e82781c27..71fbba517 100644 --- a/TlmCmd/common_cmd_packet_util.c +++ b/TlmCmd/common_cmd_packet_util.c @@ -5,7 +5,7 @@ */ #include "common_cmd_packet_util.h" #include "command_analyze.h" -#include "../Library/endian.h" +#include "../library/endian.h" #include // for NULL #include diff --git a/TlmCmd/telemetry_frame.c b/TlmCmd/telemetry_frame.c index d1b1405b0..39310b268 100644 --- a/TlmCmd/telemetry_frame.c +++ b/TlmCmd/telemetry_frame.c @@ -6,8 +6,8 @@ #include "telemetry_frame.h" #include -#include "../Library/print.h" -#include "../Library/endian.h" +#include "../library/print.h" +#include "../library/endian.h" #include "./common_cmd_packet_util.h" static void initialize_tlm_table_(void); diff --git a/applications/divided_cmd_utility.c b/applications/divided_cmd_utility.c index e45d2c86d..deb0588a8 100644 --- a/applications/divided_cmd_utility.c +++ b/applications/divided_cmd_utility.c @@ -16,7 +16,7 @@ #include "../TlmCmd/common_cmd_packet_util.h" #include "../System/TimeManager/time_manager.h" #include "../System/EventManager/event_logger.h" -#include "../Library/result.h" +#include "../library/result.h" /** * @brief App初期化関数 diff --git a/applications/event_utility.c b/applications/event_utility.c index 6d60d74a8..f5273b01e 100644 --- a/applications/event_utility.c +++ b/applications/event_utility.c @@ -7,7 +7,7 @@ #include "event_utility.h" #include "../System/EventManager/event_handler.h" #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" #include // for NULL diff --git a/applications/gs_command_dispatcher.c b/applications/gs_command_dispatcher.c index e1c626904..1a2c545e7 100644 --- a/applications/gs_command_dispatcher.c +++ b/applications/gs_command_dispatcher.c @@ -7,7 +7,7 @@ #include "gs_command_dispatcher.h" #include "../TlmCmd/packet_handler.h" #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" static CommandDispatcher gs_command_dispatcher_; const CommandDispatcher* const gs_command_dispatcher = &gs_command_dispatcher_; diff --git a/applications/memory_dump.c b/applications/memory_dump.c index 9d0eaf51f..f90a33252 100644 --- a/applications/memory_dump.c +++ b/applications/memory_dump.c @@ -5,9 +5,9 @@ #include "../System/TimeManager/time_manager.h" #include "../TlmCmd/packet_handler.h" -#include "../Library/endian.h" +#include "../library/endian.h" #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" static MemoryDump memory_dump_; const MemoryDump* const memory_dump = &memory_dump_; diff --git a/applications/nop.c b/applications/nop.c index 07c4986e5..a43b0b6c5 100644 --- a/applications/nop.c +++ b/applications/nop.c @@ -8,7 +8,7 @@ #include "nop.h" #include #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" static RESULT NOP_nop_(void); diff --git a/applications/realtime_command_dispatcher.c b/applications/realtime_command_dispatcher.c index f5545e6db..14520c13a 100644 --- a/applications/realtime_command_dispatcher.c +++ b/applications/realtime_command_dispatcher.c @@ -2,7 +2,7 @@ #include "realtime_command_dispatcher.h" #include "../TlmCmd/packet_handler.h" #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" static CommandDispatcher realtime_command_dispatcher_; const CommandDispatcher* const realtime_command_dispatcher = &realtime_command_dispatcher_; diff --git a/applications/telemetry_manager.c b/applications/telemetry_manager.c index a35683df5..ae423400a 100644 --- a/applications/telemetry_manager.c +++ b/applications/telemetry_manager.c @@ -12,9 +12,9 @@ #include "../TlmCmd/block_command_loader.h" #include "../TlmCmd/block_command_executor.h" #include "../TlmCmd/command_analyze.h" -#include "../Library/print.h" -#include "../Library/endian.h" -#include "../Library/result.h" +#include "../library/print.h" +#include "../library/endian.h" +#include "../library/result.h" #include "../TlmCmd/common_cmd_packet_util.h" #include #include diff --git a/applications/timeline_command_dispatcher.c b/applications/timeline_command_dispatcher.c index 157590653..b9ab1ad92 100644 --- a/applications/timeline_command_dispatcher.c +++ b/applications/timeline_command_dispatcher.c @@ -4,7 +4,7 @@ #include "../System/TimeManager/time_manager.h" #include "../System/EventManager/event_logger.h" #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" #include // for memset diff --git a/applications/utility_command.c b/applications/utility_command.c index 7b8aaa080..15fb0fc91 100644 --- a/applications/utility_command.c +++ b/applications/utility_command.c @@ -5,7 +5,7 @@ #include #include // for memcpy #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" static UtilityCommand utility_command_; diff --git a/applications/utility_counter.c b/applications/utility_counter.c index e82f685fc..c54c99a6e 100644 --- a/applications/utility_counter.c +++ b/applications/utility_counter.c @@ -14,7 +14,7 @@ int UTIL_COUNTER_dummy(void) #include "../System/AnomalyLogger/anomaly_logger.h" #include // for memcpy #include "../TlmCmd/common_cmd_packet_util.h" -#include "../Library/result.h" +#include "../library/result.h" static UtilityCounter utility_counter_; const UtilityCounter* const utility_counter = &utility_counter_; diff --git a/c2a_core_main.c b/c2a_core_main.c index 42b0a1b33..298cc51ae 100644 --- a/c2a_core_main.c +++ b/c2a_core_main.c @@ -1,8 +1,8 @@ #pragma section REPRO #include "c2a_core_main.h" -#include "./Library/git_revision.h" -#include "./Library/print.h" +#include "./library/git_revision.h" +#include "./library/print.h" #include "./System/TaskManager/task_dispatcher.h" #include "./System/ApplicationManager/app_manager.h" #include "./System/EventManager/event_manager.h" diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index 185ad1798..6252613d9 100644 --- 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 deleted file mode 100644 index 96f1c7b06..000000000 --- a/examples/mobc/src/src_user/Applications/app_headers.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file - * @brief Appのヘッダをまとめたヘッダ - */ -#ifndef APP_HEADERS_H_ -#define APP_HEADERS_H_ - -// Core -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Core TestApp -#include - -// DI -#include "DriverInstances/di_aobc.h" -#include "DriverInstances/di_uart_test.h" -#include "DriverInstances/di_gs.h" - -// UserDefined -#include "UserDefined/debug_apps.h" - -#endif 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 index 91850d88b..08e5169f6 100644 --- 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 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 index fad4d6c90..d989aa165 100644 --- 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 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 index c2d03513c..e510d28af 100644 --- 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 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 index c5c5740ab..ea06053bb 100644 --- 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 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 index 41c63cb4a..93549da30 100644 --- 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 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 index 891a88749..fdc675646 100644 --- 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 -#include +#include // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // 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 index 5a91cefca..fc274aeb6 100644 --- 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 +#include #include #include 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 index 1f6e03e71..6a6b4f635 100644 --- 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/examples/mobc/src/src_user/Settings/Applications/data_recorder_define.h b/examples/mobc/src/src_user/Settings/applications/data_recorder_define.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/data_recorder_define.h rename to examples/mobc/src/src_user/Settings/applications/data_recorder_define.h diff --git a/examples/mobc/src/src_user/Settings/Applications/divided_cmd_utility_params.h b/examples/mobc/src/src_user/Settings/applications/divided_cmd_utility_params.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/divided_cmd_utility_params.h rename to examples/mobc/src/src_user/Settings/applications/divided_cmd_utility_params.h diff --git a/examples/mobc/src/src_user/Settings/Applications/telemetry_manager_define.h b/examples/mobc/src/src_user/Settings/applications/telemetry_manager_define.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/telemetry_manager_define.h rename to examples/mobc/src/src_user/Settings/applications/telemetry_manager_define.h diff --git a/examples/mobc/src/src_user/Settings/Applications/telemetry_manager_params.h b/examples/mobc/src/src_user/Settings/applications/telemetry_manager_params.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/telemetry_manager_params.h rename to examples/mobc/src/src_user/Settings/applications/telemetry_manager_params.h diff --git a/examples/mobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h b/examples/mobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h similarity index 100% rename from examples/mobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h rename to examples/mobc/src/src_user/Settings/applications/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 index 027681d07..042c71489 100644 --- 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 index e8e23aae4..5c6bbc6e0 100644 --- 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 +#include #include diff --git a/examples/mobc/src/src_user/TlmCmd/command_source.h b/examples/mobc/src/src_user/TlmCmd/command_source.h index 3ec420163..328ce1647 100644 --- 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 #include #include -#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 index c37e1567e..da45e090b 100644 --- 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 #include #include -#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 index 0d22ef806..4e02fd2fc 100644 --- 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 -#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/examples/mobc/src/src_user/Applications/CMakeLists.txt b/examples/mobc/src/src_user/applications/CMakeLists.txt similarity index 70% rename from examples/mobc/src/src_user/Applications/CMakeLists.txt rename to examples/mobc/src/src_user/applications/CMakeLists.txt index 8d7b242b3..1bef2501e 100644 --- a/examples/mobc/src/src_user/Applications/CMakeLists.txt +++ b/examples/mobc/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 new file mode 100644 index 000000000..77be8a6bb --- /dev/null +++ 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Core TestApp +#include + +// 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/examples/mobc/src/src_user/Applications/app_registry.c b/examples/mobc/src/src_user/applications/app_registry.c similarity index 100% rename from examples/mobc/src/src_user/Applications/app_registry.c rename to examples/mobc/src/src_user/applications/app_registry.c diff --git a/examples/mobc/src/src_user/Applications/app_registry.h b/examples/mobc/src/src_user/applications/app_registry.h similarity index 92% rename from examples/mobc/src/src_user/Applications/app_registry.h rename to examples/mobc/src/src_user/applications/app_registry.h index e54aebcf7..6580b95bb 100644 --- a/examples/mobc/src/src_user/Applications/app_registry.h +++ b/examples/mobc/src/src_user/applications/app_registry.h @@ -1,6 +1,6 @@ #ifndef APP_REGISTRY_H_ #define APP_REGISTRY_H_ -#include +#include // こいつの自動生成がほしい．．． typedef enum diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.c b/examples/mobc/src/src_user/applications/driver_instances/di_aobc.c similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.c rename to examples/mobc/src/src_user/applications/driver_instances/di_aobc.c diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.h b/examples/mobc/src/src_user/applications/driver_instances/di_aobc.h similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_aobc.h rename to examples/mobc/src/src_user/applications/driver_instances/di_aobc.h diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_gs.c b/examples/mobc/src/src_user/applications/driver_instances/di_gs.c similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_gs.c rename to examples/mobc/src/src_user/applications/driver_instances/di_gs.c diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_gs.h b/examples/mobc/src/src_user/applications/driver_instances/di_gs.h similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_gs.h rename to examples/mobc/src/src_user/applications/driver_instances/di_gs.h diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.c b/examples/mobc/src/src_user/applications/driver_instances/di_uart_test.c similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.c rename to examples/mobc/src/src_user/applications/driver_instances/di_uart_test.c diff --git a/examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.h b/examples/mobc/src/src_user/applications/driver_instances/di_uart_test.h similarity index 100% rename from examples/mobc/src/src_user/Applications/DriverInstances/di_uart_test.h rename to examples/mobc/src/src_user/applications/driver_instances/di_uart_test.h diff --git a/examples/mobc/src/src_user/Applications/Middleware/.gitkeep b/examples/mobc/src/src_user/applications/middleware/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/Middleware/.gitkeep rename to examples/mobc/src/src_user/applications/middleware/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Aocs/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Aocs/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Aocs/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Aocs/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Cdh/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Cdh/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Cdh/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Cdh/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Com/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Com/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Com/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Com/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Mission/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Mission/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Mission/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Mission/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Power/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Power/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Power/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Power/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Prop/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Prop/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Prop/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Prop/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/Thermal/.gitkeep b/examples/mobc/src/src_user/applications/user_defined/Thermal/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/Thermal/.gitkeep rename to examples/mobc/src/src_user/applications/user_defined/Thermal/.gitkeep diff --git a/examples/mobc/src/src_user/Applications/UserDefined/debug_apps.c b/examples/mobc/src/src_user/applications/user_defined/debug_apps.c similarity index 95% rename from examples/mobc/src/src_user/Applications/UserDefined/debug_apps.c rename to examples/mobc/src/src_user/applications/user_defined/debug_apps.c index 194c828c6..8b86e7eea 100644 --- a/examples/mobc/src/src_user/Applications/UserDefined/debug_apps.c +++ b/examples/mobc/src/src_user/applications/user_defined/debug_apps.c @@ -14,11 +14,11 @@ #include #include "../../TlmCmd/telemetry_definitions.h" #include -#include -#include -#include -#include -#include "../../Applications/DriverInstances/di_gs.h" +#include +#include +#include +#include +#include "../../applications/driver_instances/di_gs.h" // #include #include "../../Library/vt100.h" #include diff --git a/examples/mobc/src/src_user/Applications/UserDefined/debug_apps.h b/examples/mobc/src/src_user/applications/user_defined/debug_apps.h similarity index 100% rename from examples/mobc/src/src_user/Applications/UserDefined/debug_apps.h rename to examples/mobc/src/src_user/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 index 433f33619..93a007277 100644 --- 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', diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index 150e09e74..dd830bb50 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -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) @@ -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) diff --git a/examples/subobc/src/src_user/Applications/CMakeLists.txt b/examples/subobc/src/src_user/Applications/CMakeLists.txt deleted file mode 100644 index 2acceeefc..000000000 --- a/examples/subobc/src/src_user/Applications/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -cmake_minimum_required(VERSION 3.13) - -project(C2A_USER_APPS) - -set(C2A_SRCS - app_registry.c - DriverInstances/di_mobc.c - UserDefined/debug_apps.c - ${C2A_CORE_DIR}/Applications/gs_command_dispatcher.c - ${C2A_CORE_DIR}/Applications/event_utility.c - ${C2A_CORE_DIR}/Applications/nop.c - ${C2A_CORE_DIR}/Applications/realtime_command_dispatcher.c - ${C2A_CORE_DIR}/Applications/timeline_command_dispatcher.c -) - -if(BUILD_C2A_AS_CXX) - set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ -endif() - -add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) - -include(${C2A_USER_DIR}/common.cmake) diff --git a/examples/subobc/src/src_user/Applications/app_headers.h b/examples/subobc/src/src_user/Applications/app_headers.h deleted file mode 100644 index 6d88caa99..000000000 --- a/examples/subobc/src/src_user/Applications/app_headers.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @brief Appのヘッダをまとめたヘッダ - */ -#ifndef APP_HEADERS_H_ -#define APP_HEADERS_H_ - -// Core -#include -#include -#include -#include -#include - -// Core TestApp -#include - -// DI -#include "DriverInstances/di_mobc.h" - -// UserDefined -#include "UserDefined/debug_apps.h" - -#endif diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c index 91850d88b..08e5169f6 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_debug_display.c +++ b/examples/subobc/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 diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c index dadb3ef1a..04f63839c 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.c +++ b/examples/subobc/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 diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c index 62b215ba2..a8ad590dc 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c +++ b/examples/subobc/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 diff --git a/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c b/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c index ba7038fef..a0900bec7 100644 --- a/examples/subobc/src/src_user/Settings/Modes/TaskLists/tl_initial.c +++ b/examples/subobc/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 diff --git a/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c b/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c index 180fcf23d..f66fea013 100644 --- a/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c +++ b/examples/subobc/src/src_user/Settings/Modes/Transitions/sl_initial.c @@ -4,7 +4,7 @@ #include "../../../TlmCmd/block_command_definitions.h" #include "../../../TlmCmd/command_definitions.h" -#include +#include #include #include diff --git a/examples/subobc/src/src_user/Settings/Applications/data_recorder_define.h b/examples/subobc/src/src_user/Settings/applications/data_recorder_define.h similarity index 100% rename from examples/subobc/src/src_user/Settings/Applications/data_recorder_define.h rename to examples/subobc/src/src_user/Settings/applications/data_recorder_define.h diff --git a/examples/subobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h b/examples/subobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h similarity index 100% rename from examples/subobc/src/src_user/Settings/Applications/timeline_command_dispatcher_define.h rename to examples/subobc/src/src_user/Settings/applications/timeline_command_dispatcher_define.h diff --git a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c b/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c index 7aea406d1..bae1cda67 100644 --- a/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c +++ b/examples/subobc/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_start_hk_tlm.c @@ -5,7 +5,7 @@ #include "../command_definitions.h" #include "../telemetry_definitions.h" -#include +#include #include diff --git a/examples/subobc/src/src_user/TlmCmd/command_source.h b/examples/subobc/src/src_user/TlmCmd/command_source.h index 3ec420163..328ce1647 100644 --- a/examples/subobc/src/src_user/TlmCmd/command_source.h +++ b/examples/subobc/src/src_user/TlmCmd/command_source.h @@ -17,6 +17,6 @@ #include #include #include -#include "../Applications/app_headers.h" +#include "../applications/app_headers.h" #endif diff --git a/examples/subobc/src/src_user/TlmCmd/telemetry_source.h b/examples/subobc/src/src_user/TlmCmd/telemetry_source.h index 9db9e05ef..eff4b1160 100644 --- a/examples/subobc/src/src_user/TlmCmd/telemetry_source.h +++ b/examples/subobc/src/src_user/TlmCmd/telemetry_source.h @@ -17,7 +17,7 @@ #include #include #include -#include "../Applications/app_headers.h" +#include "../applications/app_headers.h" #include "../Settings/build_settings.h" #endif diff --git a/examples/subobc/src/src_user/applications/CMakeLists.txt b/examples/subobc/src/src_user/applications/CMakeLists.txt new file mode 100644 index 000000000..892932512 --- /dev/null +++ b/examples/subobc/src/src_user/applications/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.13) + +project(C2A_USER_APPS) + +set(C2A_SRCS + app_registry.c + driver_instances/di_mobc.c + user_defined/debug_apps.c + ${C2A_CORE_DIR}/applications/gs_command_dispatcher.c + ${C2A_CORE_DIR}/applications/event_utility.c + ${C2A_CORE_DIR}/applications/nop.c + ${C2A_CORE_DIR}/applications/realtime_command_dispatcher.c + ${C2A_CORE_DIR}/applications/timeline_command_dispatcher.c +) + +if(BUILD_C2A_AS_CXX) + set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ +endif() + +add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) + +include(${C2A_USER_DIR}/common.cmake) diff --git a/examples/subobc/src/src_user/applications/app_headers.h b/examples/subobc/src/src_user/applications/app_headers.h new file mode 100644 index 000000000..d87156c6a --- /dev/null +++ b/examples/subobc/src/src_user/applications/app_headers.h @@ -0,0 +1,24 @@ +/** + * @file + * @brief Appのヘッダをまとめたヘッダ + */ +#ifndef APP_HEADERS_H_ +#define APP_HEADERS_H_ + +// Core +#include +#include +#include +#include +#include + +// Core TestApp +#include + +// DI +#include "driver_instances/di_mobc.h" + +// UserDefined +#include "user_defined/debug_apps.h" + +#endif diff --git a/examples/subobc/src/src_user/Applications/app_registry.c b/examples/subobc/src/src_user/applications/app_registry.c similarity index 100% rename from examples/subobc/src/src_user/Applications/app_registry.c rename to examples/subobc/src/src_user/applications/app_registry.c diff --git a/examples/subobc/src/src_user/Applications/app_registry.h b/examples/subobc/src/src_user/applications/app_registry.h similarity index 91% rename from examples/subobc/src/src_user/Applications/app_registry.h rename to examples/subobc/src/src_user/applications/app_registry.h index c9975612e..fb8c50914 100644 --- a/examples/subobc/src/src_user/Applications/app_registry.h +++ b/examples/subobc/src/src_user/applications/app_registry.h @@ -1,6 +1,6 @@ #ifndef APP_REGISTRY_H_ #define APP_REGISTRY_H_ -#include +#include // こいつの自動生成がほしい．．． typedef enum diff --git a/examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.c b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.c similarity index 100% rename from examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.c rename to examples/subobc/src/src_user/applications/driver_instances/di_mobc.c diff --git a/examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.h b/examples/subobc/src/src_user/applications/driver_instances/di_mobc.h similarity index 100% rename from examples/subobc/src/src_user/Applications/DriverInstances/di_mobc.h rename to examples/subobc/src/src_user/applications/driver_instances/di_mobc.h diff --git a/examples/subobc/src/src_user/Applications/Middleware/.gitkeep b/examples/subobc/src/src_user/applications/middleware/.gitkeep similarity index 100% rename from examples/subobc/src/src_user/Applications/Middleware/.gitkeep rename to examples/subobc/src/src_user/applications/middleware/.gitkeep diff --git a/examples/subobc/src/src_user/Applications/UserDefined/debug_apps.c b/examples/subobc/src/src_user/applications/user_defined/debug_apps.c similarity index 95% rename from examples/subobc/src/src_user/Applications/UserDefined/debug_apps.c rename to examples/subobc/src/src_user/applications/user_defined/debug_apps.c index 0aff9a00c..eabfe7e51 100644 --- a/examples/subobc/src/src_user/Applications/UserDefined/debug_apps.c +++ b/examples/subobc/src/src_user/applications/user_defined/debug_apps.c @@ -14,11 +14,11 @@ #include #include "../../TlmCmd/telemetry_definitions.h" #include -#include -#include -#include -#include -#include "../../Applications/DriverInstances/di_mobc.h" +#include +#include +#include +#include +#include "../../applications/driver_instances/di_mobc.h" // #include #include "../../Library/vt100.h" #include diff --git a/examples/subobc/src/src_user/Applications/UserDefined/debug_apps.h b/examples/subobc/src/src_user/applications/user_defined/debug_apps.h similarity index 100% rename from examples/subobc/src/src_user/Applications/UserDefined/debug_apps.h rename to examples/subobc/src/src_user/applications/user_defined/debug_apps.h diff --git a/examples/subobc/src/src_user/script/add_section/settings.pl b/examples/subobc/src/src_user/script/add_section/settings.pl index 433f33619..93a007277 100644 --- a/examples/subobc/src/src_user/script/add_section/settings.pl +++ b/examples/subobc/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', diff --git a/examples/subobc/sync_with_mobc_example.bat b/examples/subobc/sync_with_mobc_example.bat index 9920a6724..665cb4e61 100644 --- a/examples/subobc/sync_with_mobc_example.bat +++ b/examples/subobc/sync_with_mobc_example.bat @@ -13,7 +13,7 @@ call :sync_dir ".\src\src_user\ReProgramming\" "..\mobc\src\src_user\ReProgrammi call :sync_dir ".\src\src_user\script\" "..\mobc\src\src_user\script\" call :sync_dir ".\src\src_user\Settings\TlmCmd\Ccsds\" "..\mobc\src\src_user\Settings\TlmCmd\Ccsds\" -call :sync_file ".\src\src_user\Applications\UserDefined\debug_apps.h" "..\mobc\src\src_user\Applications\UserDefined\debug_apps.h" +call :sync_file ".\src\src_user\applications\user_defined\debug_apps.h" "..\mobc\src\src_user\applications\user_defined\debug_apps.h" call :sync_file ".\src\src_user\hal\sils\uart_sils_sci_if.hpp" "..\mobc\src\src_user\hal\sils\uart_sils_sci_if.hpp" call :sync_file ".\src\src_user\hal\sils\wdt_sils.cpp" "..\mobc\src\src_user\hal\sils\wdt_sils.cpp" call :sync_file ".\src\src_user\hal\sils_mockup\README.md" "..\mobc\src\src_user\hal\sils_mockup\README.md" diff --git a/hal/i2c_common.c b/hal/i2c_common.c index cbba3868c..9962c035f 100644 --- a/hal/i2c_common.c +++ b/hal/i2c_common.c @@ -6,7 +6,7 @@ */ #include "i2c_common.h" -#include "../Library/endian.h" +#include "../library/endian.h" #include /** diff --git a/Library/CMakeLists.txt b/library/CMakeLists.txt similarity index 100% rename from Library/CMakeLists.txt rename to library/CMakeLists.txt diff --git a/Library/ascii_conv.c b/library/ascii_conv.c similarity index 100% rename from Library/ascii_conv.c rename to library/ascii_conv.c diff --git a/Library/ascii_conv.h b/library/ascii_conv.h similarity index 100% rename from Library/ascii_conv.h rename to library/ascii_conv.h diff --git a/Library/bind-utils/Cargo.toml b/library/bind-utils/Cargo.toml similarity index 100% rename from Library/bind-utils/Cargo.toml rename to library/bind-utils/Cargo.toml diff --git a/Library/bind-utils/src/lib.rs b/library/bind-utils/src/lib.rs similarity index 100% rename from Library/bind-utils/src/lib.rs rename to library/bind-utils/src/lib.rs diff --git a/Library/c2a_round.c b/library/c2a_round.c similarity index 100% rename from Library/c2a_round.c rename to library/c2a_round.c diff --git a/Library/c2a_round.h b/library/c2a_round.h similarity index 100% rename from Library/c2a_round.h rename to library/c2a_round.h diff --git a/Library/crc.c b/library/crc.c similarity index 100% rename from Library/crc.c rename to library/crc.c diff --git a/Library/crc.h b/library/crc.h similarity index 100% rename from Library/crc.h rename to library/crc.h diff --git a/Library/endian.c b/library/endian.c similarity index 100% rename from Library/endian.c rename to library/endian.c diff --git a/Library/endian.h b/library/endian.h similarity index 100% rename from Library/endian.h rename to library/endian.h diff --git a/Library/git_revision.h b/library/git_revision.h similarity index 100% rename from Library/git_revision.h rename to library/git_revision.h diff --git a/Library/libc/bsearch.c b/library/libc/bsearch.c similarity index 100% rename from Library/libc/bsearch.c rename to library/libc/bsearch.c diff --git a/Library/libc/memchr.c b/library/libc/memchr.c similarity index 100% rename from Library/libc/memchr.c rename to library/libc/memchr.c diff --git a/Library/majority_vote_for3.c b/library/majority_vote_for3.c similarity index 100% rename from Library/majority_vote_for3.c rename to library/majority_vote_for3.c diff --git a/Library/majority_vote_for3.h b/library/majority_vote_for3.h similarity index 100% rename from Library/majority_vote_for3.h rename to library/majority_vote_for3.h diff --git a/Library/print.c b/library/print.c similarity index 100% rename from Library/print.c rename to library/print.c diff --git a/Library/print.h b/library/print.h similarity index 100% rename from Library/print.h rename to library/print.h diff --git a/Library/result.h b/library/result.h similarity index 100% rename from Library/result.h rename to library/result.h diff --git a/Library/stdint_wrapper/stdint.h b/library/stdint_wrapper/stdint.h similarity index 84% rename from Library/stdint_wrapper/stdint.h rename to library/stdint_wrapper/stdint.h index c2704fcf8..8ebd2a0b3 100644 --- a/Library/stdint_wrapper/stdint.h +++ b/library/stdint_wrapper/stdint.h @@ -1,7 +1,7 @@ /** * @file * @brief C89 環境用 stdint.h - * @note 真に C89 で，stdint.h が提供されない環境では，このパスを include path に追加し， src_user/Library/stdint_impl.h を自前で用意すること + * @note 真に C89 で，stdint.h が提供されない環境では，このパスを include path に追加し， src_user/library/stdint_impl.h を自前で用意すること */ #ifndef STDINT_H_ #define STDINT_H_ @@ -12,7 +12,7 @@ #ifdef SILS_FW #include // このヘッダを使う OBC であっても，SILS 環境下では C99 stdint.h が存在することが期待できる #else -#include // 真に C89 環境下では C2A user で C99 stdint.h と同等の型を提供する +#include // 真に C89 環境下では C2A user で C99 stdint.h と同等の型を提供する #endif // SILS_FW #endif // STDINT_H_ diff --git a/script/add_section/settings.pl b/script/add_section/settings.pl index 333dfa68a..5f9c1595b 100644 --- a/script/add_section/settings.pl +++ b/script/add_section/settings.pl @@ -19,7 +19,7 @@ sub GetSetting { 'applications', 'Drivers', 'hal', - 'Library', + 'library', 'System', 'TlmCmd' ]; diff --git a/script/ci/check_encoding.json b/script/ci/check_encoding.json index 8b4dd6a43..d107371e9 100644 --- a/script/ci/check_encoding.json +++ b/script/ci/check_encoding.json @@ -34,7 +34,7 @@ "applications/", "Drivers/", "hal/", - "Library/", + "library/", "System/", "TlmCmd/", "examples/mobc/src/src_user/", diff --git a/script/migration/v4-rename-library.sh b/script/migration/v4-rename-library.sh new file mode 100755 index 000000000..56bcd909f --- /dev/null +++ b/script/migration/v4-rename-library.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Script -> script + +## c2a-core ref +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#src_core/Library#src_core/library#g" +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#src_core\\\Library#src_core\\\library#g" + +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#\${C2A_CORE_DIR}/Library#\${C2A_CORE_DIR}/library#g" + +# C2A user code +mv src/src_user/Library src/src_user/library + +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#/Library#/library#g" +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#\\\Library#\\\library#g" + +# CMake +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#\${C2A_USER_DIR}/Library#\${C2A_USER_DIR}/library#g" + +# Script +find src/src_user/script -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#Library#library#g" + +git restore Doxyfile