From ac2c4c7abcb76786d0d6a0da1160a9198ecbbd2b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 9 Mar 2023 16:43:35 +0100
Subject: [PATCH 1/2] heater name bugfix

---
 common/config/eive/objects.h    | 2 +-
 fsfw                            | 2 +-
 mission/core/GenericFactory.cpp | 2 +-
 tmtc                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/config/eive/objects.h b/common/config/eive/objects.h
index cb468ef2..31d1862d 100644
--- a/common/config/eive/objects.h
+++ b/common/config/eive/objects.h
@@ -136,7 +136,7 @@ enum commonObjects : uint32_t {
   HEATER_4_CAMERA = 0x60000004,
   HEATER_5_STR = 0x60000005,
   HEATER_6_DRO = 0x60000006,
-  HEATER_7_HPA = 0x60000007,
+  HEATER_7_SYRLINKS = 0x60000007,
 
   // 0x73 ('s') for assemblies and system/subsystem components
   ACS_BOARD_ASS = 0x73000001,
diff --git a/fsfw b/fsfw
index 26e44451..23d9b44b 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 26e4445189b676eaee11840e5a9d0ede25cf3896
+Subproject commit 23d9b44b3e02bb0d35e4622d125b48e9b44fee2c
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index b6119eda..c6a3e216 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -224,7 +224,7 @@ void ObjectFactory::createGenericHeaterComponents(GpioIF& gpioIF, PowerSwitchIF&
       {new HealthDevice(objects::HEATER_4_CAMERA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4},
       {new HealthDevice(objects::HEATER_5_STR, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5},
       {new HealthDevice(objects::HEATER_6_DRO, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6},
-      {new HealthDevice(objects::HEATER_7_HPA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
+      {new HealthDevice(objects::HEATER_7_SYRLINKS, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
   }});
   heaterHandler = new HeaterHandler(objects::HEATER_HANDLER, &gpioIF, helper, &pwrSwitcher,
                                     pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
diff --git a/tmtc b/tmtc
index a3e03350..bf158bee 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit a3e03350faf3055835e65e744bc177761448ce20
+Subproject commit bf158bee2d79c95de3ac2e38f4e7d977699711b1

From 9f9b1e440ab3f02de3783cfb7aee691ac1a6c5a9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 9 Mar 2023 16:52:47 +0100
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ab39c23..4d2e2cbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+
+- Fix for heater names: HPA heater (index 7) is now the Syrlinks heater.
+
 # [v1.36.0] 2023-03-08
 
 eive-tmtc: v2.17.2