From e64a3fb6459843291309497fac3ebd4e4ec59185 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Thu, 9 Dec 2021 15:02:30 +0100 Subject: [PATCH] rerun generators --- generators/bsp_q7s_events.csv | 22 +++++++------ generators/events/translateEvents.cpp | 34 ++++++++++++--------- linux/fsfwconfig/events/translateEvents.cpp | 34 ++++++++++++--------- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index fad7c714..0153c3e6 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -118,13 +118,15 @@ 11902;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/linux/obc/PdecHandler.h 11903;CARRIER_LOCK;INFO;Carrier lock detected;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/linux/obc/PdecHandler.h 11904;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/linux/obc/PdecHandler.h -12000;IMAGE_FILE_NOT_EXISTS;LOW;Try to upload image but specified image does not exist;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12001;SENDING_UPLOAD_PACKET_FAILED;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12002;UPLOAD_REQUESTING_MSG_FAILED;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12003;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successful;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12004;UPLOAD_READING_REPLY_FAILED;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12005;UPLOAD_COM_ERROR;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12006;NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off)P1: Position of upload packet for which no reply was sent;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12007;INVALID_TYPE_ID;LOW;Received reply with invalid type ID;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12008;STATUS_ERROR;LOW;Status field in reply signals error;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h -12009;DEC_ERROR;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/StrImageLoader.h +12000;IMAGE_FILE_NOT_EXISTS;LOW;Try to upload image but specified image does not exist;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12001;IMG_LOADER_SENDING_PACKET_FAILED;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12002;IMG_LOADER_REQUESTING_MSG_FAILED;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12003;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successful;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12004;IMG_LOADER_READING_REPLY_FAILED;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12005;IMG_LOADER_COM_ERROR;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12006;IMG_LOADER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off)P1: Position of upload or download packet for which no reply was sent;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12007;INVALID_TYPE_ID;LOW;Received reply with invalid type ID;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12008;STATUS_ERROR;LOW;Status field in reply signals error;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12009;IMG_LOADER_DEC_ERROR;LOW;;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12010;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h +12011;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/bsp_q7s/devices/startracker/StrImageLoader.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index dea56991..35f4ad9b 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 130 translations. + * @brief Auto-generated event translation file. Contains 132 translations. * @details - * Generated on: 2021-12-04 11:03:12 + * Generated on: 2021-12-09 11:10:38 */ #include "translateEvents.h" @@ -126,15 +126,17 @@ const char *INVALID_FAR_STRING = "INVALID_FAR"; const char *CARRIER_LOCK_STRING = "CARRIER_LOCK"; const char *BIT_LOCK_PDEC_STRING = "BIT_LOCK_PDEC"; const char *IMAGE_FILE_NOT_EXISTS_STRING = "IMAGE_FILE_NOT_EXISTS"; -const char *SENDING_UPLOAD_PACKET_FAILED_STRING = "SENDING_UPLOAD_PACKET_FAILED"; -const char *UPLOAD_REQUESTING_MSG_FAILED_STRING = "UPLOAD_REQUESTING_MSG_FAILED"; +const char *IMG_LOADER_SENDING_PACKET_FAILED_STRING = "IMG_LOADER_SENDING_PACKET_FAILED"; +const char *IMG_LOADER_REQUESTING_MSG_FAILED_STRING = "IMG_LOADER_REQUESTING_MSG_FAILED"; const char *IMAGE_UPLOAD_SUCCESSFUL_STRING = "IMAGE_UPLOAD_SUCCESSFUL"; -const char *UPLOAD_READING_REPLY_FAILED_STRING = "UPLOAD_READING_REPLY_FAILED"; -const char *UPLOAD_COM_ERROR_STRING = "UPLOAD_COM_ERROR"; -const char *NO_REPLY_STRING = "NO_REPLY"; +const char *IMG_LOADER_READING_REPLY_FAILED_STRING = "IMG_LOADER_READING_REPLY_FAILED"; +const char *IMG_LOADER_COM_ERROR_STRING = "IMG_LOADER_COM_ERROR"; +const char *IMG_LOADER_NO_REPLY_STRING = "IMG_LOADER_NO_REPLY"; const char *INVALID_TYPE_ID_STRING = "INVALID_TYPE_ID"; const char *STATUS_ERROR_STRING = "STATUS_ERROR"; -const char *DEC_ERROR_STRING = "DEC_ERROR"; +const char *IMG_LOADER_DEC_ERROR_STRING = "IMG_LOADER_DEC_ERROR"; +const char *IMAGE_DOWNLOAD_SUCCESSFUL_STRING = "IMAGE_DOWNLOAD_SUCCESSFUL"; +const char *POSITION_MISMATCH_STRING = "POSITION_MISMATCH"; const char * translateEvents(Event event) { switch( (event & 0xffff) ) { @@ -381,23 +383,27 @@ const char * translateEvents(Event event) { case(12000): return IMAGE_FILE_NOT_EXISTS_STRING; case(12001): - return SENDING_UPLOAD_PACKET_FAILED_STRING; + return IMG_LOADER_SENDING_PACKET_FAILED_STRING; case(12002): - return UPLOAD_REQUESTING_MSG_FAILED_STRING; + return IMG_LOADER_REQUESTING_MSG_FAILED_STRING; case(12003): return IMAGE_UPLOAD_SUCCESSFUL_STRING; case(12004): - return UPLOAD_READING_REPLY_FAILED_STRING; + return IMG_LOADER_READING_REPLY_FAILED_STRING; case(12005): - return UPLOAD_COM_ERROR_STRING; + return IMG_LOADER_COM_ERROR_STRING; case(12006): - return NO_REPLY_STRING; + return IMG_LOADER_NO_REPLY_STRING; case(12007): return INVALID_TYPE_ID_STRING; case(12008): return STATUS_ERROR_STRING; case(12009): - return DEC_ERROR_STRING; + return IMG_LOADER_DEC_ERROR_STRING; + case(12010): + return IMAGE_DOWNLOAD_SUCCESSFUL_STRING; + case(12011): + return POSITION_MISMATCH_STRING; default: return "UNKNOWN_EVENT"; } diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index dea56991..35f4ad9b 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 130 translations. + * @brief Auto-generated event translation file. Contains 132 translations. * @details - * Generated on: 2021-12-04 11:03:12 + * Generated on: 2021-12-09 11:10:38 */ #include "translateEvents.h" @@ -126,15 +126,17 @@ const char *INVALID_FAR_STRING = "INVALID_FAR"; const char *CARRIER_LOCK_STRING = "CARRIER_LOCK"; const char *BIT_LOCK_PDEC_STRING = "BIT_LOCK_PDEC"; const char *IMAGE_FILE_NOT_EXISTS_STRING = "IMAGE_FILE_NOT_EXISTS"; -const char *SENDING_UPLOAD_PACKET_FAILED_STRING = "SENDING_UPLOAD_PACKET_FAILED"; -const char *UPLOAD_REQUESTING_MSG_FAILED_STRING = "UPLOAD_REQUESTING_MSG_FAILED"; +const char *IMG_LOADER_SENDING_PACKET_FAILED_STRING = "IMG_LOADER_SENDING_PACKET_FAILED"; +const char *IMG_LOADER_REQUESTING_MSG_FAILED_STRING = "IMG_LOADER_REQUESTING_MSG_FAILED"; const char *IMAGE_UPLOAD_SUCCESSFUL_STRING = "IMAGE_UPLOAD_SUCCESSFUL"; -const char *UPLOAD_READING_REPLY_FAILED_STRING = "UPLOAD_READING_REPLY_FAILED"; -const char *UPLOAD_COM_ERROR_STRING = "UPLOAD_COM_ERROR"; -const char *NO_REPLY_STRING = "NO_REPLY"; +const char *IMG_LOADER_READING_REPLY_FAILED_STRING = "IMG_LOADER_READING_REPLY_FAILED"; +const char *IMG_LOADER_COM_ERROR_STRING = "IMG_LOADER_COM_ERROR"; +const char *IMG_LOADER_NO_REPLY_STRING = "IMG_LOADER_NO_REPLY"; const char *INVALID_TYPE_ID_STRING = "INVALID_TYPE_ID"; const char *STATUS_ERROR_STRING = "STATUS_ERROR"; -const char *DEC_ERROR_STRING = "DEC_ERROR"; +const char *IMG_LOADER_DEC_ERROR_STRING = "IMG_LOADER_DEC_ERROR"; +const char *IMAGE_DOWNLOAD_SUCCESSFUL_STRING = "IMAGE_DOWNLOAD_SUCCESSFUL"; +const char *POSITION_MISMATCH_STRING = "POSITION_MISMATCH"; const char * translateEvents(Event event) { switch( (event & 0xffff) ) { @@ -381,23 +383,27 @@ const char * translateEvents(Event event) { case(12000): return IMAGE_FILE_NOT_EXISTS_STRING; case(12001): - return SENDING_UPLOAD_PACKET_FAILED_STRING; + return IMG_LOADER_SENDING_PACKET_FAILED_STRING; case(12002): - return UPLOAD_REQUESTING_MSG_FAILED_STRING; + return IMG_LOADER_REQUESTING_MSG_FAILED_STRING; case(12003): return IMAGE_UPLOAD_SUCCESSFUL_STRING; case(12004): - return UPLOAD_READING_REPLY_FAILED_STRING; + return IMG_LOADER_READING_REPLY_FAILED_STRING; case(12005): - return UPLOAD_COM_ERROR_STRING; + return IMG_LOADER_COM_ERROR_STRING; case(12006): - return NO_REPLY_STRING; + return IMG_LOADER_NO_REPLY_STRING; case(12007): return INVALID_TYPE_ID_STRING; case(12008): return STATUS_ERROR_STRING; case(12009): - return DEC_ERROR_STRING; + return IMG_LOADER_DEC_ERROR_STRING; + case(12010): + return IMAGE_DOWNLOAD_SUCCESSFUL_STRING; + case(12011): + return POSITION_MISMATCH_STRING; default: return "UNKNOWN_EVENT"; }