Merge pull request #18 from ut-issl/feature/update_db_and_change_dr_p…

…artition_in_tsp

Tlm Space Packet の 2nd header の DESTINATION INFO のフィールド名変更の対応

TLM_DB/SAMPLE_TLM_DB_HK.csv

@@ -13,11 +13,13 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,PH.SEQ_FLAG,uint16_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),2,NONE,,,,,,,,,
 ,PH.SEQ_COUNT,||,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),14,NONE,,,,,,,,,
 ,PH.PACKET_LEN,uint16_t,,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,,,,,,,,,
+,SH.VER,uint8_t,,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,,,,,,,,,
 ,SH.TI,uint32_t,,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,,,,,,,,,
-,SH.CATEGORY,uint8_t,,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,,,,,,,,,
-,SH.PACKET_IDENTIFIER,uint8_t,,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,,,,,,,,,
-,SH.PACKET_SEQ_FLAG,uint8_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),2,NONE,,,,,,,,,
-,SH.ADU_COUNT,||,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),6,NONE,,,,,,,,,
+,SH.TLM_ID,uint8_t,,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)))),HEX,,,,,,,,,
+,SH.GLOBAL_TIME,double,,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,,,,,,,,,
+,SH.ON_BOARD_SUBNET_TIME,uint32_t,,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,,,,,,,,,
+,SH.DEST_FLAGS,uint8_t,,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)))),HEX,,,,,,,,,
+,SH.DEST_INFO,uint8_t,,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_TM_MODE_TIME,uint32_t,TMGR_get_master_clock().mode_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_TM_UNIX_TIME_ON_TI0,double,TMGR_get_obct_unix_time_info().unix_time_on_ti0,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_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=GND_TEST@@3=WDFAR@@4=RTC_HIGH_RATE@@5=5@@6=6@@7=7@@8=8@@9=9@@10=10@@11=11@@12=12@@13=13@@14=14@@15=15@@16=MAX@@*=N/A,,
@@ -496,5 +498,3 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,

TLM_DB/SAMPLE_TLM_DB_MOBC.csv

@@ -13,11 +13,13 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,PH.SEQ_FLAG,uint16_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),2,NONE,,,,,,,,,
 ,PH.SEQ_COUNT,||,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),14,NONE,,,,,,,,,
 ,PH.PACKET_LEN,uint16_t,,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,,,,,,,,,
+,SH.VER,uint8_t,,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,,,,,,,,,
 ,SH.TI,uint32_t,,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,,,,,,,,,
