From 76d00ddd37330292bb1e877fb9025e2e576a4236 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 3 Apr 2024 12:48:12 +0200 Subject: [PATCH 1/6] bump fsfw --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 43ea29cb..203c0bac 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 43ea29cb845d4a7d190c87df490eb53c4992618b +Subproject commit 203c0bac5cd5a1ec3df87a569d769077efc23110 From 56512fae0d5ac7ee2fc94618a1a8c6de3a0b7d6a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 3 Apr 2024 12:52:40 +0200 Subject: [PATCH 2/6] bump fsfw again --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 203c0bac..c5159fb6 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 203c0bac5cd5a1ec3df87a569d769077efc23110 +Subproject commit c5159fb64559a69a71470cf921b75b9a0b900ea3 From 43de0978125944da764914aa2a42851b32e70fe3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 3 Apr 2024 15:06:37 +0200 Subject: [PATCH 3/6] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 649cf44f..34dedd86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Fixed + +- Re-worked some FDIR logic in the FSFW. The former logic prevented events with a severity + higher than INFO if the device was in EXTERNAL CONTROL. The new logic will allow to trigger + events but still inhibit FDIR reactions if the device is in EXTERNAL CONTROL. + # [v7.7.4] 2024-03-21 ## Changed From b01d4f63631aa953f001d7469588cf1a01ca2fb0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 14:30:11 +0200 Subject: [PATCH 4/6] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 5a0edbef..33cf7b16 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 5a0edbefa8449f4796d7d0976822c8fda139c598 +Subproject commit 33cf7b1613a11c28cd14e4057f6e47144309b0c0 From c4340c3515dcf38d509157d9470f145d2bb30560 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 14:33:02 +0200 Subject: [PATCH 5/6] re-point tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 33cf7b16..96636d59 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 33cf7b1613a11c28cd14e4057f6e47144309b0c0 +Subproject commit 96636d59e9b0e3f35947f2d0e73d2a8ab1a58c5c From 53376fd9edff135f23fc19ec1ded6a3e5dc6d979 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 10 Apr 2024 11:43:06 +0200 Subject: [PATCH 6/6] fix changelog --- CHANGELOG.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6347370..e6c6bbd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,12 +16,6 @@ will consitute of a breaking change warranting a new major release: # [unreleased] -## Fixed - -- Re-worked some FDIR logic in the FSFW. The former logic prevented events with a severity - higher than INFO if the device was in EXTERNAL CONTROL. The new logic will allow to trigger - events but still inhibit FDIR reactions if the device is in EXTERNAL CONTROL. - ## Changed - Reverted lower OP limit of `PLOC` to -10°C. @@ -47,6 +41,9 @@ will consitute of a breaking change warranting a new major release: ## Fixed - Fixed wrong order in quaternion multiplication for computation of the error quaternion. +- Re-worked some FDIR logic in the FSFW. The former logic prevented events with a severity + higher than INFO if the device was in EXTERNAL CONTROL. The new logic will allow to trigger + events but still inhibit FDIR reactions if the device is in EXTERNAL CONTROL. # [v7.7.4] 2024-03-21