From 05d6025dcc2c6988796c8c6bda640da872f9fc9e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 15 Nov 2023 15:41:51 +0100
Subject: [PATCH] bsp hosted fixes

---
 bsp_hosted/objectFactory.cpp | 11 ++++++-----
 linux/payload/plocSupvDefs.h |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bsp_hosted/objectFactory.cpp b/bsp_hosted/objectFactory.cpp
index 0f785e70..30a4154b 100644
--- a/bsp_hosted/objectFactory.cpp
+++ b/bsp_hosted/objectFactory.cpp
@@ -38,9 +38,9 @@
 
 #include "devices/gpioIds.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
+#include "linux/payload/FreshSupvHandler.h"
 #include "linux/payload/PlocMpsocHandler.h"
 #include "linux/payload/PlocMpsocSpecialComHelper.h"
-#include "linux/payload/PlocSupervisorHandler.h"
 #include "linux/payload/PlocSupvUartMan.h"
 #include "test/gpio/DummyGpioIF.h"
 #endif
@@ -97,10 +97,11 @@ void ObjectFactory::produce(void* args) {
       new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER, plocSupvString, uart::PLOC_SUPV_BAUD,
                        supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
   supervisorCookie->setNoFixedSizeReply();
-  auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
-  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie,
-                            Gpio(gpioIds::ENABLE_SUPV_UART, dummyGpioIF), pcdu::PDU1_CH6_PLOC_12V,
-                            *supvHelper);
+  new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
+  DhbConfig dhbConf(objects::PLOC_SUPERVISOR_HANDLER);
+  auto* supvHandler =
+      new FreshSupvHandler(dhbConf, supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, dummyGpioIF),
+                           dummySwitcher, power::PDU1_CH6_PLOC_12V);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
 #endif
 
diff --git a/linux/payload/plocSupvDefs.h b/linux/payload/plocSupvDefs.h
index 4423bbb3..06dd7b8e 100644
--- a/linux/payload/plocSupvDefs.h
+++ b/linux/payload/plocSupvDefs.h
@@ -13,6 +13,7 @@
 #include <atomic>
 #include <optional>
 
+#include "eive/eventSubsystemIds.h"
 #include "eive/resultClassIds.h"
 
 namespace supv {