Skip to content

Commit

Permalink
Use "c2a-core"instead of "src_core" inside include
Browse files Browse the repository at this point in the history
  • Loading branch information
tarotene committed Aug 23, 2023
1 parent a7806f0 commit 75dc3e5
Show file tree
Hide file tree
Showing 107 changed files with 266 additions and 266 deletions.
8 changes: 4 additions & 4 deletions examples/mobc/src/src_user/Drivers/Aocs/aobc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include "./aobc_command_definitions.h"
#include "./aobc_telemetry_definitions.h"
#include "./aobc_telemetry_buffer.h"
#include <src_core/TlmCmd/common_tlm_cmd_packet.h>
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <src_core/Drivers/Protocol/eb90_frame_for_driver_super.h>
#include <src_core/Drivers/Protocol/common_tlm_cmd_packet_for_driver_super.h>
#include <c2a-core/TlmCmd/common_tlm_cmd_packet.h>
#include <c2a-core/TlmCmd/common_cmd_packet.h>
#include <c2a-core/Drivers/Protocol/eb90_frame_for_driver_super.h>
#include <c2a-core/Drivers/Protocol/common_tlm_cmd_packet_for_driver_super.h>
#include <string.h>

#define AOBC_STREAM_TLM_CMD (0) //!< テレコマで使うストリーム
Expand Down
8 changes: 4 additions & 4 deletions examples/mobc/src/src_user/Drivers/Aocs/aobc.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#ifndef AOBC_H_
#define AOBC_H_

#include <src_core/hal/uart.h>
#include <src_core/Drivers/Super/driver_super.h>
#include <src_core/System/TimeManager/obc_time.h>
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <c2a-core/hal/uart.h>
#include <c2a-core/Drivers/Super/driver_super.h>
#include <c2a-core/System/TimeManager/obc_time.h>
#include <c2a-core/TlmCmd/common_cmd_packet.h>
#include "./aobc_telemetry_data_definitions.h"
#include "./aobc_telemetry_buffer.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @brief テレメトリバッファー(テレメ中継)
* @note このコードは自動生成されています!
*/
#include <src_core/Drivers/Protocol/common_tlm_cmd_packet_for_driver_super.h>
#include <c2a-core/Drivers/Protocol/common_tlm_cmd_packet_for_driver_super.h>
#include "./aobc_telemetry_definitions.h"
#include "./aobc_telemetry_buffer.h"
#include "./aobc.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#define AOBC_TELEMETRY_BUFFER_H_

#include "./aobc_telemetry_definitions.h"
#include <src_core/Drivers/Super/driver_super.h>
#include <src_core/TlmCmd/common_tlm_packet.h>
#include <src_core/TlmCmd/telemetry_frame.h>
#include <c2a-core/Drivers/Super/driver_super.h>
#include <c2a-core/TlmCmd/common_tlm_packet.h>
#include <c2a-core/TlmCmd/telemetry_frame.h>

typedef struct AOBC_Driver AOBC_Driver;

Expand Down
6 changes: 3 additions & 3 deletions examples/mobc/src/src_user/Drivers/Com/gs.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

#include "../../hal/ccsds_user.h"
#include "../../TlmCmd/Ccsds/tc_transfer_frame.h"
#include <src_core/Drivers/Super/driver_super.h>
#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include <c2a-core/Drivers/Super/driver_super.h>
#include <c2a-core/TlmCmd/packet_handler.h>
#include <c2a-core/TlmCmd/Ccsds/space_packet_typedef.h>


#define GS_RX_HEADER_SIZE (2)
Expand Down
8 changes: 4 additions & 4 deletions examples/mobc/src/src_user/Drivers/Com/gs.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#ifndef GS_H_
#define GS_H_

#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/Drivers/Super/driver_super.h>
#include <src_core/hal/uart.h>
#include <src_core/hal/ccsds.h>
#include <c2a-core/TlmCmd/packet_handler.h>
#include <c2a-core/Drivers/Super/driver_super.h>
#include <c2a-core/hal/uart.h>
#include <c2a-core/hal/ccsds.h>
#include "../../hal/ccsds_user.h"
#include "../../TlmCmd/Ccsds/vcdu.h"
#include "gs_validate.h"
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/Drivers/Com/gs_validate.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gs_validate.h"
#include "../../TlmCmd/Ccsds/tc_segment.h"
#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include <c2a-core/TlmCmd/Ccsds/space_packet_typedef.h>

#define GS_RECEIVE_WINDOW (256)
#define GS_POSITIVE_WINDOW_WIDTH_DEFAULT (64) // FIXME: 要検討
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/Drivers/Etc/uart_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

