From 2e93d7300a098ea431fece6228b3a3df5772b2c4 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sun, 17 Apr 2022 01:00:06 +0200
Subject: [PATCH] some more fixes

---
 bsp_q7s/core/CoreController.cpp |  2 +-
 bsp_q7s/core/ObjectFactory.cpp  | 10 +++++-----
 bsp_q7s/core/obsw.cpp           |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 4e7bb02b..6fe1d469 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -8,7 +8,7 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/timemanager/Stopwatch.h"
 #include "fsfw/version.h"
-#include "watchdogConf.h"
+#include "watchdog/definitions.h"
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #else
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 062b0889..2daa907a 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -596,7 +596,7 @@ void ObjectFactory::createHeaterComponents() {
   heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpio);
 
   new HeaterHandler(objects::HEATER_HANDLER, objects::GPIO_IF, heaterGpiosCookie,
-                    objects::PCDU_HANDLER, pcduSwitches::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
+                    objects::PCDU_HANDLER, pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
 }
 
 void ObjectFactory::createSolarArrayDeploymentComponents() {
@@ -616,7 +616,7 @@ void ObjectFactory::createSolarArrayDeploymentComponents() {
   // TODO: Find out burn time. For now set to 1000 ms.
   new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, objects::GPIO_IF,
                                   solarArrayDeplCookie, objects::PCDU_HANDLER,
-                                  pcduSwitches::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
+                                  pcdu::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
                                   gpioIds::DEPLSA1, gpioIds::DEPLSA2, 1000);
 }
 
@@ -627,7 +627,7 @@ void ObjectFactory::createSyrlinksComponents() {
   syrlinksUartCookie->setParityEven();
 
   new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie,
-                        pcduSwitches::PDU1_CH1_SYRLINKS_12V);
+                        pcdu::PDU1_CH1_SYRLINKS_12V);
 }
 
 void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
@@ -920,8 +920,8 @@ void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF*
   // Create device handler components
   auto plPcduHandler = new PayloadPcduHandler(
       objects::PLPCDU_HANDLER, objects::SPI_COM_IF, spiCookie, gpioComIF, SdCardManager::instance(),
-      pwrSwitcher, pcduSwitches::Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8,
-      pcduSwitches::Switches::PDU2_CH6_PL_PCDU_BATT_1_14V8, false);
+      pwrSwitcher, pcdu::Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8,
+      pcdu::Switches::PDU2_CH6_PL_PCDU_BATT_1_14V8, false);
   spiCookie->setCallbackMode(PayloadPcduHandler::extConvAsTwoCallback, plPcduHandler);
 //  plPcduHandler->enablePeriodicPrintout(true, 5);
 //  static_cast<void>(plPcduHandler);
diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp
index 27d1484e..359d04c2 100644
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@@ -8,7 +8,7 @@
 #include "OBSWVersion.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
-#include "watchdogConf.h"
+#include "watchdog/definitions.h"
 
 static int OBSW_ALREADY_RUNNING = -2;