Skip to content

Commit

Permalink
Merge pull request #318 from ut-issl/feature/add-el-low-note-tlm
Browse files Browse the repository at this point in the history 
Add EL low note telemetry
  • Loading branch information
@conjikidow
conjikidow authored May 25, 2024
2 parents 474c0ca + 8a5f779 commit 9ff22ee
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 107 deletions.
6 changes: 3 additions & 3 deletions database/TLM_DB/AOBC_TLM_DB_AOBC_HK_ALGO.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,MAG.EST.B_X_nT,float,(float)(aocs_manager->mag_vec_est_body_nT[0]),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,,,,,,,,推定磁場ベクトル 機体座標X [nT],
,MAG.EST.B_Y_nT,float,(float)(aocs_manager->mag_vec_est_body_nT[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,,,,,,,,推定磁場ベクトル 機体座標Y [nT],
,MAG.EST.B_Z_nT,float,(float)(aocs_manager->mag_vec_est_body_nT[2]),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,,,,,,,,推定磁場ベクトル 機体座標Z [nT],
,TORQUE.IN_TARGET_B.X_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[0]),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,,,,,,,,目標内力トルク 機体座標X [Nm],
,TORQUE.IN_TARGET_B.Y_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[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,,,,,,,,目標内力トルク 機体座標Y [Nm],
,TORQUE.IN_TARGET_B.Z_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[2]),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,,,,,,,,目標内力トルク 機体座標Z [Nm],
,TORQUE.IN_TARGET.B_X_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[0]),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,,,,,,,,目標内力トルク 機体座標X [Nm],
,TORQUE.IN_TARGET.B_Y_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[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,,,,,,,,目標内力トルク 機体座標Y [Nm],
,TORQUE.IN_TARGET.B_Z_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[2]),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,,,,,,,,目標内力トルク 機体座標Z [Nm],
,TORQUE.EXT_TARGET.B_X_Nm,float,(float)(aocs_manager->external_torque_target_body_Nm[0]),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,,,,,,,,目標外力トルク 機体座標X [Nm],
,TORQUE.EXT_TARGET.B_Y_Nm,float,(float)(aocs_manager->external_torque_target_body_Nm[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,,,,,,,,目標外力トルク 機体座標Y [Nm],
,TORQUE.EXT_TARGET.B_Z_Nm,float,(float)(aocs_manager->external_torque_target_body_Nm[2]),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,,,,,,,,目標外力トルク 機体座標Z [Nm],
Expand Down
2 changes: 1 addition & 1 deletion database/TLM_DB/AOBC_TLM_DB_AOBC_HK_GEN.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,OBC.EL.LATEST_LOW_EVENT.LOCAL,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_LOW@@ 0)->local,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.EL.LATEST_LOW_EVENT.TIME.TOTAL_CYCLE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_LOW@@ 0)->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.EL.LATEST_LOW_EVENT.TIME.STEP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_LOW@@ 0)->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,,,,,,,,,
,OBC.EL.LATEST_LOW_EVENT.NOTE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_LOW@@ 0)->note,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,,,,,,,,,u8にしてもよい
,OBC.EL.LATEST_HIGH_EVENT.GROUP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->group,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.EL.LATEST_HIGH_EVENT.LOCAL,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->local,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.EL.LATEST_HIGH_EVENT.TIME.TOTAL_CYCLE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->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,,,,,,,,,
Expand Down Expand Up @@ -497,4 +498,3 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,
6 changes: 3 additions & 3 deletions database/TLM_DB/calced_data/AOBC_TLM_DB_AOBC_HK_ALGO.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,MAG.EST.B_X_nT,float,(float)(aocs_manager->mag_vec_est_body_nT[0]),PACKET,131,0,32,NONE,,,,,,,,推定磁場ベクトル 機体座標X [nT],
,MAG.EST.B_Y_nT,float,(float)(aocs_manager->mag_vec_est_body_nT[1]),PACKET,135,0,32,NONE,,,,,,,,推定磁場ベクトル 機体座標Y [nT],
,MAG.EST.B_Z_nT,float,(float)(aocs_manager->mag_vec_est_body_nT[2]),PACKET,139,0,32,NONE,,,,,,,,推定磁場ベクトル 機体座標Z [nT],
,TORQUE.IN_TARGET_B.X_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[0]),PACKET,143,0,32,NONE,,,,,,,,目標内力トルク 機体座標X [Nm],
,TORQUE.IN_TARGET_B.Y_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[1]),PACKET,147,0,32,NONE,,,,,,,,目標内力トルク 機体座標Y [Nm],
,TORQUE.IN_TARGET_B.Z_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[2]),PACKET,151,0,32,NONE,,,,,,,,目標内力トルク 機体座標Z [Nm],
,TORQUE.IN_TARGET.B_X_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[0]),PACKET,143,0,32,NONE,,,,,,,,目標内力トルク 機体座標X [Nm],
,TORQUE.IN_TARGET.B_Y_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[1]),PACKET,147,0,32,NONE,,,,,,,,目標内力トルク 機体座標Y [Nm],
,TORQUE.IN_TARGET.B_Z_Nm,float,(float)(aocs_manager->internal_torque_target_body_Nm[2]),PACKET,151,0,32,NONE,,,,,,,,目標内力トルク 機体座標Z [Nm],
,TORQUE.EXT_TARGET.B_X_Nm,float,(float)(aocs_manager->external_torque_target_body_Nm[0]),PACKET,155,0,32,NONE,,,,,,,,目標外力トルク 機体座標X [Nm],
,TORQUE.EXT_TARGET.B_Y_Nm,float,(float)(aocs_manager->external_torque_target_body_Nm[1]),PACKET,159,0,32,NONE,,,,,,,,目標外力トルク 機体座標Y [Nm],
,TORQUE.EXT_TARGET.B_Z_Nm,float,(float)(aocs_manager->external_torque_target_body_Nm[2]),PACKET,163,0,32,NONE,,,,,,,,目標外力トルク 機体座標Z [Nm],
Expand Down
Loading

0 comments on commit 9ff22ee

Please sign in to comment.