Merge pull request #612 from ut-issl/develop

Update main (v3.9.1) on 2023-06-13

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   minimum_user:
     name: minimum user
-    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.1.0
+    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.3.0
     with:
       c2a_dir: Examples/minimum_user
       c2a_custom_setup: |
@@ -25,7 +25,7 @@ jobs:
 
   second_obc_user:
     name: 2nd obc user
-    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.1.0
+    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.3.0
     with:
       c2a_dir: Examples/2nd_obc_user
       c2a_custom_setup: |

.github/workflows/rust.yml

@@ -24,7 +24,7 @@ jobs:
           components: clippy, rustfmt
 
       - name: cache dependencies
-        uses: Swatinem/rust-cache@v2.4.0
+        uses: Swatinem/rust-cache@v2.5.0
 
       - name: reviewdog / clippy
         uses: sksat/action-clippy@v0.2.1

Applications/telemetry_manager.h

@@ -146,7 +146,7 @@ AppInfo TLM_MGR_create_app(void);
 
 /**
  * @brief 初期化
- * @note  DCU を使っているので，完了に 1 秒ほどかかる
+ * @note  DCU を使っているので，完了に最大 1.5 秒ほどかかる
  */
 CCP_CmdRet Cmd_TLM_MGR_INIT(const CommonCmdPacket* packet);
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "c2a-core"
-version = "3.9.0"
+version = "3.9.1"
 edition = "2021"
 
 links = "c2a-core"

Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv

@@ -26,12 +26,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.LAST_ERR.TIME.TOTAL_CYCLE,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.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.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.LAST_ERR.EXEC_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@@ *=ERR,最新内部コマンド実行結果,
-,TDSP.LAST_ERR.ERR_CODE,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.LAST_ERR.TIME.TOTAL_CYCLE,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.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.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.LAST_ERR.EXEC_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@@ *=ERR,最新内部コマンド実行結果,
+,TDSP.LAST_ERR.ERR_CODE,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,PL_count_executed_nodes(&PH_gs_cmd_list),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,

Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv

@@ -25,7 +25,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=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,=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@@*=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=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,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,uint32_t,PL_count_executed_nodes(&PH_gs_cmd_list),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,

Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv

@@ -26,12 +26,12 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,MM_STS,uint8_t,(uint8_t)(mode_manager->stat),PACKET,46,0,8,NONE,,,,,,,,モード遷移実行状態,
 ,MM_OPSMODE,uint8_t,(uint8_t)(mode_manager->current_id),PACKET,47,0,8,NONE,,,,,,,,現状モード番号,
 ,MM_OPSMODE_PREV,uint8_t,(uint8_t)(mode_manager->previous_id),PACKET,48,0,8,NONE,,,,,,,,直前モード番号,
-,TDSP.CURRENT_ID,uint8_t,(uint8_t)(task_dispathcer->task_list_id),PACKET,49,0,8,NONE,,,,,,,,現状 TaskList ID,
-,TDSP.LAST_ERR.TIME.TOTAL_CYCLE,uint32_t,(uint32_t)(task_dispathcer->tskd.prev_err.time.total_cycle),PACKET,50,0,32,NONE,,,,,,,,最新内部コマンド実行時刻,
-,TDSP.LAST_ERR.TIME.STEP,uint8_t,(uint8_t)(task_dispathcer->tskd.prev_err.time.step),PACKET,54,0,8,NONE,,,,,,,,,
-,TDSP.LAST_ERR.ID,uint16_t,(uint16_t)(task_dispathcer->tskd.prev_err.code),PACKET,55,0,16,NONE,,,,,,,,最新内部コマンドID,
-,TDSP.LAST_ERR.EXEC_STS,uint8_t,(uint8_t)(task_dispathcer->tskd.prev_err.cmd_ret.exec_sts),PACKET,57,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT@@ *=ERR,最新内部コマンド実行結果,
-,TDSP.LAST_ERR.ERR_CODE,uint32_t,task_dispathcer->tskd.prev_err.cmd_ret.err_code,PACKET,58,0,32,NONE,,,,,,,,,
+,TDSP.CURRENT_ID,uint8_t,(uint8_t)(task_dispatcher->task_list_id),PACKET,49,0,8,NONE,,,,,,,,現状 TaskList ID,
+,TDSP.LAST_ERR.TIME.TOTAL_CYCLE,uint32_t,(uint32_t)(task_dispatcher->tskd.prev_err.time.total_cycle),PACKET,50,0,32,NONE,,,,,,,,最新内部コマンド実行時刻,
+,TDSP.LAST_ERR.TIME.STEP,uint8_t,(uint8_t)(task_dispatcher->tskd.prev_err.time.step),PACKET,54,0,8,NONE,,,,,,,,,
+,TDSP.LAST_ERR.ID,uint16_t,(uint16_t)(task_dispatcher->tskd.prev_err.code),PACKET,55,0,16,NONE,,,,,,,,最新内部コマンドID,
+,TDSP.LAST_ERR.EXEC_STS,uint8_t,(uint8_t)(task_dispatcher->tskd.prev_err.cmd_ret.exec_sts),PACKET,57,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT@@ *=ERR,最新内部コマンド実行結果,
+,TDSP.LAST_ERR.ERR_CODE,uint32_t,task_dispatcher->tskd.prev_err.cmd_ret.err_code,PACKET,58,0,32,NONE,,,,,,,,,
 ,GS_CMD.COUNTER,uint32_t,PL_count_executed_nodes(&PH_gs_cmd_list),PACKET,62,0,32,NONE,,,,,,,,地上局コマンドカウンタ,
 ,GS_CMD.LAST_EXEC.TIME,uint32_t,(uint32_t)(gs_command_dispatcher->prev.time.total_cycle),PACKET,66,0,32,NONE,,,,,,,,最新地上局コマンド実行時刻,
 ,GS_CMD.LAST_EXEC.ID,uint16_t,(uint16_t)(gs_command_dispatcher->prev.code),PACKET,70,0,16,NONE,,,,,,,,最新地上局コマンドID,

Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv

