Skip to content

Commit

Permalink
mission telemetry to realtime telemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
@chutaro
chutaro authored and 伊藤湧太郎 committed Aug 8, 2023
1 parent 28c3963 commit 3ac7de6
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 39 deletions.
8 changes: 4 additions & 4 deletions database/CMD_DB/ISSL6U_AOBC_CMD_DB_CMD_DB.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description,
**,Telemetry Generator,,,,,,,,,,,,,,,,,,,
,Cmd_GENERATE_TLM,OBC,0x0014,3,uint8_t,category,uint8_t,TLM_ID,uint8_t,送出回数,,,,,,,,,TLMパケット生成 (deprecated),
,Cmd_TG_GENERATE_TLM,OBC,0x0015,4,uint8_t,tlm id,uint8_t,dest flags,uint8_t,dest info,uint8_t,送出回数,,,,,,,自身の OBC のテレメを生成,
,Cmd_TG_GENERATE_HK_TLM,OBC,0x0016,1,uint8_t,tlm id,,,,,,,,,,,,,HK テレメを生成 (事実上，現在使われていない）,
,Cmd_TG_GENERATE_MS_TLM,OBC,0x0017,1,uint8_t,tlm id,,,,,,,,,,,,,MS テレメを生成,
,Cmd_TG_GENERATE_HP_TLM,OBC,0x0016,1,uint8_t,tlm id,,,,,,,,,,,,,High Priority テレメを生成 (事実上，現在使われていない）,
,Cmd_TG_GENERATE_RT_TLM,OBC,0x0017,1,uint8_t,tlm id,,,,,,,,,,,,,Real Time テレメを生成,
,Cmd_TG_GENERATE_ST_TLM,OBC,0x0018,2,uint8_t,tlm id,uint8_t,dr partition (dest info),,,,,,,,,,,ST テレメを生成,
*,Cmd_TG_FORWARD_TLM,OBC,,5,uint16_t,apid,uint8_t,tlm id,uint8_t,dest flags,uint8_t,dest info,uint8_t,送出回数,,,,,2nd OBC のテレメを転送,
*,Cmd_TG_FORWARD_AS_HK_TLM,OBC,,2,uint16_t,apid,uint8_t,tlm id,,,,,,,,,,,HK テレメとして 2nd OBC のテレメを転送 (事実上，現在使われていない）,
*,Cmd_TG_FORWARD_AS_MS_TLM,OBC,,2,uint16_t,apid,uint8_t,tlm id,,,,,,,,,,,MS テレメとして 2nd OBC のテレメを転送,
*,Cmd_TG_FORWARD_AS_HK_TLM,OBC,,2,uint16_t,apid,uint8_t,tlm id,,,,,,,,,,,High Priority テレメとして 2nd OBC のテレメを転送 (事実上，現在使われていない）,
*,Cmd_TG_FORWARD_AS_RT_TLM,OBC,,2,uint16_t,apid,uint8_t,tlm id,,,,,,,,,,,Real Time テレメとして 2nd OBC のテレメを転送,
*,Cmd_TG_FORWARD_AS_ST_TLM,OBC,,3,uint16_t,apid,uint8_t,tlm id,uint8_t,dr partition (dest info),,,,,,,,,ST テレメとして 2nd OBC のテレメを転送,
**,BCTコマンド,,,,,,,,,,,,,,,,,,,
,Cmd_BCT_CLEAR_BLOCK,OBC,0x0019,1,uint16_t,bc_index,,,,,,,,,,,,,BLC登録解除コマンド,
Expand Down
4 changes: 2 additions & 2 deletions database/TLM_DB/ISSL6U_AOBC_TLM_DB_AOBC_OBC.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT コマンドポインタ,
,BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに…
,BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT 登録コマンドID,変数指定が大変なことに…
,MS_TLM_COUNTER,uint32_t,PH_ms_tlm_list.executed_nodes_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0コマンドカウンタ,
,MS_TLM_QUEUED,uint8_t,(uint8_t)(PH_ms_tlm_list.active_nodes_),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0登録コマンド数,
,RT_TLM_COUNTER,uint32_t,PH_rt_tlm_list.executed_nodes_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0コマンドカウンタ,
,RT_TLM_QUEUED,uint8_t,(uint8_t)(PH_rt_tlm_list.active_nodes_),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0登録コマンド数,
*,ST_TLM_COUNTER,uint32_t,PH_st_tlm_list.executed_nodes_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0コマンドカウンタ,
*,ST_TLM_QUEUED,uint8_t,(uint8_t)(PH_st_tlm_list.active_nodes_),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0登録コマンド数,
*,RP_TLM_COUNTER,uint32_t,PH_rp_tlm_list.executed_nodes_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,TL0コマンドカウンタ,
Expand Down
4 changes: 2 additions & 2 deletions database/TLM_DB/calced_data/ISSL6U_AOBC_TLM_DB_AOBC_OBC.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,208,0,8,NONE,,,,,,,,BCT コマンドポインタ,
,BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,209,0,32,NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに…
,BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,213,0,16,NONE,,,,,,,,BCT 登録コマンドID,変数指定が大変なことに…
,MS_TLM_COUNTER,uint32_t,PH_ms_tlm_list.executed_nodes_,PACKET,215,0,32,NONE,,,,,,,,TL0コマンドカウンタ,
,MS_TLM_QUEUED,uint8_t,(uint8_t)(PH_ms_tlm_list.active_nodes_),PACKET,219,0,8,NONE,,,,,,,,TL0登録コマンド数,
,RT_TLM_COUNTER,uint32_t,PH_rt_tlm_list.executed_nodes_,PACKET,215,0,32,NONE,,,,,,,,TL0コマンドカウンタ,
,RT_TLM_QUEUED,uint8_t,(uint8_t)(PH_rt_tlm_list.active_nodes_),PACKET,219,0,8,NONE,,,,,,,,TL0登録コマンド数,
*,ST_TLM_COUNTER,uint32_t,PH_st_tlm_list.executed_nodes_,PACKET,220,0,32,NONE,,,,,,,,TL0コマンドカウンタ,
*,ST_TLM_QUEUED,uint8_t,(uint8_t)(PH_st_tlm_list.active_nodes_),PACKET,224,0,8,NONE,,,,,,,,TL0登録コマンド数,
*,RP_TLM_COUNTER,uint32_t,PH_rp_tlm_list.executed_nodes_,PACKET,225,0,32,NONE,,,,,,,,TL0コマンドカウンタ,
Expand Down
30 changes: 15 additions & 15 deletions src/src_user/Applications/DriverInstances/di_mobc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

static void DI_MOBC_init_(void);
static void DI_MOBC_update_(void);
static void DI_MOBC_ms_tlm_packet_handler_init_(void);
static void DI_MOBC_ms_tlm_packet_handler_(void);
static void DI_MOBC_rt_tlm_packet_handler_init_(void);
static void DI_MOBC_rt_tlm_packet_handler_(void);

static MOBC_Driver mobc_driver_;
const MOBC_Driver* const mobc_driver = &mobc_driver_;
Expand All @@ -30,7 +30,7 @@ static uint8_t DI_MOBC_rx_buffer_allocation_[DS_STREAM_REC_BUFFER_SIZE_MOBC];
* 4 packet も送信すると それだけ 70ms 近くかかり送信だけで姿勢制御が 10 Hz で回らなくなるためそこまで送るべきではない
* 逆に AOBC は 1 秒で 10 Tlm 以上送れなくなる
*/
static const uint8_t DI_MOBC_kMsTlmPhMaxNumOfProc_ = 1;
static const uint8_t DI_MOBC_kRtTlmPhMaxNumOfProc_ = 1;


AppInfo DI_MOBC_update(void)
Expand Down Expand Up @@ -65,34 +65,34 @@ static void DI_MOBC_update_(void)
}


AppInfo DI_MOBC_ms_tlm_packet_handler(void)
AppInfo DI_MOBC_rt_tlm_packet_handler(void)
{
return AI_create_app_info("MOBC_ms_tlm_ph",
DI_MOBC_ms_tlm_packet_handler_init_,
DI_MOBC_ms_tlm_packet_handler_);
return AI_create_app_info("MOBC_rt_tlm_ph",
DI_MOBC_rt_tlm_packet_handler_init_,
DI_MOBC_rt_tlm_packet_handler_);
}

static void DI_MOBC_ms_tlm_packet_handler_init_(void)
static void DI_MOBC_rt_tlm_packet_handler_init_(void)
{
// do nothing
}

static void DI_MOBC_ms_tlm_packet_handler_(void)
static void DI_MOBC_rt_tlm_packet_handler_(void)
{
CommonTlmPacket* packet;
mobc_driver_.info.c2a.send_tlm_err_code = DS_CMD_OK;

for (uint8_t i = 0; i < DI_MOBC_kMsTlmPhMaxNumOfProc_; i++)
for (uint8_t i = 0; i < DI_MOBC_kRtTlmPhMaxNumOfProc_; i++)
{
// TODO_L: PH_ms_tlm_listをDIから隠蔽する？それか何かしらの共用構造体でのインスタンスの一部にするか？
// そうすると，ms_tlmの他のtlmができたときに共通化が容易
// TODO_L: PH_rt_tlm_listをDIから隠蔽する？それか何かしらの共用構造体でのインスタンスの一部にするか？
// そうすると，rt_tlmの他のtlmができたときに共通化が容易

if (PL_is_empty(&PH_ms_tlm_list))
if (PL_is_empty(&PH_rt_tlm_list))
{
return;
}

packet = (CommonTlmPacket*)PL_get_head(&PH_ms_tlm_list)->packet;
packet = (CommonTlmPacket*)PL_get_head(&PH_rt_tlm_list)->packet;

// 現状，WINGSの問題から DUMP TLMは考えない
if (CTP_get_apid(packet) != CTP_APID_FROM_ME)
Expand All @@ -111,7 +111,7 @@ static void DI_MOBC_ms_tlm_packet_handler_(void)
mobc_driver_.info.c2a.send_tlm_err_code = ret;
}

PL_drop_executed(&PH_ms_tlm_list);
PL_drop_executed(&PH_rt_tlm_list);
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/src_user/Applications/DriverInstances/di_mobc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ extern const MOBC_Driver* const mobc_driver; //!< MOBC driver
AppInfo DI_MOBC_update(void);

/**
* @brief MOBC MS TLM (mission telemetry) PH (packet handler) アプリ生成関数
* @brief MOBC RT TLM (Realtime telemetry) PH (packet handler) アプリ生成関数
* @param void
* @return AppInfo
* @note ひとまずテレメはMSTのみ実装する
*/
AppInfo DI_MOBC_ms_tlm_packet_handler(void);
AppInfo DI_MOBC_rt_tlm_packet_handler(void);

#endif
2 changes: 1 addition & 1 deletion src/src_user/Applications/app_registry.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void AR_load_initial_settings(void)
// add_application_(AR_DI_UART_EXAMPLE, DI_uart_example);
// add_application_(AR_DI_I2C_EXAMPLE, I2C_EXAMPLE_update);
add_application_(AR_DI_MOBC, DI_MOBC_update);
add_application_(AR_DI_MOBC_MST_PH, DI_MOBC_ms_tlm_packet_handler);
add_application_(AR_DI_MOBC_RT_TLM_PH, DI_MOBC_rt_tlm_packet_handler);
// AOCS
add_application_(AR_DI_MPU9250, DI_MPU9250_update);
add_application_(AR_DI_RM3100, DI_RM3100_update);
Expand Down
2 changes: 1 addition & 1 deletion src/src_user/Applications/app_registry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ typedef enum
// AR_DI_UART_EXAMPLE,
// AR_DI_I2C_EXAMPLE,
AR_DI_MOBC,
AR_DI_MOBC_MST_PH,
AR_DI_MOBC_RT_TLM_PH,
// AOCS
AR_DI_MPU9250,
AR_DI_RM3100,
Expand Down
2 changes: 1 addition & 1 deletion src/src_user/Settings/Modes/TaskLists/Elements/tl_elem_cdh_update.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void BCL_load_cdh_update()
BCL_tool_register_app(3, AR_RTC_DISPATCHER);
BCL_tool_register_app(4, AR_TLC_DISPATCHER_BC);
BCL_tool_register_app(5, AR_TLC_DISPATCHER_TLM);
BCL_tool_register_app(6, AR_DI_MOBC_MST_PH);
BCL_tool_register_app(6, AR_DI_MOBC_RT_TLM_PH);
BCL_tool_register_app(7, AR_EVENT_UTILITY);
BCL_tool_register_app(8, AR_APP_AOCS_DATA_RECORDER);
}
Expand Down
4 changes: 2 additions & 2 deletions src/src_user/Settings/TlmCmd/packet_handler_params.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#undef PH_TLC_BC_LIST_MAX
#undef PH_TLC_TLM_LIST_MAX
#undef PH_TLC_MIS_LIST_MAX
#undef PH_MS_TLM_LIST_MAX
#undef PH_RT_TLM_LIST_MAX

#define TL_TLM_PAGE_SIZE (16)
#define TL_TLM_PAGE_MAX (1)
Expand All @@ -26,6 +26,6 @@
// timeline_command_dispatcher.tlm_info_.tl_list の長さがこれなので
#define PH_TLC_BC_LIST_MAX (TL_TLM_PAGE_SIZE * 2)
#define PH_TLC_TLM_LIST_MAX (TL_TLM_PAGE_SIZE * 1)
#define PH_MS_TLM_LIST_MAX (4)
#define PH_RT_TLM_LIST_MAX (4)

#endif
8 changes: 4 additions & 4 deletions src/src_user/TlmCmd/command_definitions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS])
cmd_table[Cmd_CODE_TLCD_SET_PAGE_FOR_TLM].cmd_func = Cmd_TLCD_SET_PAGE_FOR_TLM;
cmd_table[Cmd_CODE_GENERATE_TLM].cmd_func = Cmd_GENERATE_TLM;
cmd_table[Cmd_CODE_TG_GENERATE_TLM].cmd_func = Cmd_TG_GENERATE_TLM;
cmd_table[Cmd_CODE_TG_GENERATE_HK_TLM].cmd_func = Cmd_TG_GENERATE_HK_TLM;
cmd_table[Cmd_CODE_TG_GENERATE_MS_TLM].cmd_func = Cmd_TG_GENERATE_MS_TLM;
cmd_table[Cmd_CODE_TG_GENERATE_HP_TLM].cmd_func = Cmd_TG_GENERATE_HP_TLM;
cmd_table[Cmd_CODE_TG_GENERATE_RT_TLM].cmd_func = Cmd_TG_GENERATE_RT_TLM;
cmd_table[Cmd_CODE_TG_GENERATE_ST_TLM].cmd_func = Cmd_TG_GENERATE_ST_TLM;
cmd_table[Cmd_CODE_BCT_CLEAR_BLOCK].cmd_func = Cmd_BCT_CLEAR_BLOCK;
cmd_table[Cmd_CODE_BCT_SET_BLOCK_POSITION].cmd_func = Cmd_BCT_SET_BLOCK_POSITION;
Expand Down Expand Up @@ -278,8 +278,8 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS])
cmd_table[Cmd_CODE_TG_GENERATE_TLM].param_size_infos[0].packed_info.bit.second = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_TLM].param_size_infos[1].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_TLM].param_size_infos[1].packed_info.bit.second = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_HK_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_MS_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_HP_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_RT_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_ST_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_TG_GENERATE_ST_TLM].param_size_infos[0].packed_info.bit.second = CA_PARAM_SIZE_TYPE_1BYTE;
cmd_table[Cmd_CODE_BCT_CLEAR_BLOCK].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_2BYTE;
Expand Down
4 changes: 2 additions & 2 deletions src/src_user/TlmCmd/command_definitions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ typedef enum
Cmd_CODE_TLCD_SET_PAGE_FOR_TLM = 0x0013,
Cmd_CODE_GENERATE_TLM = 0x0014,
Cmd_CODE_TG_GENERATE_TLM = 0x0015,
Cmd_CODE_TG_GENERATE_HK_TLM = 0x0016,
Cmd_CODE_TG_GENERATE_MS_TLM = 0x0017,
Cmd_CODE_TG_GENERATE_HP_TLM = 0x0016,
Cmd_CODE_TG_GENERATE_RT_TLM = 0x0017,
Cmd_CODE_TG_GENERATE_ST_TLM = 0x0018,
Cmd_CODE_BCT_CLEAR_BLOCK = 0x0019,
Cmd_CODE_BCT_SET_BLOCK_POSITION = 0x001A,
Expand Down
4 changes: 2 additions & 2 deletions src/src_user/TlmCmd/telemetry_definitions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_OBC_(uint8_t* packet, uint16_t* len, uint16_t ma
TF_copy_u8(&packet[208], (uint8_t)(block_command_table->pos.cmd));
TF_copy_u32(&packet[209], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1))));
TF_copy_u16(&packet[213], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1))));
TF_copy_u32(&packet[215], PH_ms_tlm_list.executed_nodes_);
TF_copy_u8(&packet[219], (uint8_t)(PH_ms_tlm_list.active_nodes_));
TF_copy_u32(&packet[215], PH_rt_tlm_list.executed_nodes_);
TF_copy_u8(&packet[219], (uint8_t)(PH_rt_tlm_list.active_nodes_));
#endif

*len = 220;
Expand Down

0 comments on commit 3ac7de6

Please sign in to comment.