prep next release
This commit is contained in:
parent
e56f8732be
commit
c3b0470aa6
@ -1,13 +1,6 @@
|
|||||||
__version__ = "5.4.3"
|
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
SW_NAME = "eive-tmtc"
|
|
||||||
VERSION_MAJOR = 5
|
|
||||||
VERSION_MINOR = 4
|
|
||||||
VERSION_REVISION = 3
|
|
||||||
|
|
||||||
EIVE_TMTC_ROOT = Path(__file__).parent
|
EIVE_TMTC_ROOT = Path(__file__).parent
|
||||||
PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
|
PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
|
||||||
|
|
||||||
|
@ -72,7 +72,9 @@ def add_gps_cmds(defs: TmtcDefinitionWrapper):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
|
def pack_gps_command( # noqa: C901
|
||||||
|
object_id: bytes, q: DefaultPusQueueHelper, op_code: str
|
||||||
|
): # noqa: C901:
|
||||||
if op_code in OpCode.RESET_GNSS:
|
if op_code in OpCode.RESET_GNSS:
|
||||||
# TODO: This needs to be re-implemented
|
# TODO: This needs to be re-implemented
|
||||||
_LOGGER.warning("Reset pin handling needs to be re-implemented")
|
_LOGGER.warning("Reset pin handling needs to be re-implemented")
|
||||||
@ -82,34 +84,52 @@ def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
|
|||||||
raise ValueError("invalid interval")
|
raise ValueError("invalid interval")
|
||||||
q.add_log_cmd(f"GPS: {Info.ENABLE_CORE_HK}")
|
q.add_log_cmd(f"GPS: {Info.ENABLE_CORE_HK}")
|
||||||
cmds = create_enable_periodic_hk_command_with_interval(
|
cmds = create_enable_periodic_hk_command_with_interval(
|
||||||
diag=False, sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK), interval_seconds=interval
|
diag=False,
|
||||||
|
sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK),
|
||||||
|
interval_seconds=interval,
|
||||||
)
|
)
|
||||||
for cmd in cmds:
|
for cmd in cmds:
|
||||||
q.add_pus_tc(cmd)
|
q.add_pus_tc(cmd)
|
||||||
if op_code in OpCode.DISABLE_CORE_HK:
|
if op_code in OpCode.DISABLE_CORE_HK:
|
||||||
q.add_log_cmd(f"gps: {Info.DISABLE_CORE_HK}")
|
q.add_log_cmd(f"gps: {Info.DISABLE_CORE_HK}")
|
||||||
q.add_pus_tc(create_disable_periodic_hk_command(diag=False, sid=make_sid(object_id=object_id,
|
q.add_pus_tc(
|
||||||
set_id=SetId.CORE_HK)))
|
create_disable_periodic_hk_command(
|
||||||
|
diag=False, sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)
|
||||||
|
)
|
||||||
|
)
|
||||||
if op_code in OpCode.REQ_CORE_HK:
|
if op_code in OpCode.REQ_CORE_HK:
|
||||||
q.add_log_cmd(f"GPS: {Info.REQ_CORE_HK}")
|
q.add_log_cmd(f"GPS: {Info.REQ_CORE_HK}")
|
||||||
q.add_pus_tc(create_request_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)))
|
q.add_pus_tc(
|
||||||
|
create_request_one_hk_command(
|
||||||
|
sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)
|
||||||
|
)
|
||||||
|
)
|
||||||
if op_code in OpCode.ENABLE_SKYVIEW_HK:
|
if op_code in OpCode.ENABLE_SKYVIEW_HK:
|
||||||
interval = float(input("Please specify interval in floating point seconds: "))
|
interval = float(input("Please specify interval in floating point seconds: "))
|
||||||
if interval <= 0:
|
if interval <= 0:
|
||||||
raise ValueError("invalid interval")
|
raise ValueError("invalid interval")
|
||||||
q.add_log_cmd(f"GPS: {Info.ENABLE_SKYVIEW_HK}")
|
q.add_log_cmd(f"GPS: {Info.ENABLE_SKYVIEW_HK}")
|
||||||
cmds = create_enable_periodic_hk_command_with_interval(
|
cmds = create_enable_periodic_hk_command_with_interval(
|
||||||
diag=False, sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK), interval_seconds=interval
|
diag=False,
|
||||||
|
sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK),
|
||||||
|
interval_seconds=interval,
|
||||||
)
|
)
|
||||||
for cmd in cmds:
|
for cmd in cmds:
|
||||||
q.add_pus_tc(cmd)
|
q.add_pus_tc(cmd)
|
||||||
if op_code in OpCode.DISABLE_SKYVIEW_HK:
|
if op_code in OpCode.DISABLE_SKYVIEW_HK:
|
||||||
q.add_log_cmd(f"gps: {Info.DISABLE_SKYVIEW_HK}")
|
q.add_log_cmd(f"gps: {Info.DISABLE_SKYVIEW_HK}")
|
||||||
q.add_pus_tc(create_disable_periodic_hk_command(diag=False, sid=make_sid(object_id=object_id,
|
q.add_pus_tc(
|
||||||
set_id=SetId.SKYVIEW_HK)))
|
create_disable_periodic_hk_command(
|
||||||
|
diag=False, sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)
|
||||||
|
)
|
||||||
|
)
|
||||||
if op_code in OpCode.REQ_SKYVIEW_HK:
|
if op_code in OpCode.REQ_SKYVIEW_HK:
|
||||||
q.add_log_cmd(f"GPS: {Info.REQ_SKYVIEW_HK}")
|
q.add_log_cmd(f"GPS: {Info.REQ_SKYVIEW_HK}")
|
||||||
q.add_pus_tc(create_request_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)))
|
q.add_pus_tc(
|
||||||
|
create_request_one_hk_command(
|
||||||
|
sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)
|
||||||
|
)
|
||||||
|
)
|
||||||
if op_code in OpCode.ON:
|
if op_code in OpCode.ON:
|
||||||
q.add_log_cmd(f"GPS: {Info.ON}")
|
q.add_log_cmd(f"GPS: {Info.ON}")
|
||||||
q.add_pus_tc(create_mode_command(object_id, Mode.ON, 0))
|
q.add_pus_tc(create_mode_command(object_id, Mode.ON, 0))
|
||||||
@ -195,24 +215,46 @@ def handle_skyview_data(pw: PrintWrapper, hk_data: bytes):
|
|||||||
inc_len_int16 = struct.calcsize(fmt_str_int16)
|
inc_len_int16 = struct.calcsize(fmt_str_int16)
|
||||||
inc_len_double = struct.calcsize(fmt_str_double)
|
inc_len_double = struct.calcsize(fmt_str_double)
|
||||||
inc_len_uint8 = struct.calcsize(fmt_str_uint8)
|
inc_len_uint8 = struct.calcsize(fmt_str_uint8)
|
||||||
unix = struct.unpack(fmt_str_unix, hk_data[current_idx: current_idx + inc_len_unix])[0]
|
unix = struct.unpack(
|
||||||
|
fmt_str_unix, hk_data[current_idx : current_idx + inc_len_unix]
|
||||||
|
)[0]
|
||||||
current_idx += inc_len_unix
|
current_idx += inc_len_unix
|
||||||
prn_id = struct.unpack(fmt_str_int16, hk_data[current_idx: current_idx + inc_len_int16])
|
prn_id = struct.unpack(
|
||||||
|
fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
|
||||||
|
)
|
||||||
current_idx += inc_len_int16
|
current_idx += inc_len_int16
|
||||||
azimuth = struct.unpack(fmt_str_int16, hk_data[current_idx: current_idx + inc_len_int16])
|
azimuth = struct.unpack(
|
||||||
|
fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
|
||||||
|
)
|
||||||
current_idx += inc_len_int16
|
current_idx += inc_len_int16
|
||||||
elevation = struct.unpack(fmt_str_int16, hk_data[current_idx: current_idx + inc_len_int16])
|
elevation = struct.unpack(
|
||||||
|
fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
|
||||||
|
)
|
||||||
current_idx += inc_len_int16
|
current_idx += inc_len_int16
|
||||||
signal_to_noise = struct.unpack(fmt_str_double, hk_data[current_idx: current_idx + inc_len_double])
|
signal_to_noise = struct.unpack(
|
||||||
|
fmt_str_double, hk_data[current_idx : current_idx + inc_len_double]
|
||||||
|
)
|
||||||
current_idx += inc_len_double
|
current_idx += inc_len_double
|
||||||
used = struct.unpack(fmt_str_uint8, hk_data[current_idx: current_idx + inc_len_uint8])
|
used = struct.unpack(
|
||||||
|
fmt_str_uint8, hk_data[current_idx : current_idx + inc_len_uint8]
|
||||||
|
)
|
||||||
current_idx += inc_len_uint8
|
current_idx += inc_len_uint8
|
||||||
pw.dlog(f"Skyview Time: {unix} unix-sec")
|
pw.dlog(f"Skyview Time: {unix} unix-sec")
|
||||||
pw.dlog("{:<8} {:<8} {:<8} {:<8} {:<8}".format('PRN_ID', 'AZ [°]', 'EL [°]', 'S2N [dBW]', 'USED'))
|
pw.dlog(
|
||||||
|
"{:<8} {:<8} {:<8} {:<8} {:<8}".format(
|
||||||
|
"PRN_ID", "AZ [°]", "EL [°]", "S2N [dBW]", "USED"
|
||||||
|
)
|
||||||
|
)
|
||||||
for idx in range(GpsInfo.MAX_SATELLITES):
|
for idx in range(GpsInfo.MAX_SATELLITES):
|
||||||
pw.dlog("{:<8} {:<8} {:<8} {:<8} {:<8}".format(prn_id[idx], azimuth[idx], elevation[idx], signal_to_noise[idx],
|
pw.dlog(
|
||||||
used[idx]))
|
"{:<8} {:<8} {:<8} {:<8} {:<8}".format(
|
||||||
|
prn_id[idx],
|
||||||
|
azimuth[idx],
|
||||||
|
elevation[idx],
|
||||||
|
signal_to_noise[idx],
|
||||||
|
used[idx],
|
||||||
|
)
|
||||||
|
)
|
||||||
FsfwTmTcPrinter.get_validity_buffer(
|
FsfwTmTcPrinter.get_validity_buffer(
|
||||||
validity_buffer=hk_data[current_idx:], num_vars=6
|
validity_buffer=hk_data[current_idx:], num_vars=6
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
name = "eive-tmtc"
|
name = "eive-tmtc"
|
||||||
description = "TMTC Commander EIVE"
|
description = "TMTC Commander EIVE"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
dynamic = ["version"]
|
version = "5.5.0"
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
license = {text = "Apache-2.0"}
|
license = {text = "Apache-2.0"}
|
||||||
authors = [
|
authors = [
|
||||||
@ -29,9 +29,8 @@ classifiers = [
|
|||||||
"Topic :: Scientific/Engineering"
|
"Topic :: Scientific/Engineering"
|
||||||
]
|
]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"tmtccmd ~= 5.0",
|
"tmtccmd == 6.0.0rc0",
|
||||||
"python-dateutil ~= 2.8",
|
"python-dateutil ~= 2.8",
|
||||||
# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@1b110d321ef85#egg=tmtccmd"
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
@ -40,9 +39,6 @@ dependencies = [
|
|||||||
[tool.setuptools]
|
[tool.setuptools]
|
||||||
include-package-data = true
|
include-package-data = true
|
||||||
|
|
||||||
[tool.setuptools.dynamic]
|
|
||||||
version = {attr = "eive_tmtc.__version__"}
|
|
||||||
|
|
||||||
# Auto-Discovery is problematic for some reason, so use custom-discovery
|
# Auto-Discovery is problematic for some reason, so use custom-discovery
|
||||||
[tool.setuptools.packages]
|
[tool.setuptools.packages]
|
||||||
find = {}
|
find = {}
|
||||||
|
4
tmtcc.py
4
tmtcc.py
@ -86,7 +86,7 @@ from tmtccmd.config.args import (
|
|||||||
ProcedureParamsWrapper,
|
ProcedureParamsWrapper,
|
||||||
)
|
)
|
||||||
from eive_tmtc import APP_LOGGER
|
from eive_tmtc import APP_LOGGER
|
||||||
from eive_tmtc import __version__
|
from importlib.metadata import version
|
||||||
from eive_tmtc.config.definitions import (
|
from eive_tmtc.config.definitions import (
|
||||||
PUS_APID,
|
PUS_APID,
|
||||||
CFDP_APID,
|
CFDP_APID,
|
||||||
@ -449,7 +449,7 @@ def setup_backend(
|
|||||||
|
|
||||||
|
|
||||||
def main(): # noqa C901: Complexity okay here.
|
def main(): # noqa C901: Complexity okay here.
|
||||||
print(f"-- eive tmtc v{__version__} --")
|
print(f"-- eive tmtc v{version('eive-tmtc')} --")
|
||||||
print(f"-- spacepackets v{spacepackets.__version__} --")
|
print(f"-- spacepackets v{spacepackets.__version__} --")
|
||||||
add_colorlog_console_logger(_LOGGER)
|
add_colorlog_console_logger(_LOGGER)
|
||||||
# TODO: -V CLI argument to enable this?
|
# TODO: -V CLI argument to enable this?
|
||||||
|
Loading…
Reference in New Issue
Block a user