#include "uart_test.h"
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <src_core/library/print.h>
#include <c2a-core/TlmCmd/common_cmd_packet.h>
#include <c2a-core/library/print.h>
#include "../../Settings/sils_define.h"
#include "string.h" // for memcpy
#include <stdio.h> // SILSでのprint
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/Drivers/Etc/uart_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef UART_TEST_H_
#define UART_TEST_H_

#include <src_core/hal/uart.h>
#include <src_core/Drivers/Super/driver_super.h>
#include <c2a-core/hal/uart.h>
#include <c2a-core/Drivers/Super/driver_super.h>

/**
* @struct UART_TEST_Info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../../../../applications/app_registry.h"
#include "../../../../TlmCmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>

void BCL_load_tl_elem_debug_display_initial(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../../../../applications/app_registry.h"
#include "../../../../TlmCmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>


void BCL_load_tl_elem_drivers_update_initial(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../../../../TlmCmd/block_command_definitions.h"
#include "../../../../applications/app_registry.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>

void BCL_load_tl_elem_gs_related_process(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../../../../applications/app_registry.h"
#include "../../../../TlmCmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>


void BCL_load_tl_elem_tlm_cmd_hirate(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../../../applications/app_registry.h"
#include "../../../TlmCmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>

void BCL_load_tl_initial(void)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma section REPRO
#include "sequence_items.h"
#include "../../../TlmCmd/block_command_definitions.h"
#include <src_core/TlmCmd/common_cmd_packet_util.h>
#include <c2a-core/TlmCmd/common_cmd_packet_util.h>
#include "../mode_definitions.h"


Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef SEQUENCE_ITEMS_H_
#define SEQUENCE_ITEMS_H_

#include <src_core/TlmCmd/block_command_table.h>
#include <src_core/applications/timeline_command_dispatcher_id_define.h>
#include <c2a-core/TlmCmd/block_command_table.h>
#include <c2a-core/applications/timeline_command_dispatcher_id_define.h>

// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// SIを使うことはもう非推奨!!!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include "../../../Drivers/Com/gs.h"

#include <src_core/applications/timeline_command_dispatcher_id_define.h>
#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/System/TimeManager/obc_time.h>
#include <c2a-core/applications/timeline_command_dispatcher_id_define.h>
#include <c2a-core/TlmCmd/block_command_loader.h>
#include <c2a-core/System/TimeManager/obc_time.h>

void BCL_load_sl_start_up_to_initial(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../../../TlmCmd/command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/System/TimeManager/obc_time.h>
#include <c2a-core/TlmCmd/block_command_loader.h>
#include <c2a-core/System/TimeManager/obc_time.h>

void BCL_load_sl_nop(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#include "mode_definitions.h"

#include <src_core/System/ModeManager/mode_manager.h>
#include <c2a-core/System/ModeManager/mode_manager.h>

#include "../../TlmCmd/block_command_definitions.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @brief EH の テスト用 Rule
*/
#include "event_handler_rules.h"
#include <src_core/System/EventManager/event_handler.h>
#include <c2a-core/System/EventManager/event_handler.h>
#include "../../../TlmCmd/block_command_definitions.h"

