eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

v1.9.0 #53

Merged
muellerr merged 354 commits from develop into master 2022-04-07 17:39:42 +02:00
Conversation 0 Commits 354 Files Changed 125 +12 -8
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 20753e7c75 - Show all commits

2
config/hook_implementations.py
View File

@ -125,7 +125,7 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
add_rw_cmds, add_rw_cmds,
add_rad_sens_cmds, add_rad_sens_cmds,
add_ploc_cmds, add_ploc_cmds,
add_system_cmds add_system_cmds,
) )
from pus_tc.devs.gps import GpsOpCodes from pus_tc.devs.gps import GpsOpCodes

8
pus_tc/system/acs.py
View File

@ -19,15 +19,15 @@ class AcsBoardSubmodes(enum.IntEnum):
def pack_acs_command(tc_queue: TcQueueT, op_code: str): def pack_acs_command(tc_queue: TcQueueT, op_code: str):
if op_code in AcsOpCodes.ACS_ASS_A_SIDE: if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
tc_queue.appendleft((QueueCommands.PRINT, "Switching to ACS board assembly A side")) tc_queue.appendleft(
(QueueCommands.PRINT, "Switching to ACS board assembly A side")
)
mode_data = pack_mode_data( mode_data = pack_mode_data(
object_id=ACS_BOARD_ASS_ID, object_id=ACS_BOARD_ASS_ID,
mode=Modes.NORMAL, mode=Modes.NORMAL,
submode=AcsBoardSubmodes.A_SIDE, submode=AcsBoardSubmodes.A_SIDE,
) )
cmd = PusTelecommand( cmd = PusTelecommand(
service=200, service=200, subservice=Subservices.COMMAND_MODE_COMMAND, app_data=mode_data
subservice=Subservices.COMMAND_MODE_COMMAND,
app_data=mode_data
) )
tc_queue.appendleft(cmd.pack_command_tuple()) tc_queue.appendleft(cmd.pack_command_tuple())

8
pus_tm/event_handler.py
View File

@ -2,7 +2,7 @@ import os.path
from config.object_ids import get_object_ids from config.object_ids import get_object_ids
from tmtccmd.utility.logger import get_console_logger from tmtccmd.utility.logger import get_console_logger
from tmtccmd.utility.fsfw import parse_fsfw_events_csv, EventDictT from tmtccmd.utility.fsfw import parse_fsfw_events_csv, EventDictT, EventInfo
LOGGER = get_console_logger() LOGGER = get_console_logger()
DEFAULT_EVENTS_CSV_PATH = "config/events.csv" DEFAULT_EVENTS_CSV_PATH = "config/events.csv"
@ -26,8 +26,12 @@ def handle_event_packet(
additional_event_info = "" additional_event_info = ""
event_dict = get_event_dict() event_dict = get_event_dict()
info = event_dict.get(event_id) info = event_dict.get(event_id)
if info is None:
LOGGER.warning(f"Event ID {event_id} has no information")
info = EventInfo()
info.name = "Unknown event"
obj_ids = get_object_ids() obj_ids = get_object_ids()
obj_id_obj = obj_ids.get(object_id) obj_id_obj = obj_ids.get(bytes(object_id))
if obj_id_obj is None: if obj_id_obj is None:
LOGGER.warning(f"Object ID 0x{object_id.hex()} has no name") LOGGER.warning(f"Object ID 0x{object_id.hex()} has no name")
obj_name = object_id.hex() obj_name = object_id.hex()

2
tmtccmd

@ -1 +1 @@
Subproject commit 0f4d4730ab35163c5a06138f4b54e4eaf89bc24c Subproject commit 7c07bee65159f5f75faeadf1a130381bc6d63334