Skip to content

Commit

Permalink
fix task dispatcher typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@chutaro
chutaro authored and 伊藤湧太郎 committed Aug 8, 2023
1 parent 3ac7de6 commit 6e4c3dd
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion database/TLM_DB/ISSL6U_AOBC_TLM_DB_AOBC_HK_GEN.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,OBC.MM.OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),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)))),STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=Bdot@@3=RoughSunPointing@@4=RoughThreeAxisMtq@@5=RoughThreeAxisRw@@6=FineThreeAxis@@7=Reserved@@8=MAX@@*=N/A,,
,OBC.MM.STS,uint8_t,(uint8_t)( ((uint8_t)(mode_manager->stat) << 7 & 0x80) | ((uint8_t)(mode_manager->previous_id) & 0x7F) ),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),1,STATUS,,,,,,,0=FINISHED@@1=PROGRESS:G@@*=N/A,,
,OBC.MM.OPSMODE_PREV,||,||,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),7,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=Bdot@@3=RoughSunPointing@@4=RoughThreeAxisMtq@@5=RoughThreeAxisRw@@6=FineThreeAxis@@7=Reserved@@8=MAX@@*=N/A,,
,OBC.TDSP_CURRENT_ID,uint16_t,task_dispathcer->task_list_id,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,,,,,,,,,
,OBC.TDSP_CURRENT_ID,uint16_t,task_dispatcher->task_list_id,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,,,,,,,,,
,OBC.GS_CMD.COUNTER,uint8_t,(uint8_t)(PH_gs_cmd_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,,,,,,,,地上局コマンドカウンタ,
,OBC.GS_CMD.LAST_EXEC_TIME,uint32_t,(uint32_t)gs_command_dispatcher->prev.time.total_cycle,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,,,,,,,,最新地上局コマンド実行時刻,
,OBC.GS_CMD.LAST_EXEC_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),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,,,,,,,,最新地上局コマンドID,
Expand Down
12 changes: 6 additions & 6 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 @@ -24,12 +24,12 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,MM_STS,uint8_t,(uint8_t)(mode_manager->stat),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,,,,,,,,モード遷移実行状態,
,MM_OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),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,,,,,,,,現状モード番号,
,MM_OPSMODE_PREV,uint8_t,(uint8_t)(mode_manager->previous_id),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,,,,,,,,直前モード番号,
,TDSP_CURRENT_ID,uint8_t,(uint8_t)(task_dispathcer->task_list_id),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,,,,,,,,現状 TaskList ID,
,TDSP_CMD_LAST_ERR_TIME_MASTER,uint32_t,(uint32_t)(task_dispathcer->tskd.prev_err.time.total_cycle),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,,,,,,,,最新内部コマンド実行時刻,
,TDSP_CMD_LAST_ERR_TIME_STEP,uint8_t,(uint8_t)(task_dispathcer->tskd.prev_err.time.step),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,,,,,,,,,
,TDSP_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(task_dispathcer->tskd.prev_err.code),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,,,,,,,,最新内部コマンドID,
,TDSP_CMD_LAST_ERR_STS,uint8_t,(uint8_t)(task_dispathcer->tskd.prev_err.cmd_ret.exec_sts),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)))),STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT,最新内部コマンド実行結果,
,TDSP_CMD_LAST_ERR_CODE,uint32_t,(uint32_t)(task_dispathcer->tskd.prev_err.cmd_ret.err_code),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,,,,,,,,最新内部コマンド実行結果,
,TDSP_CURRENT_ID,uint8_t,(uint8_t)(task_dispatcher->task_list_id),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,,,,,,,,現状 TaskList ID,
,TDSP_CMD_LAST_ERR_TIME_MASTER,uint32_t,(uint32_t)(task_dispatcher->tskd.prev_err.time.total_cycle),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,,,,,,,,最新内部コマンド実行時刻,
,TDSP_CMD_LAST_ERR_TIME_STEP,uint8_t,(uint8_t)(task_dispatcher->tskd.prev_err.time.step),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,,,,,,,,,
,TDSP_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(task_dispatcher->tskd.prev_err.code),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,,,,,,,,最新内部コマンドID,
,TDSP_CMD_LAST_ERR_STS,uint8_t,(uint8_t)(task_dispatcher->tskd.prev_err.cmd_ret.exec_sts),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)))),STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT,最新内部コマンド実行結果,
,TDSP_CMD_LAST_ERR_CODE,uint32_t,(uint32_t)(task_dispatcher->tskd.prev_err.cmd_ret.err_code),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,,,,,,,,最新内部コマンド実行結果,
,GS_CMD_COUNTER,uint32_t,PH_gs_cmd_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,,,,,,,,地上局コマンドカウンタ,
,GS_CMD_LAST_EXEC_TIME,uint32_t,(uint32_t)(gs_command_dispatcher->prev.time.total_cycle),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,,,,,,,,最新地上局コマンド実行時刻,
,GS_CMD_LAST_EXEC_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),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,,,,,,,,最新地上局コマンドID,
Expand Down
2 changes: 1 addition & 1 deletion database/TLM_DB/calced_data/ISSL6U_AOBC_TLM_DB_AOBC_HK_GEN.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,OBC.MM.OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),PACKET,30,0,8,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=Bdot@@3=RoughSunPointing@@4=RoughThreeAxisMtq@@5=RoughThreeAxisRw@@6=FineThreeAxis@@7=Reserved@@8=MAX@@*=N/A,,
,OBC.MM.STS,uint8_t,(uint8_t)( ((uint8_t)(mode_manager->stat) << 7 & 0x80) | ((uint8_t)(mode_manager->previous_id) & 0x7F) ),PACKET,31,0,1,STATUS,,,,,,,0=FINISHED@@1=PROGRESS:G@@*=N/A,,
,OBC.MM.OPSMODE_PREV,,,PACKET,31,1,7,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=Bdot@@3=RoughSunPointing@@4=RoughThreeAxisMtq@@5=RoughThreeAxisRw@@6=FineThreeAxis@@7=Reserved@@8=MAX@@*=N/A,,
,OBC.TDSP_CURRENT_ID,uint16_t,task_dispathcer->task_list_id,PACKET,32,0,16,NONE,,,,,,,,,
,OBC.TDSP_CURRENT_ID,uint16_t,task_dispatcher->task_list_id,PACKET,32,0,16,NONE,,,,,,,,,
,OBC.GS_CMD.COUNTER,uint8_t,(uint8_t)(PH_gs_cmd_list.executed_nodes_),PACKET,34,0,8,NONE,,,,,,,,地上局コマンドカウンタ,
,OBC.GS_CMD.LAST_EXEC_TIME,uint32_t,(uint32_t)gs_command_dispatcher->prev.time.total_cycle,PACKET,35,0,32,NONE,,,,,,,,最新地上局コマンド実行時刻,
,OBC.GS_CMD.LAST_EXEC_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),PACKET,39,0,16,NONE,,,,,,,,最新地上局コマンドID,
Expand Down
12 changes: 6 additions & 6 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 @@ -24,12 +24,12 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,MM_STS,uint8_t,(uint8_t)(mode_manager->stat),PACKET,30,0,8,NONE,,,,,,,,モード遷移実行状態,
,MM_OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),PACKET,31,0,8,NONE,,,,,,,,現状モード番号,
,MM_OPSMODE_PREV,uint8_t,(uint8_t)(mode_manager->previous_id),PACKET,32,0,8,NONE,,,,,,,,直前モード番号,
,TDSP_CURRENT_ID,uint8_t,(uint8_t)(task_dispathcer->task_list_id),PACKET,33,0,8,NONE,,,,,,,,現状 TaskList ID,
,TDSP_CMD_LAST_ERR_TIME_MASTER,uint32_t,(uint32_t)(task_dispathcer->tskd.prev_err.time.total_cycle),PACKET,34,0,32,NONE,,,,,,,,最新内部コマンド実行時刻,
,TDSP_CMD_LAST_ERR_TIME_STEP,uint8_t,(uint8_t)(task_dispathcer->tskd.prev_err.time.step),PACKET,38,0,8,NONE,,,,,,,,,
,TDSP_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(task_dispathcer->tskd.prev_err.code),PACKET,39,0,16,NONE,,,,,,,,最新内部コマンドID,
,TDSP_CMD_LAST_ERR_STS,uint8_t,(uint8_t)(task_dispathcer->tskd.prev_err.cmd_ret.exec_sts),PACKET,41,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT,最新内部コマンド実行結果,
,TDSP_CMD_LAST_ERR_CODE,uint32_t,(uint32_t)(task_dispathcer->tskd.prev_err.cmd_ret.err_code),PACKET,42,0,32,NONE,,,,,,,,最新内部コマンド実行結果,
,TDSP_CURRENT_ID,uint8_t,(uint8_t)(task_dispatcher->task_list_id),PACKET,33,0,8,NONE,,,,,,,,現状 TaskList ID,
,TDSP_CMD_LAST_ERR_TIME_MASTER,uint32_t,(uint32_t)(task_dispatcher->tskd.prev_err.time.total_cycle),PACKET,34,0,32,NONE,,,,,,,,最新内部コマンド実行時刻,
,TDSP_CMD_LAST_ERR_TIME_STEP,uint8_t,(uint8_t)(task_dispatcher->tskd.prev_err.time.step),PACKET,38,0,8,NONE,,,,,,,,,
,TDSP_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(task_dispatcher->tskd.prev_err.code),PACKET,39,0,16,NONE,,,,,,,,最新内部コマンドID,
,TDSP_CMD_LAST_ERR_STS,uint8_t,(uint8_t)(task_dispatcher->tskd.prev_err.cmd_ret.exec_sts),PACKET,41,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT,最新内部コマンド実行結果,
,TDSP_CMD_LAST_ERR_CODE,uint32_t,(uint32_t)(task_dispatcher->tskd.prev_err.cmd_ret.err_code),PACKET,42,0,32,NONE,,,,,,,,最新内部コマンド実行結果,
,GS_CMD_COUNTER,uint32_t,PH_gs_cmd_list.executed_nodes_,PACKET,46,0,32,NONE,,,,,,,,地上局コマンドカウンタ,
,GS_CMD_LAST_EXEC_TIME,uint32_t,(uint32_t)(gs_command_dispatcher->prev.time.total_cycle),PACKET,50,0,32,NONE,,,,,,,,最新地上局コマンド実行時刻,
,GS_CMD_LAST_EXEC_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),PACKET,54,0,16,NONE,,,,,,,,最新地上局コマンドID,
Expand Down
14 changes: 7 additions & 7 deletions src/src_user/TlmCmd/telemetry_definitions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_OBC_(uint8_t* packet, uint16_t* len, uint16_t ma
TF_copy_u8(&packet[30], (uint8_t)(mode_manager->stat));
TF_copy_u8(&packet[31], (uint8_t)(mode_manager->current_id));
TF_copy_u8(&packet[32], (uint8_t)(mode_manager->previous_id));
TF_copy_u8(&packet[33], (uint8_t)(task_dispathcer->task_list_id));
TF_copy_u32(&packet[34], (uint32_t)(task_dispathcer->tskd.prev_err.time.total_cycle));
TF_copy_u8(&packet[38], (uint8_t)(task_dispathcer->tskd.prev_err.time.step));
TF_copy_u16(&packet[39], (uint16_t)(task_dispathcer->tskd.prev_err.code));
TF_copy_u8(&packet[41], (uint8_t)(task_dispathcer->tskd.prev_err.cmd_ret.exec_sts));
TF_copy_u32(&packet[42], (uint32_t)(task_dispathcer->tskd.prev_err.cmd_ret.err_code));
TF_copy_u8(&packet[33], (uint8_t)(task_dispatcher->task_list_id));
TF_copy_u32(&packet[34], (uint32_t)(task_dispatcher->tskd.prev_err.time.total_cycle));
TF_copy_u8(&packet[38], (uint8_t)(task_dispatcher->tskd.prev_err.time.step));
TF_copy_u16(&packet[39], (uint16_t)(task_dispatcher->tskd.prev_err.code));
TF_copy_u8(&packet[41], (uint8_t)(task_dispatcher->tskd.prev_err.cmd_ret.exec_sts));
TF_copy_u32(&packet[42], (uint32_t)(task_dispatcher->tskd.prev_err.cmd_ret.err_code));
TF_copy_u32(&packet[46], PH_gs_cmd_list.executed_nodes_);
TF_copy_u32(&packet[50], (uint32_t)(gs_command_dispatcher->prev.time.total_cycle));
TF_copy_u16(&packet[54], (uint16_t)(gs_command_dispatcher->prev.code));
Expand Down Expand Up @@ -1720,7 +1720,7 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_HK_GEN_(uint8_t* packet, uint16_t* len, uint16_t
TF_copy_u32(&packet[26], (uint32_t)(TMGR_get_master_clock().mode_cycle));
TF_copy_u8(&packet[30], (uint8_t)(mode_manager->current_id));
TF_copy_u8(&packet[31], (uint8_t)( ((uint8_t)(mode_manager->stat) << 7 & 0x80) | ((uint8_t)(mode_manager->previous_id) & 0x7F) ));
TF_copy_u16(&packet[32], task_dispathcer->task_list_id);
TF_copy_u16(&packet[32], task_dispatcher->task_list_id);
TF_copy_u8(&packet[34], (uint8_t)(PH_gs_cmd_list.executed_nodes_));
TF_copy_u32(&packet[35], (uint32_t)gs_command_dispatcher->prev.time.total_cycle);
TF_copy_u16(&packet[39], (uint16_t)(gs_command_dispatcher->prev.code));
Expand Down

0 comments on commit 6e4c3dd

Please sign in to comment.