diff --git a/.idea/cmake.xml b/.idea/cmake.xml index 31d74ea..e676acf 100644 --- a/.idea/cmake.xml +++ b/.idea/cmake.xml @@ -2,7 +2,7 @@ - + diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index 6e6ef9d..acc51f5 100644 --- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp +++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 78 translations. + * @brief Auto-generated event translation file. Contains 79 translations. * @details - * Generated on: 2022-05-20 09:11:07 + * Generated on: 2022-07-27 19:41:37 */ #include "translateEvents.h" @@ -81,6 +81,7 @@ const char *BIT_LOCK_LOST_STRING = "BIT_LOCK_LOST"; const char *FRAME_PROCESSING_FAILED_STRING = "FRAME_PROCESSING_FAILED"; const char *CLOCK_SET_STRING = "CLOCK_SET"; const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE"; +const char *TC_DELETION_FAILED_STRING = "TC_DELETION_FAILED"; const char *TEST_STRING = "TEST"; const char *CHANGE_OF_SETUP_PARAMETER_STRING = "CHANGE_OF_SETUP_PARAMETER"; @@ -238,6 +239,8 @@ const char *translateEvents(Event event) { return CLOCK_SET_STRING; case (8901): return CLOCK_SET_FAILURE_STRING; + case (9100): + return TC_DELETION_FAILED_STRING; case (9700): return TEST_STRING; case (10600): diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index 9d92e60..a506a55 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 39 translations. - * Generated on: 2022-05-20 09:16:37 + * Contains 40 translations. + * Generated on: 2022-07-27 19:41:37 */ #include "translateObjects.h" @@ -32,6 +32,7 @@ const char *TC_STORE_STRING = "TC_STORE"; const char *TM_STORE_STRING = "TM_STORE"; const char *IPC_STORE_STRING = "IPC_STORE"; const char *TIME_STAMPER_STRING = "TIME_STAMPER"; +const char *TC_VERIFICATOR_STRING = "TC_VERIFICATOR"; const char *FSFW_OBJECTS_END_STRING = "FSFW_OBJECTS_END"; const char *TCPIP_TMTC_BRIDGE_STRING = "TCPIP_TMTC_BRIDGE"; const char *TCPIP_TMTC_POLLING_TASK_STRING = "TCPIP_TMTC_POLLING_TASK"; @@ -100,6 +101,8 @@ const char *translateObject(object_id_t object) { return IPC_STORE_STRING; case 0x53500010: return TIME_STAMPER_STRING; + case 0x53500020: + return TC_VERIFICATOR_STRING; case 0x53ffffff: return FSFW_OBJECTS_END_STRING; case 0x62000300: diff --git a/fsfw b/fsfw index 356d778..4e571e5 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 356d7787437e3926fb9dd9cb067d91351c9b7ae5 +Subproject commit 4e571e508280555cc96932991e125fd8ebc38df7 diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv index 50b84af..88f1727 100644 --- a/generators/bsp_hosted_events.csv +++ b/generators/bsp_hosted_events.csv @@ -74,5 +74,6 @@ 7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 8900;0x22c4;CLOCK_SET;INFO;;fsfw/src/fsfw/pus/Service9TimeManagement.h 8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h +9100;0x238c;TC_DELETION_FAILED;MEDIUM;Deletion of a TC from the map failed. P1: First 32 bit of request ID, P2. Last 32 bit of Request ID;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h -10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h +10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h diff --git a/generators/bsp_hosted_objects.csv b/generators/bsp_hosted_objects.csv index 8f37639..0c2d84d 100644 --- a/generators/bsp_hosted_objects.csv +++ b/generators/bsp_hosted_objects.csv @@ -24,6 +24,7 @@ 0x534f0200;TM_STORE 0x534f0300;IPC_STORE 0x53500010;TIME_STAMPER +0x53500020;TC_VERIFICATOR 0x53ffffff;FSFW_OBJECTS_END 0x62000300;TCPIP_TMTC_BRIDGE 0x62000400;TCPIP_TMTC_POLLING_TASK diff --git a/generators/eive_mod.db b/generators/eive_mod.db index 35331f5..f78fe9e 100644 Binary files a/generators/eive_mod.db and b/generators/eive_mod.db differ diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 6e6ef9d..acc51f5 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 78 translations. + * @brief Auto-generated event translation file. Contains 79 translations. * @details - * Generated on: 2022-05-20 09:11:07 + * Generated on: 2022-07-27 19:41:37 */ #include "translateEvents.h" @@ -81,6 +81,7 @@ const char *BIT_LOCK_LOST_STRING = "BIT_LOCK_LOST"; const char *FRAME_PROCESSING_FAILED_STRING = "FRAME_PROCESSING_FAILED"; const char *CLOCK_SET_STRING = "CLOCK_SET"; const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE"; +const char *TC_DELETION_FAILED_STRING = "TC_DELETION_FAILED"; const char *TEST_STRING = "TEST"; const char *CHANGE_OF_SETUP_PARAMETER_STRING = "CHANGE_OF_SETUP_PARAMETER"; @@ -238,6 +239,8 @@ const char *translateEvents(Event event) { return CLOCK_SET_STRING; case (8901): return CLOCK_SET_FAILURE_STRING; + case (9100): + return TC_DELETION_FAILED_STRING; case (9700): return TEST_STRING; case (10600): diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 9d92e60..a506a55 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 39 translations. - * Generated on: 2022-05-20 09:16:37 + * Contains 40 translations. + * Generated on: 2022-07-27 19:41:37 */ #include "translateObjects.h" @@ -32,6 +32,7 @@ const char *TC_STORE_STRING = "TC_STORE"; const char *TM_STORE_STRING = "TM_STORE"; const char *IPC_STORE_STRING = "IPC_STORE"; const char *TIME_STAMPER_STRING = "TIME_STAMPER"; +const char *TC_VERIFICATOR_STRING = "TC_VERIFICATOR"; const char *FSFW_OBJECTS_END_STRING = "FSFW_OBJECTS_END"; const char *TCPIP_TMTC_BRIDGE_STRING = "TCPIP_TMTC_BRIDGE"; const char *TCPIP_TMTC_POLLING_TASK_STRING = "TCPIP_TMTC_POLLING_TASK"; @@ -100,6 +101,8 @@ const char *translateObject(object_id_t object) { return IPC_STORE_STRING; case 0x53500010: return TIME_STAMPER_STRING; + case 0x53500020: + return TC_VERIFICATOR_STRING; case 0x53ffffff: return FSFW_OBJECTS_END_STRING; case 0x62000300: diff --git a/tmtc/config/events.csv b/tmtc/config/events.csv index 50b84af..88f1727 100644 --- a/tmtc/config/events.csv +++ b/tmtc/config/events.csv @@ -74,5 +74,6 @@ 7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 8900;0x22c4;CLOCK_SET;INFO;;fsfw/src/fsfw/pus/Service9TimeManagement.h 8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h +9100;0x238c;TC_DELETION_FAILED;MEDIUM;Deletion of a TC from the map failed. P1: First 32 bit of request ID, P2. Last 32 bit of Request ID;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h -10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h +10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h diff --git a/tmtc/config/objects.csv b/tmtc/config/objects.csv index 8f37639..0c2d84d 100644 --- a/tmtc/config/objects.csv +++ b/tmtc/config/objects.csv @@ -24,6 +24,7 @@ 0x534f0200;TM_STORE 0x534f0300;IPC_STORE 0x53500010;TIME_STAMPER +0x53500020;TC_VERIFICATOR 0x53ffffff;FSFW_OBJECTS_END 0x62000300;TCPIP_TMTC_BRIDGE 0x62000400;TCPIP_TMTC_POLLING_TASK diff --git a/tmtc/tmtc_conf.json b/tmtc/tmtc_conf.json index c687508..dc9034d 100644 --- a/tmtc/tmtc_conf.json +++ b/tmtc/tmtc_conf.json @@ -1,6 +1,9 @@ { - "com_if": "tcp", + "com_if": "udp", "tcpip_tcp_ip_addr": "127.0.0.1", "tcpip_tcp_port": 7301, - "tcpip_tcp_recv_max_size": 1500 + "tcpip_tcp_recv_max_size": 1500, + "tcpip_udp_ip_addr": "127.0.0.1", + "tcpip_udp_port": 7301, + "tcpip_udp_recv_max_size": 1500 } \ No newline at end of file