From dcdf0c98439e92e1ef3b9766db2d2eead2e06cdf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Oct 2021 18:03:00 +0200 Subject: [PATCH] updated object translation file --- generators/bsp_q7s_objects.csv | 38 ++++---- generators/objects/translateObjects.cpp | 86 +++++++++++-------- generators/requirements.txt | 1 + linux/fsfwconfig/objects/translateObjects.cpp | 86 +++++++++++-------- 4 files changed, 127 insertions(+), 84 deletions(-) create mode 100644 generators/requirements.txt diff --git a/generators/bsp_q7s_objects.csv b/generators/bsp_q7s_objects.csv index 4930f7a0..24035373 100644 --- a/generators/bsp_q7s_objects.csv +++ b/generators/bsp_q7s_objects.csv @@ -45,22 +45,22 @@ 0x444100A4;HEATER_HANDLER 0x44420004;TMP1075_HANDLER_1 0x44420005;TMP1075_HANDLER_2 -0x44420016;RTD_IC3 -0x44420017;RTD_IC4 -0x44420018;RTD_IC5 -0x44420019;RTD_IC6 -0x44420020;RTD_IC7 -0x44420021;RTD_IC8 -0x44420022;RTD_IC9 -0x44420023;RTD_IC10 -0x44420024;RTD_IC11 -0x44420025;RTD_IC12 -0x44420026;RTD_IC13 -0x44420027;RTD_IC14 -0x44420028;RTD_IC15 -0x44420029;RTD_IC16 -0x44420030;RTD_IC17 -0x44420031;RTD_IC18 +0x44420016;RTD_IC_0 +0x44420017;RTD_IC_1 +0x44420018;RTD_IC_2 +0x44420019;RTD_IC_3 +0x44420020;RTD_IC_4 +0x44420021;RTD_IC_5 +0x44420022;RTD_IC_6 +0x44420023;RTD_IC_7 +0x44420024;RTD_IC_8 +0x44420025;RTD_IC_9 +0x44420026;RTD_IC_10 +0x44420027;RTD_IC_11 +0x44420028;RTD_IC_12 +0x44420029;RTD_IC_13 +0x44420030;RTD_IC_14 +0x44420031;RTD_IC_15 0x445300A3;SYRLINKS_HK_HANDLER 0x49000000;ARDUINO_COM_IF 0x49010005;GPIO_IF @@ -73,6 +73,12 @@ 0x50000300;TMTC_BRIDGE 0x50000400;TMTC_POLLING_TASK 0x50000500;FILE_SYSTEM_HANDLER +0x50000600;PTME +0x50000700;PAPB_VC0 +0x50000701;PAPB_VC1 +0x50000702;PAPB_VC2 +0x50000703;PAPB_VC3 +0x50000800;CCSDS_HANDLER 0x51000500;PUS_SERVICE_6 0x53000000;FSFW_OBJECTS_START 0x53000001;PUS_SERVICE_1_VERIFICATION diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 23a232c8..4b256595 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 105 translations. - * Generated on: 2021-08-31 10:31:24 + * Contains 111 translations. + * Generated on: 2021-10-12 18:02:43 */ #include "translateObjects.h" @@ -53,22 +53,22 @@ const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2"; -const char *RTD_IC3_STRING = "RTD_IC3"; -const char *RTD_IC4_STRING = "RTD_IC4"; -const char *RTD_IC5_STRING = "RTD_IC5"; -const char *RTD_IC6_STRING = "RTD_IC6"; -const char *RTD_IC7_STRING = "RTD_IC7"; -const char *RTD_IC8_STRING = "RTD_IC8"; -const char *RTD_IC9_STRING = "RTD_IC9"; -const char *RTD_IC10_STRING = "RTD_IC10"; -const char *RTD_IC11_STRING = "RTD_IC11"; -const char *RTD_IC12_STRING = "RTD_IC12"; -const char *RTD_IC13_STRING = "RTD_IC13"; -const char *RTD_IC14_STRING = "RTD_IC14"; -const char *RTD_IC15_STRING = "RTD_IC15"; -const char *RTD_IC16_STRING = "RTD_IC16"; -const char *RTD_IC17_STRING = "RTD_IC17"; -const char *RTD_IC18_STRING = "RTD_IC18"; +const char *RTD_IC_0_STRING = "RTD_IC_0"; +const char *RTD_IC_1_STRING = "RTD_IC_1"; +const char *RTD_IC_2_STRING = "RTD_IC_2"; +const char *RTD_IC_3_STRING = "RTD_IC_3"; +const char *RTD_IC_4_STRING = "RTD_IC_4"; +const char *RTD_IC_5_STRING = "RTD_IC_5"; +const char *RTD_IC_6_STRING = "RTD_IC_6"; +const char *RTD_IC_7_STRING = "RTD_IC_7"; +const char *RTD_IC_8_STRING = "RTD_IC_8"; +const char *RTD_IC_9_STRING = "RTD_IC_9"; +const char *RTD_IC_10_STRING = "RTD_IC_10"; +const char *RTD_IC_11_STRING = "RTD_IC_11"; +const char *RTD_IC_12_STRING = "RTD_IC_12"; +const char *RTD_IC_13_STRING = "RTD_IC_13"; +const char *RTD_IC_14_STRING = "RTD_IC_14"; +const char *RTD_IC_15_STRING = "RTD_IC_15"; const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER"; const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF"; const char *GPIO_IF_STRING = "GPIO_IF"; @@ -81,6 +81,12 @@ const char *PUS_PACKET_DISTRIBUTOR_STRING = "PUS_PACKET_DISTRIBUTOR"; const char *TMTC_BRIDGE_STRING = "TMTC_BRIDGE"; const char *TMTC_POLLING_TASK_STRING = "TMTC_POLLING_TASK"; const char *FILE_SYSTEM_HANDLER_STRING = "FILE_SYSTEM_HANDLER"; +const char *PTME_STRING = "PTME"; +const char *PAPB_VC0_STRING = "PAPB_VC0"; +const char *PAPB_VC1_STRING = "PAPB_VC1"; +const char *PAPB_VC2_STRING = "PAPB_VC2"; +const char *PAPB_VC3_STRING = "PAPB_VC3"; +const char *CCSDS_HANDLER_STRING = "CCSDS_HANDLER"; const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6"; const char *FSFW_OBJECTS_START_STRING = "FSFW_OBJECTS_START"; const char *PUS_SERVICE_1_VERIFICATION_STRING = "PUS_SERVICE_1_VERIFICATION"; @@ -209,37 +215,37 @@ const char* translateObject(object_id_t object) { case 0x44420005: return TMP1075_HANDLER_2_STRING; case 0x44420016: - return RTD_IC3_STRING; + return RTD_IC_0_STRING; case 0x44420017: - return RTD_IC4_STRING; + return RTD_IC_1_STRING; case 0x44420018: - return RTD_IC5_STRING; + return RTD_IC_2_STRING; case 0x44420019: - return RTD_IC6_STRING; + return RTD_IC_3_STRING; case 0x44420020: - return RTD_IC7_STRING; + return RTD_IC_4_STRING; case 0x44420021: - return RTD_IC8_STRING; + return RTD_IC_5_STRING; case 0x44420022: - return RTD_IC9_STRING; + return RTD_IC_6_STRING; case 0x44420023: - return RTD_IC10_STRING; + return RTD_IC_7_STRING; case 0x44420024: - return RTD_IC11_STRING; + return RTD_IC_8_STRING; case 0x44420025: - return RTD_IC12_STRING; + return RTD_IC_9_STRING; case 0x44420026: - return RTD_IC13_STRING; + return RTD_IC_10_STRING; case 0x44420027: - return RTD_IC14_STRING; + return RTD_IC_11_STRING; case 0x44420028: - return RTD_IC15_STRING; + return RTD_IC_12_STRING; case 0x44420029: - return RTD_IC16_STRING; + return RTD_IC_13_STRING; case 0x44420030: - return RTD_IC17_STRING; + return RTD_IC_14_STRING; case 0x44420031: - return RTD_IC18_STRING; + return RTD_IC_15_STRING; case 0x445300A3: return SYRLINKS_HK_HANDLER_STRING; case 0x49000000: @@ -264,6 +270,18 @@ const char* translateObject(object_id_t object) { return TMTC_POLLING_TASK_STRING; case 0x50000500: return FILE_SYSTEM_HANDLER_STRING; + case 0x50000600: + return PTME_STRING; + case 0x50000700: + return PAPB_VC0_STRING; + case 0x50000701: + return PAPB_VC1_STRING; + case 0x50000702: + return PAPB_VC2_STRING; + case 0x50000703: + return PAPB_VC3_STRING; + case 0x50000800: + return CCSDS_HANDLER_STRING; case 0x51000500: return PUS_SERVICE_6_STRING; case 0x53000000: diff --git a/generators/requirements.txt b/generators/requirements.txt new file mode 100644 index 00000000..0aa54598 --- /dev/null +++ b/generators/requirements.txt @@ -0,0 +1 @@ +colorlog>=5.0.0 diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 23a232c8..4b256595 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 105 translations. - * Generated on: 2021-08-31 10:31:24 + * Contains 111 translations. + * Generated on: 2021-10-12 18:02:43 */ #include "translateObjects.h" @@ -53,22 +53,22 @@ const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2"; -const char *RTD_IC3_STRING = "RTD_IC3"; -const char *RTD_IC4_STRING = "RTD_IC4"; -const char *RTD_IC5_STRING = "RTD_IC5"; -const char *RTD_IC6_STRING = "RTD_IC6"; -const char *RTD_IC7_STRING = "RTD_IC7"; -const char *RTD_IC8_STRING = "RTD_IC8"; -const char *RTD_IC9_STRING = "RTD_IC9"; -const char *RTD_IC10_STRING = "RTD_IC10"; -const char *RTD_IC11_STRING = "RTD_IC11"; -const char *RTD_IC12_STRING = "RTD_IC12"; -const char *RTD_IC13_STRING = "RTD_IC13"; -const char *RTD_IC14_STRING = "RTD_IC14"; -const char *RTD_IC15_STRING = "RTD_IC15"; -const char *RTD_IC16_STRING = "RTD_IC16"; -const char *RTD_IC17_STRING = "RTD_IC17"; -const char *RTD_IC18_STRING = "RTD_IC18"; +const char *RTD_IC_0_STRING = "RTD_IC_0"; +const char *RTD_IC_1_STRING = "RTD_IC_1"; +const char *RTD_IC_2_STRING = "RTD_IC_2"; +const char *RTD_IC_3_STRING = "RTD_IC_3"; +const char *RTD_IC_4_STRING = "RTD_IC_4"; +const char *RTD_IC_5_STRING = "RTD_IC_5"; +const char *RTD_IC_6_STRING = "RTD_IC_6"; +const char *RTD_IC_7_STRING = "RTD_IC_7"; +const char *RTD_IC_8_STRING = "RTD_IC_8"; +const char *RTD_IC_9_STRING = "RTD_IC_9"; +const char *RTD_IC_10_STRING = "RTD_IC_10"; +const char *RTD_IC_11_STRING = "RTD_IC_11"; +const char *RTD_IC_12_STRING = "RTD_IC_12"; +const char *RTD_IC_13_STRING = "RTD_IC_13"; +const char *RTD_IC_14_STRING = "RTD_IC_14"; +const char *RTD_IC_15_STRING = "RTD_IC_15"; const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER"; const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF"; const char *GPIO_IF_STRING = "GPIO_IF"; @@ -81,6 +81,12 @@ const char *PUS_PACKET_DISTRIBUTOR_STRING = "PUS_PACKET_DISTRIBUTOR"; const char *TMTC_BRIDGE_STRING = "TMTC_BRIDGE"; const char *TMTC_POLLING_TASK_STRING = "TMTC_POLLING_TASK"; const char *FILE_SYSTEM_HANDLER_STRING = "FILE_SYSTEM_HANDLER"; +const char *PTME_STRING = "PTME"; +const char *PAPB_VC0_STRING = "PAPB_VC0"; +const char *PAPB_VC1_STRING = "PAPB_VC1"; +const char *PAPB_VC2_STRING = "PAPB_VC2"; +const char *PAPB_VC3_STRING = "PAPB_VC3"; +const char *CCSDS_HANDLER_STRING = "CCSDS_HANDLER"; const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6"; const char *FSFW_OBJECTS_START_STRING = "FSFW_OBJECTS_START"; const char *PUS_SERVICE_1_VERIFICATION_STRING = "PUS_SERVICE_1_VERIFICATION"; @@ -209,37 +215,37 @@ const char* translateObject(object_id_t object) { case 0x44420005: return TMP1075_HANDLER_2_STRING; case 0x44420016: - return RTD_IC3_STRING; + return RTD_IC_0_STRING; case 0x44420017: - return RTD_IC4_STRING; + return RTD_IC_1_STRING; case 0x44420018: - return RTD_IC5_STRING; + return RTD_IC_2_STRING; case 0x44420019: - return RTD_IC6_STRING; + return RTD_IC_3_STRING; case 0x44420020: - return RTD_IC7_STRING; + return RTD_IC_4_STRING; case 0x44420021: - return RTD_IC8_STRING; + return RTD_IC_5_STRING; case 0x44420022: - return RTD_IC9_STRING; + return RTD_IC_6_STRING; case 0x44420023: - return RTD_IC10_STRING; + return RTD_IC_7_STRING; case 0x44420024: - return RTD_IC11_STRING; + return RTD_IC_8_STRING; case 0x44420025: - return RTD_IC12_STRING; + return RTD_IC_9_STRING; case 0x44420026: - return RTD_IC13_STRING; + return RTD_IC_10_STRING; case 0x44420027: - return RTD_IC14_STRING; + return RTD_IC_11_STRING; case 0x44420028: - return RTD_IC15_STRING; + return RTD_IC_12_STRING; case 0x44420029: - return RTD_IC16_STRING; + return RTD_IC_13_STRING; case 0x44420030: - return RTD_IC17_STRING; + return RTD_IC_14_STRING; case 0x44420031: - return RTD_IC18_STRING; + return RTD_IC_15_STRING; case 0x445300A3: return SYRLINKS_HK_HANDLER_STRING; case 0x49000000: @@ -264,6 +270,18 @@ const char* translateObject(object_id_t object) { return TMTC_POLLING_TASK_STRING; case 0x50000500: return FILE_SYSTEM_HANDLER_STRING; + case 0x50000600: + return PTME_STRING; + case 0x50000700: + return PAPB_VC0_STRING; + case 0x50000701: + return PAPB_VC1_STRING; + case 0x50000702: + return PAPB_VC2_STRING; + case 0x50000703: + return PAPB_VC3_STRING; + case 0x50000800: + return CCSDS_HANDLER_STRING; case 0x51000500: return PUS_SERVICE_6_STRING; case 0x53000000: