Skip to content

Commit

Permalink
examples/subobc: apply rename migration(TlmCmd -> tlm_cmd)
Browse files Browse the repository at this point in the history
  • Loading branch information
sksat committed Aug 30, 2023
1 parent 422086a commit 13eb1a4
Show file tree
Hide file tree
Showing 60 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion examples/subobc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ add_subdirectory(${C2A_USER_DIR}/Drivers)
add_subdirectory(${C2A_USER_DIR}/hal)
add_subdirectory(${C2A_USER_DIR}/library)
add_subdirectory(${C2A_USER_DIR}/Settings)
add_subdirectory(${C2A_USER_DIR}/TlmCmd)
add_subdirectory(${C2A_USER_DIR}/tlm_cmd)

set(C2A_SRCS
${C2A_USER_DIR}/c2a_main.c
Expand Down
2 changes: 1 addition & 1 deletion examples/subobc/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "c2a-example-subobc",
"scripts": {
"build:tlmcmddb": "tlmcmddb-cli bundle --pretty src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data src/src_user/Settings/TlmCmd/DataBase/CMD_DB tlmcmddb.json",
"build:tlmcmddb": "tlmcmddb-cli bundle --pretty src/src_user/Settings/tlm_cmd/DataBase/TLM_DB/calced_data src/src_user/Settings/tlm_cmd/DataBase/CMD_DB tlmcmddb.json",
"run:c2a": "cargo run",
"run:gaia": "tmtc-c2a --satconfig satconfig.json --tlmcmddb tlmcmddb.json",
"run:kble": "bash -c 'while :; do kble -s <(jrsonnet spaghetti.jsonnet); sleep 1; done'",
Expand Down
2 changes: 1 addition & 1 deletion examples/subobc/src/src_user/Drivers/Etc/mobc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// FIXME: DS 側の TCP が整理されたら, TCP 関連を撲滅し, CTCP に統一する

#include "./mobc.h"
#include <src_core/TlmCmd/common_tlm_cmd_packet.h>
#include <src_core/tlm_cmd/common_tlm_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 <string.h>
Expand Down
4 changes: 2 additions & 2 deletions examples/subobc/src/src_user/Drivers/Etc/mobc.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <src_core/hal/uart.h>
#include <src_core/Drivers/Super/driver_super.h>
#include <src_core/system/time_manager/obc_time.h>
#include <src_core/TlmCmd/common_tlm_packet.h>
#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/tlm_cmd/common_tlm_packet.h>
#include <src_core/tlm_cmd/packet_handler.h>

/**
* @enum MOBC_TX_ERR_CODE
Expand Down
4 changes: 2 additions & 2 deletions examples/subobc/src/src_user/Settings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ set(C2A_SRCS
Modes/Transitions/sl_nop.c
system/event_logger_settings.c
system/event_handler_rules/event_handler_rules.c
TlmCmd/common_cmd_packet_define.c
TlmCmd/Ccsds/apid_define.c
tlm_cmd/common_cmd_packet_define.c
tlm_cmd/ccsds/apid_define.c
)

if(BUILD_C2A_AS_CXX)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include "tl_elem_debug_display.h"

#include "../../../../applications/app_registry.h"
#include "../../../../TlmCmd/block_command_definitions.h"
#include "../../../../tlm_cmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/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
@@ -1,10 +1,10 @@
#pragma section REPRO
#include "tl_elem_gs_related_process.h"

#include "../../../../TlmCmd/block_command_definitions.h"
#include "../../../../tlm_cmd/block_command_definitions.h"
#include "../../../../applications/app_registry.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/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 @@ -2,9 +2,9 @@
#include "tl_elem_tlm_cmd_hirate.h"

#include "../../../../applications/app_registry.h"
#include "../../../../TlmCmd/block_command_definitions.h"
#include "../../../../tlm_cmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/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 @@ -2,9 +2,9 @@
#include "tl_initial.h"

#include "../../../applications/app_registry.h"
#include "../../../TlmCmd/block_command_definitions.h"
#include "../../../tlm_cmd/block_command_definitions.h"

#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/block_command_loader.h>

void BCL_load_tl_initial(void)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma section REPRO
#include "sl_initial.h"

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

#include <src_core/applications/timeline_command_dispatcher_id_define.h>
#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/block_command_loader.h>
#include <src_core/system/time_manager/obc_time.h>

void BCL_load_sl_start_up_to_initial(void)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma section REPRO
#include "sl_nop.h"

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

#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/block_command_loader.h>
#include <src_core/system/time_manager/obc_time.h>

void BCL_load_sl_nop(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <src_core/system/mode_manager/mode_manager.h>

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


// モードごとのTLを指定
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef COMMON_CMD_PACKET_DEFINE_H_
#define COMMON_CMD_PACKET_DEFINE_H_

#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include "./Ccsds/apid_define.h"
#include <src_core/tlm_cmd/ccsds/space_packet_typedef.h>
#include "./ccsds/apid_define.h"

// CommonCmdPacket として CmdSpacePacket をつかう
typedef CmdSpacePacket CommonCmdPacket;
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 <src_core/tlm_cmd/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,8 +5,8 @@
#ifndef COMMON_TLM_PACKET_DEFINE_H_
#define COMMON_TLM_PACKET_DEFINE_H_

#include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
#include "./Ccsds/apid_define.h"
#include <src_core/tlm_cmd/ccsds/space_packet_typedef.h>
#include "./ccsds/apid_define.h"

// CommonTlmPacket として TlmSpacePacket をつかう
typedef TlmSpacePacket CommonTlmPacket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Comment,Name,ShortName,BCID,エイリアス,,,,,Danger Flag,Description,Note
,BC_AR_GS_RELATED_PROCESS,,44,,,,,,danger,,
,BC_AC_TLM_CMD_HIRATE,,50,,,,,,danger,,
**,==== 各系領域 ====,,,,,,,,,,
*,./C2A/TlmCmd/NormalBlockCommandDefinition/で定義,,,,,,,,,,
*,./C2A/tlm_cmd/normal_block_command_definition/で定義,,,,,,,,,,
*,イベントハンドラはBC_EH_など,接頭辞を適切につけること!,,,,,,,,,,
**,CDH:60-79,,,,,,,,,,
,BC_HK_CYCLIC_TLM,BC_HK10S,60,○,○,○,○,○,,,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#include "di_mobc.h"
#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/tlm_cmd/packet_handler.h>
#include <src_core/library/print.h>
#include "../../Settings/port_config.h"
#include "../../Settings/DriverSuper/driver_buffer_define.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "../../Drivers/Etc/mobc.h"
#include <src_core/system/application_manager/app_info.h>
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <src_core/tlm_cmd/common_cmd_packet.h>

extern const MOBC_Driver* const mobc_driver; //!< MOBC driver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
#include <src_core/system/task_manager/task_dispatcher.h>
#include <src_core/system/event_manager/event_logger.h>
#include <src_core/system/event_manager/event_handler.h>
#include <src_core/TlmCmd/packet_handler.h>
#include "../../TlmCmd/telemetry_definitions.h"
#include <src_core/TlmCmd/block_command_table.h>
#include <src_core/tlm_cmd/packet_handler.h>
#include "../../tlm_cmd/telemetry_definitions.h"
#include <src_core/tlm_cmd/block_command_table.h>
#include <src_core/applications/memory_dump.h>
#include <src_core/applications/gs_command_dispatcher.h>
#include <src_core/applications/realtime_command_dispatcher.h>
#include <src_core/applications/timeline_command_dispatcher.h>
#include "../../applications/driver_instances/di_mobc.h"
// #include <src_core/TlmCmd/telemetry_generator.h>
// #include <src_core/tlm_cmd/telemetry_generator.h>
#include "../../library/vt100.h"
#include <src_core/library/result.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sub GetSetting {
'hal',
'library',
'Settings',
'TlmCmd'
'tlm_cmd'
];

# スキップファイル
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set(C2A_SRCS
common_tlm_packet.c
telemetry_definitions.c
user_packet_handler.c
NormalBlockCommandDefinition/nbc_start_hk_tlm.c
normal_block_command_definition/nbc_start_hk_tlm.c
)

if(BUILD_C2A_AS_CXX)
Expand Down
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 <src_core/tlm_cmd/block_command_loader.h>
#include <src_core/tlm_cmd/block_command_table.h>
#include <string.h> // for memcpy
#include "command_definitions.h"

Expand All @@ -11,7 +11,7 @@
#include "../Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.h"
#include "../Settings/Modes/TaskLists/Elements/tl_elem_debug_display.h"
#include "../Settings/Modes/TaskLists/Elements/tl_elem_gs_related_process.h"
#include "./NormalBlockCommandDefinition/nbc_header.h"
#include "./normal_block_command_definition/nbc_header.h"

/**
* @brief
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ typedef enum
BC_AC_TLM_CMD_HIRATE = 50,

// ==== 各系領域 ====
// ./C2A/TlmCmd/NormalBlockCommandDefinition/で定義
// ./C2A/tlm_cmd/normal_block_command_definition/で定義
// イベントハンドラはBC_EH_など,接頭辞を適切につけること!

// CDH:60-79
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 <src_core/tlm_cmd/block_command_table.h>
#include <src_core/tlm_cmd/block_command_executor.h>

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

Expand Down
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 <src_core/tlm_cmd/command_analyze.h>
#include "command_definitions.h"
#include "command_source.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
#include <src_core/system/application_manager/app_manager.h>
#include <src_core/system/task_manager/task_dispatcher.h>
#include <src_core/system/watchdog_timer/watchdog_timer.h>
#include <src_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 <src_core/tlm_cmd/block_command_executor.h>
#include <src_user/tlm_cmd/block_command_user_settings.h>
#include <src_core/tlm_cmd/command_dispatcher_manager.h>
#include <src_core/tlm_cmd/telemetry_generator.h>
#include <src_core/tlm_cmd/telemetry_frame.h>
#include "../applications/app_headers.h"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* @brief CTP 関連基本関数の定義
* @note CCP: CommonCmdPacket
*/
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <src_core/TlmCmd/Ccsds/cmd_space_packet.h>
#include <src_core/tlm_cmd/common_cmd_packet.h>
#include <src_core/tlm_cmd/ccsds/cmd_space_packet.h>
#include <string.h>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @note CTP: CommonTlmPacket
* @note CCP: CommonCmdPacket
*/
#include <src_core/TlmCmd/common_tlm_cmd_packet.h>
#include <src_core/TlmCmd/Ccsds/space_packet.h>
#include <src_core/tlm_cmd/common_tlm_cmd_packet.h>
#include <src_core/tlm_cmd/ccsds/space_packet.h>
#include <string.h>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* @brief CTP 関連基本関数の定義
* @note CTP: CommonTlmPacket
*/
#include <src_core/TlmCmd/common_tlm_packet.h>
#include <src_core/TlmCmd/Ccsds/tlm_space_packet.h>
#include <src_core/tlm_cmd/common_tlm_packet.h>
#include <src_core/tlm_cmd/ccsds/tlm_space_packet.h>
#include <string.h>


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 <src_core/tlm_cmd/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 @@ -6,7 +6,7 @@
#include "../telemetry_definitions.h"

#include <src_core/applications/timeline_command_dispatcher_id_define.h>
#include <src_core/TlmCmd/block_command_loader.h>
#include <src_core/tlm_cmd/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 @@ -4,7 +4,7 @@
* @brief テレメトリ定義
* @note このコードは自動生成されています!
*/
#include <src_core/TlmCmd/telemetry_frame.h>
#include <src_core/tlm_cmd/telemetry_frame.h>
#include "telemetry_definitions.h"
#include "telemetry_source.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include <src_core/system/event_manager/event_handler.h>
#include <src_core/system/watchdog_timer/watchdog_timer.h>
#include <src_core/system/time_manager/time_manager.h>
#include <src_core/TlmCmd/command_analyze.h>
#include <src_core/TlmCmd/command_dispatcher_manager.h>
#include <src_core/TlmCmd/block_command_executor.h>
#include <src_core/tlm_cmd/command_analyze.h>
#include <src_core/tlm_cmd/command_dispatcher_manager.h>
#include <src_core/tlm_cmd/block_command_executor.h>
#include "../applications/app_headers.h"
#include "../Settings/build_settings.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @brief packet_handlerのコマンドルーター,コマンドアナライザのユーザー定義部分
*/
#include "user_packet_handler.h"
#include <src_core/TlmCmd/packet_list_util.h>
#include <src_core/tlm_cmd/packet_list_util.h>


void PH_user_init(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#ifndef USER_PACKET_HANDLER_H_
#define USER_PACKET_HANDLER_H_

#include <src_core/TlmCmd/packet_list.h>
#include <src_core/TlmCmd/common_tlm_cmd_packet.h>
#include <src_core/TlmCmd/common_cmd_packet_util.h>
#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/TlmCmd/telemetry_frame.h>
#include <src_core/tlm_cmd/packet_list.h>
#include <src_core/tlm_cmd/common_tlm_cmd_packet.h>
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include <src_core/tlm_cmd/packet_handler.h>
#include <src_core/tlm_cmd/telemetry_frame.h>
#include "telemetry_definitions.h"
#include "../Settings/TlmCmd/Ccsds/apid_define.h"
#include "../Settings/tlm_cmd/ccsds/apid_define.h"

/**
* @brief PH のユーザー固有部初期化処理
Expand Down
Loading

0 comments on commit 13eb1a4

Please sign in to comment.