From 48643945901b88536cd305d7ed52fbc13135e36f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 9 May 2022 16:13:33 +0200
Subject: [PATCH] renamed heaters

---
 bsp_q7s/fm/fmObjectFactory.cpp | 6 +++---
 common/config/commonObjects.h  | 6 +++---
 tmtc                           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bsp_q7s/fm/fmObjectFactory.cpp b/bsp_q7s/fm/fmObjectFactory.cpp
index 9d8db750..a3a208c9 100644
--- a/bsp_q7s/fm/fmObjectFactory.cpp
+++ b/bsp_q7s/fm/fmObjectFactory.cpp
@@ -605,10 +605,10 @@ void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwi
   gpioIF->addGpios(heaterGpiosCookie);
 
   HeaterHelper helper({{
-      {new HealthDevice(objects::HEATER_0_OBC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_0},
-      {new HealthDevice(objects::HEATER_1_PLOC_PROC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1},
+      {new HealthDevice(objects::HEATER_0_PLOC_PROC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_0},
+      {new HealthDevice(objects::HEATER_1_PCDU_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1},
       {new HealthDevice(objects::HEATER_2_ACS_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_2},
-      {new HealthDevice(objects::HEATER_3_PCDU_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3},
+      {new HealthDevice(objects::HEATER_3_OBC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3},
       {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},
diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h
index db2bd777..d797c208 100644
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@@ -108,10 +108,10 @@ enum commonObjects: uint32_t {
     SYRLINKS_HK_HANDLER = 0x445300A3,
 
     // 0x60 for other stuff
-    HEATER_0_OBC_BRD = 0x60000000,
-    HEATER_1_PLOC_PROC_BRD = 0x60000001,
+    HEATER_0_PLOC_PROC_BRD = 0x60000000,
+    HEATER_1_PCDU_BRD = 0x60000001,
     HEATER_2_ACS_BRD = 0x60000002,
-    HEATER_3_PCDU_BRD = 0x60000003,
+    HEATER_3_OBC_BRD = 0x60000003,
     HEATER_4_CAMERA = 0x60000004,
     HEATER_5_STR = 0x60000005,
     HEATER_6_DRO = 0x60000006,
diff --git a/tmtc b/tmtc
index e0671e08..6b7b07c3 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit e0671e080799ff502ef22814df1fe3db0f7e96d6
+Subproject commit 6b7b07c3409fc24a8585c39e308156b3657c655e