From 4171b119281163162cc08c038deed93f63fd3d66 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 3 Apr 2024 16:20:18 +0200 Subject: [PATCH 01/12] impl relative timeshift in framework --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 43ea29cb..0e2fa8dc 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 43ea29cb845d4a7d190c87df490eb53c4992618b +Subproject commit 0e2fa8dc83a6bfee7d88de8c9b8b6317fbdb1f6a From 3875ddf92b2024e75b68c50ba66c18383527060d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 3 Apr 2024 16:24:07 +0200 Subject: [PATCH 02/12] bump fsfw again --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 0e2fa8dc..f8e3777c 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 0e2fa8dc83a6bfee7d88de8c9b8b6317fbdb1f6a +Subproject commit f8e3777c43c3d3a44487d11472294f285958a684 From e59235fd75950354dfceb4262cb86d525a61184b Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 8 Apr 2024 10:28:36 +0200 Subject: [PATCH 03/12] reverted values --- mission/controller/ThermalController.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index 6b6d9cde..1062fe97 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -197,9 +197,9 @@ class ThermalController : public ExtendedControllerBase { tcsCtrl::TempLimits pcduAcuLimits = tcsCtrl::TempLimits(-35.0, -35.0, 80.0, 85.0, 85.0); tcsCtrl::TempLimits pcduPduLimits = tcsCtrl::TempLimits(-35.0, -35.0, 80.0, 85.0, 85.0); tcsCtrl::TempLimits plPcduBoardLimits = tcsCtrl::TempLimits(-55.0, -40.0, 80.0, 85.0, 125.0); - tcsCtrl::TempLimits plocMissionBoardLimits = tcsCtrl::TempLimits(-30.0, -5.0, 40.0, 45.0, 60); + tcsCtrl::TempLimits plocMissionBoardLimits = tcsCtrl::TempLimits(-30.0, -10.0, 40.0, 45.0, 60); tcsCtrl::TempLimits plocProcessingBoardLimits = - tcsCtrl::TempLimits(-30.0, -5.0, 40.0, 45.0, 60.0); + tcsCtrl::TempLimits(-30.0, -10.0, 40.0, 45.0, 60.0); tcsCtrl::TempLimits dacLimits = tcsCtrl::TempLimits(-65.0, -40.0, 113.0, 118.0, 150.0); tcsCtrl::TempLimits cameraLimits = tcsCtrl::TempLimits(-40.0, -30.0, 60.0, 65.0, 85.0); tcsCtrl::TempLimits droLimits = tcsCtrl::TempLimits(-40.0, -30.0, 75.0, 80.0, 90.0); From e6855120f3e1e1b38e2d86522f9393169ff7a968 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 8 Apr 2024 10:28:57 +0200 Subject: [PATCH 04/12] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 649cf44f..7dbc2b81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Changed + +- Reverted lower OP limit of `PLOC` to -10°C. + # [v7.7.4] 2024-03-21 ## Changed From a46f6f34d62c31496656c09098b41e46515df977 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 8 Apr 2024 10:47:14 +0200 Subject: [PATCH 05/12] allow mekf to be used for ptg laws as default --- mission/controller/acs/AcsParameters.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/controller/acs/AcsParameters.h b/mission/controller/acs/AcsParameters.h index 8f415103..dfb99c2c 100644 --- a/mission/controller/acs/AcsParameters.h +++ b/mission/controller/acs/AcsParameters.h @@ -866,7 +866,7 @@ class AcsParameters : public HasParametersIF { double desatMomentumRef[3] = {0, 0, 0}; double deSatGainFactor = 1000; uint8_t desatOn = true; - uint8_t useMekf = false; + uint8_t useMekf = true; } pointingLawParameters; struct IdleModeControllerParameters : PointingLawParameters { From 69f378f8b6eb5dddc537d122ee48b765a11fbbff Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 8 Apr 2024 10:48:03 +0200 Subject: [PATCH 06/12] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 649cf44f..9d239dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Changed + +- All pointing laws are now allowed to use the `MEKF` per default. + # [v7.7.4] 2024-03-21 ## Changed From 3e6d26669a9fcfd21ded6b855b02da8cc1e5685c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 8 Apr 2024 11:37:43 +0200 Subject: [PATCH 07/12] bump submodules --- fsfw | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfw b/fsfw index f8e3777c..aff6bb67 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit f8e3777c43c3d3a44487d11472294f285958a684 +Subproject commit aff6bb673bb208ccd764770a3beb91a1250620e0 diff --git a/tmtc b/tmtc index c843356c..492d3642 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit c843356c8af22bf45a04c71c93813716c9d743ec +Subproject commit 492d364246b3417ce3815dc58b405f493e77b9f7 From 72626582f6776a00abb87baf00ad5c6259b3dd43 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 8 Apr 2024 13:27:08 +0200 Subject: [PATCH 08/12] bump submodules --- fsfw | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfw b/fsfw index aff6bb67..efbcddc2 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit aff6bb673bb208ccd764770a3beb91a1250620e0 +Subproject commit efbcddc2e5e3e5c53675d46b856ca75eb4453741 diff --git a/tmtc b/tmtc index 492d3642..de84bf11 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 492d364246b3417ce3815dc58b405f493e77b9f7 +Subproject commit de84bf112b74347e2022e3850b60ca73cb1d8ce9 From e1b562508678d589b6335dedafeca2cc319caea8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 8 Apr 2024 13:35:42 +0200 Subject: [PATCH 09/12] update events --- bsp_hosted/fsfwconfig/events/translateEvents.cpp | 11 +++++++---- bsp_hosted/fsfwconfig/objects/translateObjects.cpp | 2 +- fsfw | 2 +- generators/bsp_hosted_events.csv | 3 ++- generators/bsp_q7s_events.csv | 3 ++- generators/events/translateEvents.cpp | 11 +++++++---- generators/objects/translateObjects.cpp | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 11 +++++++---- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- tmtc | 2 +- 10 files changed, 30 insertions(+), 19 deletions(-) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index 5cd42682..fca8b6a0 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 320 translations. + * @brief Auto-generated event translation file. Contains 321 translations. * @details - * Generated on: 2024-02-29 13:15:00 + * Generated on: 2024-04-08 13:35:22 */ #include "translateEvents.h" @@ -82,8 +82,9 @@ const char *BIT_LOCK_STRING = "BIT_LOCK"; 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_DUMP_STRING = "CLOCK_DUMP"; +const char *CLOCK_DUMP_LEGACY_STRING = "CLOCK_DUMP_LEGACY"; const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE"; +const char *CLOCK_DUMP_STRING = "CLOCK_DUMP"; 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"; @@ -483,9 +484,11 @@ const char *translateEvents(Event event) { case (8900): return CLOCK_SET_STRING; case (8901): - return CLOCK_DUMP_STRING; + return CLOCK_DUMP_LEGACY_STRING; case (8902): return CLOCK_SET_FAILURE_STRING; + case (8903): + return CLOCK_DUMP_STRING; case (9100): return TC_DELETION_FAILED_STRING; case (9700): diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index 46c7481b..6561c87a 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 175 translations. - * Generated on: 2024-02-29 13:15:00 + * Generated on: 2024-04-08 13:35:22 */ #include "translateObjects.h" diff --git a/fsfw b/fsfw index efbcddc2..e12a8cfa 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit efbcddc2e5e3e5c53675d46b856ca75eb4453741 +Subproject commit e12a8cfa292085c1ec2e1092f02ec5f722bf667d diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv index 200cbdb1..1a302603 100644 --- a/generators/bsp_hosted_events.csv +++ b/generators/bsp_hosted_events.csv @@ -76,8 +76,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 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;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8901;0x22c5;CLOCK_DUMP;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h +8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h 8902;0x22c6;CLOCK_SET_FAILURE;LOW;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h +8903;0x22c7;CLOCK_DUMP;INFO;No description;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;No description;fsfw/src/fsfw/pus/Service17Test.h 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;No description;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index 200cbdb1..1a302603 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -76,8 +76,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 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;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8901;0x22c5;CLOCK_DUMP;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h +8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h 8902;0x22c6;CLOCK_SET_FAILURE;LOW;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h +8903;0x22c7;CLOCK_DUMP;INFO;No description;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;No description;fsfw/src/fsfw/pus/Service17Test.h 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;No description;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 5cd42682..fca8b6a0 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 320 translations. + * @brief Auto-generated event translation file. Contains 321 translations. * @details - * Generated on: 2024-02-29 13:15:00 + * Generated on: 2024-04-08 13:35:22 */ #include "translateEvents.h" @@ -82,8 +82,9 @@ const char *BIT_LOCK_STRING = "BIT_LOCK"; 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_DUMP_STRING = "CLOCK_DUMP"; +const char *CLOCK_DUMP_LEGACY_STRING = "CLOCK_DUMP_LEGACY"; const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE"; +const char *CLOCK_DUMP_STRING = "CLOCK_DUMP"; 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"; @@ -483,9 +484,11 @@ const char *translateEvents(Event event) { case (8900): return CLOCK_SET_STRING; case (8901): - return CLOCK_DUMP_STRING; + return CLOCK_DUMP_LEGACY_STRING; case (8902): return CLOCK_SET_FAILURE_STRING; + case (8903): + return CLOCK_DUMP_STRING; case (9100): return TC_DELETION_FAILED_STRING; case (9700): diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 6230d3db..b2d42d0b 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2024-02-29 13:15:00 + * Generated on: 2024-04-08 13:35:22 */ #include "translateObjects.h" diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 5cd42682..fca8b6a0 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 320 translations. + * @brief Auto-generated event translation file. Contains 321 translations. * @details - * Generated on: 2024-02-29 13:15:00 + * Generated on: 2024-04-08 13:35:22 */ #include "translateEvents.h" @@ -82,8 +82,9 @@ const char *BIT_LOCK_STRING = "BIT_LOCK"; 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_DUMP_STRING = "CLOCK_DUMP"; +const char *CLOCK_DUMP_LEGACY_STRING = "CLOCK_DUMP_LEGACY"; const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE"; +const char *CLOCK_DUMP_STRING = "CLOCK_DUMP"; 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"; @@ -483,9 +484,11 @@ const char *translateEvents(Event event) { case (8900): return CLOCK_SET_STRING; case (8901): - return CLOCK_DUMP_STRING; + return CLOCK_DUMP_LEGACY_STRING; case (8902): return CLOCK_SET_FAILURE_STRING; + case (8903): + return CLOCK_DUMP_STRING; case (9100): return TC_DELETION_FAILED_STRING; case (9700): diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 6230d3db..b2d42d0b 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2024-02-29 13:15:00 + * Generated on: 2024-04-08 13:35:22 */ #include "translateObjects.h" diff --git a/tmtc b/tmtc index de84bf11..5bdba2db 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit de84bf112b74347e2022e3850b60ca73cb1d8ce9 +Subproject commit 5bdba2dbad71b94a7b9c9240793eae40dda08de2 From 35181a269363e6bf35a77ea9cc84ea2d25d89153 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 8 Apr 2024 13:36:21 +0200 Subject: [PATCH 10/12] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 649cf44f..bfab9112 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,11 +22,16 @@ will consitute of a breaking change warranting a new major release: - Rotational rate limit for the GS target pointing is now seperated from controller limit. It is also reduced to 0.75°/s now. +- PUS time service: Now dumps the time before and after relative timeshift or setting absolute time ## Fixed - Fixed wrong sign in calculation of total current within the `PWR Controller`. +## Added + +- PUS timeservice relative timeshift. + # [v7.7.3] 2024-03-18 - Bumped `eive-fsfw` From 1f0e2d99e97661752dc02b58c9716e879b7072c4 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 8 Apr 2024 13:38:35 +0200 Subject: [PATCH 11/12] fix comment block --- bsp_hosted/fsfwconfig/events/translateEvents.cpp | 2 +- bsp_hosted/fsfwconfig/objects/translateObjects.cpp | 2 +- fsfw | 2 +- generators/bsp_hosted_events.csv | 8 ++++---- generators/bsp_q7s_events.csv | 8 ++++---- generators/events/translateEvents.cpp | 2 +- generators/objects/translateObjects.cpp | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- tmtc | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index fca8b6a0..a787b609 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 321 translations. * @details - * Generated on: 2024-04-08 13:35:22 + * Generated on: 2024-04-08 13:37:59 */ #include "translateEvents.h" diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index 6561c87a..3af7f2d3 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 175 translations. - * Generated on: 2024-04-08 13:35:22 + * Generated on: 2024-04-08 13:37:59 */ #include "translateObjects.h" diff --git a/fsfw b/fsfw index e12a8cfa..94bd1ba2 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit e12a8cfa292085c1ec2e1092f02ec5f722bf667d +Subproject commit 94bd1ba2ab6c16131f8dd39a84568672d809983d diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv index 1a302603..34aa9343 100644 --- a/generators/bsp_hosted_events.csv +++ b/generators/bsp_hosted_events.csv @@ -75,10 +75,10 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 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;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8902;0x22c6;CLOCK_SET_FAILURE;LOW;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8903;0x22c7;CLOCK_DUMP;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h +8900;0x22c4;CLOCK_SET;INFO;Clock has been set. P1: old timeval seconds. P2: new timeval seconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h +8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;Clock dump event. P1: timeval seconds P2: timeval milliseconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h +8902;0x22c6;CLOCK_SET_FAILURE;LOW;Clock could not be set. P1: Returncode.;fsfw/src/fsfw/pus/Service9TimeManagement.h +8903;0x22c7;CLOCK_DUMP;INFO;Clock dump event. P1: timeval seconds P2: timeval microseconds.;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;No description;fsfw/src/fsfw/pus/Service17Test.h 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;No description;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index 1a302603..34aa9343 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -75,10 +75,10 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h 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;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8902;0x22c6;CLOCK_SET_FAILURE;LOW;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h -8903;0x22c7;CLOCK_DUMP;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h +8900;0x22c4;CLOCK_SET;INFO;Clock has been set. P1: old timeval seconds. P2: new timeval seconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h +8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;Clock dump event. P1: timeval seconds P2: timeval milliseconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h +8902;0x22c6;CLOCK_SET_FAILURE;LOW;Clock could not be set. P1: Returncode.;fsfw/src/fsfw/pus/Service9TimeManagement.h +8903;0x22c7;CLOCK_DUMP;INFO;Clock dump event. P1: timeval seconds P2: timeval microseconds.;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;No description;fsfw/src/fsfw/pus/Service17Test.h 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;No description;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index fca8b6a0..a787b609 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 321 translations. * @details - * Generated on: 2024-04-08 13:35:22 + * Generated on: 2024-04-08 13:37:59 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index b2d42d0b..110c5c62 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2024-04-08 13:35:22 + * Generated on: 2024-04-08 13:37:59 */ #include "translateObjects.h" diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index fca8b6a0..a787b609 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 321 translations. * @details - * Generated on: 2024-04-08 13:35:22 + * Generated on: 2024-04-08 13:37:59 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index b2d42d0b..110c5c62 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2024-04-08 13:35:22 + * Generated on: 2024-04-08 13:37:59 */ #include "translateObjects.h" diff --git a/tmtc b/tmtc index 5bdba2db..5a0edbef 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 5bdba2dbad71b94a7b9c9240793eae40dda08de2 +Subproject commit 5a0edbefa8449f4796d7d0976822c8fda139c598 From 47cedb90f9b240ff8a652056394efb4f18a81993 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 11:07:05 +0200 Subject: [PATCH 12/12] bump fsfw --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 94bd1ba2..a229748a 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 94bd1ba2ab6c16131f8dd39a84568672d809983d +Subproject commit a229748aa4c1ff8e2b9f7e268259b857fb8f9051