-,SH.CATEGORY,uint8_t,,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,,,,,,,,,
-,SH.PACKET_IDENTIFIER,uint8_t,,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,,,,,,,,,
-,SH.PACKET_SEQ_FLAG,uint8_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),2,NONE,,,,,,,,,
-,SH.ADU_COUNT,||,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),6,NONE,,,,,,,,,
+,SH.TLM_ID,uint8_t,,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)))),HEX,,,,,,,,,
+,SH.GLOBAL_TIME,double,,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,,,,,,,,,
+,SH.ON_BOARD_SUBNET_TIME,uint32_t,,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,,,,,,,,,
+,SH.DEST_FLAGS,uint8_t,,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)))),HEX,,,,,,,,,
+,SH.DEST_INFO,uint8_t,,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,,,,,,,,,
 ,TM_MODE_TIME,uint32_t,(uint32_t)(TMGR_get_master_clock().mode_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,,,,,,,,モード遷移後経過時刻,
 ,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,,,,,,,,現状モード番号,
@@ -496,5 +498,3 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,

TLM_DB/calced_data/SAMPLE_TLM_DB_HK.csv

@@ -13,29 +13,29 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,PH.SEQ_FLAG,uint16_t,,PACKET,2,0,2,NONE,,,,,,,,,
 ,PH.SEQ_COUNT,,,PACKET,2,2,14,NONE,,,,,,,,,
 ,PH.PACKET_LEN,uint16_t,,PACKET,4,0,16,NONE,,,,,,,,,
-,SH.TI,uint32_t,,PACKET,6,0,32,NONE,,,,,,,,,
-,SH.CATEGORY,uint8_t,,PACKET,10,0,8,NONE,,,,,,,,,
-,SH.PACKET_IDENTIFIER,uint8_t,,PACKET,11,0,8,NONE,,,,,,,,,
-,SH.PACKET_SEQ_FLAG,uint8_t,,PACKET,12,0,2,NONE,,,,,,,,,
-,SH.ADU_COUNT,,,PACKET,12,2,6,NONE,,,,,,,,,
-,OBC_TM_MODE_TIME,uint32_t,TMGR_get_master_clock().mode_cycle,PACKET,13,0,32,NONE,,,,,,,,,
-,OBC_TM_UNIX_TIME_ON_TI0,double,TMGR_get_obct_unix_time_info().unix_time_on_ti0,PACKET,17,0,64,NONE,,,,,,,,,
-,OBC_MM_OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),PACKET,25,0,8,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=GND_TEST@@3=WDFAR@@4=RTC_HIGH_RATE@@5=5@@6=6@@7=7@@8=8@@9=9@@10=10@@11=11@@12=12@@13=13@@14=14@@15=15@@16=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,26,0,1,STATUS,,,,,,,0=FINISHED@@1=PROGRESS@@*=N/A,,
-,OBC_MM_OPSMODE_PREV,,,PACKET,26,1,7,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=GND_TEST@@3=WDFAR@@4=RTC_HIGH_RATE@@5=5@@6=6@@7=7@@8=8@@9=9@@10=10@@11=11@@12=12@@13=13@@14=14@@15=15@@16=MAX@@*=N/A,,
-,OBC_TDSP_CURRENT_ID,uint16_t,TDSP_info->task_list_id,PACKET,27,0,16,NONE,,,,,,,,,
-,OBC_GS_CMD_COUNTER,uint32_t,PL_count_executed_nodes(&PH_gs_cmd_list),PACKET,29,0,32,NONE,,,,,,,,地上局コマンドカウンタ,
-,OBC_GS_CMD_LAST_EXEC_TIME,uint32_t,gs_command_dispatcher->prev.time.total_cycle,PACKET,33,0,32,NONE,,,,,,,,最新地上局コマンド実行時刻,
-,OBC_GS_CMD_LAST_EXEC_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),PACKET,37,0,16,NONE,,,,,,,,最新地上局コマンドID,
-,OBC_GS_CMD_LAST_EXEC_STS,int8_t,(int8_t)(gs_command_dispatcher->prev.sts),PACKET,39,0,8,STATUS,,,,,,,0=SUC@@ -1=LEN@@ -2=PRM@@ -3=CNT@@ -4=NDF@@ -5=RUT@@ -6=FMT@@ *=ERR,最新地上局コマンド実行結果,
-,OBC_GS_CMD_LAST_ERR_TIME,uint32_t,gs_command_dispatcher->prev_err.time.total_cycle,PACKET,40,0,32,NONE,,,,,,,,地上局異常コマンド実行時刻,
-,OBC_GS_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev_err.code),PACKET,44,0,16,NONE,,,,,,,,地上局異常コマンドID,
-,OBC_GS_CMD_LAST_ERR_STS,int8_t,(int8_t)(gs_command_dispatcher->prev_err.sts),PACKET,46,0,8,STATUS,,,,,,,0=SUC@@ -1=LEN@@ -2=PRM@@ -3=CNT@@ -4=NDF@@ -5=RUT@@ -6=FMT@@ *=ERR,地上局異常コマンド実行結果,
-,OBC_GS_CMD_ERR_COUNTER,uint8_t,(uint8_t)(gs_command_dispatcher->error_counter),PACKET,47,0,8,NONE,,,,,,,,アノマリ対応発生回数,
-,GIT_REV_CORE,uint32_t,GIT_REV_CORE_SHORT,PACKET,48,0,32,HEX,,,,,,,,,
-,GIT_REV_USER,uint32_t,GIT_REV_USER_SHORT,PACKET,52,0,32,HEX,,,,,,,,,
-,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,
+,SH.VER,uint8_t,,PACKET,6,0,8,NONE,,,,,,,,,
+,SH.TI,uint32_t,,PACKET,7,0,32,NONE,,,,,,,,,
+,SH.TLM_ID,uint8_t,,PACKET,11,0,8,HEX,,,,,,,,,
+,SH.GLOBAL_TIME,double,,PACKET,12,0,64,NONE,,,,,,,,,
+,SH.ON_BOARD_SUBNET_TIME,uint32_t,,PACKET,20,0,32,NONE,,,,,,,,,
+,SH.DEST_FLAGS,uint8_t,,PACKET,24,0,8,HEX,,,,,,,,,
+,SH.DEST_INFO,uint8_t,,PACKET,25,0,8,NONE,,,,,,,,,
+,OBC_TM_MODE_TIME,uint32_t,TMGR_get_master_clock().mode_cycle,PACKET,26,0,32,NONE,,,,,,,,,
+,OBC_TM_UNIX_TIME_ON_TI0,double,TMGR_get_obct_unix_time_info().unix_time_on_ti0,PACKET,30,0,64,NONE,,,,,,,,,
+,OBC_MM_OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),PACKET,38,0,8,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=GND_TEST@@3=WDFAR@@4=RTC_HIGH_RATE@@5=5@@6=6@@7=7@@8=8@@9=9@@10=10@@11=11@@12=12@@13=13@@14=14@@15=15@@16=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,39,0,1,STATUS,,,,,,,0=FINISHED@@1=PROGRESS@@*=N/A,,
+,OBC_MM_OPSMODE_PREV,,,PACKET,39,1,7,STATUS,,,,,,,0=START_UP@@1=INITIAL@@2=GND_TEST@@3=WDFAR@@4=RTC_HIGH_RATE@@5=5@@6=6@@7=7@@8=8@@9=9@@10=10@@11=11@@12=12@@13=13@@14=14@@15=15@@16=MAX@@*=N/A,,
+,OBC_TDSP_CURRENT_ID,uint16_t,TDSP_info->task_list_id,PACKET,40,0,16,NONE,,,,,,,,,
+,OBC_GS_CMD_COUNTER,uint32_t,PL_count_executed_nodes(&PH_gs_cmd_list),PACKET,42,0,32,NONE,,,,,,,,地上局コマンドカウンタ,
+,OBC_GS_CMD_LAST_EXEC_TIME,uint32_t,gs_command_dispatcher->prev.time.total_cycle,PACKET,46,0,32,NONE,,,,,,,,最新地上局コマンド実行時刻,
+,OBC_GS_CMD_LAST_EXEC_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),PACKET,50,0,16,NONE,,,,,,,,最新地上局コマンドID,
+,OBC_GS_CMD_LAST_EXEC_STS,int8_t,(int8_t)(gs_command_dispatcher->prev.sts),PACKET,52,0,8,STATUS,,,,,,,0=SUC@@ -1=LEN@@ -2=PRM@@ -3=CNT@@ -4=NDF@@ -5=RUT@@ -6=FMT@@ *=ERR,最新地上局コマンド実行結果,
+,OBC_GS_CMD_LAST_ERR_TIME,uint32_t,gs_command_dispatcher->prev_err.time.total_cycle,PACKET,53,0,32,NONE,,,,,,,,地上局異常コマンド実行時刻,
+,OBC_GS_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev_err.code),PACKET,57,0,16,NONE,,,,,,,,地上局異常コマンドID,
+,OBC_GS_CMD_LAST_ERR_STS,int8_t,(int8_t)(gs_command_dispatcher->prev_err.sts),PACKET,59,0,8,STATUS,,,,,,,0=SUC@@ -1=LEN@@ -2=PRM@@ -3=CNT@@ -4=NDF@@ -5=RUT@@ -6=FMT@@ *=ERR,地上局異常コマンド実行結果,
+,OBC_GS_CMD_ERR_COUNTER,uint8_t,(uint8_t)(gs_command_dispatcher->error_counter),PACKET,60,0,8,NONE,,,,,,,,アノマリ対応発生回数,
+,GIT_REV_CORE,uint32_t,GIT_REV_CORE_SHORT,PACKET,61,0,32,HEX,,,,,,,,,
+,GIT_REV_USER,uint32_t,GIT_REV_USER_SHORT,PACKET,65,0,32,HEX,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,

