From 6c367aab32d32c03c0f43e3a0f31a3e24804566d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 3 Apr 2023 16:55:22 +0200 Subject: [PATCH 1/3] add handling for 3v3 stack HK --- eive_tmtc/tmtc/power/power.py | 1 + eive_tmtc/tmtc/power/tm.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eive_tmtc/tmtc/power/power.py b/eive_tmtc/tmtc/power/power.py index 5d397c5..61f613d 100644 --- a/eive_tmtc/tmtc/power/power.py +++ b/eive_tmtc/tmtc/power/power.py @@ -71,6 +71,7 @@ class PcduSwitches(enum.IntEnum): PDU2_CH8_PAYLOAD_CAMERA = 17 P60_DOCK_5V_STACK = 18 + P60_DOCK_3V3_STACK = 19 def pack_power_commands(q: DefaultPusQueueHelper, op_code: str): diff --git a/eive_tmtc/tmtc/power/tm.py b/eive_tmtc/tmtc/power/tm.py index bfa73a6..d8afd72 100644 --- a/eive_tmtc/tmtc/power/tm.py +++ b/eive_tmtc/tmtc/power/tm.py @@ -566,7 +566,9 @@ def handle_pcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): current_idx += len(PDU1_CHANNELS_NAMES) pdu2_vals = [hk_data[i + current_idx] for i in range(len(PDU2_CHANNELS_NAMES))] current_idx += len(PDU2_CHANNELS_NAMES) - p60_stack_val = hk_data[current_idx] + p60_stack_5v_val = hk_data[current_idx] + current_idx += 1 + p60_stack_3v3_val = hk_data[current_idx] current_idx += 1 pw.dlog("PDU1 Switcher States") for name, val in zip(PDU1_CHANNELS_NAMES, pdu1_vals): @@ -574,5 +576,6 @@ def handle_pcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): pw.dlog("PDU2 Switcher States") for name, val in zip(PDU2_CHANNELS_NAMES, pdu2_vals): pw.dlog(f"{name.ljust(25)}: {val}") - pw.dlog(f"{'P60 Dock 5V Stack'.ljust(25)}: {p60_stack_val}") + pw.dlog(f"{'P60 Dock 5V Stack'.ljust(25)}: {p60_stack_5v_val}") + pw.dlog(f"{'P60 Dock 3V3 Stack'.ljust(25)}: {p60_stack_3v3_val}") pw.printer.print_validity_buffer(hk_data[current_idx:], 3) From 8a69507d05429a7934188b208c8cbf0b46c69398 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 3 Apr 2023 16:57:05 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28689fc..1121bb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ list yields a list of all related PRs for each release. - Add boot mode command for EIVE system. +## Changed + +- PCDU switcher set now includes the 3V3 stack switcher state. + # [v2.20.1] 2023-04-01 ## Fixed From fb7b273485f378994eb5775d86b314301d0c97d5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 3 Apr 2023 16:57:58 +0200 Subject: [PATCH 3/3] other small fix --- eive_tmtc/tmtc/power/tm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eive_tmtc/tmtc/power/tm.py b/eive_tmtc/tmtc/power/tm.py index d8afd72..4ae2ef9 100644 --- a/eive_tmtc/tmtc/power/tm.py +++ b/eive_tmtc/tmtc/power/tm.py @@ -578,4 +578,4 @@ def handle_pcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): pw.dlog(f"{name.ljust(25)}: {val}") pw.dlog(f"{'P60 Dock 5V Stack'.ljust(25)}: {p60_stack_5v_val}") pw.dlog(f"{'P60 Dock 3V3 Stack'.ljust(25)}: {p60_stack_3v3_val}") - pw.printer.print_validity_buffer(hk_data[current_idx:], 3) + pw.printer.print_validity_buffer(hk_data[current_idx:], 4)