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.

Sign up for GitHub

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

Jump to bottom

Pre Release (v3.5.0-beta.2): Space Packet標準化にともなうC2A間通信の対応 #226

Merged
merged 12 commits into from
Feb 2, 2022
Merged

Pre Release (v3.5.0-beta.2): Space Packet標準化にともなうC2A間通信の対応 #226

merged 12 commits into from
Feb 2, 2022

Conversation

meltingrabbit
Copy link
Collaborator

@meltingrabbit meltingrabbit commented Jan 31, 2022 •
edited
Loading

概要

Space Packet標準化にともなうC2A間通信の対応

Issue

詳細

  • C2A間通信を，space packet仮定で書き直した
    • ついでに，不適切コードも直している
  • TLM GENERATE で content を作る部分を，content のみではなく，packetをまるっとつくるようにした
    • 2nd OBCでは，packetをbufferから読み出すため．MOBCもそれにあわせる

検証結果

  • 既存のテストがすべて通ればOK
  • ISSL内部の複数のOBCでのC2A間通信が正常にでいればOK

影響範囲

補足

以下については，PRを分ける ( #155 (comment) で)

  • MOBCと2nd OBCでtlm idがかぶっても良くなる，つまり，APIDでテレメを分離する
    • GENERATE_TLMは該当C2Aのテレメ生成コマンドで，tlm bufferからのtlm吸い出しコマンドを別で作る
  • AOBC_MAX_TLM_NUM が 0xff なのは流石に贅沢なので，減らす．

@meltingrabbit meltingrabbit added enhancement New feature or request priority::high priorityg high labels Jan 31, 2022
@meltingrabbit meltingrabbit self-assigned this Jan 31, 2022
@meltingrabbit
add 2nd obc code as AOBC
e65bf44 
これから，C2A間通信の大工事をやっていくが，その前に既存のC2Aの間通信のコードをcommitしておく
@meltingrabbit meltingrabbit changed the title WIP: Space Packet標準化にともなうC2A間通信の対応 WIP: Pre Release (v3.5.0-beta.1): Space Packet標準化にともなうC2A間通信の対応 Jan 31, 2022
@meltingrabbit meltingrabbit changed the title WIP: Pre Release (v3.5.0-beta.1): Space Packet標準化にともなうC2A間通信の対応 WIP: Pre Release (v3.5.0-beta.2): Space Packet標準化にともなうC2A間通信の対応 Jan 31, 2022
@meltingrabbit meltingrabbit mentioned this pull request Jan 31, 2022
Merged
@meltingrabbit meltingrabbit changed the title WIP: Pre Release (v3.5.0-beta.2): Space Packet標準化にともなうC2A間通信の対応 Pre Release (v3.5.0-beta.2): Space Packet標準化にともなうC2A間通信の対応 Jan 31, 2022
@meltingrabbit
Copy link
Collaborator Author

@yngyu , @chutaro テストもとおってWIPはずれたので，レビューお願いします．

ここでレビューOKの場合，ISSL環境の実機で試し，マージします．

@meltingrabbit meltingrabbit mentioned this pull request Jan 31, 2022
Closed
yngyu
yngyu approved these changes Feb 1, 2022
View reviewed changes
Copy link
Contributor

@yngyu yngyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve です、お疲れ様です。

@meltingrabbit
Copy link
Collaborator Author

ありがとう～

ut-issl/c2a-tlm-cmd-code-generator#17 のレビューが通り次第，時を同じくしてマージします．

yngyu
yngyu reviewed Feb 1, 2022
View reviewed changes
Copy link
Contributor

@yngyu yngyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[IMO] すいません、TLMS が最初なんのことかわからなかったので TLM_NUM にしませんか?

@meltingrabbit
Copy link
Collaborator Author

AOBC_MAX_TLMS？

@yngyu
Copy link
Contributor

yngyu commented Feb 1, 2022

それです

@meltingrabbit
Copy link
Collaborator Author

AOBC_MAX_TLM_NUM とかにしますか

@meltingrabbit
Copy link
Collaborator Author

ut-issl/c2a-tlm-cmd-code-generator#17 と合わせてそこだけ変えちゃいます．（自動生成部分なので）

@meltingrabbit
Copy link
Collaborator Author

直ったはず．後ほどテストも通し直しておきます．

@meltingrabbit
Copy link
Collaborator Author

テストも通りました．

@meltingrabbit
Copy link
Collaborator Author

ツールの更新が入ったので，バージョンを上げてpre releaseします．

@meltingrabbit meltingrabbit merged commit f3197d5 into develop Feb 2, 2022
@meltingrabbit meltingrabbit deleted the feature/comm_bw_c2a branch February 2, 2022 04:06
@meltingrabbit
Copy link
Collaborator Author

リリースうちました．

https://github.com/ut-issl/c2a-core/releases/tag/v3.5.0-beta.2

This was referenced Feb 2, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yngyu yngyu yngyu approved these changes

@github-actions github-actions[bot] github-actions[bot] left review comments

@chutaro chutaro Awaiting requested review from chutaro

Assignees

@meltingrabbit meltingrabbit

Labels
enhancement New feature or request priority::high priorityg high
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@meltingrabbit @yngyu