From 35a485d79e38a55b295157caa1d679b75fa08b6f Mon Sep 17 00:00:00 2001 From: Marius Eggert Date: Wed, 25 Jan 2023 13:43:08 +0100 Subject: [PATCH 1/2] fixed mgm proc output --- eive_tmtc/tmtc/acs/acs_ctrl.py | 1 + 1 file changed, 1 insertion(+) diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index 0511ce2..c156233 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -534,6 +534,7 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes): mgm_vec = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len]) mgm_vec = [f"{val:8.3f}" for val in mgm_vec] pw.dlog(f"MGM {i}: {mgm_vec}") + current_idx *= inc_len fmt_str = "!ddd" inc_len = struct.calcsize(fmt_str) mgm_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len]) From 82c6b60af26dae5cde3482dcc55cc414c1c675a8 Mon Sep 17 00:00:00 2001 From: Marius Eggert Date: Wed, 25 Jan 2023 13:45:11 +0100 Subject: [PATCH 2/2] this should be better --- eive_tmtc/tmtc/acs/acs_ctrl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index c156233..0978807 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -534,7 +534,7 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes): mgm_vec = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len]) mgm_vec = [f"{val:8.3f}" for val in mgm_vec] pw.dlog(f"MGM {i}: {mgm_vec}") - current_idx *= inc_len + current_idx += inc_len fmt_str = "!ddd" inc_len = struct.calcsize(fmt_str) mgm_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])