From f35c96eecc893f529fe0494dd526b60d25ab669c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 10 Oct 2022 11:15:58 +0200 Subject: [PATCH 1/3] re-run generators --- config/events.csv | 13 ++++++++----- config/objects.csv | 2 ++ config/returnvalues.csv | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/config/events.csv b/config/events.csv index 415d150..49cdc61 100644 --- a/config/events.csv +++ b/config/events.csv @@ -216,8 +216,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h 13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h 13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h -13801;0x35e9;SET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h -13802;0x35ea;GET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h -13803;0x35eb;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h -13804;0x35ec;WRITE_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h -13805;0x35ed;READ_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h +13800;0x35e8;MISSING_PACKET;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h +13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h +13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;;mission/devices/devicedefinitions/ScexDefinitions.h +13901;0x364d;SET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h +13902;0x364e;GET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h +13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h +13904;0x3650;WRITE_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h +13905;0x3651;READ_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h diff --git a/config/objects.csv b/config/objects.csv index 68d5676..94f508b 100644 --- a/config/objects.csv +++ b/config/objects.csv @@ -47,6 +47,7 @@ 0x44330015;PLOC_MPSOC_HANDLER 0x44330016;PLOC_SUPERVISOR_HANDLER 0x44330017;PLOC_SUPERVISOR_HELPER +0x44330032;SCEX 0x444100A2;SOLAR_ARRAY_DEPL_HANDLER 0x444100A4;HEATER_HANDLER 0x44420004;TMP1075_HANDLER_1 @@ -70,6 +71,7 @@ 0x445300A3;SYRLINKS_HK_HANDLER 0x49000000;ARDUINO_COM_IF 0x49010005;GPIO_IF +0x49010006;SCEX_UART_READER 0x49020004;SPI_MAIN_COM_IF 0x49020005;SPI_RW_COM_IF 0x49020006;SPI_RTD_COM_IF diff --git a/config/returnvalues.csv b/config/returnvalues.csv index f464a43..7fccee9 100644 --- a/config/returnvalues.csv +++ b/config/returnvalues.csv @@ -419,8 +419,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x2403;MT_NoMatch;;3;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h 0x2404;MT_Full;;4;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h 0x2405;MT_NewNodeCreated;;5;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h -0x3f01;DLEE_StreamTooShort;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h -0x3f02;DLEE_DecodingError;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h +0x3f01;DLEE_NoPacketFound;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h +0x3f02;DLEE_PossiblePacketLoss;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h 0x2f01;ASC_TooLongForTargetType;;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h 0x2f02;ASC_InvalidCharacters;;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h 0x2f03;ASC_BufferTooSmall;;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h From 656a534ba70824fcdf86d53bd1cfb87c6e70779c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 10 Oct 2022 11:20:10 +0200 Subject: [PATCH 2/3] basic info event handling --- pus_tm/event_handler.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pus_tm/event_handler.py b/pus_tm/event_handler.py index e7315cb..68df29a 100644 --- a/pus_tm/event_handler.py +++ b/pus_tm/event_handler.py @@ -58,6 +58,9 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter): ) pw.dlog(additional_event_info) pw.dlog(context) + if info.name == "MODE_INFO": + pw.dlog(f"Mode: {tm.param_1}") + pw.dlog(f"Submode: {tm.param_2}") else: specific_handler = False if info.info != "": From 4c3f5f28256be0dbfc5b46ea87f8f484c93a9996 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 11 Oct 2022 22:43:06 +0200 Subject: [PATCH 3/3] bump tmtccmd --- deps/tmtccmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/tmtccmd b/deps/tmtccmd index 96ca55b..f3ea410 160000 --- a/deps/tmtccmd +++ b/deps/tmtccmd @@ -1 +1 @@ -Subproject commit 96ca55b17a823ce10307e8aa6d8cd906323d1ae5 +Subproject commit f3ea4108bd694c751887c1cbc2337a29eee064df