Rework logging handling #194

Merged
muellerr merged 7 commits from rework_logging_handling into v4.0.0-dev 2023-06-09 12:44:00 +02:00
3 changed files with 9 additions and 9 deletions
Showing only changes of commit 1548278ad6 - Show all commits

View File

@ -10,7 +10,9 @@ list yields a list of all related PRs for each release.
# [unreleased]
# [v3.2.0] to be released
# [v4.0.0] to be released
`tmtccmd` version: v5.0.0a0
## Added
@ -21,6 +23,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

View File

@ -150,11 +150,9 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
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,
@ -162,7 +160,6 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
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}",
@ -213,14 +210,14 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
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)

View File

@ -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@<gitRev>#egg=tmtccmd
]