Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BCE Rotator の実行開始コマンド位置の修正 #319

Merged
merged 4 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
注意: これは既存の C2A core update の「リリースの間の Pull Request を眺めてなんとなく察する」という曖昧な操作を緩和していくための試みであり,C2A user に対するお知らせを行う場として使っていくことを意図しています.初めから c2a-core の全変更を取り扱うと不必要に煩雑になるだけになってしまうため,完全な変更内容の一覧についてはこれまで通り [GitHub Releases](https://github.com/arkedge/c2a-core/releases) などから参照してください.


## v4.4.0 (2024-xx-xx)

### Migration Guide
- [#319](https://github.com/arkedge/c2a-core/pull/319): `rotator` で TI=0 のコマンドから実行されるように修正
- デバッグ出力を使用している user は,起動時の表示タイミングが変わるため,この PR の Example user の変更を取り込むこと
- rotator で実行順に依存するような処理がある場合は,適宜 Task list の並び替えを行うこと


## v4.3.0 (2024-02-06)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

void BCL_load_tl_elem_debug_display_initial(void)
{
BCL_tool_register_app ( 0, AR_APP_DBG_FLUSH_SCREEN);
BCL_tool_register_app ( 1, AR_APP_DBG_PRINT_GIT_REV);
BCL_tool_register_app ( 2, AR_APP_DBG_PRINT_TIMESTAMP);
BCL_tool_register_app ( 3, AR_APP_DBG_PRINT_CMD_STATUS);
BCL_tool_register_app ( 4, AR_APP_DBG_PRINT_EVENT_LOGGER0);
BCL_tool_register_app ( 5, AR_APP_DBG_PRINT_EVENT_LOGGER1);
BCL_tool_register_app ( 6, AR_APP_DBG_PRINT_EVENT_HANDLER);
BCL_tool_register_app ( 0, AR_APP_DBG_PRINT_GIT_REV);
BCL_tool_register_app ( 1, AR_APP_DBG_PRINT_TIMESTAMP);
BCL_tool_register_app ( 2, AR_APP_DBG_PRINT_CMD_STATUS);
BCL_tool_register_app ( 3, AR_APP_DBG_PRINT_EVENT_LOGGER0);
BCL_tool_register_app ( 4, AR_APP_DBG_PRINT_EVENT_LOGGER1);
BCL_tool_register_app ( 5, AR_APP_DBG_PRINT_EVENT_HANDLER);
BCL_tool_register_app ( 6, AR_NOP);
BCL_tool_register_app ( 7, AR_NOP);
BCL_tool_register_app ( 8, AR_NOP);
BCL_tool_register_app ( 9, AR_NOP);
BCL_tool_register_app ( 9, AR_APP_DBG_FLUSH_SCREEN);
}

#pragma section
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

void BCL_load_tl_elem_debug_display_initial(void)
{
BCL_tool_register_app ( 0, AR_APP_DBG_FLUSH_SCREEN);
BCL_tool_register_app ( 1, AR_APP_DBG_PRINT_GIT_REV);
BCL_tool_register_app ( 2, AR_APP_DBG_PRINT_TIMESTAMP);
BCL_tool_register_app ( 3, AR_APP_DBG_PRINT_CMD_STATUS);
BCL_tool_register_app ( 4, AR_APP_DBG_PRINT_EVENT_LOGGER0);
BCL_tool_register_app ( 5, AR_APP_DBG_PRINT_EVENT_LOGGER1);
BCL_tool_register_app ( 6, AR_APP_DBG_PRINT_EVENT_HANDLER);
BCL_tool_register_app ( 0, AR_APP_DBG_PRINT_GIT_REV);
BCL_tool_register_app ( 1, AR_APP_DBG_PRINT_TIMESTAMP);
BCL_tool_register_app ( 2, AR_APP_DBG_PRINT_CMD_STATUS);
BCL_tool_register_app ( 3, AR_APP_DBG_PRINT_EVENT_LOGGER0);
BCL_tool_register_app ( 4, AR_APP_DBG_PRINT_EVENT_LOGGER1);
BCL_tool_register_app ( 5, AR_APP_DBG_PRINT_EVENT_HANDLER);
BCL_tool_register_app ( 6, AR_NOP);
BCL_tool_register_app ( 7, AR_NOP);
BCL_tool_register_app ( 8, AR_NOP);
BCL_tool_register_app ( 9, AR_NOP);
BCL_tool_register_app ( 9, AR_APP_DBG_FLUSH_SCREEN);
}

#pragma section
6 changes: 3 additions & 3 deletions tlm_cmd/block_command_executor.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@ static CCP_CmdRet BCE_rotate_block_cmd_(bct_id_t block)

bc_exe_params->rotate.counter = 0;

BCE_set_bc_exe_params_(block, bc_exe_params);
BCT_make_pos(&pos, block, bc_exe_params->rotate.next_cmd);

++bc_exe_params->rotate.next_cmd;
bc_exe_params->rotate.next_cmd %= BCT_get_bc_length(block);

BCE_set_bc_exe_params_(block, bc_exe_params);

BCT_make_pos(&pos, block, bc_exe_params->rotate.next_cmd);
BCT_load_cmd(&pos, &ccp);
return PH_dispatch_command(&ccp);
}
Expand Down
Loading