TLM_DB/calced_data/SAMPLE_TLM_DB_MOBC.csv

@@ -13,22 +13,22 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,PH.SEQ_FLAG,uint16_t,,PACKET,2,0,2,NONE,,,,,,,,,
 ,PH.SEQ_COUNT,,,PACKET,2,2,14,NONE,,,,,,,,,
 ,PH.PACKET_LEN,uint16_t,,PACKET,4,0,16,NONE,,,,,,,,,
-,SH.TI,uint32_t,,PACKET,6,0,32,NONE,,,,,,,,,
-,SH.CATEGORY,uint8_t,,PACKET,10,0,8,NONE,,,,,,,,,
-,SH.PACKET_IDENTIFIER,uint8_t,,PACKET,11,0,8,NONE,,,,,,,,,
-,SH.PACKET_SEQ_FLAG,uint8_t,,PACKET,12,0,2,NONE,,,,,,,,,
-,SH.ADU_COUNT,,,PACKET,12,2,6,NONE,,,,,,,,,
-,TM_MODE_TIME,uint32_t,(uint32_t)(TMGR_get_master_clock().mode_cycle),PACKET,13,0,32,NONE,,,,,,,,モード遷移後経過時刻,
-,MM_STS,uint8_t,(uint8_t)(mode_manager->stat),PACKET,17,0,8,NONE,,,,,,,,モード遷移実行状態,
-,MM_OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),PACKET,18,0,8,NONE,,,,,,,,現状モード番号,
-,MM_OPSMODE_PREV,uint8_t,(uint8_t)(mode_manager->previous_id),PACKET,19,0,8,NONE,,,,,,,,直前モード番号,
-,TDSP_CURRENT_ID,uint8_t,(uint8_t)(TDSP_info->task_list_id),PACKET,20,0,8,NONE,,,,,,,,現状 TaskList ID,
-,TDSP_CMD_LAST_ERR_TIME_MASTER,uint32_t,(uint32_t)(TDSP_info->tskd.prev_err.time.total_cycle),PACKET,21,0,32,NONE,,,,,,,,最新内部コマンド実行時刻,
-,TDSP_CMD_LAST_ERR_TIME_STEP,uint8_t,(uint8_t)(TDSP_info->tskd.prev_err.time.step),PACKET,25,0,8,NONE,,,,,,,,,
-,TDSP_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(TDSP_info->tskd.prev_err.code),PACKET,26,0,16,NONE,,,,,,,,最新内部コマンドID,
-,TDSP_CMD_LAST_ERR_STS,int32_t,(int32_t)(TDSP_info->tskd.prev_err.sts),PACKET,28,0,32,STATUS,,,,,,,0=SUC:G@@ -1=LEN:R@@ -2=PRM:R@@ -3=CNT:R@@ -4=NDF:R@@ -5=RUT:R@@ -6=FMT:R@@ *=ERR:R,最新内部コマンド実行結果,
-,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,
+,SH.VER,uint8_t,,PACKET,6,0,8,NONE,,,,,,,,,
+,SH.TI,uint32_t,,PACKET,7,0,32,NONE,,,,,,,,,
+,SH.TLM_ID,uint8_t,,PACKET,11,0,8,HEX,,,,,,,,,
+,SH.GLOBAL_TIME,double,,PACKET,12,0,64,NONE,,,,,,,,,
+,SH.ON_BOARD_SUBNET_TIME,uint32_t,,PACKET,20,0,32,NONE,,,,,,,,,
+,SH.DEST_FLAGS,uint8_t,,PACKET,24,0,8,HEX,,,,,,,,,
+,SH.DEST_INFO,uint8_t,,PACKET,25,0,8,NONE,,,,,,,,,
+,TM_MODE_TIME,uint32_t,(uint32_t)(TMGR_get_master_clock().mode_cycle),PACKET,26,0,32,NONE,,,,,,,,モード遷移後経過時刻,
+,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)(TDSP_info->task_list_id),PACKET,33,0,8,NONE,,,,,,,,現状 TaskList ID,
+,TDSP_CMD_LAST_ERR_TIME_MASTER,uint32_t,(uint32_t)(TDSP_info->tskd.prev_err.time.total_cycle),PACKET,34,0,32,NONE,,,,,,,,最新内部コマンド実行時刻,
+,TDSP_CMD_LAST_ERR_TIME_STEP,uint8_t,(uint8_t)(TDSP_info->tskd.prev_err.time.step),PACKET,38,0,8,NONE,,,,,,,,,
+,TDSP_CMD_LAST_ERR_ID,uint16_t,(uint16_t)(TDSP_info->tskd.prev_err.code),PACKET,39,0,16,NONE,,,,,,,,最新内部コマンドID,
+,TDSP_CMD_LAST_ERR_STS,int32_t,(int32_t)(TDSP_info->tskd.prev_err.sts),PACKET,41,0,32,STATUS,,,,,,,0=SUC:G@@ -1=LEN:R@@ -2=PRM:R@@ -3=CNT:R@@ -4=NDF:R@@ -5=RUT:R@@ -6=FMT:R@@ *=ERR:R,最新内部コマンド実行結果,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,