Compare commits
4 Commits
v2.12.1
...
aadd6f59b5
Author | SHA1 | Date | |
---|---|---|---|
aadd6f59b5 | |||
e5bb7f395f | |||
33da498ea8 | |||
94a82b84e8 |
@ -10,6 +10,12 @@ list yields a list of all related PRs for each release.
|
|||||||
|
|
||||||
# [unreleased]
|
# [unreleased]
|
||||||
|
|
||||||
|
- Fixed SUS processed data printout format.
|
||||||
|
|
||||||
|
# [v2.12.2] 2023-02-08
|
||||||
|
|
||||||
|
- Use specific `tmtccmd` rev with new mode helper method.
|
||||||
|
|
||||||
# [v2.12.1] 2023-02-08
|
# [v2.12.1] 2023-02-08
|
||||||
|
|
||||||
## Added
|
## Added
|
||||||
|
@ -4,9 +4,9 @@ from pathlib import Path
|
|||||||
SW_NAME = "eive-tmtc"
|
SW_NAME = "eive-tmtc"
|
||||||
VERSION_MAJOR = 2
|
VERSION_MAJOR = 2
|
||||||
VERSION_MINOR = 12
|
VERSION_MINOR = 12
|
||||||
VERSION_REVISION = 1
|
VERSION_REVISION = 2
|
||||||
|
|
||||||
__version__ = "2.12.1"
|
__version__ = "2.12.2"
|
||||||
|
|
||||||
EIVE_TMTC_ROOT = Path(__file__).parent
|
EIVE_TMTC_ROOT = Path(__file__).parent
|
||||||
PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
|
PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
|
||||||
|
@ -436,30 +436,31 @@ def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
|
|||||||
)
|
)
|
||||||
return
|
return
|
||||||
current_idx = 0
|
current_idx = 0
|
||||||
|
vec_fmt = "[{:8.3f}, {:8.3f}, {:8.3f}]"
|
||||||
for idx in range(12):
|
for idx in range(12):
|
||||||
fmt_str = "!fff"
|
fmt_str = "!fff"
|
||||||
length = struct.calcsize(fmt_str)
|
length = struct.calcsize(fmt_str)
|
||||||
sus_list = struct.unpack(fmt_str, hk_data[current_idx : current_idx + length])
|
sus_list = struct.unpack(fmt_str, hk_data[current_idx : current_idx + length])
|
||||||
sus_list_formatted = [f"{val:8.3f}" for val in sus_list]
|
sus_list_formatted = vec_fmt.format(*sus_list)
|
||||||
current_idx += length
|
current_idx += length
|
||||||
pw.dlog(f"SUS {idx} CALIB: {sus_list_formatted}")
|
pw.dlog(f"{f'SUS {idx} CALIB'.ljust(25)}: {sus_list_formatted}")
|
||||||
fmt_str = "!ddd"
|
fmt_str = "!ddd"
|
||||||
inc_len = struct.calcsize(fmt_str)
|
inc_len = struct.calcsize(fmt_str)
|
||||||
sus_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
|
sus_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
|
||||||
|
|
||||||
sus_vec_tot = [f"{val:8.3f}" for val in sus_vec_tot]
|
sus_vec_tot = vec_fmt.format(*sus_vec_tot)
|
||||||
current_idx += inc_len
|
current_idx += inc_len
|
||||||
pw.dlog(f"SUS Vector Total: {sus_vec_tot}")
|
pw.dlog(f"{'SUS Vector Total'.ljust(25)}: {sus_vec_tot}")
|
||||||
sus_vec_tot_deriv = struct.unpack(
|
sus_vec_tot_deriv = struct.unpack(
|
||||||
fmt_str, hk_data[current_idx : current_idx + inc_len]
|
fmt_str, hk_data[current_idx : current_idx + inc_len]
|
||||||
)
|
)
|
||||||
sus_vec_tot_deriv = [f"{val:8.3f}" for val in {sus_vec_tot_deriv}]
|
sus_vec_tot_deriv = vec_fmt.format(*sus_vec_tot_deriv)
|
||||||
current_idx += inc_len
|
current_idx += inc_len
|
||||||
pw.dlog(f"SUS Vector Derivative: {sus_vec_tot_deriv}")
|
pw.dlog(f"{'SUS Vector Derivative'.ljust(25)}: {sus_vec_tot_deriv}")
|
||||||
sun_ijk_model = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
|
sun_ijk_model = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
|
||||||
sun_ijk_model = [f"{val:8.3f}" for val in sun_ijk_model]
|
sun_ijk_model = vec_fmt.format(*sun_ijk_model)
|
||||||
current_idx += inc_len
|
current_idx += inc_len
|
||||||
pw.dlog(f"SUS ijk Model: {sun_ijk_model}")
|
pw.dlog(f"{'SUS ijk Model'.ljust(25)}: {sun_ijk_model}")
|
||||||
pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=15)
|
pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=15)
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,8 +27,8 @@ classifiers =
|
|||||||
|
|
||||||
[options]
|
[options]
|
||||||
install_requires =
|
install_requires =
|
||||||
tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0rc0
|
# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0rc0
|
||||||
# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@<gitRev>#egg=tmtccmd
|
tmtccmd @ git+https://github.com/robamu-org/tmtccmd@8cfa99b1e225fc6e34deec9f5223f19255374b70#egg=tmtccmd
|
||||||
packages = find:
|
packages = find:
|
||||||
python_requires = >=3.10
|
python_requires = >=3.10
|
||||||
include_package_data = True
|
include_package_data = True
|
||||||
|
Reference in New Issue
Block a user