From 0e2352de663c5db7aed9ddd40fc1a0e62a9a35b4 Mon Sep 17 00:00:00 2001 From: chutaro <35984595+chutaro@users.noreply.github.com> Date: Mon, 25 Sep 2023 18:24:40 +0900 Subject: [PATCH 1/4] add tlm_apid --- isslwings/operation.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/isslwings/operation.py b/isslwings/operation.py index be0c83f..9b9a700 100644 --- a/isslwings/operation.py +++ b/isslwings/operation.py @@ -13,6 +13,7 @@ default_obc_info = { "name": "MOBC", + "tlm_apid": "0x00", "hk_tlm_info": { "tlm_name": "HK", "cmd_counter": "OBC.GS_CMD.COUNTER", @@ -127,6 +128,8 @@ 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 int(response_data["packetInfo"]["tlmApid"], base=16) != int(self.obc_info["tlm_apid"], 16): + continue if int(response_data["packetInfo"]["id"], base=16) == tlm_code_id: tlm_code_is_found = True break From cbdb6886de27b737be634cc1c8e3993573551916 Mon Sep 17 00:00:00 2001 From: chutaro <35984595+chutaro@users.noreply.github.com> Date: Mon, 25 Sep 2023 18:34:12 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BE=8C=E6=96=B9=E4=BA=92=E6=8F=9B?= =?UTF-8?q?=E6=80=A7=E3=82=92=E6=8C=81=E3=81=9F=E3=81=9B=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- isslwings/operation.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/isslwings/operation.py b/isslwings/operation.py index 9b9a700..95802bd 100644 --- a/isslwings/operation.py +++ b/isslwings/operation.py @@ -128,8 +128,9 @@ 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 int(response_data["packetInfo"]["tlmApid"], base=16) != int(self.obc_info["tlm_apid"], 16): - continue + if "tlm_apid" in self.obc_info: + if int(response_data["packetInfo"]["tlmApid"], base=16) != int(self.obc_info["tlm_apid"], 16): + continue if int(response_data["packetInfo"]["id"], base=16) == tlm_code_id: tlm_code_is_found = True break From 04f6f55cef736be5b48c50e9b58e3f9b89b33186 Mon Sep 17 00:00:00 2001 From: chutaro <35984595+chutaro@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:31:48 +0900 Subject: [PATCH 3/4] fix small --- isslwings/operation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/isslwings/operation.py b/isslwings/operation.py index 95802bd..6f8aacf 100644 --- a/isslwings/operation.py +++ b/isslwings/operation.py @@ -129,7 +129,8 @@ def get_latest_tlm(self, tlm_code_id: int) -> Tuple[dict, str]: tlm_code_is_found = False for response_data in response["data"]: if "tlm_apid" in self.obc_info: - if int(response_data["packetInfo"]["tlmApid"], base=16) != int(self.obc_info["tlm_apid"], 16): + 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 From 3b81396d47b01f4eb64a256631e8141ce2fb7127 Mon Sep 17 00:00:00 2001 From: chutaro <35984595+chutaro@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:53:47 +0900 Subject: [PATCH 4/4] fix small --- isslwings/operation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isslwings/operation.py b/isslwings/operation.py index 6f8aacf..7f19199 100644 --- a/isslwings/operation.py +++ b/isslwings/operation.py @@ -13,7 +13,7 @@ default_obc_info = { "name": "MOBC", - "tlm_apid": "0x00", + # "tlm_apid": "0x00", 複数 OBC のテレメを用いる場合は設定する "hk_tlm_info": { "tlm_name": "HK", "cmd_counter": "OBC.GS_CMD.COUNTER",