@@ -25,7 +25,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
 ,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,task_dispathcer->task_list_id,PACKET,40,0,16,NONE,,,,,,,,,
+,OBC.TDSP.CURRENT_ID,uint16_t,task_dispatcher->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,(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,

Examples/2nd_obc_user/src/src_user/TlmCmd/telemetry_definitions.c

@@ -28,12 +28,12 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_AOBC_(uint8_t* packet, uint16_t* len, uint16_t m
   TF_copy_u8(&packet[46], (uint8_t)(mode_manager->stat));
   TF_copy_u8(&packet[47], (uint8_t)(mode_manager->current_id));
   TF_copy_u8(&packet[48], (uint8_t)(mode_manager->previous_id));
-  TF_copy_u8(&packet[49], (uint8_t)(task_dispathcer->task_list_id));
-  TF_copy_u32(&packet[50], (uint32_t)(task_dispathcer->tskd.prev_err.time.total_cycle));
-  TF_copy_u8(&packet[54], (uint8_t)(task_dispathcer->tskd.prev_err.time.step));
-  TF_copy_u16(&packet[55], (uint16_t)(task_dispathcer->tskd.prev_err.code));
-  TF_copy_u8(&packet[57], (uint8_t)(task_dispathcer->tskd.prev_err.cmd_ret.exec_sts));
-  TF_copy_u32(&packet[58], task_dispathcer->tskd.prev_err.cmd_ret.err_code);
+  TF_copy_u8(&packet[49], (uint8_t)(task_dispatcher->task_list_id));
+  TF_copy_u32(&packet[50], (uint32_t)(task_dispatcher->tskd.prev_err.time.total_cycle));
+  TF_copy_u8(&packet[54], (uint8_t)(task_dispatcher->tskd.prev_err.time.step));
+  TF_copy_u16(&packet[55], (uint16_t)(task_dispatcher->tskd.prev_err.code));
+  TF_copy_u8(&packet[57], (uint8_t)(task_dispatcher->tskd.prev_err.cmd_ret.exec_sts));
+  TF_copy_u32(&packet[58], task_dispatcher->tskd.prev_err.cmd_ret.err_code);
   TF_copy_u32(&packet[62], PL_count_executed_nodes(&PH_gs_cmd_list));
   TF_copy_u32(&packet[66], (uint32_t)(gs_command_dispatcher->prev.time.total_cycle));
   TF_copy_u16(&packet[70], (uint16_t)(gs_command_dispatcher->prev.code));
@@ -120,7 +120,7 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max
   TF_copy_double(&packet[30], TMGR_get_unixtime_at_ti0());
   TF_copy_u8(&packet[38], (uint8_t)(mode_manager->current_id));
   TF_copy_u8(&packet[39], (uint8_t)( ((uint8_t)(mode_manager->stat) << 7 & 0x80) | ((uint8_t)(mode_manager->previous_id) & 0x7F) ));
-  TF_copy_u16(&packet[40], task_dispathcer->task_list_id);
+  TF_copy_u16(&packet[40], task_dispatcher->task_list_id);
   TF_copy_u32(&packet[42], PL_count_executed_nodes(&PH_gs_cmd_list));
   TF_copy_u32(&packet[46], (uint32_t)(gs_command_dispatcher->prev.time.total_cycle));
   TF_copy_u16(&packet[50], (uint16_t)(gs_command_dispatcher->prev.code));

Examples/minimum_user/src/src_user/Drivers/Aocs/aobc.c

@@ -140,7 +140,6 @@ DS_CMD_ERR_CODE AOBC_send_cmd(AOBC_Driver* aobc_driver, const CommonCmdPacket* p
 
   // [TODO] ここではコマンドが実際に存在するか，ということはフィルタしない！（でいいよね？）
   // 必要があれば，AOBC 側で弾くべき．
-
   switch (cmd_code)
   {
   case AOBC_Cmd_CODE_GENERATE_TLM:            // FALLTHROUGH