Skip to content

get_latest_tlm で tlm_id だけではなく APID もチェックするようにする #38

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

Open
chutaro wants to merge 4 commits into
base: main
Choose a base branch
from
Open

get_latest_tlm で tlm_id だけではなく APID もチェックするようにする #38

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e2352d
add tlm_apid
chutaro Sep 25, 2023
cbdb688
後方互換性を持たせた
chutaro Sep 25, 2023
04f6f55
fix small
chutaro Sep 25, 2023
3b81396
fix small
chutaro Sep 26, 2023
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
5 changes: 5 additions & 0 deletions isslwings/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

default_obc_info = {
"name": "MOBC",
# "tlm_apid": "0x00", 複数 OBC のテレメを用いる場合は設定する
"hk_tlm_info": {
"tlm_name": "HK",
"cmd_counter": "OBC.GS_CMD.COUNTER",
Expand Down Expand Up @@ -127,6 +128,10 @@ def get_latest_tlm(self, tlm_code_id: int) -> Tuple[dict, str]:
# 該当するtlm_code_nameのテレメ情報を探す
tlm_code_is_found = False
for response_data in response["data"]:
if "tlm_apid" in self.obc_info:
tlm_apid = int(self.obc_info["tlm_apid"], 16)
if int(response_data["packetInfo"]["tlmApid"], base=16) != tlm_apid:
continue
if int(response_data["packetInfo"]["id"], base=16) == tlm_code_id:
tlm_code_is_found = True
break
Expand Down