From 6503778cd5bc0379adbc6e1d458d6515f1a19aa0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 10 Jan 2023 14:17:55 +0100
Subject: [PATCH] various bugfixes

---
 bsp_q7s/core/ObjectFactory.cpp                          | 2 +-
 mission/devices/CMakeLists.txt                          | 2 +-
 mission/devices/{PCDUHandler.cpp => PcduHandler.cpp}    | 7 ++++---
 mission/devices/{PCDUHandler.h => PcduHandler.h}        | 0
 mission/devices/devicedefinitions/GomspaceDefinitions.h | 5 ++---
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename mission/devices/{PCDUHandler.cpp => PcduHandler.cpp} (99%)
 rename mission/devices/{PCDUHandler.h => PcduHandler.h} (100%)

diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 70e16002..7219b96d 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -54,6 +54,7 @@
 #include "linux/boardtest/LibgpiodTest.h"
 #endif
 #include <mission/devices/ImtqHandler.h>
+#include <mission/devices/PcduHandler.h>
 
 #include <sstream>
 
@@ -80,7 +81,6 @@
 #include "mission/devices/HeaterHandler.h"
 #include "mission/devices/Max31865PT1000Handler.h"
 #include "mission/devices/P60DockHandler.h"
-#include "mission/devices/PCDUHandler.h"
 #include "mission/devices/PDU1Handler.h"
 #include "mission/devices/PDU2Handler.h"
 #include "mission/devices/PayloadPcduHandler.h"
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index b8fb326c..1589a460 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -3,7 +3,7 @@ target_sources(
   PRIVATE GomspaceDeviceHandler.cpp
           BpxBatteryHandler.cpp
           Tmp1075Handler.cpp
-          PCDUHandler.cpp
+          PcduHandler.cpp
           P60DockHandler.cpp
           PDU1Handler.cpp
           PDU2Handler.cpp
diff --git a/mission/devices/PCDUHandler.cpp b/mission/devices/PcduHandler.cpp
similarity index 99%
rename from mission/devices/PCDUHandler.cpp
rename to mission/devices/PcduHandler.cpp
index 2a8607bf..0030242f 100644
--- a/mission/devices/PCDUHandler.cpp
+++ b/mission/devices/PcduHandler.cpp
@@ -1,11 +1,10 @@
-#include "PCDUHandler.h"
-
 #include <OBSWConfig.h>
 #include <devices/powerSwitcherList.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/housekeeping/HousekeepingSnapshot.h>
 #include <fsfw/ipc/MutexFactory.h>
 #include <fsfw/ipc/QueueFactory.h>
+#include <mission/devices/PcduHandler.h>
 #include <mission/devices/devicedefinitions/GomSpacePackets.h>
 
 PCDUHandler::PCDUHandler(object_id_t setObjectId, size_t cmdQueueSize)
@@ -104,8 +103,10 @@ void PCDUHandler::initializeSwitchStates() {
     for (uint8_t idx = 0; idx < NUMBER_OF_SWITCHES; idx++) {
       if (idx < PDU::CHANNELS_LEN) {
         switchStates[idx] = INIT_SWITCHES_PDU1.at(idx);
-      } else {
+      } else if (idx < PDU::CHANNELS_LEN * 2) {
         switchStates[idx] = INIT_SWITCHES_PDU2.at(idx - PDU::CHANNELS_LEN);
+      } else {
+        switchStates[idx] = OFF;
       }
     }
   } catch (const std::out_of_range& err) {
diff --git a/mission/devices/PCDUHandler.h b/mission/devices/PcduHandler.h
similarity index 100%
rename from mission/devices/PCDUHandler.h
rename to mission/devices/PcduHandler.h
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index bc8b2edd..75a81d8f 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -737,11 +737,10 @@ enum Switches : power::Switch_t {
   PDU2_CH7_ACS_BOARD_SIDE_B_3V3,
   PDU2_CH8_PAYLOAD_CAMERA,
 
-  P60_DOCK_5V_STACK
+  P60_DOCK_5V_STACK,
+  NUMBER_OF_SWITCHES
 };
 
-static constexpr uint8_t NUMBER_OF_SWITCHES = 18;
-
 static const uint8_t ON = 1;
 static const uint8_t OFF = 0;