From 368b01c081f9799cc9d81a1168d5287dab5ae6ca Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Wed, 23 Mar 2022 11:13:59 +0100 Subject: [PATCH] include fixes --- bsp_q7s/memory/FilesystemHelper.cpp | 2 +- bsp_q7s/memory/FilesystemHelper.h | 1 + linux/devices/ploc/PlocMPSoCHelper.cpp | 6 +++--- linux/devices/ploc/PlocSupervisorHandler.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bsp_q7s/memory/FilesystemHelper.cpp b/bsp_q7s/memory/FilesystemHelper.cpp index 1c990426..e1f03305 100644 --- a/bsp_q7s/memory/FilesystemHelper.cpp +++ b/bsp_q7s/memory/FilesystemHelper.cpp @@ -2,7 +2,7 @@ #include #include "FilesystemHelper.h" #include "bsp_q7s/memory/SdCardManager.h" -#include "fsfw/serviceinterface/serviceInterfaceStream.h" +#include "fsfw/serviceinterface/ServiceInterfaceStream.h" FilesystemHelper::FilesystemHelper() { } diff --git a/bsp_q7s/memory/FilesystemHelper.h b/bsp_q7s/memory/FilesystemHelper.h index a3e59dea..80dcd50f 100644 --- a/bsp_q7s/memory/FilesystemHelper.h +++ b/bsp_q7s/memory/FilesystemHelper.h @@ -3,6 +3,7 @@ #include #include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "commonClassIds.h" /** * @brief This class implements often used functions concerning the file system management. diff --git a/linux/devices/ploc/PlocMPSoCHelper.cpp b/linux/devices/ploc/PlocMPSoCHelper.cpp index b3f220f4..cb604a81 100644 --- a/linux/devices/ploc/PlocMPSoCHelper.cpp +++ b/linux/devices/ploc/PlocMPSoCHelper.cpp @@ -5,7 +5,7 @@ #include "OBSWConfig.h" #ifdef XIPHOS_Q7S -#include "bsp_q7s/memory/FileSystemHelper.h" +#include "bsp_q7s/memory/FilesystemHelper.h" #endif #include "mission/utility/Timestamp.h" @@ -68,11 +68,11 @@ void PlocMPSoCHelper::setSequenceCount(SourceSequenceCounter* sequenceCount_) { ReturnValue_t PlocMPSoCHelper::startFlashWrite(std::string obcFile, std::string mpsocFile) { #ifdef XIPHOS_Q7S - ReturnValue_t result = FilesystemHelper::checkPath(file); + ReturnValue_t result = FilesystemHelper::checkPath(obcFile); if (result != RETURN_OK) { return result; } - result = FilesystemHelper::fileExists(file); + result = FilesystemHelper::fileExists(mpsocFile); if (result != RETURN_OK) { return result; } diff --git a/linux/devices/ploc/PlocSupervisorHandler.h b/linux/devices/ploc/PlocSupervisorHandler.h index 43530944..8339ccd4 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.h +++ b/linux/devices/ploc/PlocSupervisorHandler.h @@ -1,7 +1,7 @@ #ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_ #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_ -#include "OBSWconfig.h" +#include "OBSWConfig.h" #include #include #include