From 7c1e7226e08b7ae5f1eda9259201a5140626ed24 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 15 May 2023 16:42:56 +0200 Subject: [PATCH 1/4] bugfix CFDP: bump tmtccmd --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c1ef478..a9fb0e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ "Topic :: Scientific/Engineering" ] dependencies = [ - "tmtccmd ~= 4.1", + "tmtccmd ~= 5.0.0a0", "python-dateutil ~= 2.8", # tmtccmd @ git+https://github.com/robamu-org/tmtccmd@#egg=tmtccmd ] From 5f379bf2bb76f5cc65e9ca58036a4b239d8638b8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 15 May 2023 16:43:40 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a57d1d4..1af6124 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ list yields a list of all related PRs for each release. # [unreleased] +`tmtccmd` version: v5.0.0a0 + ## Added - Event handling for reboot counter events. @@ -19,6 +21,7 @@ list yields a list of all related PRs for each release. ## Fixed - Fix for PLOC power switching. +- Bump `tmtccmd` to v5.0.0a0 for important bugfix in CFDP header. # [v3.1.1] 2023-04-17 From 17dd9de51e174828ecb244fc5508de3d5f867ac2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 7 Jun 2023 17:25:51 +0200 Subject: [PATCH 3/4] moved 2 parameters --- eive_tmtc/tmtc/power/tm.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/eive_tmtc/tmtc/power/tm.py b/eive_tmtc/tmtc/power/tm.py index 4ae2ef9..44ce657 100644 --- a/eive_tmtc/tmtc/power/tm.py +++ b/eive_tmtc/tmtc/power/tm.py @@ -153,11 +153,9 @@ def handle_pdu_data( current_idx = 0 priv_idx = pdu_idx - 1 if set_id == SetId.AUX or set_id == SetId.AUX: - fmt_str = "!hhBBBIIH" + fmt_str = "!BBBIIH" inc_len = struct.calcsize(fmt_str) ( - vcc, - vbat, conv_enb_0, conv_enb_1, conv_enb_2, @@ -165,7 +163,6 @@ def handle_pdu_data( uptime, reset_cause, ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len]) - pw.dlog(f"VCC {vcc} mV | VBAT {vbat} mV") pw.dlog(f"Converter Enables [{conv_enb_0},{conv_enb_1},{conv_enb_2}]") pw.dlog( f"Boot Cause {boot_cause} | Uptime {uptime} | Reset Cause {reset_cause}", @@ -216,14 +213,14 @@ def handle_pdu_data( f"{voltage_list[idx]:05} | {current_list[idx]:04}" ) pw.dlog(content_line) - fmt_str = "!IBf" + fmt_str = "!IBfhh" inc_len = struct.calcsize(fmt_str) - (boot_count, batt_mode, temperature) = struct.unpack( + (boot_count, batt_mode, temperature, vcc, vbat) = struct.unpack( fmt_str, hk_data[current_idx : current_idx + inc_len] ) info = ( f"Boot Count {boot_count} | Battery Mode {batt_mode} | " - f"Temperature {temperature}" + f"Temperature {temperature} | VCC {vcc} | VBAT {vbat}" ) pw.dlog(info) From a5a30d37ebefb897d9b60de11a14903cccd84f93 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 9 Jun 2023 12:41:49 +0200 Subject: [PATCH 4/4] tweak changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdff101..da5dd7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ list yields a list of all related PRs for each release. # [v4.0.0] to be released -`tmtccmd` version: v5.0.0rc0 +`tmtccmd` version: v5.0.0a0 ## Added @@ -23,7 +23,7 @@ list yields a list of all related PRs for each release. ## Fixed - Fix for PLOC power switching. -- Bump `tmtccmd` to v5.0.0rc0 for important bugfix in CFDP header. +- Bump `tmtccmd` to v5.0.0a0 for important bugfix in CFDP header. # [v3.1.1] 2023-04-17