Skip to content

Commit

Permalink
examples/mobc: 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 0da429b commit 422086a
Show file tree
Hide file tree
Showing 135 changed files with 105 additions and 105 deletions.
2 changes: 1 addition & 1 deletion examples/mobc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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
4 changes: 2 additions & 2 deletions examples/mobc/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "c2a-example-mobc",
"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'",
"run-all": "run-p run:*",
"devtools:sils": "run-s build:* run-all",
"build:tlmcmddb-sub": "tlmcmddb-cli bundle --pretty ../subobc/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data ../subobc/src/src_user/Settings/TlmCmd/DataBase/CMD_DB tlmcmddb-subobc.json",
"build:tlmcmddb-sub": "tlmcmddb-cli bundle --pretty ../subobc/src/src_user/Settings/tlm_cmd/DataBase/TLM_DB/calced_data ../subobc/src/src_user/Settings/tlm_cmd/DataBase/CMD_DB tlmcmddb-subobc.json",
"tlmcmddb-merge": "tlmcmddb-cli merge --pretty --output tlmcmddb.json tlmcmddb.json tlmcmddb-subobc.json",
"run-subobc:c2a-subobc": "env UART_KBLE_PORT=9697 cargo run --manifest-path ../subobc/Cargo.toml",
"run-subobc:c2a": "run-s run:c2a",
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/Drivers/Aocs/aobc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#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/tlm_cmd/common_tlm_cmd_packet.h>
#include <src_core/tlm_cmd/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 <string.h>
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/Drivers/Aocs/aobc.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#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_cmd_packet.h>
#include <src_core/tlm_cmd/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 @@ -8,8 +8,8 @@

#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 <src_core/tlm_cmd/common_tlm_packet.h>
#include <src_core/tlm_cmd/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 @@ -10,10 +10,10 @@
#include <stdint.h>

#include "../../hal/ccsds_user.h"
#include "../../TlmCmd/Ccsds/tc_transfer_frame.h"
#include "../../tlm_cmd/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 <src_core/tlm_cmd/packet_handler.h>
#include <src_core/tlm_cmd/ccsds/space_packet_typedef.h>


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

#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/tlm_cmd/packet_handler.h>
#include <src_core/Drivers/Super/driver_super.h>
#include <src_core/hal/uart.h>
#include <src_core/hal/ccsds.h>
#include "../../hal/ccsds_user.h"
#include "../../TlmCmd/Ccsds/vcdu.h"
#include "../../tlm_cmd/ccsds/vcdu.h"
#include "gs_validate.h"

#define GS_RX_HEADER_NUM (3)
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/Drivers/Com/gs_validate.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

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

#define GS_RECEIVE_WINDOW (256)
#define GS_POSITIVE_WINDOW_WIDTH_DEFAULT (64) // FIXME: 要検討
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/Drivers/Com/gs_validate.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <stdint.h>

#include "../../TlmCmd/Ccsds/tc_transfer_frame.h"
#include "../../tlm_cmd/ccsds/tc_transfer_frame.h"

/**
* @enum GS_VALIDATE_ERR
Expand Down
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/Drivers/Etc/uart_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#include "uart_test.h"
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <src_core/tlm_cmd/common_cmd_packet.h>
#include <src_core/library/print.h>
#include "../../Settings/sils_define.h"
#include "string.h" // for memcpy
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/Settings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ set(C2A_SRCS
system/event_logger_settings.c
system/event_handler_rules/event_handler_rules.c
system/event_handler_rules/event_handler_rule_test.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
Expand Up @@ -2,9 +2,9 @@
#include "tl_elem_drivers_update.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_drivers_update_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,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 "../../../tlm_cmd/block_command_definitions.h"
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include "../mode_definitions.h"


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

#include <src_core/TlmCmd/block_command_table.h>
#include <src_core/tlm_cmd/block_command_table.h>
#include <src_core/applications/timeline_command_dispatcher_id_define.h>

// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#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 "../../../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/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,7 +5,7 @@
*/
#include "event_handler_rules.h"
#include <src_core/system/event_manager/event_handler.h>
#include "../../../TlmCmd/block_command_definitions.h"
#include "../../../tlm_cmd/block_command_definitions.h"

void EH_load_rule_test(void)
{
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 @@ -15,7 +15,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 @@ -7,9 +7,9 @@

#include "di_aobc.h"
#include "../../Drivers/Aocs/aobc.h"
#include "../../TlmCmd/user_packet_handler.h"
#include "../../tlm_cmd/user_packet_handler.h"
#include <src_core/library/print.h>
#include <src_core/TlmCmd/common_cmd_packet_util.h>
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include "../../Settings/port_config.h"
#include "../../Settings/DriverSuper/driver_buffer_define.h"
#include <src_core/library/result.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "../../Drivers/Aocs/aobc_command_definitions.h"
#include "../../Drivers/Aocs/aobc_telemetry_definitions.h"
#include <src_core/system/application_manager/app_info.h>
#include <src_core/TlmCmd/command_dispatcher.h>
#include <src_core/TlmCmd/common_cmd_packet.h>
#include <src_core/tlm_cmd/command_dispatcher.h>
#include <src_core/tlm_cmd/common_cmd_packet.h>

extern const AOBC_Driver* const aobc_driver; //!< AOBC driver
extern const CommandDispatcher* const DI_AOBC_cdis; //!< AOBC cmd dispatcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* @brief GS Driver のインスタンス化
*/
#include "di_gs.h"
#include <src_core/TlmCmd/packet_handler.h>
#include <src_core/TlmCmd/common_cmd_packet_util.h>
#include <src_core/tlm_cmd/packet_handler.h>
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include <src_core/library/print.h>
#include <src_core/library/result.h>
#include "../../Drivers/Com/gs_validate.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <stdint.h>

#include "../../Drivers/Com/gs.h"
#include "../../TlmCmd/Ccsds/tcp_to_m_pdu.h"
#include "../../TlmCmd/Ccsds/vcdu.h"
#include "../../tlm_cmd/ccsds/tcp_to_m_pdu.h"
#include "../../tlm_cmd/ccsds/vcdu.h"
#include <src_core/system/application_manager/app_info.h>

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "di_uart_test.h"
#include <stddef.h> // for NULL
#include <src_core/library/print.h>
#include <src_core/TlmCmd/common_cmd_packet_util.h>
#include <src_core/tlm_cmd/common_cmd_packet_util.h>
#include "../../Settings/port_config.h"
#include "../../Settings/DriverSuper/driver_buffer_define.h"
#include <src_core/library/result.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "../../Drivers/Etc/uart_test.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 UART_TEST_Driver* const uart_test_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_gs.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
2 changes: 1 addition & 1 deletion examples/mobc/src/src_user/script/add_section/settings.pl
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
Loading

0 comments on commit 422086a

Please sign in to comment.