void EH_load_rule_test(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @brief event_logger の設定
*/

#include <src_core/System/EventManager/event_logger.h>
#include <c2a-core/System/EventManager/event_logger.h>
#include "event_logger_settings.h"
#include "event_logger_group.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef COMMON_CMD_PACKET_DEFINE_H_
#define COMMON_CMD_PACKET_DEFINE_H_

#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include <c2a-core/TlmCmd/Ccsds/space_packet_typedef.h>
#include "./Ccsds/apid_define.h"

// CommonCmdPacket として CmdSpacePacket をつかう
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef COMMON_TLM_CMD_PACKET_DEFINE_H_
#define COMMON_TLM_CMD_PACKET_DEFINE_H_

#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include <c2a-core/TlmCmd/Ccsds/space_packet_typedef.h>

// CommonTlmCmdPacket として SpacePacket をつかう
typedef SpacePacket CommonTlmCmdPacket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef COMMON_TLM_PACKET_DEFINE_H_
#define COMMON_TLM_PACKET_DEFINE_H_

#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include <c2a-core/TlmCmd/Ccsds/space_packet_typedef.h>
#include "./Ccsds/apid_define.h"

// CommonTlmPacket として TlmSpacePacket をつかう
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/TlmCmd/Ccsds/tc_segment.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define TC_SEGMENT_H_

#include <stdint.h>
#include <src_core/TlmCmd/Ccsds/cmd_space_packet.h>
#include <c2a-core/TlmCmd/Ccsds/cmd_space_packet.h>
#include <src_user/Settings/TlmCmd/Ccsds/space_packet_typedef_params.h>

#define TCS_HEADER_SIZE (1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "tc_transfer_frame.h"

#include <string.h>
#include <src_core/library/crc.h>
#include <c2a-core/library/crc.h>

TCTF_VER TCTF_get_ver(const TcTransferFrame* tctf)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/TlmCmd/Ccsds/tcp_to_m_pdu.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "tcp_to_m_pdu.h"
// FIXME: CTP ではなく TSP を使ってしまっている.できれば抽象化するべき
#include <src_core/TlmCmd/Ccsds/tlm_space_packet.h>
#include <c2a-core/TlmCmd/Ccsds/tlm_space_packet.h>

void T2M_initialize(TcpToMPdu* tcp_to_m_pdu)
{
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/TlmCmd/Ccsds/tcp_to_m_pdu.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

#include <stddef.h> // for size_t

#include <src_core/TlmCmd/packet_list.h>
#include <c2a-core/TlmCmd/packet_list.h>
#include "m_pdu.h"
#include <src_core/System/TimeManager/time_manager.h>
#include <c2a-core/System/TimeManager/time_manager.h>

/**
* @enum T2M_ACK
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef NBC_HEADER_H_
#define NBC_HEADER_H_

#include <src_core/TlmCmd/block_command_table.h>
#include <c2a-core/TlmCmd/block_command_table.h>

void BCL_load_start_hk_tlm(void);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
*/
#include "nbc_header.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>

#include "../command_definitions.h"
#include "../block_command_definitions.h"
#include <src_core/System/EventManager/event_logger.h>
#include <c2a-core/System/EventManager/event_logger.h>

typedef enum
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "../command_definitions.h"
#include "../telemetry_definitions.h"

#include <src_core/applications/timeline_command_dispatcher_id_define.h>
#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/applications/timeline_command_dispatcher_id_define.h>
#include <c2a-core/TlmCmd/block_command_loader.h>


void BCL_load_start_hk_tlm(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#include "nbc_header.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_loader.h>

#include "../command_definitions.h"
#include "../../Drivers/Aocs/aobc_command_definitions.h"
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/TlmCmd/block_command_definitions.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma section REPRO
#include "block_command_definitions.h"
#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/TlmCmd/block_command_table.h>
#include <c2a-core/TlmCmd/block_command_loader.h>
#include <c2a-core/TlmCmd/block_command_table.h>
#include <string.h> // for memcpy
#include "command_definitions.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef BLOCK_COMMAND_USER_SETTINGS_H_
#define BLOCK_COMMAND_USER_SETTINGS_H_

#include <src_core/TlmCmd/block_command_table.h>
#include <src_core/TlmCmd/block_command_executor.h>
#include <c2a-core/TlmCmd/block_command_table.h>
#include <c2a-core/TlmCmd/block_command_executor.h>

#define BCUS_MRAM_BCT_BLOCKS (10) // MRAMに確保する

Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/TlmCmd/command_definitions.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @brief コマンド定義
* @note このコードは自動生成されています!
*/
#include <src_core/TlmCmd/command_analyze.h>
#include <c2a-core/TlmCmd/command_analyze.h>
#include "command_definitions.h"
#include "command_source.h"

Expand Down
22 changes: 11 additions & 11 deletions examples/mobc/src/src_user/TlmCmd/command_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
#ifndef COMMAND_SOURCE_H_
#define COMMAND_SOURCE_H_

#include <src_core/System/EventManager/event_logger.h>
#include <src_core/System/EventManager/event_handler.h>
#include <src_core/System/TimeManager/time_manager.h>
#include <src_core/System/ModeManager/mode_manager.h>
#include <src_core/System/ApplicationManager/app_manager.h>
#include <src_core/System/TaskManager/task_dispatcher.h>
#include <src_core/System/WatchdogTimer/watchdog_timer.h>
#include <src_core/TlmCmd/block_command_executor.h>
#include <c2a-core/System/EventManager/event_logger.h>
#include <c2a-core/System/EventManager/event_handler.h>
#include <c2a-core/System/TimeManager/time_manager.h>
#include <c2a-core/System/ModeManager/mode_manager.h>
#include <c2a-core/System/ApplicationManager/app_manager.h>
#include <c2a-core/System/TaskManager/task_dispatcher.h>
#include <c2a-core/System/WatchdogTimer/watchdog_timer.h>
#include <c2a-core/TlmCmd/block_command_executor.h>
#include <src_user/TlmCmd/block_command_user_settings.h>
#include <src_core/TlmCmd/command_dispatcher_manager.h>
#include <src_core/TlmCmd/telemetry_generator.h>
#include <src_core/TlmCmd/telemetry_frame.h>
#include <c2a-core/TlmCmd/command_dispatcher_manager.h>
#include <c2a-core/TlmCmd/telemetry_generator.h>
#include <c2a-core/TlmCmd/telemetry_frame.h>
#include "../applications/app_headers.h"

#endif
Loading

0 comments on commit 75dc3e5

Please sign in to comment.