Merge pull request #273 from ut-issl/main

Merge main to develop for hotfix #272
ut-issl · Feb 15, 2024 · d44547e · d44547e
2 parents 01d1ea3 + 12dc463
commit d44547e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/database/TLM_DB/AOBC_TLM_DB_AOBC_HK_ALGO.csv b/database/TLM_DB/AOBC_TLM_DB_AOBC_HK_ALGO.csv
@@ -66,9 +66,9 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,MODE_MANAGER.BDOT_RETRY_CNT,uint8_t,(uint8_t)(aocs_mode_manager->bdot_retry_count),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,,,,,,,,自動モード遷移でBdotに戻った回数,
 ,FLAGS.UNDEFINED,uint8_t,(uint8_t)(aocs_manager->flags_for_tlm),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,,,,,,,*=UNDEFINED,,
 ,FLAGS.IS_CONTROL_ERROR_SMALL,||,||,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),1,1,STATUS,,,,,,,0=ERROR_LARGE@@ 1=ERROR_SMALL,,
-,FLAGS.IS_UNLOADIGN_FOR_RWZ,||,||,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=No@@ 1=UNLOADING_for_RWZ,,
-,FLAGS.IS_UNLOADIGN_FOR_RWY,||,||,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=No@@ 1=UNLOADING_for_RWY,,
-,FLAGS.IS_UNLOADIGN_FOR_RWX,||,||,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=No@@ 1=UNLOADING_for_RWX,,
+,FLAGS.IS_UNLOADING_FOR_RWZ,||,||,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=No@@ 1=UNLOADING_for_RWZ,,
+,FLAGS.IS_UNLOADING_FOR_RWY,||,||,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=No@@ 1=UNLOADING_for_RWY,,
+,FLAGS.IS_UNLOADING_FOR_RWX,||,||,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=No@@ 1=UNLOADING_for_RWX,,
 ,FLAGS.IS_STT_AVAILABLE,||,||,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=No@@ 1=STT_AVAILABLE,,
 ,FLAGS.IS_GPSR_AVAILABLE,||,||,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=No@@ 1=GPS-R_AVAILABLE,,
 ,FLAGS.IS_SS_AVAILABLE,||,||,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=No@@ 1=SS_AVAILABLE,,

diff --git a/database/TLM_DB/calced_data/AOBC_TLM_DB_AOBC_HK_ALGO.csv b/database/TLM_DB/calced_data/AOBC_TLM_DB_AOBC_HK_ALGO.csv
@@ -66,9 +66,9 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,MODE_MANAGER.BDOT_RETRY_CNT,uint8_t,(uint8_t)(aocs_mode_manager->bdot_retry_count),PACKET,223,0,8,NONE,,,,,,,,自動モード遷移でBdotに戻った回数,
 ,FLAGS.UNDEFINED,uint8_t,(uint8_t)(aocs_manager->flags_for_tlm),PACKET,224,0,1,STATUS,,,,,,,*=UNDEFINED,,
 ,FLAGS.IS_CONTROL_ERROR_SMALL,,,PACKET,224,1,1,STATUS,,,,,,,0=ERROR_LARGE@@ 1=ERROR_SMALL,,
-,FLAGS.IS_UNLOADIGN_FOR_RWZ,,,PACKET,224,2,1,STATUS,,,,,,,0=No@@ 1=UNLOADING_for_RWZ,,
-,FLAGS.IS_UNLOADIGN_FOR_RWY,,,PACKET,224,3,1,STATUS,,,,,,,0=No@@ 1=UNLOADING_for_RWY,,
-,FLAGS.IS_UNLOADIGN_FOR_RWX,,,PACKET,224,4,1,STATUS,,,,,,,0=No@@ 1=UNLOADING_for_RWX,,
+,FLAGS.IS_UNLOADING_FOR_RWZ,,,PACKET,224,2,1,STATUS,,,,,,,0=No@@ 1=UNLOADING_for_RWZ,,
+,FLAGS.IS_UNLOADING_FOR_RWY,,,PACKET,224,3,1,STATUS,,,,,,,0=No@@ 1=UNLOADING_for_RWY,,
+,FLAGS.IS_UNLOADING_FOR_RWX,,,PACKET,224,4,1,STATUS,,,,,,,0=No@@ 1=UNLOADING_for_RWX,,
 ,FLAGS.IS_STT_AVAILABLE,,,PACKET,224,5,1,STATUS,,,,,,,0=No@@ 1=STT_AVAILABLE,,
 ,FLAGS.IS_GPSR_AVAILABLE,,,PACKET,224,6,1,STATUS,,,,,,,0=No@@ 1=GPS-R_AVAILABLE,,
 ,FLAGS.IS_SS_AVAILABLE,,,PACKET,224,7,1,STATUS,,,,,,,0=No@@ 1=SS_AVAILABLE,,