Skip to content

Commit 9524dcd

Browse files
meltingrabbitmeltingrabbit
authored
Merge pull request #601 from ut-issl/feature/realtime_tlm
Pre Release (v3.9.0-beta.9): Mission Telemetry などの命名を Realtime Temeletry などにする
2 parents f5a2571 + aa3e237 commit 9524dcd

File tree

62 files changed

+521
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+521
-521
lines changed

‎Applications/telemetry_manager.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_register_tlc_(CommonCmdPacket* packet,
138138
uint8_t dr_partition);
139139

140140
/**
141-
* @brief TLM MGR に登録する TLC (TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM) を生成する
141+
* @brief TLM MGR に登録する TLC (TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM) を生成する
142142
* @param[out] packet: TLC packet
143143
* @param[in] ti: TI
144144
* @param[in] tlm_id: TLM_CODE
145145
* @return TLM_MGR_ERR_CODE
146146
*/
147-
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_ms_tlm_(CommonCmdPacket* packet,
147+
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_rt_tlm_(CommonCmdPacket* packet,
148148
cycle_t ti,
149149
TLM_CODE tlm_id);
150150

@@ -162,14 +162,14 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_st_tlm_(CommonCmdPacket* packet
162162
uint8_t dr_partition);
163163

164164
/**
165-
* @brief TLM MGR に登録する TLC (TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM) を生成する
165+
* @brief TLM MGR に登録する TLC (TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM) を生成する
166166
* @param[out] packet: TLC packet
167167
* @param[in] ti: TI
168168
* @param[in] apid: APID
169169
* @param[in] tlm_id: TLM_CODE
170170
* @return TLM_MGR_ERR_CODE
171171
*/
172-
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_forward_as_ms_tlm_(CommonCmdPacket* packet,
172+
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_forward_as_rt_tlm_(CommonCmdPacket* packet,
173173
cycle_t ti,
174174
APID apid,
175175
TLM_CODE tlm_id);
@@ -543,12 +543,12 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_register_tlc_(CommonCmdPacket* packet,
543543
{
544544
switch (cmd_type)
545545
{
546-
case TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM:
547-
return TLM_MGR_form_tg_generate_ms_tlm_(packet, ti, tlm_id);
546+
case TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM:
547+
return TLM_MGR_form_tg_generate_rt_tlm_(packet, ti, tlm_id);
548548
case TLM_MGR_CMD_TYPE_TG_GENERATE_ST_TLM:
549549
return TLM_MGR_form_tg_generate_st_tlm_(packet, ti, tlm_id, dr_partition);
550-
case TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM:
551-
return TLM_MGR_form_tg_forward_as_ms_tlm_(packet, ti, apid, tlm_id);
550+
case TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM:
551+
return TLM_MGR_form_tg_forward_as_rt_tlm_(packet, ti, apid, tlm_id);
552552
case TLM_MGR_CMD_TYPE_TG_FORWARD_AS_ST_TLM:
553553
return TLM_MGR_form_tg_forward_as_st_tlm_(packet, ti, apid, tlm_id, dr_partition);
554554
case TLM_MGR_CMD_TYPE_DR_REPLAY_TLM:
@@ -560,7 +560,7 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_register_tlc_(CommonCmdPacket* packet,
560560
}
561561

562562

563-
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_ms_tlm_(CommonCmdPacket* packet,
563+
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_rt_tlm_(CommonCmdPacket* packet,
564564
cycle_t ti,
565565
TLM_CODE tlm_id)
566566
{
@@ -571,7 +571,7 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_ms_tlm_(CommonCmdPacket* packet
571571

572572
ret = CCP_form_tlc(packet,
573573
ti,
574-
Cmd_CODE_TG_GENERATE_MS_TLM,
574+
Cmd_CODE_TG_GENERATE_RT_TLM,
575575
param,
576576
1);
577577
if (ret != CCP_UTIL_ACK_OK) return TLM_MGR_ERR_CODE_OTHER_ERR;
@@ -600,7 +600,7 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_tg_generate_st_tlm_(CommonCmdPacket* packet
600600
}
601601

602602

603-
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_forward_as_ms_tlm_(CommonCmdPacket* packet,
603+
static TLM_MGR_ERR_CODE TLM_MGR_form_tg_forward_as_rt_tlm_(CommonCmdPacket* packet,
604604
cycle_t ti,
605605
APID apid,
606606
TLM_CODE tlm_id)
@@ -615,7 +615,7 @@ static TLM_MGR_ERR_CODE TLM_MGR_form_tg_forward_as_ms_tlm_(CommonCmdPacket* pack
615615

616616
ret = CCP_form_tlc(packet,
617617
ti,
618-
Cmd_CODE_TG_FORWARD_AS_MS_TLM,
618+
Cmd_CODE_TG_FORWARD_AS_RT_TLM,
619619
param,
620620
3);
621621
if (ret != CCP_UTIL_ACK_OK) return TLM_MGR_ERR_CODE_OTHER_ERR;
@@ -905,8 +905,8 @@ static RESULT TLM_MGR_check_same_cmd_(const TLM_MGR_CmdElem* cmd_elem,
905905
{
906906
switch (cmd_type)
907907
{
908-
case TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM:
909-
if (cmd_elem->cmd_type == TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM &&
908+
case TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM:
909+
if (cmd_elem->cmd_type == TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM &&
910910
cmd_elem->tlm_id == tlm_id)
911911
{
912912
return RESULT_OK;
@@ -920,8 +920,8 @@ static RESULT TLM_MGR_check_same_cmd_(const TLM_MGR_CmdElem* cmd_elem,
920920
return RESULT_OK;
921921
}
922922
break;
923-
case TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM:
924-
if (cmd_elem->cmd_type == TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM &&
923+
case TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM:
924+
if (cmd_elem->cmd_type == TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM &&
925925
cmd_elem->apid == apid &&
926926
cmd_elem->tlm_id == tlm_id)
927927
{
@@ -1171,15 +1171,15 @@ CCP_CmdRet Cmd_TLM_MGR_STOP_TLM(const CommonCmdPacket* packet)
11711171
}
11721172

11731173

1174-
CCP_CmdRet Cmd_TLM_MGR_REGISTER_GENERATE_MS_TLM(const CommonCmdPacket* packet)
1174+
CCP_CmdRet Cmd_TLM_MGR_REGISTER_GENERATE_RT_TLM(const CommonCmdPacket* packet)
11751175
{
11761176
TLM_MGR_ERR_CODE err_code;
11771177
TLM_MGR_BC_ROLE bc_role = (TLM_MGR_BC_ROLE)CCP_get_param_from_packet(packet, 0, uint8_t);
11781178
TLM_CODE tlm_id = (TLM_CODE)CCP_get_param_from_packet(packet, 1, uint8_t);
11791179

11801180
if (telemetry_manager_.is_inited == 0) return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
11811181

1182-
err_code = TLM_MGR_register_(bc_role, TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM, APID_UNKNOWN, tlm_id, 0);
1182+
err_code = TLM_MGR_register_(bc_role, TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM, APID_UNKNOWN, tlm_id, 0);
11831183
return TLM_MGR_conv_err_code_to_ccp_cmd_ret_(err_code);
11841184
}
11851185

@@ -1198,7 +1198,7 @@ CCP_CmdRet Cmd_TLM_MGR_REGISTER_GENERATE_ST_TLM(const CommonCmdPacket* packet)
11981198
}
11991199

12001200

1201-
CCP_CmdRet Cmd_TLM_MGR_REGISTER_FORWARD_AS_MS_TLM(const CommonCmdPacket* packet)
1201+
CCP_CmdRet Cmd_TLM_MGR_REGISTER_FORWARD_AS_RT_TLM(const CommonCmdPacket* packet)
12021202
{
12031203
TLM_MGR_ERR_CODE err_code;
12041204
TLM_MGR_BC_ROLE bc_role = (TLM_MGR_BC_ROLE)CCP_get_param_from_packet(packet, 0, uint8_t);
@@ -1207,7 +1207,7 @@ CCP_CmdRet Cmd_TLM_MGR_REGISTER_FORWARD_AS_MS_TLM(const CommonCmdPacket* packet)
12071207

12081208
if (telemetry_manager_.is_inited == 0) return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
12091209

1210-
err_code = TLM_MGR_register_(bc_role, TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM, apid, tlm_id, 0);
1210+
err_code = TLM_MGR_register_(bc_role, TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM, apid, tlm_id, 0);
12111211
return TLM_MGR_conv_err_code_to_ccp_cmd_ret_(err_code);
12121212
}
12131213

@@ -1240,15 +1240,15 @@ CCP_CmdRet Cmd_TLM_MGR_REGISTER_REPLAY_TLM(const CommonCmdPacket* packet)
12401240
}
12411241

12421242

1243-
CCP_CmdRet Cmd_TLM_MGR_DELETE_GENERATE_MS_TLM(const CommonCmdPacket* packet)
1243+
CCP_CmdRet Cmd_TLM_MGR_DELETE_GENERATE_RT_TLM(const CommonCmdPacket* packet)
12441244
{
12451245
TLM_MGR_ERR_CODE err_code;
12461246
TLM_MGR_BC_ROLE bc_role = (TLM_MGR_BC_ROLE)CCP_get_param_from_packet(packet, 0, uint8_t);
12471247
TLM_CODE tlm_id = (TLM_CODE)CCP_get_param_from_packet(packet, 1, uint8_t);
12481248

12491249
if (telemetry_manager_.is_inited == 0) return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
12501250

1251-
err_code = TLM_MGR_delete_(bc_role, TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM, APID_UNKNOWN, tlm_id, 0);
1251+
err_code = TLM_MGR_delete_(bc_role, TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM, APID_UNKNOWN, tlm_id, 0);
12521252
return TLM_MGR_conv_err_code_to_ccp_cmd_ret_(err_code);
12531253
}
12541254

@@ -1267,7 +1267,7 @@ CCP_CmdRet Cmd_TLM_MGR_DELETE_GENERATE_ST_TLM(const CommonCmdPacket* packet)
12671267
}
12681268

12691269

1270-
CCP_CmdRet Cmd_TLM_MGR_DELETE_FORWARD_AS_MS_TLM(const CommonCmdPacket* packet)
1270+
CCP_CmdRet Cmd_TLM_MGR_DELETE_FORWARD_AS_RT_TLM(const CommonCmdPacket* packet)
12711271
{
12721272
TLM_MGR_ERR_CODE err_code;
12731273
TLM_MGR_BC_ROLE bc_role = (TLM_MGR_BC_ROLE)CCP_get_param_from_packet(packet, 0, uint8_t);
@@ -1276,7 +1276,7 @@ CCP_CmdRet Cmd_TLM_MGR_DELETE_FORWARD_AS_MS_TLM(const CommonCmdPacket* packet)
12761276

12771277
if (telemetry_manager_.is_inited == 0) return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
12781278

1279-
err_code = TLM_MGR_delete_(bc_role, TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM, apid, tlm_id, 0);
1279+
err_code = TLM_MGR_delete_(bc_role, TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM, apid, tlm_id, 0);
12801280
return TLM_MGR_conv_err_code_to_ccp_cmd_ret_(err_code);
12811281
}
12821282

‎Applications/telemetry_manager.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ typedef enum
6161
typedef enum
6262
{
6363
TLM_MGR_CMD_TYPE_UNREGISTERED = 0, //!< まだ使われていない (これは 0 であることが必要)
64-
TLM_MGR_CMD_TYPE_TG_GENERATE_MS_TLM,
64+
TLM_MGR_CMD_TYPE_TG_GENERATE_RT_TLM,
6565
TLM_MGR_CMD_TYPE_TG_GENERATE_ST_TLM,
66-
TLM_MGR_CMD_TYPE_TG_FORWARD_AS_MS_TLM,
66+
TLM_MGR_CMD_TYPE_TG_FORWARD_AS_RT_TLM,
6767
TLM_MGR_CMD_TYPE_TG_FORWARD_AS_ST_TLM,
6868
TLM_MGR_CMD_TYPE_DR_REPLAY_TLM
6969
} TLM_MGR_CMD_TYPE;
@@ -193,15 +193,15 @@ CCP_CmdRet Cmd_TLM_MGR_START_TLM(const CommonCmdPacket* packet);
193193
CCP_CmdRet Cmd_TLM_MGR_STOP_TLM(const CommonCmdPacket* packet);
194194

195195
// 以下，コマンド登録コマンド
196-
CCP_CmdRet Cmd_TLM_MGR_REGISTER_GENERATE_MS_TLM(const CommonCmdPacket* packet);
196+
CCP_CmdRet Cmd_TLM_MGR_REGISTER_GENERATE_RT_TLM(const CommonCmdPacket* packet);
197197
CCP_CmdRet Cmd_TLM_MGR_REGISTER_GENERATE_ST_TLM(const CommonCmdPacket* packet);
198-
CCP_CmdRet Cmd_TLM_MGR_REGISTER_FORWARD_AS_MS_TLM(const CommonCmdPacket* packet);
198+
CCP_CmdRet Cmd_TLM_MGR_REGISTER_FORWARD_AS_RT_TLM(const CommonCmdPacket* packet);
199199
CCP_CmdRet Cmd_TLM_MGR_REGISTER_FORWARD_AS_ST_TLM(const CommonCmdPacket* packet);
200200
CCP_CmdRet Cmd_TLM_MGR_REGISTER_REPLAY_TLM(const CommonCmdPacket* packet);
201201

202-
CCP_CmdRet Cmd_TLM_MGR_DELETE_GENERATE_MS_TLM(const CommonCmdPacket* packet);
202+
CCP_CmdRet Cmd_TLM_MGR_DELETE_GENERATE_RT_TLM(const CommonCmdPacket* packet);
203203
CCP_CmdRet Cmd_TLM_MGR_DELETE_GENERATE_ST_TLM(const CommonCmdPacket* packet);
204-
CCP_CmdRet Cmd_TLM_MGR_DELETE_FORWARD_AS_MS_TLM(const CommonCmdPacket* packet);
204+
CCP_CmdRet Cmd_TLM_MGR_DELETE_FORWARD_AS_RT_TLM(const CommonCmdPacket* packet);
205205
CCP_CmdRet Cmd_TLM_MGR_DELETE_FORWARD_AS_ST_TLM(const CommonCmdPacket* packet);
206206
CCP_CmdRet Cmd_TLM_MGR_DELETE_REPLAY_TLM(const CommonCmdPacket* packet);
207207

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "c2a-core"
3-
version = "3.9.0-beta.8"
3+
version = "3.9.0-beta.9"
44
edition = "2021"
55

66
links = "c2a-core"

‎Docs/Core/communication.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ https://github.com/ut-issl/c2a-core/blob/e84ac663187adb7b9d51939f2228b9ecfa7ae29
9494
- ただし，地上局でのパケット保存処理をシンプルにするためなどの理由で，配送の過程でそれぞれのフラグごとにバケットをバラす．つまり，オンボードサブネットワークから地上に送信されるパケットでは， 1 つの flag のみ立っている状態を基本とする．
9595
- 今後拡張予定あり
9696
- 現時点では以下
97-
- `0b00000001`: Housekeeping Telemetry
98-
- `0b00000010`: Mission Telemetry
97+
- `0b00000001`: High Priority Realtime Telemetry (現在の C2A Core では使われてない (Realtime Telemetry として処理されている))
98+
- `0b00000010`: Realtime Telemetry
9999
- `0b00000100`: Stored Telemetry
100100
- `0b00001000`: Replay Telemetry
101101
- `0b00010000`: 将来拡張用の確保領域

‎Examples/2nd_obc_user/src/src_user/Applications/DriverInstances/di_mobc.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
static void DI_MOBC_init_(void);
1414
static void DI_MOBC_update_(void);
15-
static void DI_MOBC_ms_tlm_packet_handler_init_(void);
16-
static void DI_MOBC_ms_tlm_packet_handler_(void);
15+
static void DI_MOBC_rt_tlm_packet_handler_init_(void);
16+
static void DI_MOBC_rt_tlm_packet_handler_(void);
1717

1818
static MOBC_Driver mobc_driver_;
1919
const MOBC_Driver* const mobc_driver = &mobc_driver_;
@@ -22,7 +22,7 @@ const MOBC_Driver* const mobc_driver = &mobc_driver_;
2222
static DS_StreamRecBuffer DI_MOBC_rx_buffer_;
2323
static uint8_t DI_MOBC_rx_buffer_allocation_[DS_STREAM_REC_BUFFER_SIZE_DEFAULT];
2424

25-
static const uint8_t DI_MOBC_kMsTlmPhMaxNumOfProc_ = 4; //!< 一度に送出する最大テレメ数
25+
static const uint8_t DI_MOBC_kRtTlmPhMaxNumOfProc_ = 4; //!< 一度に送出する最大テレメ数
2626

2727

2828
AppInfo DI_MOBC_update(void)
@@ -60,48 +60,48 @@ static void DI_MOBC_update_(void)
6060
}
6161

6262

63-
AppInfo DI_MOBC_ms_tlm_packet_handler(void)
63+
AppInfo DI_MOBC_rt_tlm_packet_handler(void)
6464
{
65-
return AI_create_app_info("MOBC_ms_tlm_ph",
66-
DI_MOBC_ms_tlm_packet_handler_init_,
67-
DI_MOBC_ms_tlm_packet_handler_);
65+
return AI_create_app_info("MOBC_rt_tlm_ph",
66+
DI_MOBC_rt_tlm_packet_handler_init_,
67+
DI_MOBC_rt_tlm_packet_handler_);
6868
}
6969

70-
static void DI_MOBC_ms_tlm_packet_handler_init_(void)
70+
static void DI_MOBC_rt_tlm_packet_handler_init_(void)
7171
{
7272
// なにもしない
7373
}
7474

75-
static void DI_MOBC_ms_tlm_packet_handler_(void)
75+
static void DI_MOBC_rt_tlm_packet_handler_(void)
7676
{
7777
uint8_t i;
7878
CommonTlmPacket packet; // FIXME: これは static にする？
7979
// static のほうがコンパイル時にアドレスが確定して安全． Out of stack space を回避できる
8080
// 一方でメモリ使用量は増える．
8181
mobc_driver_.info.c2a.send_tlm_err_code = DS_CMD_OK;
8282

83-
for (i = 0; i < DI_MOBC_kMsTlmPhMaxNumOfProc_; i++)
83+
for (i = 0; i < DI_MOBC_kRtTlmPhMaxNumOfProc_; i++)
8484
{
8585
DS_CMD_ERR_CODE ret;
8686

8787
// TODO: ここは一部 MW に入れるべきなのかなぁ．．．？
8888
// 最近 C2A の MW の扱いが難しい．いっそなくすか？
8989

90-
// TODO: PH_ms_tlm_list を DI から隠蔽する？それか何かしらの共用構造体でのインスタンスの一部にするか？
91-
// そうすると， ms_tlm の他の tlm ができたときに共通化が容易
90+
// TODO: PH_rt_tlm_list を DI から隠蔽する？それか何かしらの共用構造体でのインスタンスの一部にするか？
91+
// そうすると， rt_tlm の他の tlm ができたときに共通化が容易
9292

93-
if (PL_is_empty(&PH_ms_tlm_list))
93+
if (PL_is_empty(&PH_rt_tlm_list))
9494
{
9595
// キューが空なら終了
9696
return;
9797
}
9898

9999
// 送信するパケットを取得
100-
packet = *(const CommonTlmPacket*)PL_get_head(&PH_ms_tlm_list)->packet;
100+
packet = *(const CommonTlmPacket*)PL_get_head(&PH_rt_tlm_list)->packet;
101101

102102
// 送信したパケットを消去
103103
// 以後エラーが出ても，そのパケットは再送しないので，取り出したここで消してしまう．
104-
PL_drop_executed(&PH_ms_tlm_list);
104+
PL_drop_executed(&PH_rt_tlm_list);
105105

106106
// FIXME: 現状，WINGS の問題から DUMP TLMは考えない．
107107
// APID_AOBC_TLM 以外を弾いている．

‎Examples/2nd_obc_user/src/src_user/Applications/DriverInstances/di_mobc.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ extern const MOBC_Driver* const mobc_driver; //!< MOBC driver
1919
AppInfo DI_MOBC_update(void);
2020

2121
/**
22-
* @brief MOBC MS TLM (mission telemetry) PH (packet handler) アプリ生成関数
22+
* @brief MOBC RT_TLM (Realtime Telemetry) PH (packet handler) アプリ生成関数
2323
* @param void
2424
* @return AppInfo
25-
* @note ひとまずテレメは MST のみ実装する
25+
* @note ひとまずテレメは RT_TLM のみ実装する
2626
*/
27-
AppInfo DI_MOBC_ms_tlm_packet_handler(void);
27+
AppInfo DI_MOBC_rt_tlm_packet_handler(void);
2828

2929
#endif

‎Examples/2nd_obc_user/src/src_user/Applications/app_registry.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void AR_load_initial_settings(void)
1212
{
1313
add_application_(AR_NOP, NOP_create_app);
1414
add_application_(AR_DI_MOBC_CMD_PH, DI_MOBC_update);
15-
add_application_(AR_DI_MOBC_MST_PH, DI_MOBC_ms_tlm_packet_handler);
15+
add_application_(AR_DI_MOBC_RT_TLM_PH, DI_MOBC_rt_tlm_packet_handler);
1616
add_application_(AR_GSC_DISPATCHER, GSCD_create_app);
1717
add_application_(AR_RTC_DISPATCHER, RTCD_create_app);
1818
add_application_(AR_TLC_DISPATCHER_GS, TLCD_gs_create_app);

‎Examples/2nd_obc_user/src/src_user/Applications/app_registry.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ typedef enum
77
{
88
AR_NOP,
99
AR_DI_MOBC_CMD_PH,
10-
AR_DI_MOBC_MST_PH,
10+
AR_DI_MOBC_RT_TLM_PH,
1111
AR_GSC_DISPATCHER,
1212
AR_RTC_DISPATCHER,
1313
AR_TLC_DISPATCHER_GS,

‎Examples/2nd_obc_user/src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void BCL_load_tl_elem_tlm_cmd_hirate(void)
1212
BCL_tool_register_app (0, AR_RTC_DISPATCHER);
1313
BCL_tool_register_app (1, AR_TLC_DISPATCHER_BC);
1414
BCL_tool_register_app (2, AR_TLC_DISPATCHER_TLM);
15-
BCL_tool_register_app (3, AR_DI_MOBC_MST_PH);
15+
BCL_tool_register_app (3, AR_DI_MOBC_RT_TLM_PH);
1616
#ifdef TLCD_ENABLE_MISSION_TL
1717
BCL_tool_register_app (5, AR_TLC_DISPATCHER_MIS);
1818
#endif

‎Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/DataBase/CMDFILE/sample.ops‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# =======================================
1616
.MOBC_RT.BCT_CLEAR_BLOCK 77 # BCT 77 を使用
1717
wait_sec 1
18-
MOBC_BL.TG_GENERATE_MS_TLM 1 0xf0 # HK
18+
MOBC_BL.TG_GENERATE_RT_TLM 1 0xf0 # HK
1919
wait_sec 1
20-
MOBC_BL.TG_FORWARD_AS_MS_TLM 3 0x511 0x91 # AOBC HK
20+
MOBC_BL.TG_FORWARD_AS_RT_TLM 3 0x511 0x91 # AOBC HK
2121
wait_sec 1
2222
MOBC_BL.TLCD_DEPLOY_BLOCK 10 2 77
2323
wait_sec 1
@@ -31,12 +31,12 @@
3131
.# =======================================
3232
# AOBC Tlm
3333
# =======================================
34-
.MOBC_RT.TG_FORWARD_AS_MS_TLM 0x511 0x90 # AOBC AOBC → CNT ERR が出るはず
35-
.AOBC_RT.TG_GENERATE_MS_TLM 0x90 # AOBC AOBC
36-
.MOBC_RT.TG_FORWARD_AS_MS_TLM 0x511 0x90 # AOBC AOBC
34+
.MOBC_RT.TG_FORWARD_AS_RT_TLM 0x511 0x90 # AOBC AOBC → CNT ERR が出るはず
35+
.AOBC_RT.TG_GENERATE_RT_TLM 0x90 # AOBC AOBC
36+
.MOBC_RT.TG_FORWARD_AS_RT_TLM 0x511 0x90 # AOBC AOBC
3737
.#
3838
.# AOBCリセット
3939
.MOBC_RT.AM_INITIALIZE_APP 4 # AR_DI_AOBC
40-
.MOBC_RT.TG_FORWARD_AS_MS_TLM 0x511 0x90 # AOBC AOBC → CNT ERR が出るはず
41-
.AOBC_RT.TG_GENERATE_MS_TLM 0x90 # AOBC AOBC
42-
.MOBC_RT.TG_FORWARD_AS_MS_TLM 0x511 0x90 # AOBC AOBC
40+
.MOBC_RT.TG_FORWARD_AS_RT_TLM 0x511 0x90 # AOBC AOBC → CNT ERR が出るはず
41+
.AOBC_RT.TG_GENERATE_RT_TLM 0x90 # AOBC AOBC
42+
.MOBC_RT.TG_FORWARD_AS_RT_TLM 0x511 0x90 # AOBC AOBC

0 commit comments

Comments
 (0)