From 27f676a725e904d253db6347971ff213133a81f2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 1 Feb 2023 17:44:45 +0100
Subject: [PATCH] bump fsfw for Health service update

---
 CHANGELOG.md                    | 5 +++++
 fsfw                            | 2 +-
 mission/core/GenericFactory.cpp | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c013105..2c6d1040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,11 @@ change warranting a new major release:
 
 # [unreleased]
 
+## Changed
+
+- Bumped FSFW to include improvements and bugfix for Health Service. The health service now
+  supports the announce all health info command.
+
 ## Fixed
 
  - The CCSDS handler starts the transmitter timer each time it is commanded to MODE_ON and times out the timer when the handler is commanded to MODE_OFF
diff --git a/fsfw b/fsfw
index 7766b24a..64787f85 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 7766b24a1d55df2a3f0d702e627b38c1118c5e8d
+Subproject commit 64787f85ca4ce796003240dfbebeb07f6e2b0816
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 9dee61ab..9c08726c 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -8,7 +8,7 @@
 #include <fsfw/internalerror/InternalErrorReporter.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/pus/CService200ModeCommanding.h>
-#include <fsfw/pus/CService201HealthCommanding.h>
+#include <fsfw/pus/CServiceHealthCommanding.h>
 #include <fsfw/pus/Service17Test.h>
 #include <fsfw/pus/Service1TelecommandVerification.h>
 #include <fsfw/pus/Service20ParameterManagement.h>
@@ -162,8 +162,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
                                    pus::PUS_SERVICE_20);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
                                 pus::PUS_SERVICE_200, 8);
-  new CService201HealthCommanding(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID,
-                                  pus::PUS_SERVICE_201);
+  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable, 20);
+  new CServiceHealthCommanding(healthCfg);
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1
   using namespace cfdp;