From 53e556d0b38f86e4f6dfacd44933e78244354e63 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 21 Jun 2022 01:21:23 +0200 Subject: [PATCH] improve csv format --- generators/bsp_q7s_events.csv | 1 + generators/bsp_q7s_returnvalues.csv | 3 ++- generators/deps/fsfwgen | 2 +- generators/events/translateEvents.cpp | 2 +- generators/returnvalues/returnvalues_parser.py | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 2 +- tmtc | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index f3793f8f..3f7b74f9 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -1,3 +1,4 @@ +Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h 2201;0x0899;STORE_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h 2202;0x089a;STORE_SEND_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv index 1cbf670b..147a9ea4 100644 --- a/generators/bsp_q7s_returnvalues.csv +++ b/generators/bsp_q7s_returnvalues.csv @@ -1,3 +1,4 @@ +Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/HasReturnvaluesIF.h 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/HasReturnvaluesIF.h 0x64a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CCSDSHandler.h @@ -14,7 +15,7 @@ 0x56b4;RWHA_MissingEndSign;HDLC decoding mechanism never receives the end sign 0x7E;180;RW_HANDLER;mission/devices/RwHandler.h 0x56b5;RWHA_NoReply;Reaction wheel only responds with empty frames.;181;RW_HANDLER;mission/devices/RwHandler.h 0x56b6;RWHA_NoStartMarker;Expected a start marker as first byte;182;RW_HANDLER;mission/devices/RwHandler.h -0x56a0;RWHA_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000; 1000] or [1000; 65000];160;RW_HANDLER;mission/devices/RwHandler.h +0x56a0;RWHA_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;RW_HANDLER;mission/devices/RwHandler.h 0x56a1;RWHA_InvalidRampTime;Action Message with invalid ramp time was received.;161;RW_HANDLER;mission/devices/RwHandler.h 0x56a2;RWHA_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;RW_HANDLER;mission/devices/RwHandler.h 0x56a3;RWHA_ExecutionFailed;Command execution failed;163;RW_HANDLER;mission/devices/RwHandler.h diff --git a/generators/deps/fsfwgen b/generators/deps/fsfwgen index a2e0c4f9..a5dee6e4 160000 --- a/generators/deps/fsfwgen +++ b/generators/deps/fsfwgen @@ -1 +1 @@ -Subproject commit a2e0c4f98ef98772fbb1b7b0ef673b02271258fb +Subproject commit a5dee6e41749508a85842a931e6f1d210aee2031 diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 00860ca4..75e14146 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 207 translations. * @details - * Generated on: 2022-06-21 00:56:47 + * Generated on: 2022-06-21 01:20:13 */ #include "translateEvents.h" diff --git a/generators/returnvalues/returnvalues_parser.py b/generators/returnvalues/returnvalues_parser.py index 84617ea9..4cacd529 100644 --- a/generators/returnvalues/returnvalues_parser.py +++ b/generators/returnvalues/returnvalues_parser.py @@ -80,7 +80,7 @@ VALUES(?,?,?,?,?) def parse_returnvalues(): returnvalue_table = generate_returnvalue_table() if EXPORT_TO_FILE: - ReturnValueParser.export_to_file( + ReturnValueParser.export_to_csv( CSV_RETVAL_FILENAME, returnvalue_table, FILE_SEPARATOR ) if COPY_CSV_FILE: diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 00860ca4..75e14146 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 207 translations. * @details - * Generated on: 2022-06-21 00:56:47 + * Generated on: 2022-06-21 01:20:13 */ #include "translateEvents.h" diff --git a/tmtc b/tmtc index 286ec254..eced4538 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 286ec254458d78a812c666ba2be7dbbefe77051d +Subproject commit eced453886859b1dd3daf0943eda2835acdfa71c