eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

moved 2 parameters #196

Merged
muellerr merged 13 commits from move-pdu-datavar into v4.0.0-dev 2023-06-09 12:41:56 +02:00
Conversation 0 Commits 13 Files Changed 6 +40 -37
6 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17dd9de51e - Show all commits

11
eive_tmtc/tmtc/power/tm.py
View File

@@ -153,11 +153,9 @@ def handle_pdu_data(
current_idx = 0 current_idx = 0
priv_idx = pdu_idx - 1 priv_idx = pdu_idx - 1
if set_id == SetId.AUX or set_id == SetId.AUX: if set_id == SetId.AUX or set_id == SetId.AUX:
fmt_str = "!hhBBBIIH" fmt_str = "!BBBIIH"
inc_len = struct.calcsize(fmt_str) inc_len = struct.calcsize(fmt_str)
( (
vcc,
vbat,
conv_enb_0, conv_enb_0,
conv_enb_1, conv_enb_1,
conv_enb_2, conv_enb_2,
@@ -165,7 +163,6 @@ def handle_pdu_data(
uptime, uptime,
reset_cause, reset_cause,
) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len]) ) = 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"Converter Enables [{conv_enb_0},{conv_enb_1},{conv_enb_2}]")
pw.dlog( pw.dlog(
f"Boot Cause {boot_cause} | Uptime {uptime} | Reset Cause {reset_cause}", 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}" f"{voltage_list[idx]:05} | {current_list[idx]:04}"
) )
pw.dlog(content_line) pw.dlog(content_line)
fmt_str = "!IBf" fmt_str = "!IBfhh"
inc_len = struct.calcsize(fmt_str) 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] fmt_str, hk_data[current_idx : current_idx + inc_len]
) )
info = ( info = (
f"Boot Count {boot_count} | Battery Mode {batt_mode} | " f"Boot Count {boot_count} | Battery Mode {batt_mode} | "
f"Temperature {temperature}" f"Temperature {temperature} | VCC {vcc} | VBAT {vbat}"
) )
pw.dlog(info) pw.dlog(info)