prep v5.2.0 #216

Merged
muellerr merged 3 commits from prep_v5.2.0 into main 2023-07-13 11:55:27 +02:00
9 changed files with 7 additions and 11 deletions
Showing only changes of commit 2153aa2842 - Show all commits

View File

@ -10,6 +10,8 @@ list yields a list of all related PRs for each release.
# [unreleased] # [unreleased]
# [v5.2.0] 2023-07-13
## Added ## Added
- New TCS controller events - New TCS controller events

View File

@ -1,11 +1,11 @@
__version__ = "5.1.0" __version__ = "5.2.0"
import logging import logging
from pathlib import Path from pathlib import Path
SW_NAME = "eive-tmtc" SW_NAME = "eive-tmtc"
VERSION_MAJOR = 5 VERSION_MAJOR = 5
VERSION_MINOR = 1 VERSION_MINOR = 2
VERSION_REVISION = 0 VERSION_REVISION = 0
EIVE_TMTC_ROOT = Path(__file__).parent EIVE_TMTC_ROOT = Path(__file__).parent

View File

@ -765,7 +765,6 @@ def gen_disable_listen_to_hk_for_x_seconds(
def activate_mgts_alternately( def activate_mgts_alternately(
q: DefaultPusQueueHelper, q: DefaultPusQueueHelper,
): ):
q.add_pus_tc( q.add_pus_tc(
pack_dipole_command( pack_dipole_command(
object_id=oids.IMTQ_HANDLER_ID, object_id=oids.IMTQ_HANDLER_ID,

View File

@ -12,7 +12,6 @@ _LOGGER = logging.getLogger(__name__)
class TmTcpServer: class TmTcpServer:
def __init__(self, ip_address: str, port: int): def __init__(self, ip_address: str, port: int):
self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.server_socket.bind((ip_address, port)) self.server_socket.bind((ip_address, port))
@ -46,7 +45,6 @@ class TmTcpServer:
self.client_connection.setblocking(False) self.client_connection.setblocking(False)
print("Client connected") print("Client connected")
except IOError: except IOError:
return return
data_json_bytes = json.dumps(dictionary).encode() data_json_bytes = json.dumps(dictionary).encode()
@ -65,7 +63,6 @@ class TmTcpServer:
self.client_connection = None self.client_connection = None
def report_raw_hk_data(self, object_id: ObjectIdU32, set_id: int, hk_data: bytes): def report_raw_hk_data(self, object_id: ObjectIdU32, set_id: int, hk_data: bytes):
data_dict = { data_dict = {
"type": "TM", "type": "TM",
"tmType": "Raw HK", "tmType": "Raw HK",

View File

@ -61,7 +61,7 @@ GYR_SEL_DICT = {
def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str): def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):
print("Please select the Gyro Device") print("Please select the Gyro Device")
for (k, v) in GYR_SEL_DICT.items(): for k, v in GYR_SEL_DICT.items():
print(f"{k}: {v[0]}") print(f"{k}: {v[0]}")
sel_idx = int(input("Select gyro device by index: ")) sel_idx = int(input("Select gyro device by index: "))
gyr_info = GYR_SEL_DICT[GyrSel(sel_idx)] gyr_info = GYR_SEL_DICT[GyrSel(sel_idx)]

View File

@ -49,7 +49,7 @@ MGM_SEL_DICT = {
def handle_mgm_cmd(q: DefaultPusQueueHelper, op_code: str): def handle_mgm_cmd(q: DefaultPusQueueHelper, op_code: str):
print("Please select the MGM Device") print("Please select the MGM Device")
for (k, v) in MGM_SEL_DICT.items(): for k, v in MGM_SEL_DICT.items():
print(f"{k}: {v[0]}") print(f"{k}: {v[0]}")
sel_idx = int(input("Select MGM device by index: ")) sel_idx = int(input("Select MGM device by index: "))
mgm_info = MGM_SEL_DICT[MgmSel(sel_idx)] mgm_info = MGM_SEL_DICT[MgmSel(sel_idx)]

View File

@ -290,7 +290,6 @@ def pack_set_speed_command(
def handle_rw_hk_data( def handle_rw_hk_data(
pw: PrintWrapper, object_id: ObjectIdU32, set_id: int, hk_data: bytes pw: PrintWrapper, object_id: ObjectIdU32, set_id: int, hk_data: bytes
): ):
current_idx = 0 current_idx = 0
if set_id == RwSetId.STATUS_SET_ID: if set_id == RwSetId.STATUS_SET_ID:
pw.dlog( pw.dlog(

View File

@ -172,7 +172,6 @@ class Info(str, enum.Enum):
@tmtc_definitions_provider @tmtc_definitions_provider
def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper): def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
oce = OpCodeEntry() oce = OpCodeEntry()
oce.add(OpCodes.OFF, Info.OFF) oce.add(OpCodes.OFF, Info.OFF)
oce.add(OpCodes.ON, Info.ON) oce.add(OpCodes.ON, Info.ON)

View File

@ -54,7 +54,7 @@ class TcsCtrlComponentInfo:
end_time: datetime.datetime end_time: datetime.datetime
def handle_thermal_controller_hk_data( def handle_thermal_controller_hk_data( # noqa C901: complexity is okay.
object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
): ):
# need a better solutuon for this is this is used again.. # need a better solutuon for this is this is used again..