From 82af8e00dfe26882c8e1e5fa8bf3a15a952efc36 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 27 Oct 2022 14:02:34 +0200
Subject: [PATCH] bufixes for PDEC

---
 bsp_q7s/boardconfig/busConf.h  | 2 +-
 bsp_q7s/core/ObjectFactory.cpp | 3 ++-
 bsp_q7s/core/ObjectFactory.h   | 2 +-
 fsfw                           | 2 +-
 linux/obc/AxiPtmeConfig.cpp    | 2 +-
 linux/obc/PapbVcInterface.cpp  | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bsp_q7s/boardconfig/busConf.h b/bsp_q7s/boardconfig/busConf.h
index 0bd781df..21b9db2d 100644
--- a/bsp_q7s/boardconfig/busConf.h
+++ b/bsp_q7s/boardconfig/busConf.h
@@ -20,7 +20,7 @@ static constexpr char UART_SCEX_DEV[] = "/dev/scex";
 static constexpr char UIO_PDEC_REGISTERS[] = "/dev/uio_pdec_regs";
 static constexpr char UIO_PTME[] = "/dev/uio_ptme";
 static constexpr char UIO_PDEC_CONFIG_MEMORY[] = "/dev/uio_pdec_cfg_mem";
-static constexpr char UIO_PDEC_RAM[] = "/dev/pdec_ram";
+static constexpr char UIO_PDEC_RAM[] = "/dev/uio_pdec_ram";
 static constexpr int MAP_ID_PTME_CONFIG = 3;
 
 namespace uiomapids {
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 82d066c8..fdc263de 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -690,7 +690,7 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF,
 #endif /* OBSW_ADD_RW == 1 */
 }
 
-void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
+ReturnValue_t ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
   using namespace gpio;
   // GPIO definitions of signals connected to the virtual channel interfaces of the PTME IP Core
   GpioCookie* gpioCookiePtmeIp = new GpioCookie;
@@ -790,6 +790,7 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
                                     Direction::OUT, Levels::LOW);
   gpioRS485Chip->addGpio(gpioIds::RS485_EN_RX_DATA, gpio);
   gpioChecker(gpioComIF->addGpios(gpioRS485Chip), "RS485 Transceiver");
+  return returnvalue::OK;
 }
 
 void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
diff --git a/bsp_q7s/core/ObjectFactory.h b/bsp_q7s/core/ObjectFactory.h
index 76660f30..2947d786 100644
--- a/bsp_q7s/core/ObjectFactory.h
+++ b/bsp_q7s/core/ObjectFactory.h
@@ -37,7 +37,7 @@ void createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitcher, GpioIF& gp
 void createSyrlinksComponents(PowerSwitchIF* pwrSwitcher);
 void createPayloadComponents(LinuxLibgpioIF* gpioComIF);
 void createReactionWheelComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher);
-void createCcsdsComponents(LinuxLibgpioIF* gpioComIF);
+ReturnValue_t createCcsdsComponents(LinuxLibgpioIF* gpioComIF);
 void createMiscComponents();
 
 void createTestComponents(LinuxLibgpioIF* gpioComIF);
diff --git a/fsfw b/fsfw
index 1b7e94d7..226dc4d8 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 1b7e94d718ba8f526dd53324d33d0e577cbfc81b
+Subproject commit 226dc4d8b742fea832861bf70d37dc48beb15dc9
diff --git a/linux/obc/AxiPtmeConfig.cpp b/linux/obc/AxiPtmeConfig.cpp
index 7c1f90c6..ead3d691 100644
--- a/linux/obc/AxiPtmeConfig.cpp
+++ b/linux/obc/AxiPtmeConfig.cpp
@@ -4,7 +4,7 @@
 #include "fsfw_hal/linux/uio/UioMapper.h"
 
 AxiPtmeConfig::AxiPtmeConfig(object_id_t objectId, std::string axiUio, int mapNum)
-    : SystemObject(objectId), axiUio(axiUio), mapNum(mapNum) {
+    : SystemObject(objectId), axiUio(std::move(axiUio)), mapNum(mapNum) {
   mutex = MutexFactory::instance()->createMutex();
   if (mutex == nullptr) {
     sif::warning << "Failed to create mutex" << std::endl;
diff --git a/linux/obc/PapbVcInterface.cpp b/linux/obc/PapbVcInterface.cpp
index fc23fed8..1fbbe2ba 100644
--- a/linux/obc/PapbVcInterface.cpp
+++ b/linux/obc/PapbVcInterface.cpp
@@ -8,7 +8,7 @@ PapbVcInterface::PapbVcInterface(LinuxLibgpioIF* gpioComIF, gpioId_t papbBusyId,
     : gpioComIF(gpioComIF),
       papbBusyId(papbBusyId),
       papbEmptyId(papbEmptyId),
-      uioFile(uioFile),
+      uioFile(std::move(uioFile)),
       mapNum(mapNum) {}
 
 PapbVcInterface::~PapbVcInterface() {}