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 library to snake case #50

Merged
merged 6 commits into from
Aug 3, 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
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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 $<TARGET_OBJECTS:C2A_CORE_LIB>)
endif()

Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolver = "2"

members = [
"./sils-runtime",
"./Library/bind-utils",
"./library/bind-utils",

"./hal/i2c-noop",
"./hal/spi-noop",
Expand Down Expand Up @@ -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 を要求しないようにする
Expand Down
4 changes: 2 additions & 2 deletions Drivers/Protocol/eb90_frame_for_driver_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion Drivers/Protocol/eb90_packet_for_driver_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_ をちゃんと見る!

Expand Down
2 changes: 1 addition & 1 deletion Drivers/Super/driver_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

#include "driver_super.h"
#include "../../Library/print.h"
#include "../../library/print.h"
#include <string.h> // for memset などの mem 系
#include <stddef.h> // for NULL
#include "../../TlmCmd/common_cmd_packet_util.h"
Expand Down
2 changes: 1 addition & 1 deletion Drivers/Super/driver_super.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <src_user/hal/if_list.h>
#include <stdint.h>
#include "../../Library/endian.h" // パスが不定な自動生成コード類で使えるように
#include "../../library/endian.h" // パスが不定な自動生成コード類で使えるように
#include "../../System/TimeManager/time_manager.h"

#define DS_STREAM_MAX (3) /*!< DS_StreamConfig の最大数
Expand Down
2 changes: 1 addition & 1 deletion System/ApplicationManager/app_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define APP_INFO_H_

#include "../TimeManager/obc_time.h"
#include "../../Library/result.h"
#include "../../library/result.h"

typedef struct
{
Expand Down
2 changes: 1 addition & 1 deletion System/ApplicationManager/app_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "../TimeManager/time_manager.h"
#include "../WatchdogTimer/watchdog_timer.h"
#include <src_user/TlmCmd/command_definitions.h>
#include "../../Library/print.h"
#include "../../library/print.h"
#include "../../TlmCmd/common_cmd_packet_util.h"

static AM_ACK AM_initialize_app_(size_t id);
Expand Down
2 changes: 1 addition & 1 deletion System/ModeManager/mode_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <src_user/TlmCmd/command_definitions.h>
#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の実体
Expand Down
4 changes: 2 additions & 2 deletions System/TaskManager/task_dispatcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ static void TDSP_deploy_block_as_task_list_(void);

// debug_apps にあるべき & 今はつわかないので無効化
#if 0
#include "../../Library/print.h"
#include <src_user/Library/vt100.h>
#include "../../library/print.h"
#include <src_user/library/vt100.h>
/**
* @brief デバッグ情報表示
*/
Expand Down
2 changes: 1 addition & 1 deletion System/TimeManager/obc_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion System/TimeManager/time_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "time_manager.h"
#include "obc_time_config.h"
#include <string.h>
#include "../../Library/c2a_round.h"
#include "../../library/c2a_round.h"
#include "../TaskManager/task_dispatcher.h"
#include "../../TlmCmd/common_cmd_packet_util.h"

Expand Down
2 changes: 1 addition & 1 deletion System/WatchdogTimer/watchdog_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/Ccsds/space_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @note 詳細は space_packet.h を参照
*/
#include "space_packet.h"
#include "../../Library/endian.h"
#include "../../library/endian.h"
#include <string.h>


Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/block_command_executor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/block_command_loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "block_command_executor.h"
#include <src_user/TlmCmd/command_definitions.h> // 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

Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/block_command_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "command_analyze.h"
#include <src_user/TlmCmd/command_definitions.h>
#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"

Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/command_analyze.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "command_analyze.h"
#include "common_cmd_packet_util.h"
#include <src_user/TlmCmd/command_definitions.h>
#include "../Library/print.h"
#include "../library/print.h"
#include "../System/EventManager/event_logger.h"
#include <string.h>

Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/command_dispatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <src_user/TlmCmd/command_definitions.h>

/**
Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/command_dispatcher_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/common_cmd_packet_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#include "common_cmd_packet_util.h"
#include "command_analyze.h"
#include "../Library/endian.h"
#include "../library/endian.h"
#include <stddef.h> // for NULL
#include <string.h>

Expand Down
4 changes: 2 additions & 2 deletions TlmCmd/telemetry_frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "telemetry_frame.h"

#include <stdint.h>
#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);
Expand Down
2 changes: 1 addition & 1 deletion applications/divided_cmd_utility.c
Original file line number Diff line number Diff line change
Expand Up @@ -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初期化関数
Expand Down
2 changes: 1 addition & 1 deletion applications/event_utility.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stddef.h> // for NULL

Expand Down
2 changes: 1 addition & 1 deletion applications/gs_command_dispatcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
4 changes: 2 additions & 2 deletions applications/memory_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
2 changes: 1 addition & 1 deletion applications/nop.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "nop.h"
#include <stddef.h>
#include "../TlmCmd/common_cmd_packet_util.h"
#include "../Library/result.h"
#include "../library/result.h"

static RESULT NOP_nop_(void);

Expand Down
2 changes: 1 addition & 1 deletion applications/realtime_command_dispatcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
6 changes: 3 additions & 3 deletions applications/telemetry_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <src_user/TlmCmd/block_command_definitions.h>
#include <src_user/TlmCmd/command_definitions.h>
Expand Down
2 changes: 1 addition & 1 deletion applications/timeline_command_dispatcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string.h> // for memset

Expand Down
2 changes: 1 addition & 1 deletion applications/utility_command.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <src_user/Settings/port_config.h>
#include <string.h> // for memcpy
#include "../TlmCmd/common_cmd_packet_util.h"
#include "../Library/result.h"
#include "../library/result.h"


static UtilityCommand utility_command_;
Expand Down
2 changes: 1 addition & 1 deletion applications/utility_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ int UTIL_COUNTER_dummy(void)
#include "../System/AnomalyLogger/anomaly_logger.h"
#include <string.h> // 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_;
Expand Down
4 changes: 2 additions & 2 deletions c2a_core_main.c
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
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
Loading